From 3f00df76cf6e2962e998366391ec56e4aa3d4a20 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Fri, 2 May 2025 17:25:46 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9bom?= =?UTF-8?q?=E6=9C=A8=E7=AE=B1=E7=B1=BB=E5=9E=8B=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BstIvtStockingivtController.java | 6 + .../service/IBstIvtStockingivtService.java | 3 + .../impl/BstIvtStockingivtServiceImpl.java | 12 ++ .../controller/MdpbBoxtypeController.java | 14 ++ .../database/service/IMdpbBoxtypeService.java | 6 + .../service/impl/MdpbBoxtypeServiceImpl.java | 24 ++++ .../bst/ivt/stockingivt/bstIvtStockingivt.js | 9 +- .../views/wms/basedata/st/boxType/boxtype.js | 17 ++- .../wms/pdm/order/slittingplan/index.vue | 21 ++- .../pdm/order/slittingplan/tubeDialog2.vue | 131 ++++++++++++++++++ 10 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java index db396471e..8a194adae 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/controller/BstIvtStockingivtController.java @@ -80,5 +80,11 @@ public class BstIvtStockingivtController { return new ResponseEntity<>(bstIvtStockingivtService.showDetail2(param), HttpStatus.OK); } + @Log("查询bom记录") + @GetMapping("/showBom2") + public ResponseEntity showBom2(@RequestParam Map param) { + return new ResponseEntity<>(bstIvtStockingivtService.showBom2(param), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java index 55d688fe6..b987f4fff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/IBstIvtStockingivtService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto; import org.nl.common.domain.query.PageQuery; @@ -103,4 +104,6 @@ public interface IBstIvtStockingivtService extends IService { List> showDetail(JSONObject param); List showDetail2(Map param); + + PdmBiOrderbominfo showBom2(Map param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java index a8c88c889..7a5cd4630 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/stockingivt/service/impl/BstIvtStockingivtServiceImpl.java @@ -15,6 +15,8 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt; import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper; import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; +import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto; @@ -52,6 +54,8 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page) { @@ -351,4 +355,12 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); + lam.eq(PdmBiOrderbominfo::getMfgOrder,mfg_order_name); + PdmBiOrderbominfo order = pdmBiOrderbominfoService.getOne(lam); + return order; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java index 69d5b43fc..6e2c15051 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/controller/MdpbBoxtypeController.java @@ -67,4 +67,18 @@ public class MdpbBoxtypeController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/confirmBox") + @Log("保存bom") + public ResponseEntity confirmBox(@RequestBody JSONObject whereJson) { + iMdpbBoxtypeService.confirmBox(whereJson); + return new ResponseEntity<>(HttpStatus.OK); + } + + + @GetMapping("/getBoxTypes") + @Log("查询木箱类型") + public ResponseEntity query(@RequestParam Map whereJson) { + return new ResponseEntity<>(iMdpbBoxtypeService.list(), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java index c211b48ee..f3131c7c7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/IMdpbBoxtypeService.java @@ -50,4 +50,10 @@ public interface IMdpbBoxtypeService extends IService { * @param whereJson： {需要修改的参数} */ void confirmUpdate(JSONObject whereJson); + + /** + * 一键修改 + * @param whereJson： {需要修改的参数} + */ + void confirmBox(JSONObject whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java index 5f663621d..935bbd16e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/impl/MdpbBoxtypeServiceImpl.java @@ -9,11 +9,14 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; +import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService; import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype; import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbBoxtypeMapper; import org.nl.common.domain.query.PageQuery; import org.nl.modules.common.exception.BadRequestException; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,6 +34,8 @@ import java.util.Set; @Service public class MdpbBoxtypeServiceImpl extends ServiceImpl implements IMdpbBoxtypeService { + @Autowired + private IPdmBiOrderbominfoService pdmBiOrderbominfoService; @Override public IPage queryAll(Map whereJson, PageQuery page) { // 查询条件 @@ -81,4 +86,23 @@ public class MdpbBoxtypeServiceImpl extends ServiceImpl().lambda() + .eq(PdmBiOrderbominfo::getMfgOrder,whereJson.getString("mfgOrder")) + .set(PdmBiOrderbominfo::getProductName, whereJson.getString("productName")) + .set(PdmBiOrderbominfo::getDescription, boxtype.getBox_name()) + ); + } } diff --git a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js index 96ecd52c8..190917cac 100644 --- a/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js +++ b/lms/nladmin-ui/src/views/b_lms/bst/ivt/stockingivt/bstIvtStockingivt.js @@ -39,5 +39,12 @@ export function showDetail2(params) { params }) } +export function showBom2(params) { + return request({ + url: 'api/bstIvtStockingivt/showBom2', + method: 'get', + params + }) +} -export default { add, edit, del, showDetail, showDetail2 } +export default { add, edit, del, showDetail, showDetail2, showBom2 } diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js index cdceb528e..b042aa4da 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js +++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/boxtype.js @@ -31,5 +31,18 @@ export function confirmUpdate(data) { data }) } - -export default { add, edit, del, confirmUpdate } +export function getBoxTypes(params) { + return request({ + url: 'api/boxtype/getBoxTypes', + method: 'get', + params + }) +} +export function confirmBox(data) { + return request({ + url: 'api/boxtype/confirmBox', + method: 'post', + data + }) +} +export default { add, edit, del, confirmUpdate, getBoxTypes, confirmBox } diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue index f4b77ed34..8ba8d664e 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue @@ -488,7 +488,11 @@ - + + + @@ -557,6 +561,7 @@ + @@ -565,8 +570,8 @@ import crudSlittingproductionplan from '@/views/wms/pdm/order/slittingplan/slitt import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' -import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' +import TubeDialog2 from '@/views/wms/pdm/order/slittingplan/tubeDialog2.vue' const defaultForm = { workorder_id: null, @@ -619,7 +624,7 @@ const defaultForm = { export default { name: 'Slittingproductionplan', dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'], - components: { pagination, crudOperation, rrOperation, udOperation }, + components: { pagination, crudOperation, rrOperation, TubeDialog2 }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ @@ -640,6 +645,8 @@ export default { data() { return { permission: {}, + showView2: false, + mstrow: {}, rules: { order_type: [ { required: true, message: '分切订单类型不能为空', trigger: 'blur' } @@ -679,6 +686,14 @@ export default { hand() { this.crud.toQuery() }, + toView2(index, row) { + this.showView2 = true + this.mstrow = row + }, + querytable() { + this.$refs.table.clearSelection() + this.crud.toQuery() + }, upMaterFinish() { const _selectData = this.$refs.table.selection const data = { diff --git a/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue new file mode 100644 index 000000000..8a84a1ab0 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/tubeDialog2.vue @@ -0,0 +1,131 @@ + + + + +