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 7fba61f..3ea9f42 100644 --- a/measurement/src/main/java/com/ruoyi/basedata/controller/EmpwgtdataController.java +++ b/measurement/src/main/java/com/ruoyi/basedata/controller/EmpwgtdataController.java @@ -128,4 +128,13 @@ public class EmpwgtdataController extends BaseController return success(empwgtdataService.getCarnoEmpwgtData(carno)); } + + @PreAuthorize("@ss.hasPermi('measurement/basedata:empwgtdata:query')") + @GetMapping(value = "/getCarnoEmpwgtDataStatus/{carno}") + public AjaxResult getCarnoEmpwgtDataStatus(@PathVariable("carno") String carno) + { + return success(empwgtdataService.getCarnoEmpwgtDataStatus(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 cad27ad..9b84448 100644 --- a/measurement/src/main/java/com/ruoyi/basedata/service/IEmpwgtdataService.java +++ b/measurement/src/main/java/com/ruoyi/basedata/service/IEmpwgtdataService.java @@ -71,4 +71,11 @@ public interface IEmpwgtdataService extends IService public Empwgtdata selectEnableEmpwgtdata(Empwgtdata empwgtdata); public Empwgtdata getCarnoEmpwgtData(String carno); + + /** + * 根据车牌号,获取当前皮重数据状态。 + * @param carno + * @return + */ + public String getCarnoEmpwgtDataStatus(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 d9cd13b..2243527 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 @@ -3,6 +3,7 @@ package com.ruoyi.basedata.service.impl; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.ZoneId; +import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.List; @@ -10,6 +11,7 @@ import com.ruoyi.basedata.domain.Pounddata; import com.ruoyi.basedata.service.IPounddataService; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.util.AllNumberUtil; +import com.ruoyi.util.Util; import org.springframework.beans.factory.annotation.Autowired; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -183,5 +185,51 @@ public class EmpwgtdataServiceImpl extends ServiceImpl { + const msg = response.msg; + if ("" !== msg){ + //弹出提示框 + this.$confirm(msg, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + } + }); }, //查询主榜单数据,分页设置为1 handleSearchMstBillFirst(){ diff --git a/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue b/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue index f350e25..290b300 100644 --- a/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue +++ b/ruoyi-ui/src/views/measurement/operation/steelpound/index.vue @@ -748,6 +748,8 @@ export default { }, //查询主榜单数据 handleSearchMstBill(){ + // 校验是否选中磅点 + if (!this.checkPoundSelected())return; this.mstBillLoading = true this.queryPageParams.mstBill.poundid = this.truepoundData.buspoundid; listPoundmst(this.queryPageParams.mstBill).then(response => {