diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java index daad800..e60220e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesContainerSnStationController.java @@ -55,7 +55,7 @@ public class MesContainerSnStationController { @ApiOperation(value = "新增") public ResultBean doInsert(@RequestBody MesContainerSnStation mesContainerSnStation) { try { - ValidatorBean.checkNotNull(mesContainerSnStation.getCreateUser(), "工厂代码为空"); + ValidatorBean.checkNotNull(mesContainerSnStation.getCreateUser(), "操作人为空"); ValidatorBean.checkNotNull(mesContainerSnStation.getOrganizeCode(), "工厂代码为空"); //校验容器条码是否存在 mesContainerSnService.checkContainerSnIsExist(mesContainerSnStation.getContainerSn(), mesContainerSnStation.getOrganizeCode()); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java index e6d2752..2661758 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java @@ -54,6 +54,7 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic resultMap.put(MesPcnExtConstWords.CUT_WORK_ORDER_NO, workOrderCutPrintModel.getCutWorkOrderNo()); resultMap.put(MesPcnExtConstWords.CUT_NAME, workOrderCutPrintModel.getCutName()); + resultMap.put(MesPcnExtConstWords.CUT_CODE, workOrderCutPrintModel.getCutCode()); // 原材料零件号 resultMap.put(MesPcnExtConstWords.RAW_PART_NO, cutSchemeMaterial == null ? "" : cutSchemeMaterial.getPartNo());