|
|
@@ -60,7 +60,7 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
productProcess.setVersion("1.1"); |
|
|
|
productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); |
|
|
|
productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD")); |
|
|
|
productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%"); |
|
|
|
productProcess.setShrinkage((productProcess.getDetectionLen() / productProcess.getLen()) * 100 + "%"); |
|
|
|
productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW); |
|
|
|
productProcess.setCompanyId(currentUser.getCompanyId()); |
|
|
|
productProcessMapper.insert(productProcess); |
|
|
@@ -77,14 +77,14 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
productProcess.setVersion("1.1"); |
|
|
|
productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); |
|
|
|
productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD")); |
|
|
|
productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%"); |
|
|
|
productProcess.setShrinkage((productProcess.getDetectionLen() / productProcess.getLen()) * 100 + "%"); |
|
|
|
productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW); |
|
|
|
productProcess.setCompanyId(currentUser.getCompanyId()); |
|
|
|
productProcessMapper.insert(productProcess); |
|
|
|
|
|
|
|
//保存由前端获取的工序信息 |
|
|
|
List<MtAloneProcessVo> processVoList = productAndProcess.getProcessVoList(); |
|
|
|
if(null != processVoList) { |
|
|
|
if (null != processVoList) { |
|
|
|
List<MtAloneProcess> processList = new ArrayList<MtAloneProcess>(processVoList.size()); |
|
|
|
for (MtAloneProcess processVo : processVoList) { |
|
|
|
MtAloneProcess process = new MtAloneProcess(); |
|
|
@@ -104,7 +104,7 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
List<MtAloneProcessVo> tempProcessVoList = processService.findProcessVoListByProductProcess(params); |
|
|
|
|
|
|
|
ProductProcessHo productProcessHo = new ProductProcessHo(); |
|
|
|
if(null != productProcess) { |
|
|
|
if (null != productProcess) { |
|
|
|
BeanUtils.copyProperties(productProcess, productProcessHo); |
|
|
|
if (null != tempProcessVoList) { |
|
|
|
List<ProcessHo> processHoList = new ArrayList<ProcessHo>(tempProcessVoList.size()); |
|
|
@@ -127,7 +127,7 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
|
|
|
|
//批次产品加工单初步赋值,关联bom |
|
|
|
ProductProcessBom productProcessBom = productProcessBomService.selectByProdProcBom(params); |
|
|
|
if(null != productProcessBom) { |
|
|
|
if (null != productProcessBom) { |
|
|
|
productProcessHo.setProductBomId(productProcessBom.getId()); |
|
|
|
productProcessHo.setProductProcessBomName(productProcessBom.getProductProcessName()); |
|
|
|
//工序初步赋值,关联bom |
|
|
@@ -189,18 +189,15 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
productProcess.setVersion("1.1"); |
|
|
|
productProcess.setStatus(ProduceManageConstant.STATUS_AVAILABLE); |
|
|
|
productProcess.setWorkOrderCode(ProduceManagePublicMethod.creatUniqueCode("PCJGD")); |
|
|
|
productProcess.setShrinkage((productProcess.getDetectionLen()/productProcess.getLen())*100+"%"); |
|
|
|
productProcess.setShrinkage((productProcess.getDetectionLen() / productProcess.getLen()) * 100 + "%"); |
|
|
|
productProcess.setReviewStatus(ProduceManageConstant.REVIEW_STATUS_FORREVIEW); |
|
|
|
productProcess.setCompanyId(currentUser.getCompanyId()); |
|
|
|
productProcessMapper.insert(productProcess); |
|
|
|
|
|
|
|
//保存工序和物料信息,避免循环操作数据库 |
|
|
|
List<ProcessHo> processHoList = productProcessHo.getProcessHoList(); |
|
|
|
List<MtAloneProcess> processList; |
|
|
|
List<ProcessMaterials> processMaterialsList; |
|
|
|
if((null!=processHoList) && (0!=processHoList.size())) { |
|
|
|
processList = new ArrayList<MtAloneProcess>(processHoList.size()); |
|
|
|
processMaterialsList = new ArrayList<ProcessMaterials>(); |
|
|
|
if (null != processHoList && processHoList.size() != 0) { |
|
|
|
List<MtAloneProcess> processList = new ArrayList<MtAloneProcess>(processHoList.size()); |
|
|
|
for (ProcessHo processHo : processHoList) { |
|
|
|
MtAloneProcess process = new MtAloneProcess(); |
|
|
|
BeanUtils.copyProperties(processHo, process); |
|
|
@@ -210,12 +207,18 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
process.setVersion("1.1"); |
|
|
|
process.setStatus(ProduceManageConstant.STATUS_AVAILABLE); |
|
|
|
process.setProductProcessId(productProcess.getId()); |
|
|
|
process.setCode(ProduceManagePublicMethod.creatUniqueCode("GX")); |
|
|
|
process.setCode(ProduceManagePublicMethod.creatUniqueCode("JGGX")); |
|
|
|
process.setCompanyId(currentUser.getCompanyId()); |
|
|
|
processList.add(process); |
|
|
|
} |
|
|
|
processService.save(processList); |
|
|
|
|
|
|
|
List<ProcessMaterials> processMaterialsList = new ArrayList<ProcessMaterials>(); |
|
|
|
for (int i = 0; i < processHoList.size(); i++) { |
|
|
|
ProcessHo processHo = processHoList.get(i); |
|
|
|
MtAloneProcess process = processList.get(i); |
|
|
|
List<ProcessMaterialsVo> processMaterialsVoList = processHo.getProcessMaterialsVoList(); |
|
|
|
if((null!=processMaterialsVoList) && (0!=processMaterialsVoList.size())){ |
|
|
|
if (null != processMaterialsVoList && processMaterialsVoList.size() != 0) { |
|
|
|
for (ProcessMaterialsVo processMaterialsVo : processMaterialsVoList) { |
|
|
|
ProcessMaterials processMaterials = new ProcessMaterials(); |
|
|
|
BeanUtils.copyProperties(processMaterialsVo, processMaterials); |
|
|
@@ -225,20 +228,18 @@ public class ProductProcessServiceImpl extends AbstractService<ProductProcess, I |
|
|
|
processMaterials.setVersion("1.1"); |
|
|
|
processMaterials.setStatus(ProduceManageConstant.STATUS_AVAILABLE); |
|
|
|
processMaterials.setProcessId(process.getId()); |
|
|
|
processMaterials.setCode(ProduceManagePublicMethod.creatUniqueCode("SCWL")); |
|
|
|
processMaterials.setDosage(productProcess.getPiNum()*processMaterials.getDosage()); |
|
|
|
processMaterials.setCode(ProduceManagePublicMethod.creatUniqueCode("JGWL")); |
|
|
|
processMaterials.setDosage(productProcess.getPiNum() * processMaterials.getDosage()); |
|
|
|
processMaterials.setCompanyId(currentUser.getCompanyId()); |
|
|
|
processMaterialsList.add(processMaterials); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
processService.save(processList); |
|
|
|
if (0 != processMaterialsList.size()) |
|
|
|
if (processMaterialsList.size() != 0) |
|
|
|
processMaterialsService.save(processMaterialsList); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |