From 8baa74c92706963ae6154c9ecc09a5aa1d31a161 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 3 Jul 2024 16:26:07 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E7=9B=98=E7=82=B9=E6=98=AF=E5=90=A6=E6=95=B4=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customer/controller/BmCustomerController.java     |  2 +-
 .../service/impl/StIvtStructattrServiceImpl.java      | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
index 15bf50ee..42417791 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/customer/controller/BmCustomerController.java
@@ -31,7 +31,7 @@ import java.util.*;
  **/
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/bmCustomer")
+@RequestMapping("/api/customerbase")
 @Slf4j
 public class BmCustomerController {
 
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
index f96c950c..5953df89 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
@@ -66,10 +66,15 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
     }
     @Override
     public void changeStruct(String struct_code, String vehicle_code, String task_type, BigDecimal change_qty,Boolean growth) {
-        this.update(new UpdateWrapper<StIvtStructattr>()
-                .set("update_time",DateUtil.now())
+        UpdateWrapper<StIvtStructattr> wrapper = new UpdateWrapper<StIvtStructattr>()
+                .set("update_time", DateUtil.now())
                 .set("lock_type", StatusEnum.LOCK.code("无锁"))
-                .eq("struct_code",struct_code));
+                .eq("struct_code", struct_code);
+        //如果是整出
+        if (!growth && change_qty==null){
+            wrapper.set("vehicle_code",null);
+        }
+        this.update(wrapper);
         List<MdPbVehicleMater> vehicleMaters = vehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>().eq("vehicle_code", vehicle_code));
         List<StIvtStructivtflow> records = new ArrayList<>();
         StIvtStructattr attr = this.getOne(new QueryWrapper<StIvtStructattr>().eq("struct_code", struct_code).select("stor_code"));