From 6c9b9a96ef48600f2e9eb3fdaa5ed4f0659a6c59 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 02 六月 2023 15:43:37 +0800
Subject: [PATCH] //出库时,如果当前库位组有相同的物料,则先出外侧物料

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 37a625c..3c85513 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -88,6 +88,7 @@
             WrkDetl wrkDetl = new WrkDetl();
             wrkDetl.setWrkNo(wrkMast.getWrkNo());
             wrkDetl.setModiTime(now);
+            wrkDetl.setMatType(locDetl.getMatType());
 
             wrkDetl.sync(locDetl);
             wrkDetlService.insert(wrkDetl);
@@ -241,6 +242,7 @@
                 wrkDetl.setOrderNo(orderNo);
                 wrkDetl.setIoTime(wrkMast.getIoTime());
                 wrkDetl.setWrkNo(wrkNo);
+                wrkDetl.setMatType(locDetl.getMatType());
                 return R.ok().add(wrkDetl);
             }
         }
@@ -348,7 +350,7 @@
     @ManagerAuth
     public R getCheckDetl2(String barcode) {
         WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
-        if(Cools.isEmpty()){
+        if(Cools.isEmpty(wrkMast)){
             throw new CoolException("姝ゆ墭鐩樼爜娌℃湁鐩樼偣浠诲姟");
         }
         if (wrkMast.getIoType() != 107){

--
Gitblit v1.9.1