From 282e8a6b99d5db1e2572cf43c5ca535443b4b902 Mon Sep 17 00:00:00 2001
From: "xiangwei.zhang" <752558143@qq.com>
Date: Mon, 31 Mar 2025 16:16:14 +0800
Subject: [PATCH] =?UTF-8?q?45843=201=20=E6=97=A0=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E8=A1=A5=E6=8A=A5=E5=B7=A5JOB=E9=92=88=E5=AF=B9=E5=A4=9A?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC=E5=9C=BA=E6=99=AF=EF=BC=8C?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8SAP=20=E4=B8=BB=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE0001=E8=BF=9B=E8=A1=8C=E8=A1=A5=E6=8A=A5=E5=B7=A5=202?=
 =?UTF-8?q?=20=E6=97=A0=E5=B7=A5=E5=8D=95=E6=8A=A5=E5=B7=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BA=A7=E7=BA=BF=E7=89=A9=E6=96=99=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=80=E4=B8=AA=E4=BA=8B=E5=8A=A1=E5=8E=BB=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E7=94=9F=E4=BA=A7=E7=89=88=E6=9C=AC=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/controller/busi/TestController.java | 43 +---------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java
index de57c5d..226d67d 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/busi/TestController.java
@@ -54,48 +54,7 @@ public class TestController {
     @GetMapping("/reportWorkByPreDayJob")
     @ApiOperation(value = "查询设备交互")
     public ResultBean queryReworkTaskByPager(String organizeCode) {
-        try {
-            //遍历系统参数指定的产线获取对应班次，找到早班的开始时间，
-            String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_WORK_CENTER_NO");
-            List<String> workCenterCodeList = Arrays.asList(workCenterCodes.split(","));
-            String userName = "REPORT_PRE_DAY_JOB";
-            DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
-            List<MesShift> mesShiftListAll = mesShiftRepository.findByHqlWhere(packBean);
-            for (String workCenterCode : workCenterCodeList) {
-                List<MesShift> mesShiftList = mesShiftListAll.stream().filter(s -> s.getWorkCenterCode().equalsIgnoreCase(workCenterCode)).collect(Collectors.toList());
-                //1.获取生产加工记录production_record表中，report_status为待汇报状态的工单
-                List<MesProductionRecord> mesProductionRecordList = workOrderService.getPreDayReportMesProductionRecord(organizeCode, mesShiftList, workCenterCode);
-                if (CollectionUtils.isEmpty(mesProductionRecordList)) {
-                    continue;
-                }
-
-                //3.插入生产工单表
-                List<MesWorkOrder> mesWorkOrders = workOrderService.insertMesWorkOrder(mesProductionRecordList, mesShiftList, organizeCode, userName);
-                if (CollectionUtils.isEmpty(mesWorkOrders)) {
-                    continue;
-
-                }
-                //4.根据产线+物料产生的工单报工
-
-                for (MesWorkOrder mesWorkOrder : mesWorkOrders) {
-                    List<MesProductionRecord> mesProductionRecords = mesProductionRecordList.stream().filter(
-                            w -> w.getWorkCenterCode().equalsIgnoreCase(mesWorkOrder.getWorkCenterCode())
-                                    && w.getPartNo().equalsIgnoreCase(mesWorkOrder.getPartNo())).collect(Collectors.toList());
-                    workOrderService.doPcnJobProductReport(mesProductionRecords, mesShiftList, organizeCode, userName, mesWorkOrder);
-                }
-                for (MesProductionRecord mesProductionRecord : mesProductionRecordList) {
-                    mesProductionRecord.setReportStatus(20);
-                    ConvertBean.serviceModelUpdate(mesProductionRecord, userName);
-                }
-                productionRecordRao.saveAll(mesProductionRecordList);
-
-            }
-            return ResultBean.success("查询成功").setResultList(null);
-        } catch (ImppBusiException imppException) {
-            return ResultBean.fail(imppException);
-        } catch (Exception e) {
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
-        }
+      return  null;
     }
 
     @GetMapping("/reportOrder")