返工，装配件替换问题修复

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

@@ -63,9 +63,11 @@ public class MesReworkTaskController {
 
     @PostMapping("/reworkRecord")
     @ApiOperation(value = "返工")
-    public ResultBean reworkRecord(@RequestBody Long[] inspectionDetailIds,String userName,String organizeCode) {
+    public ResultBean reworkRecord(@RequestBody MesReworkTaskRequestModel mesReworkTaskRequestModel) {
         try {
-            for (long inspectionDetailId : inspectionDetailIds) {
+            String userName = mesReworkTaskRequestModel.getUserName();
+            String organizeCode = !StringUtils.isEmpty(mesReworkTaskRequestModel.getOrganizeCode())?mesReworkTaskRequestModel.getOrganizeCode():AuthUtil.getOrganizeCode();
+            for (long inspectionDetailId : mesReworkTaskRequestModel.getIds()) {
                 mesReworkTaskService.reworkRecord(inspectionDetailId,userName,organizeCode);
             }
             return ResultBean.success("返工成功");

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

@@ -306,8 +306,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         boolean checkResult = true;
         //查询装配记录
         requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
+        requestModel.setIsOrigSn(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         List<MesProductionAssembly> mesProductionAssemblies = assemblyQuery(requestModel);
-        if (CollectionUtils.isEmpty(mesProductionAssemblies)) MesPcnException.throwFlowException("装配件记录不存在");
+        if (CollectionUtils.isEmpty(mesProductionAssemblies)) MesPcnException.throwFlowException("未查询到没有替换的装配件记录");
         Map<String,MesWorkCenter> mesWorkCenterMap = new HashMap<>();
         //匹配装配件
         for (MesProductionAssembly assembly : mesProductionAssemblies) {
@@ -350,7 +351,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                 break;
             }
         }
-        if(checkResult) MesPcnException.throwFlowException("条码信息不存在");
+        if(checkResult) MesPcnException.throwFlowException("装配件替换失败，未匹配到符合规则的已装配数据");
         /**
          * 需要更新NC标记后进入的表明细状态为已处理
          */

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

@@ -346,19 +346,21 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         mesProductOffLineRDao.saveAll(mesProductOffLineList);
     }
 
-    private void updateMesWorkOrder(MesWorkOrder mesWorkOrder, String userName) {
+    private void updateMesWorkOrder(MesWorkOrder mesWorkOrder, String userName,double qty) {
         //修改工单，需要重新同步
         mesWorkOrder.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         ConvertBean.serviceModelUpdate(mesWorkOrder, userName);
         mesWorkOrder.setModifyDatetime((new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS")).format(new Date()));
         workOrderExtService.update(mesWorkOrder);
         //保存记录
-        saveMesWorkOrderLog(mesWorkOrder);
+        saveMesWorkOrderLog(mesWorkOrder,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.REPORT.getValue(),qty);
     }
 
-    public void saveMesWorkOrderLog(MesWorkOrder mesWorkOrder) {
+    public void saveMesWorkOrderLog(MesWorkOrder mesWorkOrder,int type,double qty) {
         MesWorkOrderLog workOrderLog = new MesWorkOrderLog();
         BeanUtils.copyProperties(mesWorkOrder, workOrderLog, "id");
+        workOrderLog.setType(type);
+        workOrderLog.setModifyQty(qty);
         mesWorkOrderLogRepository.insert(workOrderLog);
     }
 
@@ -1021,7 +1023,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
         mesWorkOrderDb.setRemark(mesWorkOrder.getRemark());
         String sn = getOrderNo(mesWorkOrder, mesPart, userName);
         //更新工单
-        updateMesWorkOrder(mesWorkOrderDb, userName);
+        updateMesWorkOrder(mesWorkOrderDb, userName,mesWorkOrder.getNum());
         //记录条码表&加工记录表
         //insertMesProductionRecord(insertMesProduceSn(mesPart, sn, userName, mesWorkOrder),mesWorkOrderDb);
         insertMesProduceSn(mesPart, sn, userName, mesWorkOrder);
@@ -1193,7 +1195,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
             if (CollectionUtils.isNotEmpty(saveMesWorkOrderToWms)) {
                 mesWorkOrderToWmsRDao.saveAll(saveMesWorkOrderToWms);
             }
-            saveMesWorkOrderLog(mesWorkOrder);
+            saveMesWorkOrderLog(mesWorkOrder,MesExtEnumUtil.WORK_ORDER_LOG_TYPE.INSERT.getValue(),item.getQty());
             mesWorkOrderList.add(mesWorkOrder);
         }
 

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

@@ -55,4 +55,7 @@ public class MesReworkTaskRequestModel {
     @ApiModelProperty("操作人")
     private String userName;
 
+    @ApiModelProperty("ids")
+    private Long[] ids;
+
 }