From 3d57910ed5c971d143b71af4f9bfb4c18dcf6e9d Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期一, 06 十二月 2021 15:56:13 +0800
Subject: [PATCH] 1.0.3

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 c1518be..75144c6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -74,6 +74,7 @@
 
     @Override
     @Transactional
+    //鍏ュ簱
     public String startupFullPutStore(FullStoreParam param, Long userId) {
         // 鍙傛暟闈炵┖鍒ゆ柇
         if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
@@ -169,6 +170,7 @@
 
     @Override
     @Transactional
+    //鍑哄簱浣滀笟
     public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {
 
         // 鍚堝苟鍚岀被椤�
@@ -207,7 +209,13 @@
                 throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
             }
             // 鐢熸垚宸ヤ綔鍙�
-            int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+            int rok;
+            if(ioType==103||ioType==107){
+                rok=2;
+            }else{
+                rok=1;
+            }
+            int workNo = commonService.getWorkNo(rok);
 
             // 鐢熸垚宸ヤ綔妗�
             WrkMast wrkMast = new WrkMast();
@@ -309,6 +317,7 @@
 
     @Override
     @Transactional
+    //绌烘澘鍏ュ簱
     public String emptyPlateIn(Integer devpNo, Long userId) {
         // 婧愮珯鐐圭姸鎬佹娴�
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
@@ -368,18 +377,20 @@
 
     @Override
     @Transactional
+    //绌烘澘鍑哄簱
     public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
         if (Cools.isEmpty(param.getOutSite())) {
             throw new CoolException("绔欑偣涓嶅瓨鍦�");
         }
         for (String locNo : param.getLocNos()) {
             // 鑾峰彇宸ヤ綔鍙�
-            int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+            int workNo = commonService.getWorkNo(1);
             // 鑾峰彇搴撲綅
             LocMast locMast = locMastService.selectById(locNo);
             if (Cools.isEmpty(locMast)) {
                 throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
             }
+
             // 鑾峰彇婧愮珯
             Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                     .eq("type_no", 110)
@@ -429,6 +440,7 @@
 
     @Override
     @Transactional
+    //鐩樼偣鍑哄簱
     public void locCheckOut(StockOutParam param, Long userId) {
         // 鐩爣绔欑偣鐘舵�佹娴�
         BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());

--
Gitblit v1.9.1