From 9fd4e3102faa0b77f0feb4b5cf50107b443d8ace Mon Sep 17 00:00:00 2001 From: liuxy Date: Tue, 20 Jan 2026 10:54:05 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BomCallMaterialController.java | 6 + .../service/IPdmBomCallMaterialService.java | 9 ++ .../service/dao/PdmBomCallMaterial.java | 5 + .../dao/mapper/PdmBomCallMaterialMapper.java | 8 ++ .../dao/mapper/PdmBomCallMaterialMapper.xml | 33 +++++ .../impl/PdmBomCallMaterialServiceImpl.java | 7 + .../impl/MdPbGroupplateServiceImpl.java | 1 + .../service/impl/OutBillServiceImpl.java | 2 +- .../src/views/wms/basedata/group/AddBoms.vue | 134 ++++++++++++++++++ .../wms/basedata/group/AddReceiveDtl.vue | 57 ++++++-- .../src/views/wms/pdm/callmaterial/index.vue | 23 ++- 11 files changed, 270 insertions(+), 15 deletions(-) create mode 100644 wms/nladmin-ui/src/views/wms/basedata/group/AddBoms.vue diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java index fac86c0..930814a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/controller/BomCallMaterialController.java @@ -41,6 +41,12 @@ public class BomCallMaterialController { return new ResponseEntity<>(TableDataInfo.build(iPdmBomCallMaterialService.queryAll(whereJson, page)), HttpStatus.OK); } + @GetMapping("/queryGroupBom") + @Log("退料组盘查询工单分页查询") + public ResponseEntity queryGroupBom(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(iPdmBomCallMaterialService.queryGroupBom(whereJson, page)), HttpStatus.OK); + } + @PostMapping @Log("新增叫料单") public ResponseEntity create(@Validated @RequestBody PdmBomCallMaterial dto) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java index 1429f91..f7f3edb 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/IPdmBomCallMaterialService.java @@ -30,6 +30,15 @@ public interface IPdmBomCallMaterialService extends IService */ IPage queryAll(Map whereJson, PageQuery page); + /** + * 退料组盘查询工单分页查询 + * + * @param whereJson : {查询参数} + * @param page : 分页对象 + * @return 返回结果 + */ + IPage queryGroupBom(Map whereJson, PageQuery page); + /** * 新增叫料单 * diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java index 1e9d484..37bbf8d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/PdmBomCallMaterial.java @@ -120,4 +120,9 @@ public class PdmBomCallMaterial implements Serializable { */ private String receive_name; + /** + * 是否二次退料 + */ + private String return_two; + } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java index 3eaf55d..24364e3 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.java @@ -29,6 +29,14 @@ public interface PdmBomCallMaterialMapper extends BaseMapper */ IPage queryAllByPage(Page page, @Param("param") Map whereJson); + /** + * 退料组盘查询工单分页查询 + * @param page 分页条件 + * @param whereJson 查询条件 + * @return IPage + */ + IPage queryGroupBom(Page page, @Param("param") Map whereJson); + /** * 计算总计 * @param whereJson {} diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml index 92c8ebc..501f51a 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/dao/mapper/PdmBomCallMaterialMapper.xml @@ -49,10 +49,38 @@ bom.create_time <= #{param.end_time} + + AND + bom.return_two = #{param.return_two} + + ORDER BY bom.create_time Desc + + diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java index 7a9aa43..09de86b 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm_manage/service/impl/PdmBomCallMaterialServiceImpl.java @@ -74,6 +74,13 @@ public class PdmBomCallMaterialServiceImpl extends ServiceImpl queryGroupBom(Map whereJson, PageQuery page) { + whereJson.put("to_day", DateUtil.today()); + return this.baseMapper.queryGroupBom(new Page<>(page.getPage() + 1, page.getSize()), + whereJson); + } + @Override @Transactional public void create(PdmBomCallMaterial dto) { diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java index 08914f8..55fb306 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/MdPbGroupplateServiceImpl.java @@ -334,6 +334,7 @@ public class MdPbGroupplateServiceImpl extends ServiceImpl // 如果是领料出库单则更新工单状态以及实际出库重量 if (ObjectUtil.isNotEmpty(ioStorInvDtl.getSource_bill_code())) { PdmBomCallMaterial callMaterDao = iPdmBomCallMaterialService.findByCode(ioStorInvDtl.getSource_bill_code()); - callMaterDao.setReal_qty(ioStorInvDtl.getPlan_qty()); + callMaterDao.setReal_qty(ioStorInvDtl.getAssign_qty()); callMaterDao.setBom_status(BomEnum.CALL_BOM_STATUS.code("叫料完成")); iPdmBomCallMaterialService.updateById(callMaterDao); } diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/AddBoms.vue b/wms/nladmin-ui/src/views/wms/basedata/group/AddBoms.vue new file mode 100644 index 0000000..4ccaac6 --- /dev/null +++ b/wms/nladmin-ui/src/views/wms/basedata/group/AddBoms.vue @@ -0,0 +1,134 @@ + + + + diff --git a/wms/nladmin-ui/src/views/wms/basedata/group/AddReceiveDtl.vue b/wms/nladmin-ui/src/views/wms/basedata/group/AddReceiveDtl.vue index 42455b1..60aa97c 100644 --- a/wms/nladmin-ui/src/views/wms/basedata/group/AddReceiveDtl.vue +++ b/wms/nladmin-ui/src/views/wms/basedata/group/AddReceiveDtl.vue @@ -11,13 +11,13 @@ > - + @@ -30,9 +30,12 @@ {{'可退重量：'+ item.real_weigh_qty }} + 选择工单 + + + + + + + + @@ -191,12 +200,6 @@ - - - - - - + @@ -273,12 +277,14 @@ import CRUD, { crud } from '@crud/crud' import crudGroup from '@/views/wms/basedata/group/group' +import AddBoms from '@/views/wms/basedata/group/AddBoms' import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo' import crudCallMaterial from '@/views/wms/pdm/callmaterial/callmaterial' import crudPoint from '@/views/wms/sch/point/schBasePoint' export default { name: 'WeighDialog', mixins: [crud()], + components: { AddBoms }, dicts: ['storagevehicle_type', 'QUALITY_TYPE'], props: { dialogShow: { @@ -322,6 +328,8 @@ export default { vehicleList: [], current: null, dialogVisible: false, + addBomsDialog: false, + flagnow: false, rules: { material_code: [ { required: true, message: '物料不能为空', trigger: 'blur' } @@ -403,7 +411,7 @@ export default { this.bomList = res }) const area_type = 'INOUR01' - crudPoint.getPointList({ 'region_code': area_type }).then(res => { + crudPoint.getPointList({'region_code': area_type}).then(res => { this.pointList = res }) }, @@ -451,7 +459,7 @@ export default { }) }, queryMater(value) { - crudGroup.queryMater({ 'material_code': value }).then(row => { + crudGroup.queryMater({'material_code': value}).then(row => { this.formMst.material_spec = row.material_spec this.formMst.material_name = row.material_name this.formMst.material_id = row.material_id @@ -484,15 +492,36 @@ export default { } }, queryVehicle(value) { - crudGroup.queryVehicle({ 'point_code': value }).then(res => { + crudGroup.queryVehicle({'point_code': value}).then(res => { this.vehicleList = res }) }, queryVehicleType(value) { - crudGroup.queryVehicleType({ 'vehicle_code': value }).then(res => { + crudGroup.queryVehicleType({'vehicle_code': value}).then(res => { this.formMst.box_type = res.storagevehicle_type }) + }, + tableChanged(rows) { + rows.forEach((item) => { + if (this.formMst.bom_list.length !== 0) { + this.flagnow = false + + for (let j = 0; j < this.formMst.bom_list.length; j++) { + const bom_code = this.formMst.bom_list[j] + if (bom_code === item.bom_code) { + this.flagnow = true + } + } + if (!this.flagnow) { + this.formMst.bom_list.push(item.bom_code) + } + } else { + this.formMst.bom_list.push(item.bom_code) + } + }) + this.queryBomMater(this.formMst.bom_list) } + } } @@ -505,5 +534,9 @@ export default { .input-with-select { background-color: #fff; } +.select-wrapper { + display: flex; + align-items: center; /* 垂直居中 */ +} diff --git a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue index 38f23ba..ea5a380 100644 --- a/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue +++ b/wms/nladmin-ui/src/views/wms/pdm/callmaterial/index.vue @@ -7,7 +7,7 @@ :inline="true" class="demo-form-inline" label-position="right" - label-width="80px" + label-width="110px" label-suffix=":" > @@ -62,6 +62,23 @@ /> + + + + + { this.pointList = res }) + this.query.return_two = '0' this.initQuery() }, methods: {