46256 PCN：返工作业页面，点击返工完成后，数量字段为0，产线代码为空

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

@@ -33,6 +33,7 @@ import cn.estsh.i3plus.pojo.mes.repository.*;
 import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
+import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.SpringContextsUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -1181,6 +1182,15 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
 
     private void doCreateReworkMove(MesReworkTaskRequestModel requestModel,String srcLocate, String destLocate,String workCenterCode,String partNo,Long partInspectionId) {
         MesPartSap mesPartSap = mesPartService.getMesPartSapByPartNo(partNo, requestModel.getOrganizeCode());
+
+        GenSerialNoModel serialNoModel = new GenSerialNoModel("INPUT_DEFECT_ZRSUM");
+        serialNoModel.setPartNo(mesPartSap.getPartNo());
+        ResultBean rb = syncFuncService.syncSerialNo(serialNoModel, requestModel.getUserName(), requestModel.getOrganizeCode(), 1);
+        String zrsum = "";
+        if (null != rb && !CollectionUtils.isEmpty(rb.getResultList())) {
+            zrsum = (rb.getResultList().get(0)).toString();
+        }
+
         MesMove move = new MesMove();
         move.setMatnr(mesPartSap.getPartNo());
         move.setOrganizeCode(requestModel.getOrganizeCode());
@@ -1189,6 +1199,7 @@ public class MesReworkTaskServiceImpl implements IMesReworkTaskService {
         move.setUmlgo(destLocate);
         move.setPartInspectionId(partInspectionId);
         move.setMenge(requestModel.getReworkedQty());
+        move.setZrsum(zrsum);
         move.setMeins(mesPartSap.getUnit());
         move.setPostDate(TimeTool.getToday());
         move.setPostTime(TimeTool.getTimeShortWithColon());

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

@@ -134,11 +134,17 @@ public class MesProductionRecordService implements IMesProductionRecordService {
     public void updateProductionRecord(String organizeCode, String userName, Long id, String errorMsg) {
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
         DdlPreparedPack.getNumEqualPack(id, "id", ddlPackBean);
-//        DdlPreparedPack.getStringEqualPack(sn, "productSn", ddlPackBean);
+
+        MesProductionRecord mesProductionRecord = productionRecordRepository.getByProperty(ddlPackBean);
+        if (mesProductionRecord !=null && Objects.equals(mesProductionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue())) {
+            productionRecordRepository.updateByPropertiesNoSync(new String[]{"modifyUser", "modifyDatetime","reportStatus", "remark"},
+                    new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue(), errorMsg },ddlPackBean);
+        } else {
             productionRecordRepository.updateByProperties(new String[]{"modifyUser", "modifyDatetime","reportStatus", "remark"},
                     new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue(), errorMsg },ddlPackBean);
-    }
 
+        }
+    }
     @Override
     public ResultBean queryMesProductionRecordReport(String organizeCode, String productSn) {
 
@@ -255,9 +261,16 @@ public class MesProductionRecordService implements IMesProductionRecordService {
         recordList.forEach(record->{
             DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(record.getOrganizeCode());
             DdlPreparedPack.getNumEqualPack(record.getId(), "id", ddlPackBean);
+
+            MesProductionRecord mesProductionRecord = productionRecordRepository.getByProperty(ddlPackBean);
+            if (mesProductionRecord !=null && Objects.equals(mesProductionRecord.getReportStatus(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue())) {
+                productionRecordRao.updateByPropertiesNoSync(new String[]{"modifyUser", "modifyDatetime", "reportStatus","remark"},
+                        new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), reportStatus,msg}, ddlPackBean);
+            } else {
                 productionRecordRao.updateByPropertiesNoSync(new String[]{"modifyUser", "modifyDatetime", "reportStatus","remark","systemSyncStatus","systemSyncDatetime"},
                         new Object[]{userName, DateUtil.format(new Date(), MesPcnExtConstWords.DATE_FORMAT_SSS), reportStatus,msg,CommonEnumUtil.FALSE,""}, ddlPackBean);
 
+            }
         });
     }