diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialDtlController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialDtlController.java index 82fd63f..76e71ff 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialDtlController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialDtlController.java @@ -65,4 +65,11 @@ public class BomCallMaterialDtlController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/confirmGroup") + @Log("退料组盘确认") + public ResponseEntity confirmGroup(@RequestBody PdmBomCallMaterialDtlDto dto) { + iPdmBomCallMaterialDtlService.confirmGroup(dto); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialDtlService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialDtlService.java index 9da061c..e083c1d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialDtlService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialDtlService.java @@ -68,4 +68,13 @@ public interface IPdmBomCallMaterialDtlService extends IService().lambda() + .set(GroupPlate::getQty, bomdtlDao.getWeigh_qty()) + .set(GroupPlate::getStatus, IOSEnum.GROUP_PLATE_STATUS.code("组盘")) + .set(GroupPlate::getBom_id, null) + .set(GroupPlate::getOut_type, null) + .set(GroupPlate::getIs_need_delete, null) + .eq(GroupPlate::getStoragevehicle_code, dto.getVehicle_code()) + ); + } } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/callmaterialdtl.js b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/callmaterialdtl.js index ae1a804..791adf8 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/callmaterialdtl.js +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/callmaterialdtl.js @@ -56,4 +56,12 @@ export function confirm(data) { }) } -export default { add, edit, del, getDtl, getWeigh, saveWeigh, confirm } +export function confirmGroup(data) { + return request({ + url: 'api/bomCallMaterialDtl/confirmGroup', + method: 'post', + data + }) +} + +export default { add, edit, del, getDtl, getWeigh, saveWeigh, confirm, confirmGroup } diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue index fbf2798..2e2c0c6 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterialdtl/index.vue @@ -100,6 +100,17 @@ > 退料确认 + + 退料组盘确认 + { + this.crud.notify('操作成功!', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }) + }, empConfirm() { const data = this.$refs.table.selection[0] if (data.bom_status === '2') {