diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesGenerateSnService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesGenerateSnService.java index ad3e195..4a6c8bf 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesGenerateSnService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesGenerateSnService.java @@ -66,6 +66,7 @@ public class MesGenerateSnService extends BaseStepService { MesProductionProcessContext productionProcessContext = productionProcessContextStepService.getEquipmentVariableList(reqBean, MesExtEnumUtil.EQUIP_VARIABLE_TYPE.PRODUCTION.getValue()); + List mesModelMultiCavities = productionProcessContext.getMesModelMultiCavities(); List mesProduceSns = new ArrayList<>(); for (MesModelMultiCavity modelMultiCavity : mesModelMultiCavities) { @@ -76,7 +77,7 @@ public class MesGenerateSnService extends BaseStepService { return execNonCompleteAndSendMsgReturn(reqBean, resultBean, stepResult, "零件号不存在"); } String sn = generateByRule(mesPart); - MesProduceSn mesProduceSn = generateMesProduceSn(); + MesProduceSn mesProduceSn = generateMesProduceSn(mesPart, sn); mesProduceSns.add(mesProduceSn); } mesProduceSnRepository.saveAll(mesProduceSns); @@ -93,8 +94,21 @@ public class MesGenerateSnService extends BaseStepService { return resultList.get(0); } - private MesProduceSn generateMesProduceSn(MesPart mesPart) { + private MesProduceSn generateMesProduceSn(MesPart mesPart, String sn) { MesProduceSn mesProduceSn = new MesProduceSn(); - mesProduceSn.set + mesProduceSn.setProductSn(sn); + mesProduceSn.setQcStatus(); + mesProduceSn.setWorkOrderNo(); + mesProduceSn.setAreaCode(); + mesProduceSn.setColorName(); + mesProduceSn.setCompensateTime(); + mesProduceSn.setCraftCode(); + mesProduceSn.setCustCode(); + mesProduceSn.setCustLabelTemplate(); + mesProduceSn.setCustPartNo(); + mesProduceSn.setEquipmentCode(); + mesProduceSn.setEquipmentName(); + mesProduceSn.set(); + } } diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application.properties b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application.properties index 7b5ae70..55ef997 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/resources/application.properties @@ -1,5 +1,5 @@ #\u4F7F\u7528\u914D\u7F6E -spring.profiles.active=test +spring.profiles.active=71 #\u9879\u76EE\u63CF\u8FF0\u4FE1\u606F\uFF08swagger\u4E2D\u663E\u5F0F\uFF09\uFF0C\u4E2D\u6587\u4F7F\u7528uncode\u8F6C\u7801 desc.application.name=\u751F\u4EA7\u4E2D\u5FC3\u8282\u70B9 ######### \u81EA\u5B9A\u4E49\u53C2\u6570 #########