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

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

@@ -18,10 +18,7 @@ import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -66,9 +63,9 @@ public class MesReworkTaskController {
         }
     }
 
-    @GetMapping("/reworkRecord")
+    @PostMapping("/reworkRecord")
     @ApiOperation(value = "返工")
-    public ResultBean reworkRecord(long[] inspectionDetailIds) {
+    public ResultBean reworkRecord(@RequestBody Long[] inspectionDetailIds) {
         try {
             for (long inspectionDetailId : inspectionDetailIds) {
                 mesReworkTaskService.reworkRecord(inspectionDetailId);
@@ -86,7 +83,7 @@ public class MesReworkTaskController {
     public ResultBean assemblyQuery(MesReworkTaskRequestModel requestModel) {
         // 数据校验
         ValidatorBean.checkNotNull(requestModel.getCustSn(), "客户条码不能为空");
-        ValidatorBean.checkNotNull(requestModel.getPartNo(), "零件号不能为空");
+        /*ValidatorBean.checkNotNull(requestModel.getPartNo(), "零件号不能为空");*/
         try {
             List<MesProductionAssembly> mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel);
             return ResultBean.success("返工成功").setResultObject(mesProductionRecords);
@@ -103,9 +100,9 @@ public class MesReworkTaskController {
         try {
             // 数据校验
             ValidatorBean.checkNotNull(requestModel.getCustSn(), "客户条码不能为空");
-            ValidatorBean.checkNotNull(requestModel.getPartNo(), "零件号不能为空");
+            /*ValidatorBean.checkNotNull(requestModel.getPartNo(), "零件号不能为空");*/
             ValidatorBean.checkNotNull(requestModel.getSn(), "替换条码不能为空");
-            ValidatorBean.checkNotNull(requestModel.getDetailId(), "缺陷位置id不能为空");
+            ValidatorBean.checkNotNull(requestModel.getDetailIds(), "缺陷位置id不能为空");
 
             mesReworkTaskService.assemblySnRepeat(requestModel);
             return ResultBean.success("返工成功");

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

@@ -149,7 +149,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
     public List<MesProductionAssembly> assemblyQuery(MesReworkTaskRequestModel requestModel) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(requestModel.getOrganizeCode());
         DdlPreparedPack.getStringEqualPack(requestModel.getCustSn(), "custSn", packBean);
-        DdlPreparedPack.getStringEqualPack(requestModel.getPartNo(), "partNo", packBean);
+        //DdlPreparedPack.getStringEqualPack(requestModel.getPartNo(), "partNo", packBean);
         if (!StringUtils.isEmpty(requestModel.getAssemblyPartNo())) {
             DdlPreparedPack.getStringEqualPack(requestModel.getAssemblyPartNo(), "assemblyPartNo", packBean);
         }
@@ -192,20 +192,20 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                 MesPcnException.throwFlowException("条码信息不存在");
             }
             requestModel.setAssemblyPartNo(mesProduceSn.getPartNo());
-            requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_PART_STATUS.ASSEMBLY_PART_STATUS_10.getValue());
+            requestModel.setAssemblyPartStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
             List<MesProductionAssembly> mesProductionAssemblies = assemblyQuery(requestModel);
             if (CollectionUtils.isEmpty(mesProductionAssemblies)) {
                 MesPcnException.throwFlowException("未匹配到该条码的零件号");
             }
             // 需要变更之前的记录
             MesProductionAssembly mesProductionAssembly = mesProductionAssemblies.get(0);
-            mesProductionAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_PART_STATUS.ASSEMBLY_PART_STATUS_20.getValue());
+            mesProductionAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_20.getValue());
 
 
             // 需要新增一条替换条码的记录
             MesProductionAssembly mesProductionRepeatAssembly = new MesProductionAssembly();
             BeanUtils.copyProperties(mesProductionAssembly, mesProductionRepeatAssembly);
-            mesProductionRepeatAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_PART_STATUS.ASSEMBLY_PART_STATUS_10.getValue());
+            mesProductionRepeatAssembly.setAssemblyStatus(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue());
             mesProductionRepeatAssembly.setId(null);
 
             mesProductionAssembly.setRepeatAssemblySn(requestModel.getSn());
@@ -215,7 +215,9 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             /**
              * 需要更新NC标记后进入的表明细状态为已处理
              */
-            reworkRecord(requestModel.getDetailId());
+            for (Long detailId : requestModel.getDetailIds()) {
+                reworkRecord(detailId);
+            }
         } catch (Exception e) {
             log.error("替换条码异常", e);
         }

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

@@ -181,7 +181,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
                     newMesProductOffLine.setReportPartNo(oldMesWorkOrder.getPartNo());
                     newMesProductOffLine.setReportPartNameRdd(oldMesWorkOrder.getPartNameRdd());
                     newMesProductOffLine.setItemPartNo(mesBom.getItemPartNo());
-                    newMesProductOffLine.setItemPartNameRdd(mesBom.getItemPartName());
+                    newMesProductOffLine.setItemPartName(mesBom.getItemPartName());
                     newMesProductOffLine.setItemQty(mesBom.getItemQty());
                     newMesProductOffLine.setAlort(mesProductVersion.getReceiveInventoryPoint());
                     newMesProductOffLine.setStgeLoc(mesProductVersion.getShipInventoryPoint());

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

@@ -39,6 +39,6 @@ public class MesReworkTaskRequestModel {
 
     private Integer assemblyPartStatus;
 
-    private Long detailId;
+    private List<Long> detailIds;
 
 }