From 9021b079e84454d09a4b640e4a4d3143e7d6db87 Mon Sep 17 00:00:00 2001 From: xiaosuonian <913474402@qq.com> Date: Tue, 15 Jul 2025 11:21:38 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=88=9B=E5=BB=BA=E4=B8=BB=E7=A3=85=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E7=A3=85=E5=8D=95=E6=97=B6=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E4=B8=BB=E7=A3=85=E5=8D=95=E5=8F=B7=E8=B5=8B=E5=80=BC=E5=88=B0?= =?UTF-8?q?=E7=A3=85=E5=8D=95=E4=BF=A1=E6=81=AF=E4=B8=AD=E3=80=82=202.?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=93=81=E6=B0=B4=E7=A3=85=EF=BC=8C=E9=92=A2?= =?UTF-8?q?=E6=9D=90=E7=A3=85=E9=80=BB=E8=BE=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bill/controller/PoundBillController.java | 20 +++++ .../ruoyi/bill/service/IPoundBillService.java | 4 + .../service/impl/PoundBillServiceImpl.java | 79 +++++++++++++++-- .../src/api/measurement/bill/poundbill.js | 18 +++- .../measurement/operation/moltenironpound.js | 88 +++++++++---------- .../operation/moltenironpound/index.vue | 10 ++- .../operation/shortdispound/index.vue | 4 + .../operation/steelpound/index.vue | 1 + 8 files changed, 170 insertions(+), 54 deletions(-) diff --git a/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java b/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java index b55e264..de98f6e 100644 --- a/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java +++ b/measurement/src/main/java/com/ruoyi/bill/controller/PoundBillController.java @@ -129,6 +129,16 @@ public class PoundBillController extends BaseController { return toAjax(poundBillService.insertTransPoundBill(poundBill)); } + /** + * 新增磅单信息（铁水磅） + */ + @PreAuthorize("@ss.hasPermi('measurement:poundbill:add')") + @Log(title = "磅单信息", businessType = BusinessType.INSERT) + @PostMapping(value = "/molteniron") + public AjaxResult addMolteniron(@RequestBody PoundBill poundBill) + { + return toAjax(poundBillService.insertMoltenironPoundBill(poundBill)); + } /** * 新增磅单信息（成品磅） */ @@ -173,6 +183,16 @@ public class PoundBillController extends BaseController { return toAjax(poundBillService.updateTransPoundBill(poundBill)); } + /** + * 修改磅单信息(倒短磅过皮申请变完成状态) + */ + @PreAuthorize("@ss.hasPermi('measurement:poundbill:edit')") + @Log(title = "磅单信息", businessType = BusinessType.UPDATE) + @PutMapping(value = "/molteniron") + public AjaxResult editMolteniron(@RequestBody PoundBill poundBill) + { + return toAjax(poundBillService.updateMoltenironPoundBill(poundBill)); + } /** * 删除磅单信息 diff --git a/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java b/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java index 5772207..54ff219 100644 --- a/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java +++ b/measurement/src/main/java/com/ruoyi/bill/service/IPoundBillService.java @@ -44,6 +44,8 @@ public interface IPoundBillService extends IService public int insertTransPoundBill(PoundBill poundBill); + public int insertMoltenironPoundBill(PoundBill poundBill); + public int insertSteelPoundBill(PoundBill poundBill); /** @@ -58,6 +60,8 @@ public interface IPoundBillService extends IService public int updateTransPoundBill(PoundBill poundBill); + public int updateMoltenironPoundBill(PoundBill poundBill); + /** * 批量删除磅单信息 * diff --git a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java index c33adb6..6a172d9 100644 --- a/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java +++ b/measurement/src/main/java/com/ruoyi/bill/service/impl/PoundBillServiceImpl.java @@ -306,12 +306,48 @@ public class PoundBillServiceImpl extends ServiceImpl params = poundBill.getParams(); + String ttsid = (String) params.get("ttsid"); + String poundid = (String) params.get("poundid"); + empwgtdata.setTtsid(ttsid); + empwgtdata.setPoundid(poundid); + empwgtdata.setIsused("N"); + empwgtdataService.insertEmpwgtdata(empwgtdata); + String empDataId = empwgtdata.getId(); + String empUsrcode = empwgtdata.getUsrcode(); + //开始对磅单信息进行赋值。 + PoundBill byId = getById(id); + byId.setEmpsysid(empDataId); + byId.setEmpusrcode(empUsrcode); + byId.setEmpmqty(poundBill.getEmpmqty()); + byId.setNetmqty(poundBill.getNetmqty()); + byId.setEmpdt(new Date()); + byId.setEmpdtoprname(SecurityUtils.getUsername()); + byId.setBillstate("2"); + boolean b = updateById(byId); if(b){ return 1; }else{ diff --git a/ruoyi-ui/src/api/measurement/bill/poundbill.js b/ruoyi-ui/src/api/measurement/bill/poundbill.js index 76a7658..85e9ec6 100644 --- a/ruoyi-ui/src/api/measurement/bill/poundbill.js +++ b/ruoyi-ui/src/api/measurement/bill/poundbill.js @@ -69,7 +69,15 @@ export function addTransPoundbill(data) { data: data }) } -// 新增磅单信息(倒短) +// 新增磅单信息(铁水) +export function addMoltenironPoundbill(data) { + return request({ + url: '/measurement/poundbill/molteniron', + method: 'post', + data: data + }) +} +// 新增磅单信息(钢材) export function addSteelPoundbill(data) { return request({ url: '/measurement/poundbill/steel', @@ -103,6 +111,14 @@ export function updateTransPoundbill(data) { data: data }) } +// 修改磅单信息（铁水） +export function updateMoltenironPoundbill(data) { + return request({ + url: '/measurement/poundbill/molteniron', + method: 'put', + data: data + }) +} // 删除磅单信息 export function delPoundbill(id) { diff --git a/ruoyi-ui/src/api/measurement/operation/moltenironpound.js b/ruoyi-ui/src/api/measurement/operation/moltenironpound.js index d5fe0a5..13ffc55 100644 --- a/ruoyi-ui/src/api/measurement/operation/moltenironpound.js +++ b/ruoyi-ui/src/api/measurement/operation/moltenironpound.js @@ -1,44 +1,44 @@ -import request from '@/utils/request' - -// 查询铁水磅列表 -export function listMoltenironpound(query) { - return request({ - url: '/measurement/operation/moltenironpound/list', - method: 'get', - params: query - }) -} - -// 查询铁水磅详细 -export function getMoltenironpound(id) { - return request({ - url: '/measurement/operation/moltenironpound/' + id, - method: 'get' - }) -} - -// 新增铁水磅 -export function addMoltenironpound(data) { - return request({ - url: '/measurement/operation/moltenironpound', - method: 'post', - data: data - }) -} - -// 修改铁水磅 -export function updateMoltenironpound(data) { - return request({ - url: '/measurement/operation/moltenironpound', - method: 'put', - data: data - }) -} - -// 删除铁水磅 -export function delMoltenironpound(id) { - return request({ - url: '/measurement/operation/moltenironpound/' + id, - method: 'delete' - }) -} +// import request from '@/utils/request' +// +// // 查询铁水磅列表 +// export function listMoltenironpound(query) { +// return request({ +// url: '/measurement/operation/moltenironpound/list', +// method: 'get', +// params: query +// }) +// } +// +// // 查询铁水磅详细 +// export function getMoltenironpound(id) { +// return request({ +// url: '/measurement/operation/moltenironpound/' + id, +// method: 'get' +// }) +// } +// +// // 新增铁水磅 +// export function addMoltenironpound(data) { +// return request({ +// url: '/measurement/operation/moltenironpound', +// method: 'post', +// data: data +// }) +// } +// +// // 修改铁水磅 +// export function updateMoltenironpound(data) { +// return request({ +// url: '/measurement/operation/moltenironpound', +// method: 'put', +// data: data +// }) +// } +// +// // 删除铁水磅 +// export function delMoltenironpound(id) { +// return request({ +// url: '/measurement/operation/moltenironpound/' + id, +// method: 'delete' +// }) +// } diff --git a/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue b/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue index 619f54a..a3421fb 100644 --- a/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue +++ b/ruoyi-ui/src/views/measurement/operation/moltenironpound/index.vue @@ -386,7 +386,7 @@ /> - 操作 + 操作 @@ -630,7 +630,8 @@ import { addTransPoundbill, getNumber as getPoundBillNumber, getPoundbill, listPoundbill, - updateTransPoundbill + addMoltenironPoundbill, + updateMoltenironPoundbill, } from "@/api/measurement/bill/poundbill"; import {getCarnoEmpwgtData} from "@/api/measurement/basedata/empwgtdata"; //引入searchSelect方法 @@ -1015,6 +1016,7 @@ export default { const mainRow = this.mstBillFormData.thisSelectedRow; const form = this.poundBillDetailFormData.poundBillDetailForm; form.appliid = this.mstBillFormData.selectedIds[0]; + form.wetusrcode = this.mstBillFormData.selectedUsrcodes[0]; form.sendunitid = mainRow.sendunitid; form.recunitid = mainRow.recunitid; form.trnunitid = mainRow.trnunitid; @@ -1048,7 +1050,7 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { - addTransPoundbill(this.poundBillDetailFormData.poundBillDetailForm).then(response => { + addMoltenironPoundbill(this.poundBillDetailFormData.poundBillDetailForm).then(response => { this.$message.success("新增榜单明细成功！"); this.poundBillDetailFormData.poundBillDetailOpen = false; //查询榜单明细数据 @@ -1112,7 +1114,7 @@ export default { cancelButtonText: "取消", type: "warning" }).then(() => { - updateTransPoundbill(this.poundBillDetailFormData.poundBillDetailForm).then(response => { + updateMoltenironPoundbill(this.poundBillDetailFormData.poundBillDetailForm).then(response => { this.$message.success("榜单明细称皮重成功！"); this.poundBillDetailFormData.poundBillDetailOpen = false; //查询榜单明细数据 diff --git a/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue b/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue index caeb2f0..bed2f4a 100644 --- a/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue +++ b/ruoyi-ui/src/views/measurement/operation/shortdispound/index.vue @@ -838,6 +838,7 @@ export default { //主榜单相关界面参数 mstBillFormData:{ selectedIds:[], + selectedUsrcodes:[], mstBillForm:{}, mstBillRules:{}, mstBillTitle:"主榜单信息", @@ -967,9 +968,11 @@ watch: { handleMstSelectionChange(selection) { if (selection.length > 0){ this.mstBillFormData.selectedIds = selection.map(item => item.id) + this.mstBillFormData.selectedUsrcodes = selection.map(item => item.usrcode) this.queryPoundBillDetailFirst(); }else { this.mstBillFormData.selectedIds = []; + this.mstBillFormData.selectedUsrcodes = []; } }, // 过磅明细多选框选中数据 @@ -1203,6 +1206,7 @@ watch: { const mainRow = this.mstBillFormData.thisSelectedRow; const form = this.poundBillDetailFormData.poundBillDetailForm; form.appliid = this.mstBillFormData.selectedIds[0]; + form.wetusrcode = this.mstBillFormData.selectedUsrcodes[0]; form.sendunitid = mainRow.sendunitid; form.recunitid = mainRow.recunitid; form.trnunitid = mainRow.trnunitid; diff --git a/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue b/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue index 290b300..7b1ba34 100644 --- a/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue +++ b/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue @@ -838,6 +838,7 @@ export default { const mainRow = this.mstBillFormData.thisSelectedRow; const form = this.poundBillDetailFormData.poundBillDetailForm; form.appliid = this.mstBillFormData.selectedIds[0]; + form.wetusrcode = this.mstBillFormData.selectedUsrcodes[0]; form.sendunitid = mainRow.sendunitid; form.recunitid = mainRow.recunitid; form.itmcode = mainRow.itmcode;