From f02ba45876c94df6d01e1d9b4b302ae80718c2f3 Mon Sep 17 00:00:00 2001 From: xiaosuonian <913474402@qq.com> Date: Tue, 24 Jun 2025 15:14:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=87=BA=E5=8E=82=E5=85=A5=E5=8E=82=E7=A3=85?= =?UTF-8?q?=EF=BC=8C=E5=87=BA=E5=8E=82=E7=A3=85=EF=BC=8C=E5=8F=8C=E5=87=BB?= =?UTF-8?q?=E8=BF=87=E7=A3=85=E7=94=B3=E8=AF=B7=E6=97=B6=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=AE=E9=87=8D=E6=95=B0=E6=8D=AE=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E5=A1=AB=E5=85=85=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EmpwgtdataController.java | 8 +++++ .../basedata/service/IEmpwgtdataService.java | 3 ++ .../service/impl/EmpwgtdataServiceImpl.java | 31 +++++++++++++++++++ .../service/impl/PoundBillServiceImpl.java | 18 +++++++++++ .../measurement/bill/PoundBillMapper.xml | 2 +- .../api/measurement/basedata/empwgtdata.js | 8 +++++ .../operation/outinpound/index.vue | 31 +++++++++++++++++-- 7 files changed, 98 insertions(+), 3 deletions(-) diff --git a/measurement/src/main/java/com/ruoyi/basedata/controller/EmpwgtdataController.java b/measurement/src/main/java/com/ruoyi/basedata/controller/EmpwgtdataController.java index 4e1c8bf..7fba61f 100644 --- a/measurement/src/main/java/com/ruoyi/basedata/controller/EmpwgtdataController.java +++ b/measurement/src/main/java/com/ruoyi/basedata/controller/EmpwgtdataController.java @@ -120,4 +120,12 @@ public class EmpwgtdataController extends BaseController { return toAjax(empwgtdataService.removeByIds(Arrays.asList(ids))); } + + @PreAuthorize("@ss.hasPermi('measurement/basedata:empwgtdata:query')") + @GetMapping(value = "/getCarnoEmpwgtData/{carno}") + public AjaxResult getCarnoEmpwgtData(@PathVariable("carno") String carno) + { + + return success(empwgtdataService.getCarnoEmpwgtData(carno)); + } } diff --git a/measurement/src/main/java/com/ruoyi/basedata/service/IEmpwgtdataService.java b/measurement/src/main/java/com/ruoyi/basedata/service/IEmpwgtdataService.java index 8c95f9f..500b330 100644 --- a/measurement/src/main/java/com/ruoyi/basedata/service/IEmpwgtdataService.java +++ b/measurement/src/main/java/com/ruoyi/basedata/service/IEmpwgtdataService.java @@ -1,5 +1,6 @@ package com.ruoyi.basedata.service; +import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; @@ -68,4 +69,6 @@ public interface IEmpwgtdataService extends IService * @return */ public Empwgtdata selectEnableEmpwgtdata(Empwgtdata empwgtdata); + + public BigDecimal getCarnoEmpwgtData(String carno); } diff --git a/measurement/src/main/java/com/ruoyi/basedata/service/impl/EmpwgtdataServiceImpl.java b/measurement/src/main/java/com/ruoyi/basedata/service/impl/EmpwgtdataServiceImpl.java index 46d26bd..0053204 100644 --- a/measurement/src/main/java/com/ruoyi/basedata/service/impl/EmpwgtdataServiceImpl.java +++ b/measurement/src/main/java/com/ruoyi/basedata/service/impl/EmpwgtdataServiceImpl.java @@ -1,8 +1,12 @@ package com.ruoyi.basedata.service.impl; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.Date; import java.util.List; +import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.util.AllNumberUtil; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -26,6 +30,9 @@ public class EmpwgtdataServiceImpl extends ServiceImpl - where id = #{id} diff --git a/ruoyi-ui/src/api/measurement/basedata/empwgtdata.js b/ruoyi-ui/src/api/measurement/basedata/empwgtdata.js index e904bde..63293e7 100644 --- a/ruoyi-ui/src/api/measurement/basedata/empwgtdata.js +++ b/ruoyi-ui/src/api/measurement/basedata/empwgtdata.js @@ -50,3 +50,11 @@ export function delEmpwgtdata(id) { method: 'delete' }) } + +// 查询可用的历史皮重重量数据。 +export function getCarnoEmpwgtData(carno) { + return request({ + url: '/measurement/basedata/empwgtdata/getCarnoEmpwgtData/' + carno, + method: 'get' + }) +} diff --git a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue index 4bc7c00..703d464 100644 --- a/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue +++ b/ruoyi-ui/src/views/measurement/operation/outinpound/index.vue @@ -476,7 +476,7 @@ import { listPoundappli, getPoundappli, delPoundappli, addPoundappli, updatePoun //导入物理磅的方法 import { listTruepound, getTruepound, delTruepound, addTruepound, updateTruepound } from "@/api/measurement/basedata/truepound" //导入皮重库的方法 -import { listEmpwgtdata,getNumber as getHistoryPoundNumber, getEmpwgtdata, delEmpwgtdata, addEmpwgtdata, updateEmpwgtdata } from "@/api/measurement/basedata/empwgtdata" +import { listEmpwgtdata,getNumber as getHistoryPoundNumber, getEmpwgtdata, delEmpwgtdata, addEmpwgtdata, updateEmpwgtdata,getCarnoEmpwgtData } from "@/api/measurement/basedata/empwgtdata" //导入磅单信息的方法 import { listPoundbill,getNumber as getPoundNumber, getPoundbill, delPoundbill, addPoundbill, addOutPoundbill, addInPoundbill, updatePoundbill,updateInPoundbill } from "@/api/measurement/bill/poundbill" import {delUser} from "@/api/system/user"; @@ -566,6 +566,17 @@ export default { }, created() { }, + computed:{ + searchPound(){ + var sqlQuery; + if (this.queryParams.poundid!= null && this.queryParams.poundid!= ""){ + sqlQuery = "id = \"" + this.queryParams.poundid + "\""; + }else { + sqlQuery = ""; + } + return sqlQuery; + } + }, watch: { //监听磅点变化 'queryParams.poundid': function(newVal, oldVal) { @@ -701,7 +712,23 @@ export default { var number = response.data.number; this.form.usrcode = number +"|"+this.form.carno; this.form.crtdt = response.data.date; - }) + }); + //如果是出厂磅，才需要这个逻辑。 + if ("1"===this.queryParams.poundtype) + getCarnoEmpwgtData(this.form.carno).then(response => { + this.form.empmqty = response.data; + var tempwghmqty = new Decimal(this.form.wghmqty); + var tempempmqty = new Decimal(this.form.empmqty) + this.form.netmqty = tempwghmqty.minus(tempempmqty); + var tempnetmqty = new Decimal(this.form.netmqty) + var tempsrccleanmqty = new Decimal(this.form.srccleanmqty); + this.form.netdiffqty = tempnetmqty.minus(tempsrccleanmqty); + if (this.form.netdiffqty > 0){ + this.form.ductmqty = this.form.netdiffqty; + }else { + this.form.ductmqty = 0; + } + }); }, //过皮申请单击选中，并将车号进行赋值。 tareHandleRowClick(row) {