Merge remote-tracking branch 'origin/dev' into dev

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

@@ -188,7 +188,14 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             mesReworkTask.setReworkedQty(requestModel.getReworkedQty());
             mesReworkTask.setScrapQty(requestModel.getScrapQty());
         } else {
-            mesReworkTask.setReworkedQty(mesReworkTask.getQty());
+            if (MesExtEnumUtil.NC_TYPE.REWORK.getValue() == requestModel.getType()) {
+                mesReworkTask.setReworkedQty(mesReworkTask.getQty());
+            } else if (MesExtEnumUtil.NC_TYPE.SCRAP.getValue() == requestModel.getType()) {
+                //更新条码状态为报废
+                updateMesProduceSn(requestModel);
+                //更新返工数量
+                mesReworkTask.setScrapQty(mesReworkTask.getQty());
+            }
         }
 
         mesReworkTask.setStatus(MesExtEnumUtil.REWORK_TASK_STATUS.FINISH.getValue());
@@ -380,4 +387,25 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
 
         return res;
     }
+
+    private void updateMesProduceSn(MesReworkTaskRequestModel requestModel) {
+        MesProduceSn produceSn = checkProduceSn(requestModel.getSn(), requestModel.getOrganizeCode());
+        produceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.SCRAP.getValue());
+        mesProduceSnRepository.update(produceSn);
+    }
+
+    private MesProduceSn checkProduceSn(String serialNumber, String org) {
+        //根据扫描的条码查询条码是否存在
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean(org);
+        DdlPreparedPack.getStringEqualPack(serialNumber, "productSn", packBean);
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
+        MesProduceSn produceSn = mesProduceSnRepository.getByProperty(packBean);
+
+        //若不存在则提示条码不存在
+        if (StringUtils.isEmpty(produceSn)) {
+            throw new ImppBusiException(String.format("【%s】此条码不存在，请检查数据", serialNumber));
+        }
+
+        return produceSn;
+    }
 }

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

@@ -48,4 +48,8 @@ public class MesReworkTaskRequestModel {
     @ApiModelProperty("报废数量")
     private Integer scrapQty;
 
+    /**20 返工  30 报废 */
+    @ApiModelProperty("类型")
+    private Integer type;
+
 }