From fc43732c0c860ed7fa75cff5380dfc61a6c17763 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Wed, 29 Nov 2023 13:52:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=B7=A5=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/system/api/domain/sap/SapRFW.java  | 22 +++++++------------
 .../service/impl/IWCInterfaceServiceImpl.java |  4 +++-
 .../impl/ProOrderWorkorderServiceImpl.java    |  1 -
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
index e6df8f1a..6d21a116 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/sap/SapRFW.java
@@ -1,5 +1,7 @@
 package com.op.system.api.domain.sap;
 
+import java.util.List;
+
 /**
  * 报工
  */
@@ -7,14 +9,14 @@ public class SapRFW {
     private String aufnr;
     private String gamng;
     private lt_gs lt_gs;
-    private lt_hw lt_hw;
+    private List<lt_hw> lt_hwList;
 
-    public SapRFW.lt_hw getLt_hw() {
-        return lt_hw;
+    public List<lt_hw> getLt_hwList() {
+        return lt_hwList;
     }
 
-    public void setLt_hw(SapRFW.lt_hw lt_hw) {
-        this.lt_hw = lt_hw;
+    public void setLt_hwList(List<lt_hw> lt_hwList) {
+        this.lt_hwList = lt_hwList;
     }
 
     public SapRFW.lt_gs getLt_gs() {
@@ -140,13 +142,5 @@ public class SapRFW {
                     '}';
         }
     }
-    @Override
-    public String toString() {
-        return "{" +
-        "aufnr:"+aufnr+","+
-        "gamng:"+gamng+","+
-        "lt_gs:"+lt_gs.toString()+","+
-        "lt_hw:"+lt_hw.toString()+","+
-                "}";
-    }
+
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
index 0c42940d..e9ddc3d9 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
@@ -304,10 +304,12 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         ltgs.setConf_activity5(work.getSac5());//折旧
         ltgs.setConf_activity6(work.getSac6());
         sapRFW.setLt_gs(ltgs);
+        List<SapRFW.lt_hw> lt_hwList =new ArrayList<>();
         SapRFW.lt_hw lthw = sapRFW.new lt_hw();//MES生产订单报工货物移动修改
         lthw.setEntry_qnt(work.getQuantityFeedback().toString());//TODO;
         lthw.setMaterial(work.getProcessCode());
-        sapRFW.setLt_hw(lthw);
+        lt_hwList.add(lthw);
+        sapRFW.setLt_hwList(lt_hwList);
         //添加调用sap日志
         SysSapLog sysSapLog = new SysSapLog();
         sysSapLog.setId(IdUtils.fastSimpleUUID());
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 ce1bf79c..5c041426 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
@@ -244,7 +244,6 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                     mesPrepare.setStatus("L0");//待确认
                     proOrderWorkorderMapper.createPrepare(mesPrepare);
                     //备(领)料明细
-
                     List<MesPrepareDetailDTO> details = new ArrayList<>();
                     MesPrepareDetailDTO detail = new MesPrepareDetailDTO();
                     detail.setCreateTime(DateUtils.getNowDate());