From 7ea3d2290466712db41ca9047580338f2b2cabfd Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Mon, 10 Jul 2023 21:54:20 +0800
Subject: [PATCH] =?UTF-8?q?rev:aps=E8=AE=A2=E5=8D=95=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=8C=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IPdmProduceWorkorderServiceImpl.java | 42 ++++++++++++-------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
index 7b1215a6..1b92e5d7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
@@ -30,6 +30,7 @@ import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstand
 import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService;
 import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase;
 import org.nl.wms.mps_manage.other.service.dto.ProduceshiftorderDto;
+import org.nl.wms.product_manage.service.workorder.dao.WorkorderRecord;
 import org.nl.wms.scheduler_manage.ReportEnum;
 import org.nl.wms.product_manage.service.device.IPdmBiDeviceService;
 import org.nl.wms.product_manage.service.device.dao.PdmBiDevice;
@@ -217,6 +218,19 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     public void finish(JSONObject param) {
         //强制完成时修改工单状态
         String workorder_id = param.getJSONObject("row").getString("workorder_id");
+        PdmProduceWorkorder pdmProduceWorkorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>()
+           .nested(i -> i
+              .isNull("workorder_code").or()
+              .eq("workorder_code", "").or()
+              .eq("workorder_code", "0"))
+           .eq("workorder_id", workorder_id));
+        //aps排产完成的工单，生成工单编号再下发
+        if(null!=pdmProduceWorkorder) {
+                this.update(new UpdateWrapper<PdmProduceWorkorder>()
+                   .eq("workorder_id", pdmProduceWorkorder.getWorkorder_id())
+                   .set("workorder_code", CodeUtil.getNewCode("PDM_SHIFTORDER")));
+
+        }
         this.update(new UpdateWrapper<PdmProduceWorkorder>()
                 .set("workorder_status", WorkerOrderEnum.FORCE_COMPLETE.getCode())
                 .set("confirm_id", SecurityUtils.getCurrentUserId())
@@ -237,20 +251,20 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
 
 
     public void recordWorkOrder(OptionRecord.OptionEnum optionEnum, String... ids) {
-//        List<PdmProduceWorkorder> workorders = this.list(new QueryWrapper<PdmProduceWorkorder>().in("workorder_id", ids));
-//        for (PdmProduceWorkorder one : workorders) {
-//            WorkorderRecord record = WorkorderRecord.builder()
-//                    .workorder_id(one.getWorkorder_id())
-//                    .device_code(one.getDevice_code())
-//                    .dq_init_qty(one.getReal_qty())
-//                    .dq_finish_qty(one.getReal_qty())
-//                    .operatetime_start(one.getCreate_time())
-//                    .workprocedure_id(one.getWorkprocedure_id())
-//                    .operatetime_end(DateUtil.now())
-//                    .shift_type_scode(one.getShift_type_scode())
-//                    .product_area(one.getProduct_area()).build();
-//            OptionRecord.recordAsync(optionEnum, one.getWorkorder_status(), OptionRecord.Buss.WORKORDER, one.getWorkorder_id(), record);
-//        }
+        List<PdmProduceWorkorder> workorders = this.list(new QueryWrapper<PdmProduceWorkorder>().in("workorder_id", ids));
+        for (PdmProduceWorkorder one : workorders) {
+            WorkorderRecord record = WorkorderRecord.builder()
+                                                    .workorder_id(one.getWorkorder_id())
+                                                    .device_code(one.getDevice_code())
+                                                    .dq_init_qty(one.getReal_qty())
+                                                    .dq_finish_qty(one.getReal_qty())
+                                                    .operatetime_start(one.getCreate_time())
+                                                    .workprocedure_id(one.getWorkprocedure_id())
+                                                    .operatetime_end(DateUtil.now())
+                                                    .shift_type_scode(one.getShift_type_scode())
+                                                    .product_area(one.getProduct_area()).build();
+            OptionRecord.recordAsync(optionEnum, one.getWorkorder_status(), OptionRecord.Buss.WORKORDER, one.getWorkorder_id(), record);
+        }
     }
 
     @Override