From bc60e1a2c18cd5cb23cc83f3cbeeb68de1d2fd6b Mon Sep 17 00:00:00 2001
From: jun <junsheng.li@estsh.com>
Date: Thu, 5 Sep 2024 15:29:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=8C=96=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E6=8B=86=E8=A7=A3=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pcn/apiservice/controller/busi/MesReworkTaskController.java  | 4 +---
 .../apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java    | 9 +++++----
 .../estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskModel.java  | 7 ++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java
index e242600..33e1321 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/MesReworkTaskController.java
@@ -82,9 +82,7 @@ public class MesReworkTaskController {
     @ApiOperation(value = "装配件查询")
     public ResultBean assemblyQuery(MesReworkTaskRequestModel requestModel) {
         // 数据校验
-        if (StringUtils.isEmpty(requestModel.getCustSn())) {
-            ResultBean.success("返工成功").setResultObject(null);
-        }
+        ValidatorBean.checkNotNull(requestModel.getCustSn(), "客户条码不能为空");
         /*ValidatorBean.checkNotNull(requestModel.getPartNo(), "零件号不能为空");*/
         try {
             List<MesProductionAssembly> mesProductionRecords = mesReworkTaskService.assemblyQuery(requestModel);
diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
index 002ba36..1f7210c 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/MesReworkTaskServiceImpl.java
@@ -180,6 +180,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
          * 组装返回信息
          */
         MesReworkTaskModel mesReworkTaskModel = MesReworkTaskModel.builder()
+                .mesReworkTask(res)
                 .reworkOrder(res.getReworkOrder())
                 .sn(res.getSn())
                 .mesPartTypePicture(mesPartTypePicture)
@@ -561,8 +562,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
             DdlPreparedPack.getNumEqualPack(MesExtEnumUtil.ASSEMBLY_STATUS.ASSEMBLY_STATUS_10.getValue(), "assemblyStatus", packBean);
             List<MesProductionAssembly> mesProductionAssemblies = mesProductionAssemblyRepository.findByHqlWhere(packBean);
             if (!CollectionUtils.isEmpty(mesProductionAssemblies)) {
-                assembly.setChildTreeList(parseArray(mesProductionAssemblies));
-                recursionAssemblySnTree(assembly.getChildTreeList(), requestModel);
+                assembly.setChildren(parseArray(mesProductionAssemblies));
+                recursionAssemblySnTree(assembly.getChildren(), requestModel);
             }
         }
     }
@@ -656,8 +657,8 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
                 //对于已勾选报废的子件，对于有零件号的项，产生移库（产线的材料库位->报废库（系统参数配置））。移库数量为报废时的明细数量；
                 createMove(getMesWorkCenter(organizeCode, assemblyModel.getWorkCenterCode()),destLocate, assemblyModel,userName);
                 //循环处理数据
-                if(!CollectionUtils.isEmpty(assemblyModel.getChildTreeList())){
-                    recursionCheck(assemblyModel.getChildTreeList(),organizeCode,userName,destLocate);
+                if(!CollectionUtils.isEmpty(assemblyModel.getChildren())){
+                    recursionCheck(assemblyModel.getChildren(),organizeCode,userName,destLocate);
                 }
             } else if (assemblyModel.getFlag() == CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()) {
                 //装配解绑
diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskModel.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskModel.java
index 4666aec..94e2e09 100644
--- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskModel.java
+++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/model/MesReworkTaskModel.java
@@ -3,10 +3,10 @@ package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
 import cn.estsh.i3plus.pojo.mes.bean.MesPartTypePicture;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspection;
 import cn.estsh.i3plus.pojo.mes.bean.nc.MesPartInspectionDetail;
+import cn.estsh.i3plus.pojo.mes.bean.rework.MesReworkTask;
 import lombok.Builder;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.List;
 
 @Data
@@ -24,6 +24,11 @@ public class MesReworkTaskModel {
      * 返工单零件对应的图片信息
      */
     private MesPartTypePicture mesPartTypePicture;
+
+    /**
+     * 返工单零件对应的图片信息
+     */
+    private MesReworkTask mesReworkTask;
     /**
      * 缺陷信息
      */