From 9f2b73a49f1051497ff09e929d0e39ead8e3fb6f Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 13 Dec 2023 17:31:22 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=88=86=E6=94=AF=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/PdmProduceWorkorderController.java      | 11 ++++++-----
 .../dao/mapper/PdmProduceWorkorderMapper.xml          |  2 +-
 .../impl/IPdmProduceWorkorderServiceImpl.java         |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
index 5dcab5a8..00e32e68 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java
@@ -70,14 +70,15 @@ public class PdmProduceWorkorderController{
      @Log("查询工单管理")
      //("查询工单管理")
      public ResponseEntity<Object> queryPad(@RequestBody WorkorderQuery query) {
-          PageQuery page = new PageQuery();
-          page.setPage(0);
-          page.setSize(99);
+          PageQuery page = new PageQuery();page.setPage(0);page.setSize(99);
           query.setOrder_status(WorkerOrderEnum.PRODUCTING.getCode());
           TableDataInfo tableDataInfo = iPdmProduceWorkorderService.queryAll(query, page);
           List content = tableDataInfo.getContent();
-          content.add(MapOf.of("device_code", "A1_KZ_14", "workorder_code", "刻字回流点", "material_code", "刻字回流点", "material_spec", "刻字回流点", "material_name", "刻字回流点"));
-          return new ResponseEntity<>(tableDataInfo, HttpStatus.OK);
+          content.add(MapOf.of("device_code","A1_KZ_14",
+                  "workorder_code","刻字回流点",
+                  "material_code","刻字回流点",
+                  "material_spec","刻字回流点","material_name","刻字回流点"));
+          return new ResponseEntity<>(tableDataInfo,HttpStatus.OK);
      }
 
      @PostMapping("/create")
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
index de7b624f..d197fa54 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -34,7 +34,7 @@
             and find_in_set(ShiftOrder.workorder_status, #{query.order_status})
         </if>
         <if test="query.device_code != null and query.device_code != ''">
-            and ShiftOrder.device_code like concat('%',#{query.device_code},'%')
+            and ShiftOrder.device_code like '%${query.device_code}%'
         </if>
         <if test="query.create_type != null and query.create_type != ''">
             and ShiftOrder.create_type =  #{query.create_type}
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 f8a16326..b12263ad 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
@@ -440,6 +440,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
         workorder.setUpdate_id(SecurityUtils.getCurrentUserId());
         workorder.setUpdate_name(SecurityUtils.getCurrentNickName());
         workorder.setReal_qty(null);
+        workorder.setStop_time(DateUtil.now());
         this.updateById(workorder);
         //更新刻字数量
         //todo 测试是否累加还是直接更新报工数量
@@ -861,6 +862,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
             workOrder.setUpdate_id(SecurityUtils.getCurrentUserId());
             workOrder.setUpdate_name(SecurityUtils.getCurrentNickName());
             workOrder.setAps_realproducestart_date(getDates(workOrder.getPlanproducestart_date(),workOrder.getCreate_type().equals(StatusEnum.APSINTO.getCode())?"yyyy/MM/dd HH:mm:ss":"yyyy-MM-dd HH:mm:ss"));
+            workOrder.setRepare_qty(new BigDecimal(0));
             workOrder.setReal_qty(null);
             workOrder.setAps_assign_qty(workOrder.getPlan_qty());
             workOrder.setOpen_time(DateUtil.now());