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() - .set("update_time",DateUtil.now()) + UpdateWrapper wrapper = new UpdateWrapper() + .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 vehicleMaters = vehicleMaterService.list(new QueryWrapper().eq("vehicle_code", vehicle_code)); List records = new ArrayList<>(); StIvtStructattr attr = this.getOne(new QueryWrapper().eq("struct_code", struct_code).select("stor_code"));