电子化检验 AB bug 生产零件条码 策略bug

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

@@ -4,6 +4,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
 import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesInputDefectRecordService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesPartInspectionInputModel;
+import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesPartInspectionViewModel;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@@ -25,16 +26,17 @@ public class MesInputDefectRecordController {
     @Autowired
     private IMesInputDefectRecordService inputDefectRecordService;
 
-
     @PostMapping("/query-part-inspection")
     @ApiOperation(value = "查询页面信息")
     public ResultBean queryPartInspection(@RequestBody MesPartInspectionInputModel model) {
 
         try {
-
+            String organizeCode = !StringUtils.isEmpty(model.getOrganizeCode()) ? model.getOrganizeCode() : AuthUtil.getOrganize().getOrganizeCode();
-
+            MesPartInspectionViewModel result = inputDefectRecordService.queryPartInspection(model, organizeCode);
-//            return ResultBean.success("查询成功").setResultObject(inputDefectRecordService.queryPartInspection(model, "CK01"));
+            String msg = "查询成功";
-            return ResultBean.success("查询成功").setResultObject(inputDefectRecordService.queryPartInspection(model, AuthUtil.getOrganizeCode()));
+            if (!StringUtils.isEmpty(model.getFrontBack()) && model.getFrontBack().compareTo(10) == 0 && StringUtils.isEmpty(result.getPartTypePicture().getFrontPictureName())) msg = "A面图片未维护";
+            if (!StringUtils.isEmpty(model.getFrontBack()) && model.getFrontBack().compareTo(20) == 0 && StringUtils.isEmpty(result.getPartTypePicture().getBackPictureName())) msg = "B面图片未维护";
+            return ResultBean.success(msg).setResultObject(result);
         } catch (ImppBusiException imppException) {
             return ResultBean.fail(imppException);
         } catch (Exception e) {

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

@@ -672,7 +672,7 @@ public class MesInputDefectRecordService implements IMesInputDefectRecordService
         MesPartTypePicture partTypePicture = partTypePictureRepository.getByProperty(packBean);
 
         //若不存在则提示零件类别不存在
-        if (StringUtils.isEmpty(partTypePicture)) {
+        if (null == partTypePicture) {
             throw new ImppBusiException(String.format("【%s】物料号对应的【%s】零件类别不存在，请检查数据", part.getPartNo(), part.getPartTypeCode()));
         }
 

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

@@ -156,8 +156,8 @@ public class MesProduceSnPrintService implements IMesProduceSnPrintService {
             GenSerialNoModel genSerialNoModel = new GenSerialNoModel();
             genSerialNoModel.setRuleCode(numberRule.getRuleCode());
             genSerialNoModel.setPartNo(mesPart.getPartNo());
-            genSerialNoModel.putDataMap("mesPart",mesPart);
+            genSerialNoModel.putDataMap(MesPart.class.getSimpleName(), mesPart);
-            genSerialNoModel.putDataMap("mesCustomerPart",mesCustomerPart);
+            genSerialNoModel.putDataMap(MesCustomerPart.class.getSimpleName(), mesCustomerPart);
             genSerialNoModel.setOrganizeCode(organizeCode);
             genSerialNoModel = packStrategy.execute(genSerialNoModel);
             genSerialNoModel.setCustPartNo(mesCustomerPart == null ? null : mesCustomerPart.getCustPartNo());

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/B2mAndGqaaNumberRuleStrategyService.java

@@ -8,7 +8,6 @@ import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
-import java.util.HashMap;
 
 /**
  * @Description :
@@ -22,7 +21,7 @@ public class B2mAndGqaaNumberRuleStrategyService implements INumberRulePackAttri
     @Override
     public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
 
-        MesPart mesPart = (MesPart) genSerialNoModel.getDataMap().get("mesPart");
+        MesPart mesPart = (MesPart) genSerialNoModel.getDataMap().get(MesPart.class.getSimpleName());
         Date date = new Date();
 //        genSerialNoModel.setRuleCode(numberRule.getRuleCode());
         //${SPILTRULE}${partNo}${SPILTRULE}${SPILTRULE}${year}${month}${day}${serialNo}${SPILTRULE}

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/XiaoPengNumberRuleStrategyService.java

@@ -8,10 +8,8 @@ import cn.estsh.i3plus.pojo.mes.repository.MesCustomerPartRepository;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -31,7 +29,7 @@ public class XiaoPengNumberRuleStrategyService implements INumberRulePackAttribu
     public GenSerialNoModel execute(GenSerialNoModel genSerialNoModel) {
         Date date = new Date();
         Map<String, Object> dataMap =genSerialNoModel.getDataMap();
-        MesCustomerPart customerPart = (MesCustomerPart) dataMap.get("mesCustomerPart");
+        MesCustomerPart customerPart = (MesCustomerPart) dataMap.get(MesCustomerPart.class.getSimpleName());
         //客户零件号
         String custPartNo = customerPart.getCustPartNo();
         genSerialNoModel.setCustPartNo(custPartNo);

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesPartInspectionInputModel.java

@@ -18,6 +18,12 @@ import java.util.List;
 @Data
 public class MesPartInspectionInputModel {
 
+    @ApiParam("操作人")
+    private String userInfo;
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
     @ApiParam("NC-零件检测-单据id")
     private Long id;