| | |
| | | import com.jcdm.common.utils.DateUtils; |
| | | import com.jcdm.main.da.paramCollection.domain.DaParamCollection; |
| | | import com.jcdm.main.da.paramCollection.mapper.DaParamCollectionMapper; |
| | | import org.aspectj.weaver.loadtime.Aj; |
| | | import org.springframework.beans.factory.annotation.Autowired; |
| | | import org.springframework.stereotype.Service; |
| | | import com.jcdm.main.bs.formulaChild.mapper.BsFormulaChildInfoMapper; |
| | |
| | | } |
| | | |
| | | @Override |
| | | public List<BsFormulaChildInfo> releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) { |
| | | public BsFormulaChildInfo getCount(String productCode, String processesCode) { |
| | | BsFormulaChildInfo info = new BsFormulaChildInfo(); |
| | | info.setProcessesCode(processesCode); |
| | | info.setProductCode(productCode); |
| | | return bsFormulaChildInfoMapper.getCount(info); |
| | | } |
| | | |
| | | @Override |
| | | public BsFormulaChildInfo releaseCheck(BsFormulaChildInfo bsFormulaChildInfo) { |
| | | return bsFormulaChildInfoMapper.releaseCheck(bsFormulaChildInfo); |
| | | } |
| | | |
| | | @Override |
| | | public AjaxResult updateResults(BsFormulaChildInfo bsFormulaChildInfo) { |
| | | BsFormulaChildInfo checkInfo = new BsFormulaChildInfo(); |
| | | checkInfo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); |
| | | checkInfo.setProductCode(bsFormulaChildInfo.getProductCode()); |
| | | bsFormulaChildInfo.setMaterialCode(bsFormulaChildInfo.getScanBarcode().substring(1,2)); |
| | | List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(bsFormulaChildInfo); |
| | | if(bsFormulaChildInfos.size()>0){ |
| | |
| | | bsFormulaChildInfo.setParamCode(bsFormulaChildInfos.get(0).getParamCode()); |
| | | bsFormulaChildInfo.setSfcBarcode(bsFormulaChildInfo.getSfcBarcode()); |
| | | addParameterCollection(bsFormulaChildInfo); |
| | | // BsFormulaChildInfo count = bsFormulaChildInfoMapper.getCount(checkInfo); |
| | | // Integer i = count.getCounts(); |
| | | }else { |
| | | return AjaxResult.error("非本工位物料,请重新扫描"); |
| | | } |
| | |
| | | bsFormulaChildInfoMapper.workpieceRelease(bsFormulaChildInfo); |
| | | return AjaxResult.success(); |
| | | } |
| | | |
| | | @Override |
| | | public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) { |
| | | BsFormulaChildInfo listQuery = new BsFormulaChildInfo(); |
| | | listQuery.setParamCode(bsFormulaChildInfo.getParamCode()); |
| | | String paramCode = bsFormulaChildInfo.getTightenTheArray(); |
| | | if(paramCode.contains("N")){ |
| | | List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery); |
| | | bsFormulaChildInfos.get(0).setResults("NG"); |
| | | bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray()); |
| | | bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0)); |
| | | return AjaxResult.error("扫描结果NG,请重新扫描!"); |
| | | }else { |
| | | List<BsFormulaChildInfo> bsFormulaChildInfos = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(listQuery); |
| | | bsFormulaChildInfos.get(0).setResults("OK"); |
| | | bsFormulaChildInfos.get(0).setCollectData(bsFormulaChildInfo.getTightenTheArray()); |
| | | bsFormulaChildInfoMapper.updateBsFormulaChildInfo(bsFormulaChildInfos.get(0)); |
| | | } |
| | | return AjaxResult.success("扫描成功!"); |
| | | } |
| | | |
| | | |
| | | |
| | | |
| | | } |