From 3a711d808ec2b3afea5c46a94ab2b544fb295ca4 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期一, 27 六月 2022 14:26:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    8 +++++++-
 src/main/java/com/zy/asrs/service/MobileService.java          |    8 ++++++++
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 072f9a3..a6f1e5a 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -1,8 +1,13 @@
 package com.zy.asrs.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.param.CombParam;
 import com.zy.asrs.entity.param.MobileAdjustParam;
+
+import java.util.Date;
 
 public interface MobileService {
 
@@ -19,4 +24,7 @@
     void packComb(CombParam param, Long userId);
 
     void pakoutByOrder(JSONObject param, Long userId);
+
+    void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
+                  Double curOutQty, Integer ioType, Long userId, Date now);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 34c46a2..7df6a4f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -444,7 +444,7 @@
                 Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty;   //鏈鍑哄簱閲�
                 int ioType = sumCount <= curOutQty ? 101 : 103;
 
-//                stockOut(orderDetl, staNo, locDetl, curOutQty, ioType, userId);
+//                stockOut(orderDetl, sta, locDetl, curOutQty, ioType, userId);
                 order.setSettle(2L);
                 order.setUpdateBy(userId);
                 order.setUpdateTime(now);
@@ -467,4 +467,10 @@
         }
     }
 
+    @Override
+    @Transactional
+    public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
+                         Double curOutQty, Integer ioType, Long userId, Date now) {
+
+    }
 }

--
Gitblit v1.9.1