From 28239b573a4be5e7678de8c65279153a7b17b760 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 18 六月 2023 16:47:49 +0800
Subject: [PATCH] #库位地图添加虚拟库位

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

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 b052cf5..381c01f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -24,7 +24,6 @@
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.HttpHandler;
 import com.zy.common.utils.Synchro;
-import com.zy.common.web.BaseController;
 import com.zy.system.entity.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,8 +81,6 @@
     private ManLocDetlService manLocDetlService;
     @Autowired
     private ManLocDetlMapper manLocDetlMapper;
-
-    private BaseController baseController;
 
 
     @Override
@@ -576,6 +573,9 @@
                   if (checkManLocDetl.getWeight() == null){
                       checkManLocDetl.setWeight(0.0);
                   }
+                  if (jsonOrderDetl.getWeight() == null){
+                      jsonOrderDetl.setWeight(0.0);
+                  }
                 if(manLocDetlService.increase(checkManLocDetl.getAnfme() + jsonOrderDetl.getAnfme(),
                         node.getName(),
                         jsonOrderDetl.getMatnr(),
@@ -645,7 +645,7 @@
             manPakOutEntityWrapper.eq("matnr",jsonOrderDetl.getMatnr());
             ManPakOut manPakOut = manPakOutService.selectOne(manPakOutEntityWrapper); //鑾峰彇鎷h揣鍗曚腑鐨勫搴旂殑璁㈠崟
             if(manPakOut.getCount() == null){
-                manPakOut.setCount(0);
+                manPakOut.setCount(0.0);
             }
 //            if (jsonOrderDetl.getAnfme() > manPakOut.getAnfme()) { //鍒ゆ柇宸ヤ綔鏁伴噺鏄惁澶т簬鎷h揣鍗曠殑鏁伴噺
 //                return R.error("鍑哄簱鏁伴噺澶т簬鎷h揣鍗曟�绘暟閲�");
@@ -700,7 +700,7 @@
                 return R.error("鏇存柊璁㈠崟鐘舵�佸け璐�");
             }
             if(manPakOut.getCount() == null){
-                manPakOut.setCount(0);
+                manPakOut.setCount(0.0);
             }
             manPakOut.setCount(manPakOut.getCount()+jsonOrderDetl.getAnfme().intValue());
             if (!manPakOutService.update(manPakOut,manPakOutEntityWrapper)){

--
Gitblit v1.9.1