From cc79183af9dda2e2e983ad9915d41f9c3fe2ed11 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 15 七月 2023 15:29:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index f07908e..01bc2bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -624,6 +624,8 @@
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(now);
             wrkDetl.setModiUser(userId);
+            wrkDetl.setOwner(locDetl.getOwner());
+            wrkDetl.setPayment(locDetl.getPayment());
             if (!wrkDetlService.insert(wrkDetl)) {
                 throw new CoolException("淇濆瓨宸ヤ綔妗f槑缁嗗け璐�");
             }
@@ -1129,9 +1131,9 @@
             String[][] locNos2 =new String[param.getLocDetls().size()][2];
             int i=0;
             for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
-                if (!locNos.contains(locDetl.getLocNo())){
-                    locNos.add(locDetl.getLocNo());
-                    locNos2[i][0]=locDetl.getLocNo();
+                if (!locNos.contains(locDetl.getLoc_no())){
+                    locNos.add(locDetl.getLoc_no());
+                    locNos2[i][0]=locDetl.getLoc_no();
                     locNos2[i][1]=locDetl.getManu();
                     i++;
                 }
@@ -1194,15 +1196,10 @@
             String[][] locNos2 =new String[param.getLocDetls().size()][2];
             int i=0;
             for (EmptyPlateOutParam.LocDetl locDetl : param.getLocDetls()){
-                if (!locNos.contains(locDetl.getLocNo())){
-                    locNos.add(locDetl.getLocNo());
-                    locNos2[i][0]=locDetl.getLocNo();
-                    if (locDetl.getLocNo().substring(0,2) == "DT"){
-                        locNos2[i][1]= "骞冲簱";
-                    }else {
-                        locNos2[i][1]= "绔嬪簱";
-                    }
-
+                if (!locNos.contains(locDetl.getLoc_no())){
+                    locNos.add(locDetl.getLoc_no());
+                    locNos2[i][0]=locDetl.getLoc_no();
+                    locNos2[i][1]=locDetl.getManu();
                     i++;
                 }
             }

--
Gitblit v1.9.1