From 78411c83b79259472b6902c8680eceafcaf3c2bf Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 17 Sep 2025 10:00:26 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=8B=E6=8C=81=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E3=80=81=E5=B0=8F=E6=96=99=E7=AE=B1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GroupController.java | 2 +- .../wms/ext/service/impl/AcsToWmsServiceImpl.java | 1 - .../controller/PdaGeneralPublicController.java | 14 +++++++------- .../service/impl/PdaUpdatePointServiceImpl.java | 5 +++++ .../controller/PdaSmallBoxPublicController.java | 4 ++-- .../service/impl/SchBasePointServiceImpl.java | 6 ------ .../service/util/tasks/DetainInTask.java | 5 +---- .../service/impl/VehicleOutServiceImpl.java | 7 +++++++ .../src/views/wms/basedata/group/AddDtl.vue | 3 +++ .../views/wms/pdm/callmaterialdtl/WeighDialog.vue | 5 ++--- .../src/views/wms/st/combinedBox/WeighDialog.vue | 5 ++--- .../src/views/wms/st/selectout/WeighDialog.vue | 6 ++---- 12 files changed, 32 insertions(+), 31 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java index 3d5618d..3638e5b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/controller/GroupController.java @@ -83,7 +83,7 @@ public class GroupController { } @PostMapping("/copySave") - @Log("查询供应商") + @Log("复制新增") public ResponseEntity copySave(@RequestBody GroupPlate dto) { iMdPbGroupplateService.create(dto); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java index 20c8ce0..79770ed 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java @@ -91,7 +91,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (ResultAcsStatus.EXECUTING.getCode().equals(acs_task_status)) { // 执行中 status = TaskStatus.EXECUTING; - // 更新车号 } else if (ResultAcsStatus.FINISHED.getCode().equals(acs_task_status)) { // 完成 status = TaskStatus.FINISHED; diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java index 6f17580..6bcddb9 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/controller/PdaGeneralPublicController.java @@ -37,49 +37,49 @@ public class PdaGeneralPublicController { @Log("查询品质类型") @SaIgnore public ResponseEntity queryGroupQuality() { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryGroupQuality()), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.queryGroupQuality(), HttpStatus.OK); } @PostMapping("/queryMaterial") @Log("查询物料") @SaIgnore public ResponseEntity queryMaterial(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryMaterial(whereJson)), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.queryMaterial(whereJson), HttpStatus.OK); } @PostMapping("/querySupp") @Log("查询供应商") @SaIgnore public ResponseEntity querySupp(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.querySupp(whereJson)), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.querySupp(whereJson), HttpStatus.OK); } @PostMapping("/queryBoxType") @Log("查询料箱类型") @SaIgnore public ResponseEntity queryBoxType() { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryBoxType()), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.queryBoxType(), HttpStatus.OK); } @PostMapping("/queryGroupInfo") @Log("查询组盘记录") @SaIgnore public ResponseEntity queryGroupInfo(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryGroupInfo(whereJson)), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.queryGroupInfo(whereJson), HttpStatus.OK); } @PostMapping("/queryBomInfo") @Log("查询工单信息") @SaIgnore public ResponseEntity queryBomInfo(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryBomInfo(whereJson)), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.queryBomInfo(whereJson), HttpStatus.OK); } @PostMapping("/queryVehicleType") @Log("查询载具类型") @SaIgnore public ResponseEntity queryVehicleType() { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaGeneralPublicService.queryVehicleType()), HttpStatus.OK); + return new ResponseEntity<>(pdaGeneralPublicService.queryVehicleType(), HttpStatus.OK); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java index 5cc4430..492cca8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/general_management/service/impl/PdaUpdatePointServiceImpl.java @@ -55,6 +55,11 @@ public class PdaUpdatePointServiceImpl implements PdaUpdatePointService { } SchBasePoint pointDao = schBasePointMapper.selectById(whereJson.getString("point_code")); + // 判断当前点位是否已经有载具 + if (ObjectUtil.isNotEmpty(pointDao.getVehicle_code())) { + throw new BadRequestException("当前点位已存在载具!【"+pointDao.getVehicle_code()+"】"); + } + pointDao.setVehicle_code(whereJson.getString("storagevehicle_code")); schBasePointMapper.updateById(pointDao); return PdaResponse.requestOk(); diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/smallbox_management/controller/PdaSmallBoxPublicController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/smallbox_management/controller/PdaSmallBoxPublicController.java index e81451e..f8c1726 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/smallbox_management/controller/PdaSmallBoxPublicController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/smallbox_management/controller/PdaSmallBoxPublicController.java @@ -44,13 +44,13 @@ public class PdaSmallBoxPublicController { @Log("查询库区") @SaIgnore public ResponseEntity querySectCode() { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaSmallBoxPublicService.querySectCode()), HttpStatus.OK); + return new ResponseEntity<>(pdaSmallBoxPublicService.querySectCode(), HttpStatus.OK); } @PostMapping("/queryInBillType") @Log("查询入库业务类型") @SaIgnore public ResponseEntity queryInBillType() { - return new ResponseEntity<>(PdaResponse.requestParamOk(pdaSmallBoxPublicService.queryInBillType()), HttpStatus.OK); + return new ResponseEntity<>(pdaSmallBoxPublicService.queryInBillType(), HttpStatus.OK); } } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java index 453892c..097e204 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBasePointServiceImpl.java @@ -238,12 +238,6 @@ public class SchBasePointServiceImpl extends ServiceImpl().lambda() + .set(Structattr::getLock_type, IOSEnum.LOCK_TYPE.code("空托盘出库锁")) + .eq(Structattr::getStruct_code, structattr.getStruct_code()) + ); + // 创建任务 JSONObject jsonTask = new JSONObject(); jsonTask.put("point_code1", structattr.getStruct_code()); diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue b/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue index 7a2c7df..a82fc1a 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/AddDtl.vue @@ -267,6 +267,9 @@ export default { this.crud.notify('载具不能为空！', CRUD.NOTIFICATION_TYPE.INFO) return } + this.formMst.bom_id = '' + this.formMst.out_type = '' + this.formMst.is_need_delete = '' crudGroup.copySave(this.formMst).then(row => { this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) this.close() diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/WeighDialog.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/WeighDialog.vue index b624af4..8f38c4e 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/WeighDialog.vue +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/WeighDialog.vue @@ -127,10 +127,9 @@ export default { this.$emit('update:dialogShow', false) }, getWeigh() { - this.formMst.weigh_qty = '20' - /* crudCallMaterialDtl.getWeigh(this.formMst).then(res => { + crudCallMaterialDtl.getWeigh(this.formMst).then(res => { this.formMst.weigh_qty = res.weigh_qty - })*/ + }) }, saveWeigh() { // 校验称重信息不能为0或者空 diff --git a/wms/nladmin-ui/src/views/wms/st/combinedBox/WeighDialog.vue b/wms/nladmin-ui/src/views/wms/st/combinedBox/WeighDialog.vue index 5e6b6ab..ee01d4e 100644 --- a/wms/nladmin-ui/src/views/wms/st/combinedBox/WeighDialog.vue +++ b/wms/nladmin-ui/src/views/wms/st/combinedBox/WeighDialog.vue @@ -136,13 +136,12 @@ export default { this.formMst.material_qty = parseFloat(val) - parseFloat(this.formMst.ivt_qty) }, getWeigh() { - this.formMst.weight_qty = '100' this.changeQty(this.formMst.weight_qty) - /* crudCombinedBox.getWeigh(this.formMst).then(res => { + crudCombinedBox.getWeigh(this.formMst).then(res => { this.formMst.weigh_qty = res.weigh_qty this.changeQty(res.weight_qty) this.crud.notify('称重成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) - })*/ + }) }, saveWeigh() { // 校验称重信息不能为0或者空 diff --git a/wms/nladmin-ui/src/views/wms/st/selectout/WeighDialog.vue b/wms/nladmin-ui/src/views/wms/st/selectout/WeighDialog.vue index 48cc5cb..7d7b3bf 100644 --- a/wms/nladmin-ui/src/views/wms/st/selectout/WeighDialog.vue +++ b/wms/nladmin-ui/src/views/wms/st/selectout/WeighDialog.vue @@ -211,13 +211,11 @@ export default { this.crud.notify('拣选批次不能为空！', CRUD.NOTIFICATION_TYPE.INFO) return } - this.formMst.weigh_qty = '40' - this.formMst.select_qty = '10' - /* crudSectout.getWeigh(this.current).then(res => { + crudSectout.getWeigh(this.current).then(res => { this.formMst.weigh_qty = res.weigh_qty this.formMst.select_qty = res.select_qty this.crud.notify('称重成功！', CRUD.NOTIFICATION_TYPE.SUCCESS) - })*/ + }) }, saveWeigh() { // 校验称重信息不能为0或者空