From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

---
 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 0273900..a4c1ff4 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -32,14 +32,16 @@
         for (MatCodeCountDto dto : matCodeCountDtos) {
             MatCode matCode = matCodeService.selectById(dto.getMatNo());
             if (Cools.isEmpty(matCode)){
-                throw new CoolException("鐗╂枡鏉$爜鏁版嵁涓虹┖");
+                throw new CoolException("浜у搧鏉$爜鏁版嵁涓虹┖");
             }
             // 淇濇寔宸ヤ綔妗f槑缁�
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.setWrkNo(workNo);
             wrkDetl.setIoTime(new Date());
-            wrkDetl.setAnfme(dto.getCount()); // 鏁伴噺
+            wrkDetl.setQty(dto.getCount()); // 鏁伴噺
             VersionUtils.setWrkDetl(wrkDetl, matCode); // 鐗堟湰鎺у埗
+            wrkDetl.setBillNo("0");
+            wrkDetl.setSeqNo(0);
             wrkDetl.setZpallet(barcode); // 鎵樼洏鏉$爜
             wrkDetl.setAppeUser(userId);
             wrkDetl.setAppeTime(new Date());
@@ -50,4 +52,10 @@
             }
         }
     }
+
+    @Override
+    @Transactional
+    public List<WrkDetl> queryWrkDetl(String matNo, String locNo) {
+        return baseMapper.queryWrkDetl(matNo, locNo);
+    }
 }

--
Gitblit v1.9.1