From a4b0ec81dac5c671bcd741823488c4bc7685beb0 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 24 Oct 2024 14:34:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProOrderWorkorderServiceImpl.java   | 12 ++++--------
 .../mapper/plan/ProOrderWorkorderMapper.xml          |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 7671209d3..d655c762a 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -1496,8 +1496,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         for(ProOrderWorkorder data:workorderList){
             mapData = new HashMap();
             mapData.put("xh", xh);
-            mapData.put("orderCode",data.getOrderCode().substring(4));
-            mapData.put("workorderSap", data.getWorkorderCodeSap().substring(4));
+            mapData.put("orderCode",data.getOrderCode().substring(3));
+            mapData.put("workorderSap", data.getWorkorderCodeSap().substring(3));
             mapData.put("materialCode", data.getProductCode().substring(7));
             mapData.put("materialDesc", data.getProductName());
             mapData.put("quality", data.getQuantitySplit());
@@ -1754,11 +1754,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
     }
 
     public static void main(String args[]) {
-        List<String> wcodes = new ArrayList<>();
-        wcodes.add("aaa");
-        wcodes.add("bbb");
-        wcodes.add("ccc");
-        Collections.reverse(wcodes);
-        System.out.println(StringUtils.join(wcodes, ","));
+        String s = "000800003044";
+        System.out.println(s.substring(3));
     }
 }
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 885639c10..ee93c1ab2 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -900,7 +900,7 @@
     <select id="getBatchList" resultType="java.lang.String">
         select batch_code
         from pro_order_workorder_batch powb
-        where powb.del_flag = '0' and workorder_id = '127e2fd8c21d492297f3316a3879a43b'
+        where powb.del_flag = '0' and workorder_id = #{workorderId}
         order by batch_code
     </select>