lhq/FT541-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

物料

Browse Source
This commit is contained in:
张怡蓉
2025-11-04 13:54:16 +08:00
parent 7c755361f0
commit 4737cd0cef
11 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java
View File

@@ -100,6 +100,8 @@ public class BasCustomer extends BaseEntity
private String updateId; private String updateId;
@Override @Override
public String getRemark() { public String getRemark() {
return remark; return remark;

8
ruoyi-admin/src/main/java/com/ruoyi/bas/traycode/domain/BasTraycode.java
View File

@@ -16,16 +16,16 @@ public class BasTraycode extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id */ /** id */
@Excel(name = "${bas.Traycode.id}") // @Excel(name = "${bas.Traycode.id}")
private Long id; private Long id;
/** 条码类型id */ /** 条码类型id */
@Excel(name = "${bas.Traycode.formatId}") // @Excel(name = "${bas.Traycode.formatId}")
private Long formatId; private Long formatId;
private String formatName; private String formatName;
/** 条码 */ /** 条码 */
@Excel(name = "${bas.Traycode.trayCode}") @Excel(name = "条码")
private String trayCode; private String trayCode;
/** 备用字段1 */ /** 备用字段1 */
@@ -33,7 +33,7 @@ public class BasTraycode extends BaseEntity
private String spare1; private String spare1;
/** 备用字段2 */ /** 备用字段2 */
// @Excel(name = "${bas.Traycode.spare2}") @Excel(name = "是否可用",dictType = "sys_yes_no")
private String spare2; private String spare2;
/** 备用字段3 */ /** 备用字段3 */

59
ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/domain/BasWarehouse.java
View File

@@ -18,13 +18,15 @@ public class BasWarehouse extends BaseEntity
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** id（主键不允许为空）主键 */ /** id（主键不允许为空）主键 */
@Excel(name = "id") @Excel(name = "仓库ID")
private String warehouseId; private String warehouseId;
/** 仓库id（不允许为空） */ /** 仓库id（不允许为空） */
@Excel(name = "仓库编号")
private String warehouseNo; private String warehouseNo;
/** 项目编号 */ /** 项目编号 */
// @Excel(name = "${bas.Warehouse.projectNo}")
private String projectNo; private String projectNo;
/** 仓库名称（不允许为空） */ /** 仓库名称（不允许为空） */
@@ -36,9 +38,11 @@ public class BasWarehouse extends BaseEntity
private String address; private String address;
/** 仓库描述（允许为空） */ /** 仓库描述（允许为空） */
@Excel(name = "备注")
private String cDesc; private String cDesc;
/** 仓库级别（允许为空）1、2 */ /** 仓库级别（允许为空）1、2 */
// @Excel(name = "${bas.Warehouse.warehouseKind}")
private String warehouseKind; private String warehouseKind;
/** 仓库类型 */ /** 仓库类型 */
@@ -49,9 +53,6 @@ public class BasWarehouse extends BaseEntity
@Excel(name = "是否可用",dictType = "sys_yes_no") @Excel(name = "是否可用",dictType = "sys_yes_no")
private String isCurrent; private String isCurrent;
@Excel(name = "备注")
private String remark;
/*仓库数据权限*/ /*仓库数据权限*/
private List<String> dataScope; private List<String> dataScope;
private List<String> typeData; private List<String> typeData;
@@ -73,122 +74,114 @@ public class BasWarehouse extends BaseEntity
this.cDesc = cDesc; this.cDesc = cDesc;
} }
@Override
public String getRemark() {
return remark;
}
@Override
public void setRemark(String remark) {
this.remark = remark;
}
public void setWarehouseId(String warehouseId) public void setWarehouseId(String warehouseId)
{ {
this.warehouseId = warehouseId; this.warehouseId = warehouseId;
} }
public String getWarehouseId() public String getWarehouseId()
{ {
return warehouseId; return warehouseId;
} }
public void setWarehouseNo(String warehouseNo) public void setWarehouseNo(String warehouseNo)
{ {
this.warehouseNo = warehouseNo; this.warehouseNo = warehouseNo;
} }
public String getWarehouseNo() public String getWarehouseNo()
{ {
return warehouseNo; return warehouseNo;
} }
public void setProjectNo(String projectNo) public void setProjectNo(String projectNo)
{ {
this.projectNo = projectNo; this.projectNo = projectNo;
} }
public String getProjectNo() public String getProjectNo()
{ {
return projectNo; return projectNo;
} }
public void setWarehouseName(String warehouseName) public void setWarehouseName(String warehouseName)
{ {
this.warehouseName = warehouseName; this.warehouseName = warehouseName;
} }
public String getWarehouseName() public String getWarehouseName()
{ {
return warehouseName; return warehouseName;
} }
public void setAddress(String address) public void setAddress(String address)
{ {
this.address = address; this.address = address;
} }
public String getAddress() public String getAddress()
{ {
return address; return address;
} }
public void setCDesc(String cDesc) public void setCDesc(String cDesc)
{ {
this.cDesc = cDesc; this.cDesc = cDesc;
} }
public String getCDesc() public String getCDesc()
{ {
return cDesc; return cDesc;
} }
public void setWarehouseKind(String warehouseKind) public void setWarehouseKind(String warehouseKind)
{ {
this.warehouseKind = warehouseKind; this.warehouseKind = warehouseKind;
} }
public String getWarehouseKind() public String getWarehouseKind()
{ {
return warehouseKind; return warehouseKind;
} }
public void setWarehouseType(String warehouseType) public void setWarehouseType(String warehouseType)
{ {
this.warehouseType = warehouseType; this.warehouseType = warehouseType;
} }
public String getWarehouseType() public String getWarehouseType()
{ {
return warehouseType; return warehouseType;
} }
public void setIsCurrent(String isCurrent) public void setIsCurrent(String isCurrent)
{ {
this.isCurrent = isCurrent; this.isCurrent = isCurrent;
} }
public String getIsCurrent() public String getIsCurrent()
{ {
return isCurrent; return isCurrent;
} }
public void setDataScope(List<String> dataScope) public void setDataScope(List<String> dataScope)
{ {
this.dataScope = dataScope; this.dataScope = dataScope;
} }
public List<String> getDataScope() public List<String> getDataScope()
{ {
return dataScope; return dataScope;
} }
public void setTypeData(List<String> typeData) public void setTypeData(List<String> typeData)
{ {
this.typeData = typeData; this.typeData = typeData;
} }
public List<String> getTypeData() public List<String> getTypeData()
{ {
return typeData; return typeData;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -198,6 +198,8 @@ public class PdaServiceImp implements PdaService {
@Override @Override
public AjaxResult selectStockinDetail(String stockinDetailId) { public AjaxResult selectStockinDetail(String stockinDetailId) {
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(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); return AjaxResult.success(inStockinDetail);
} }

11
ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
View File

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="lotNo" column="lot_no" /> <result property="lotNo" column="lot_no" />
<result property="productGuid" column="product_guid" /> <result property="productGuid" column="product_guid" />
<result property="productId" column="product_id" /> <result property="productId" column="product_id" />
<result property="productName" column="product_name" />
<result property="quantity" column="quantity" /> <result property="quantity" column="quantity" />
<result property="quantityX" column="quantity_x" /> <result property="quantityX" column="quantity_x" />
<result property="quantityJ" column="quantity_j" /> <result property="quantityJ" column="quantity_j" />
@@ -81,6 +81,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="model" column="model" /> <result property="model" column="model" />
<result property="orderId" column="order_id" /> <result property="orderId" column="order_id" />
<result property="productName" column="product_name" /> <result property="productName" column="product_name" />
<result property="productPrice" column="product_price" />
<result property="productDrawNo" column="product_draw_no" />
<result property="productUnit" column="product_unit" />
<result property="productSpec" column="product_spec" />
<result property="productStatus" column="product_status" />
<result property="createSys" column="create_sys" />
<result property="isUsed" column="is_used" />
<result property="supplierName" column="supplier_name" />
<result property="customerName" column="customer_name" />
</resultMap> </resultMap>
<sql id="selectOutStockoutDetailFinishVo"> <sql id="selectOutStockoutDetailFinishVo">

6
ruoyi-ui/src/views/bas/roadway/index.vue
View File

@@ -188,9 +188,9 @@
<el-form-item label="巷道名称" prop="roadwayName"> <el-form-item label="巷道名称" prop="roadwayName">
<el-input v-model="form.roadwayName" placeholder="请输入巷道名称" /> <el-input v-model="form.roadwayName" placeholder="请输入巷道名称" />
</el-form-item> </el-form-item>
<el-form-item label="设备id" prop="deviceId"> <!-- <el-form-item label="设备id" prop="deviceId">-->
<el-input v-model="form.deviceId" placeholder="请输入设备id" /> <!-- <el-input v-model="form.deviceId" placeholder="请输入设备id" />-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="北入库锁" prop="inLocked"> <el-form-item label="北入库锁" prop="inLocked">
<el-select v-model="form.inLocked" placeholder="请选择北入库锁"> <el-select v-model="form.inLocked" placeholder="请选择北入库锁">
<el-option <el-option

2
ruoyi-ui/src/views/kpi/inAnalysis/indexByTime.vue
View File

@@ -67,7 +67,7 @@ export default {
queryWarehouseParam:{ queryWarehouseParam:{
pageNum: 1, pageNum: 1,
pageSize: 99, pageSize: 99,
typeData:[1,2] typeData:[1]
} }
} }
}, },

2
ruoyi-ui/src/views/kpi/outAnalysis/indexByTime.vue
View File

@@ -67,7 +67,7 @@ export default {
queryWarehouseParam:{ queryWarehouseParam:{
pageNum: 1, pageNum: 1,
pageSize: 99, pageSize: 99,
typeData:[1,2] typeData:[1]
} }
} }
}, },

2
ruoyi-ui/src/views/kpi/roadwayAnalysis/index.vue
View File

@@ -81,7 +81,7 @@ export default {
queryWarehouseParam:{ queryWarehouseParam:{
pageNum: 1, pageNum: 1,
pageSize: 99, pageSize: 99,
typeData:[1,2] typeData:[1]
} }
} }
}, },

2
ruoyi-ui/src/views/kpi/spaceAnalysis/index.vue
View File

@@ -67,7 +67,7 @@ export default {
queryWarehouseParam:{ queryWarehouseParam:{
pageNum: 1, pageNum: 1,
pageSize: 99, pageSize: 99,
typeData:[1,2] typeData:[1]
} }
} }
} }

2
ruoyi-ui/src/views/kpi/spacePlan/index.vue
View File

@@ -89,7 +89,7 @@ export default {
queryWarehouseParam:{ queryWarehouseParam:{
pageNum: 1, pageNum: 1,
pageSize: 99, pageSize: 99,
typeData:[1,2] typeData:[1]
} }
} }
}, },