问题清单修复

modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/base/IMesTemplateService.java

@@ -12,5 +12,5 @@ public interface IMesTemplateService {
      * @return 标签模板
      */
     @ApiOperation(value = "按条件查询", notes = "按条件查询")
-    MesLabelTemplate getMesLabelTemplate(String templateCode);
+    MesLabelTemplate getMesLabelTemplate(String templateCode,String organizeCode);
 }

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesProduceSnPrintController.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 
+import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesTemplateService;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesProduceSnPrintService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
@@ -33,6 +34,23 @@ public class MesProduceSnPrintController {
     @Autowired
     private IMesProduceSnPrintService mesProduceSnPrintService;
 
+    @Autowired
+    private IMesTemplateService mesTemplateService;
+
+    @GetMapping("/mes-template/find")
+    @ApiOperation(value = "查询打印模板信息")
+    public ResultBean findMesLabelTemplate(MesProduceSnPrintModel mesProduceSnPrintModel) {
+        try {
+            ValidatorBean.checkNotNull(mesProduceSnPrintModel.getPrintTemplate(), "打印模板不能为空");
+            ValidatorBean.checkNotNull(mesProduceSnPrintModel.getOrganizeCode(), "工厂代码不能为空");
+            return ResultBean.success("查询成功").setResultObject(mesTemplateService.getMesLabelTemplate(mesProduceSnPrintModel.getPrintTemplate(), mesProduceSnPrintModel.getOrganizeCode()));
+        } catch (ImppBusiException imppException) {
+            return ResultBean.fail(imppException);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
     @GetMapping("/mes-packing-define/find")
     @ApiOperation(value = "查询信息")
     public ResultBean findMesPackingDefine(MesProduceSnPrintModel mesProduceSnPrintModel) {

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesTemplateServiceImpl.java

@@ -2,12 +2,14 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.base;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesTemplateService;
 import cn.estsh.i3plus.ext.mes.pcn.apiservice.util.MesPcnException;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords;
 import cn.estsh.i3plus.platform.common.util.MesPcnConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
 import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam;
 import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateParamRepository;
 import cn.estsh.i3plus.pojo.mes.repository.MesLabelTemplateRepository;
+import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,21 +33,19 @@ public class MesTemplateServiceImpl implements IMesTemplateService {
     private MesLabelTemplateParamRepository mesLabelTemplateParamRDao;
 
     @Override
-    public MesLabelTemplate getMesLabelTemplate(String templateCode) {
+    public MesLabelTemplate getMesLabelTemplate(String templateCode,String organizeCode) {
         // 根据标签模板代码，查询【MES_标签模板表】，获取对应的方法代码
         MesLabelTemplate labelTemplate = mesLabelTemplateRDao.getByProperty(
-                new String[]{MesPcnConstWords.IS_VALID, MesPcnConstWords.IS_DELETED, "templateCode"},
+                new String[]{MesPcnConstWords.IS_VALID, MesPcnConstWords.IS_DELETED, "templateCode", MesPcnExtConstWords.ORGANIZE_CODE},
-                new Object[]{CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), templateCode});
+                new Object[]{CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), templateCode,organizeCode});
 
         if (labelTemplate == null) {
             MesPcnException.throwMesBusiException("标签模板代码【%s】在标签模板表不存在！", templateCode);
         }
 
         // 根据模板代码查询模板参数信息
-        List<MesLabelTemplateParam> templateParamList = mesLabelTemplateParamRDao.findByProperty(new String[]{"templateCode",
+        List<MesLabelTemplateParam> templateParamList = mesLabelTemplateParamRDao.findByProperty(new String[]{"templateCode", MesPcnConstWords.IS_VALID, MesPcnConstWords.IS_DELETED,MesPcnExtConstWords.ORGANIZE_CODE},
-                        MesPcnConstWords.IS_VALID, MesPcnConstWords.IS_DELETED},
+                new Object[]{templateCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),organizeCode});
-                new Object[]{templateCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(),
-                        CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()});
 
         if (CollectionUtils.isEmpty(templateParamList)) {
             MesPcnException.throwMesBusiException("标签模板代码【%s】在标签模板明细表不存在！", templateCode);

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesProduceSnPrintService.java

@@ -143,7 +143,7 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
 
             }
             // 获取打印模板
-            MesLabelTemplate mesLabelTemplate = mesTemplateService.getMesLabelTemplate(printTemplate);
+            MesLabelTemplate mesLabelTemplate = mesTemplateService.getMesLabelTemplate(printTemplate,organizeCode);
             String methodCode = mesLabelTemplate.getMethodCode();
             if (StringUtils.isEmpty(methodCode)) {
                 throw ImppExceptionBuilder.newInstance().setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
@@ -194,7 +194,7 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
             mesProduceSnPrintModel.getMesProduceSnPrintDataModelList().add(model);
         }
         //获取打印模板信息
-        mesProduceSnPrintModel.setMesLabelTemplate(mesTemplateService.getMesLabelTemplate(mesProduceSnPrintModel.getPrintTemplate()));
+        mesProduceSnPrintModel.setMesLabelTemplate(mesTemplateService.getMesLabelTemplate(mesProduceSnPrintModel.getPrintTemplate(),organizeCode));
         return mesProduceSnPrintModel;
     }
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java

@@ -250,7 +250,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                     newMesProductOffLine.setQty(1d);
                     newMesProductOffLine.setReportSn(produceSn.getProductSn());
                     newMesProductOffLine.setBomVersion(oldMesWorkOrder.getProductVersion());
-                    newMesProductOffLine.setSerialNumber(produceSn.getProductSn());
+                    newMesProductOffLine.setSerialNumber(produceSn.getSerialNumber());
                     newMesProductOffLine.setUnit(mesBom.getUnit());
                     newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
                     newMesProductOffLine.setWorkOrderNo(oldMesWorkOrder.getWorkOrderNo());
@@ -317,7 +317,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                 newMesProductOffLine.setQty(1d);
                 newMesProductOffLine.setReportSn(mesProductionRecord.getProductSn());
                 newMesProductOffLine.setBomVersion(mesWorkOrderDb.getProductVersion());
-                newMesProductOffLine.setSerialNumber(mesProductionRecord.getProductSn());
+                newMesProductOffLine.setSerialNumber(mesProductionRecord.getSerialNumber());
                 newMesProductOffLine.setUnit(mesBom.getUnit());
                 newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
                 newMesProductOffLine.setWorkOrderNo(mesWorkOrderDb.getWorkOrderNo());
@@ -609,7 +609,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             newMesProductOffLine.setQty(1d);
             newMesProductOffLine.setReportSn(productionRecord.getProductSn());
             newMesProductOffLine.setBomVersion(oldMesWorkOrder.getProductVersion());
-            newMesProductOffLine.setSerialNumber(productionRecord.getProductSn());
+            newMesProductOffLine.setSerialNumber(productionRecord.getSerialNumber());
             newMesProductOffLine.setUnit(mesBom.getUnit());
             newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
             newMesProductOffLine.setWorkOrderNo(oldMesWorkOrder.getWorkOrderNo());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesReportNoSortStepService.java

@@ -172,7 +172,7 @@ public class MesReportNoSortStepService extends BaseStepService {
                     newMesProductOffLine.setQty(1d);
                     newMesProductOffLine.setReportSn(produceSn.getProductSn());
                     newMesProductOffLine.setBomVersion(oldMesWorkOrder.getProductVersion());
-                    newMesProductOffLine.setSerialNumber(produceSn.getProductSn());
+                    newMesProductOffLine.setSerialNumber(produceSn.getSerialNumber());
                     newMesProductOffLine.setUnit(mesBom.getUnit());
                     newMesProductOffLine.setItemUnit(mesBom.getItemUnit());
                     newMesProductOffLine.setWorkOrderNo(oldMesWorkOrder.getWorkOrderNo());