From da56d02042073d80e11f96b0425392f95e98bad9 Mon Sep 17 00:00:00 2001 From: "ZHOUZ\\Noble'lift" <1014987728@qq.com> Date: Wed, 19 Jul 2023 16:01:51 +0800 Subject: [PATCH] =?UTF-8?q?rev:1=E3=80=81=E5=BA=93=E5=AD=98=E5=8F=AF?= =?UTF-8?q?=E8=A7=86=E4=B9=8E=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=EF=BC=9B?= =?UTF-8?q?2=E3=80=81=E5=BA=93=E5=AD=98=E8=AE=B0=E5=BD=95=E5=8F=AF?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E3=80=81=E5=BA=93=E5=AD=98=E6=95=B0=E4=B8=BA?= =?UTF-8?q?0=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=9B3=E3=80=81?= =?UTF-8?q?=E8=BD=BD=E5=85=B7=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/st/base/rest/VehicleController.java | 4 +-- .../wms/st/base/service/VehicleService.java | 4 +-- .../base/service/impl/VehicleServiceImpl.java | 31 ++++++++++++------- .../nl/wms/st/ivt/StoreIvtServiceImpl.java | 13 ++++++-- wms/qd/src/views/wms/st/vehicle/index.vue | 14 ++++----- wms/qd/src/views/wms/st/visable/index4.vue | 4 +-- 6 files changed, 42 insertions(+), 28 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/rest/VehicleController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/rest/VehicleController.java index ba1a988..57cc90b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/rest/VehicleController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/rest/VehicleController.java @@ -45,8 +45,8 @@ public class VehicleController { @Log("新增载具") @ApiOperation("新增载具") //@PreAuthorize("@el.check('vehicle:add')") - public ResponseEntity create(@Validated @RequestBody VehicleDto dto) { - vehicleService.create(dto); + public ResponseEntity create(@RequestBody JSONObject form) { + vehicleService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/VehicleService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/VehicleService.java index 827a6d0..05e4628 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/VehicleService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/VehicleService.java @@ -49,9 +49,9 @@ public interface VehicleService { /** * 创建 - * @param dto / + * @param form / */ - void create(VehicleDto dto); + void create(JSONObject form); /** * 编辑 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/impl/VehicleServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/impl/VehicleServiceImpl.java index a31be6b..56f40cc 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/impl/VehicleServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/impl/VehicleServiceImpl.java @@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; import org.nl.utils.FileUtil; import org.nl.utils.SecurityUtils; import org.nl.wms.st.base.service.VehicleService; @@ -77,19 +78,27 @@ public class VehicleServiceImpl implements VehicleService { @Override @Transactional(rollbackFor = Exception.class) - public void create(VehicleDto dto) { - String currentUsername = SecurityUtils.getCurrentUsername(); - String now = DateUtil.now(); + public void create(JSONObject form) { + int vehicle_qty = form.getIntValue("vehicle_qty"); + for (int i = 0; i < vehicle_qty; i++) { + VehicleDto dto = form.toJavaObject(VehicleDto.class); + String currentUsername = SecurityUtils.getCurrentUsername(); + String now = DateUtil.now(); - dto.setVehicle_uuid(IdUtil.simpleUUID()); - dto.setCreate_by(currentUsername); - dto.setUpdate_by(currentUsername); - dto.setUpdate_time(now); - dto.setCreate_time(now); + String vehicle_code = CodeUtil.getNewCode("VEHICLE_CODE"); + dto.setVehicle_code(vehicle_code); + dto.setVehicle_name(vehicle_code); + dto.setVehicle_uuid(IdUtil.simpleUUID()); + dto.setCreate_by(currentUsername); + dto.setUpdate_by(currentUsername); + dto.setUpdate_time(now); + dto.setCreate_time(now); + + WQLObject wo = WQLObject.getWQLObject("st_base_vehicle"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); + } - WQLObject wo = WQLObject.getWQLObject("st_base_vehicle"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); } @Override diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/StoreIvtServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/StoreIvtServiceImpl.java index d2e4f41..85c4b2a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/StoreIvtServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/StoreIvtServiceImpl.java @@ -113,10 +113,16 @@ public class StoreIvtServiceImpl { break; case 22: json.put("ivt_qty", change_qty); + json.put("vehicle_code", vehicle_code); + json.put("barcode",param.getString("barcode")); + stackIvtTab.insert(json); break; case 23: json.put("ivt_qty", change_qty); json.put("canuse_qty", change_qty); + json.put("vehicle_code", vehicle_code); + json.put("barcode",param.getString("barcode")); + stackIvtTab.insert(json); break; case 24:// 同时减 // 语句 @@ -130,9 +136,7 @@ public class StoreIvtServiceImpl { default: // 可选 throw new BadRequestException("变动类型不正确!"); } - json.put("vehicle_code", vehicle_code); - json.put("barcode",param.getString("barcode")); - stackIvtTab.insert(json); + } // 对应的货位上有物料，需判断数量重量相关字段是否符合实际逻辑，符合时更新相应记录 if (stackIvtObj != null) { @@ -167,6 +171,9 @@ public class StoreIvtServiceImpl { if (after_canuse_qty.doubleValue() < 0) { throw new BadRequestException("可用数量不足，无法操作!"); } + if (after_ivt_qty.doubleValue() <= 0 ) { + is_sub0 = true; + } stackIvtObj.put("canuse_qty", after_canuse_qty); break; case 12:// 12-增加可用重量和数量; diff --git a/wms/qd/src/views/wms/st/vehicle/index.vue b/wms/qd/src/views/wms/st/vehicle/index.vue index c77452d..cb7329e 100644 --- a/wms/qd/src/views/wms/st/vehicle/index.vue +++ b/wms/qd/src/views/wms/st/vehicle/index.vue @@ -24,7 +24,7 @@ width="500px" > - + + +
@@ -98,7 +101,8 @@ const defaultForm = { create_by: null, create_time: null, update_by: null, - update_time: null + update_time: null, + vehicle_qty: null } export default { name: 'Vehicle', @@ -124,12 +128,6 @@ export default { vehicle_uuid: [ { required: true, message: '载具标识不能为空', trigger: 'blur' } ], - vehicle_code: [ - { required: true, message: '载具编码不能为空', trigger: 'blur' } - ], - vehicle_name: [ - { required: true, message: '载具名称不能为空', trigger: 'blur' } - ], is_active: [ { required: true, message: '是否启用不能为空', trigger: 'blur' } ], diff --git a/wms/qd/src/views/wms/st/visable/index4.vue b/wms/qd/src/views/wms/st/visable/index4.vue index 696cf76..443389b 100644 --- a/wms/qd/src/views/wms/st/visable/index4.vue +++ b/wms/qd/src/views/wms/st/visable/index4.vue @@ -1,9 +1,9 @@