From 1735f6e48c24e2db3003e74b852ae5d5a4c2282f Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sat, 16 Dec 2023 17:55:02 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IPdmProduceWorkorderServiceImpl.java | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 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 90566468..6d509a28 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
@@ -353,6 +353,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
     @Transactional(rollbackFor = Exception.class)
     public void finish(JSONObject param) {
         //强制完成时修改工单状态
+        String now = DateUtil.now();
         String workorder_id = param.getJSONObject("row").getString("workorder_id");
         PdmProduceWorkorder pdmProduceWorkorder = this.getOne(new QueryWrapper<PdmProduceWorkorder>().eq("workorder_id", workorder_id));
         //aps排产完成的工单，生成工单编号再下发
@@ -363,23 +364,23 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
          if (report_qty == null){
               report_qty = new BigDecimal(0);
          }
-        try {
-            //根据计划实际生产时间获取计算对应APS实际生产时间
-            Date interval2End = getDateEndFromInterval(pdmProduceWorkorder.getRealproducestart_date(), pdmProduceWorkorder.getPlanproduceend_date(), pdmProduceWorkorder.getAps_realproducestart_date());
-            pdmProduceWorkorder.setAps_realproduceend_date(interval2End);
-            pdmProduceWorkorder.setAps_realproduceend_date(getDates(pdmProduceWorkorder.getPlanproduceend_date(),pdmProduceWorkorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
-        } catch (ParseException e) {
-            throw new BadRequestException(e.getMessage());
-        }
+//        try {
+//            //根据计划实际生产时间获取计算对应APS实际生产时间
+//            Date interval2End = getDateEndFromInterval(pdmProduceWorkorder.getRealproducestart_date(), pdmProduceWorkorder.getPlanproduceend_date(), pdmProduceWorkorder.getAps_realproducestart_date());
+//            pdmProduceWorkorder.setAps_realproduceend_date(getDates(pdmProduceWorkorder.getPlanproduceend_date(),pdmProduceWorkorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
+//        } catch (ParseException e) {
+//            throw new BadRequestException(e.getMessage());
+//        }
         pdmProduceWorkorder.setWorkorder_status(WorkerOrderEnum.FORCE_COMPLETE.getCode());
         pdmProduceWorkorder.setConfirm_id(SecurityUtils.getCurrentUserId());
         pdmProduceWorkorder.setConfirm_name(SecurityUtils.getCurrentNickName());
-        pdmProduceWorkorder.setConfirm_time(DateUtil.now());
+        pdmProduceWorkorder.setConfirm_time(now);
         pdmProduceWorkorder.setAps_workorder_status("B");
-        pdmProduceWorkorder.setRealproduceend_date(DateUtil.now().replace("-", "/"));
+        pdmProduceWorkorder.setRealproduceend_date(now);
+        pdmProduceWorkorder.setAps_realproduceend_date(new Date());
         pdmProduceWorkorder.setAps_update_flag("M");
         pdmProduceWorkorder.setAps_update_inner_flag("M");
-        pdmProduceWorkorder.setAps_update_time(DateUtil.now());
+        pdmProduceWorkorder.setAps_update_time(now);
         pdmProduceWorkorder.setUpdate_time(new Date());
         pdmProduceWorkorder.setUpdate_id(SecurityUtils.getCurrentUserId());
         pdmProduceWorkorder.setUpdate_name(SecurityUtils.getCurrentNickName());
@@ -399,7 +400,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         if (!HttpStatus.OK.equals(result.get("status"))) {
             log.error((String) result.get("message"));
         }
-        this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, workorder_id);
+        //this.recordWorkOrder(OptionRecord.OptionEnum.UPDATE, workorder_id);
     }
 
     /**
@@ -427,20 +428,21 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
 
         //自动完工
         if (workorder.getPlan_qty().doubleValue() <= workorder.getReport_qty().doubleValue()) {
-            workorder.setRealproduceend_date(DateUtil.now().replace("-", "/"));
+            workorder.setRealproduceend_date(DateUtil.now());
+            workorder.setAps_realproduceend_date(new Date());
             workorder.setWorkorder_status(WorkerOrderEnum.COMPLETE.getCode());
             workorder.setAps_workorder_status("B");
             workorder.setConfirm_time(DateUtil.now());
             workorder.setConfirm_id(SecurityUtils.getCurrentUserId());
             workorder.setConfirm_name(SecurityUtils.getCurrentNickName());
-            try {
-                //根据计划实际生产时间获取计算对应APS实际生产时间
-                Date interval2End = getDateEndFromInterval(workorder.getRealproducestart_date(), workorder.getPlanproduceend_date(), workorder.getAps_realproducestart_date());
-                workorder.setAps_realproduceend_date(interval2End);
-                workorder.setAps_realproduceend_date(getDates(workorder.getPlanproduceend_date(),workorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
-            } catch (ParseException e) {
-                throw new BadRequestException(e.getMessage());
-            }
+//            try {
+//                //根据计划实际生产时间获取计算对应APS实际生产时间
+//                Date interval2End = getDateEndFromInterval(workorder.getRealproducestart_date(), workorder.getPlanproduceend_date(), workorder.getAps_realproducestart_date());
+//                workorder.setAps_realproduceend_date(interval2End);
+//                workorder.setAps_realproduceend_date(getDates(workorder.getPlanproduceend_date(),workorder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
+//            } catch (ParseException e) {
+//                throw new BadRequestException(e.getMessage());
+//            }
         } else {
             //工单暂停
             workorder.setWorkorder_status(WorkerOrderEnum.STOP.getCode());