From 76e6628a6a238a1a742d04b30fbba588884a0f62 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 31 五月 2021 10:07:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OpenController.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index df9bbd4..018f04d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -118,6 +118,9 @@
                     throw new CoolException("褰撳墠琛ヤ粨浠诲姟姝e湪鎵ц锛岃鑰愬績绛夊緟");
                 }
                 Double sumAnfme = Optional.ofNullable(locDetlService.getSumAnfme(param.getMatnr())).orElse(0.0D);
+                if (!Cools.isEmpty(param.getAllotNo()) && sumAnfme < param.getAnfme()) {
+                    throw new CoolException("绔嬪簱搴撳瓨涓嶈冻锛岀己璐ф暟閲忥細" + (param.getAnfme() - sumAnfme));
+                }
                 double lack = 0.0D;
                 if (sumAnfme < param.getAnfme()) {
                     lack = param.getAnfme() - sumAnfme;
@@ -145,16 +148,16 @@
                             dto.setLocDetl(locDetl);
                             dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
                             detlDtos.add(dto);
-                            workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo());
+                            workService.stockOut(staNo, detlDtos, 101, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()));
                         // 鎷f枡
                         } else {
-                            BasDevp staNo = basDevpService.checkSiteStatus(107);
+                            BasDevp staNo = basDevpService.checkSiteStatus(113);
                             List<LocDetlDto> detlDtos = new ArrayList<>();
                             LocDetlDto dto = new LocDetlDto();
                             dto.setLocDetl(locDetl);
                             dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
                             detlDtos.add(dto);
-                            workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo());
+                            workService.stockOut(staNo, detlDtos, 103, 9527L, param.getAllotNo(), Cools.isEmpty(param.getAllotNo()));
                         }
 
                         PakoutVo pakoutVo = new PakoutVo();

--
Gitblit v1.9.1