From 4737cd0cef331167c0a078190a1938ff0ebf4377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Tue, 4 Nov 2025 13:54:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/BasCustomer/domain/BasCustomer.java | 2 + .../bas/traycode/domain/BasTraycode.java | 8 +-- .../bas/warehouse/domain/BasWarehouse.java | 59 ++++++++----------- .../com/ruoyi/pda/service/PdaServiceImp.java | 2 + .../out/OutStockoutDetailFinishMapper.xml | 11 +++- ruoyi-ui/src/views/bas/roadway/index.vue | 6 +- .../src/views/kpi/inAnalysis/indexByTime.vue | 2 +- .../src/views/kpi/outAnalysis/indexByTime.vue | 2 +- .../src/views/kpi/roadwayAnalysis/index.vue | 2 +- .../src/views/kpi/spaceAnalysis/index.vue | 2 +- ruoyi-ui/src/views/kpi/spacePlan/index.vue | 2 +- 11 files changed, 52 insertions(+), 46 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java index 2238cc0..af7372b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java @@ -100,6 +100,8 @@ public class BasCustomer extends BaseEntity private String updateId; + + @Override public String getRemark() { return remark; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java index de122ce..7844fbd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java @@ -16,16 +16,16 @@ public class BasTraycode extends BaseEntity private static final long serialVersionUID = 1L; /** id */ - @Excel(name = "${bas.Traycode.id}") +// @Excel(name = "${bas.Traycode.id}") private Long id; /** 条码类型id */ - @Excel(name = "${bas.Traycode.formatId}") +// @Excel(name = "${bas.Traycode.formatId}") private Long formatId; private String formatName; /** 条码 */ - @Excel(name = "${bas.Traycode.trayCode}") + @Excel(name = "条码") private String trayCode; /** 备用字段1 */ @@ -33,7 +33,7 @@ public class BasTraycode extends BaseEntity private String spare1; /** 备用字段2 */ -// @Excel(name = "${bas.Traycode.spare2}") + @Excel(name = "是否可用",dictType = "sys_yes_no") private String spare2; /** 备用字段3 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java index fb4732b..ee01467 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java @@ -18,13 +18,15 @@ public class BasWarehouse extends BaseEntity private static final long serialVersionUID = 1L; /** id（主键不允许为空）主键 */ - @Excel(name = "id") + @Excel(name = "仓库ID") private String warehouseId; /** 仓库id（不允许为空） */ + @Excel(name = "仓库编号") private String warehouseNo; /** 项目编号 */ +// @Excel(name = "${bas.Warehouse.projectNo}") private String projectNo; /** 仓库名称（不允许为空） */ @@ -36,9 +38,11 @@ public class BasWarehouse extends BaseEntity private String address; /** 仓库描述（允许为空） */ + @Excel(name = "备注") private String cDesc; /** 仓库级别（允许为空）1、2 */ +// @Excel(name = "${bas.Warehouse.warehouseKind}") private String warehouseKind; /** 仓库类型 */ @@ -49,9 +53,6 @@ public class BasWarehouse extends BaseEntity @Excel(name = "是否可用",dictType = "sys_yes_no") private String isCurrent; - @Excel(name = "备注") - private String remark; - /*仓库数据权限*/ private List dataScope; private List typeData; @@ -73,122 +74,114 @@ public class BasWarehouse extends BaseEntity this.cDesc = cDesc; } - @Override - public String getRemark() { - return remark; - } - @Override - public void setRemark(String remark) { - this.remark = remark; - } public void setWarehouseId(String warehouseId) { this.warehouseId = warehouseId; } - public String getWarehouseId() + public String getWarehouseId() { return warehouseId; } - public void setWarehouseNo(String warehouseNo) + public void setWarehouseNo(String warehouseNo) { this.warehouseNo = warehouseNo; } - public String getWarehouseNo() + public String getWarehouseNo() { return warehouseNo; } - public void setProjectNo(String projectNo) + public void setProjectNo(String projectNo) { this.projectNo = projectNo; } - public String getProjectNo() + public String getProjectNo() { return projectNo; } - public void setWarehouseName(String warehouseName) + public void setWarehouseName(String warehouseName) { this.warehouseName = warehouseName; } - public String getWarehouseName() + public String getWarehouseName() { return warehouseName; } - public void setAddress(String address) + public void setAddress(String address) { this.address = address; } - public String getAddress() + public String getAddress() { return address; } - public void setCDesc(String cDesc) + public void setCDesc(String cDesc) { this.cDesc = cDesc; } - public String getCDesc() + public String getCDesc() { return cDesc; } - public void setWarehouseKind(String warehouseKind) + public void setWarehouseKind(String warehouseKind) { this.warehouseKind = warehouseKind; } - public String getWarehouseKind() + public String getWarehouseKind() { return warehouseKind; } - public void setWarehouseType(String warehouseType) + public void setWarehouseType(String warehouseType) { this.warehouseType = warehouseType; } - public String getWarehouseType() + public String getWarehouseType() { return warehouseType; } - public void setIsCurrent(String isCurrent) + public void setIsCurrent(String isCurrent) { this.isCurrent = isCurrent; } - public String getIsCurrent() + public String getIsCurrent() { return isCurrent; } - public void setDataScope(List dataScope) + public void setDataScope(List dataScope) { this.dataScope = dataScope; } - public List getDataScope() + public List getDataScope() { return dataScope; } - public void setTypeData(List typeData) + public void setTypeData(List typeData) { this.typeData = typeData; } - public List getTypeData() + public List getTypeData() { return typeData; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 6f61281..23e5e39 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -198,6 +198,8 @@ public class PdaServiceImp implements PdaService { @Override public AjaxResult selectStockinDetail(String stockinDetailId) { InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(stockinDetailId); + int i = Integer.parseInt(inStockinDetail.getQuantity()) - Integer.parseInt(inStockinDetail.getScanNum()); + inStockinDetail.setQuantityX(String.valueOf(i)); return AjaxResult.success(inStockinDetail); } diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml index 5887eed..5b0a21c 100644 --- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml @@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -81,6 +81,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + diff --git a/ruoyi-ui/src/views/bas/roadway/index.vue b/ruoyi-ui/src/views/bas/roadway/index.vue index 80ddfdd..b393c97 100644 --- a/ruoyi-ui/src/views/bas/roadway/index.vue +++ b/ruoyi-ui/src/views/bas/roadway/index.vue @@ -188,9 +188,9 @@ - - - + + +