From 9c0236bacbd10fb629a4142719c4199bca1038bc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 17:28:58 +0800
Subject: [PATCH] 修改 1. 新增库位明细流界面 2. 修改库存信息表
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java | 318 +++++++++++++++++++++-------------------------------
1 files changed, 127 insertions(+), 191 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
index d256b0c..48363f4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -37,21 +37,27 @@
private Long id;
/**
- * 浠诲姟鏄庣粏ID
+ * 涓诲崟ID
*/
- @ApiModelProperty("浠诲姟鏄庣粏ID")
- private Long taskItemId;
-
- /**
- * 搴撳瓨澶栭敭鏍囪瘑
- */
- @ApiModelProperty(value= "搴撳瓨澶栭敭鏍囪瘑")
+ @ApiModelProperty(value= "涓诲崟ID")
private Long stockId;
/**
- * 鐗╂枡鏍囪瘑
+ * 涓诲崟缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡鏍囪瘑")
+ @ApiModelProperty(value= "涓诲崟缂栧彿")
+ private String stockCode;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value= "鏄庣粏ID")
+ private Long sourceItemId;
+
+ /**
+ * 鐗╂枡ID
+ */
+ @ApiModelProperty(value= "鐗╂枡ID")
private Long matnrId;
/**
@@ -60,21 +66,23 @@
@ApiModelProperty(value= "鐗╂枡缂栫爜")
private String matnrCode;
-
- @ApiModelProperty(value = "閫氱煡鍗曟槑缁嗘爣璇�")
- private Long asnItemId;
-
/**
- * 鍚嶇О
+ * 鐗╂枡鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String maktx;
/**
- * 鏁伴噺
+ * 閫佽揣鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value= "閫佽揣鏁伴噺")
private Double anfme;
+
+ /**
+ * 搴撳瓨鍗曚綅
+ */
+ @ApiModelProperty(value= "搴撳瓨鍗曚綅")
+ private String stockUnit;
/**
* 鎵ц涓暟閲�
@@ -83,46 +91,58 @@
private Double workQty;
/**
- * 瀹屾垚鏁伴噺
+ * 閲囪喘鏁伴噺
*/
- @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ApiModelProperty(value= "閲囪喘鏁伴噺")
+ private Double purQty;
+
+ /**
+ * 閲囪喘鍗曚綅
+ */
+ @ApiModelProperty(value= "閲囪喘鍗曚綅")
+ private String purUnit;
+
+ /**
+ * 宸叉敹鏁伴噺
+ */
+ @ApiModelProperty(value= "宸叉敹鏁伴噺")
private Double qty;
/**
- * 鏀惰揣閲嶉噺
+ * 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "鏀惰揣閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ private String splrCode;
/**
- * 鍗曚綅
+ * 搴撳瓨鎵规
*/
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
-
- /**
- * 璐т富鏍囪瘑
- */
- @ApiModelProperty(value= "璐т富鏍囪瘑")
- private Long shipperId;
-
- /**
- * 渚涘簲鍟嗘爣璇�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗘爣璇�")
- private String splrId;
-
- /**
- * 鍝佺墝
- */
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
-
- /**
- * 鎵规
- */
- @ApiModelProperty(value= "鎵规")
+ @ApiModelProperty(value= "搴撳瓨鎵规")
private String batch;
+
+ /**
+ * 渚涘簲鍟嗘壒娆�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
+ private String splrBatch;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
+ private String splrName;
+
+ /**
+ * 璺熻釜鐮�
+ */
+ @ApiModelProperty(value= "璺熻釜鐮�")
+ private String trackCode;
+
+ /**
+ * 鏉″舰鐮�
+ */
+ @ApiModelProperty(value= "鏉″舰鐮�")
+ private String barcode;
/**
* 鐢熶骇鏃ユ湡
@@ -131,86 +151,10 @@
private String prodTime;
/**
- * 璐ㄦ鏍囪瘑
+ * 鍖呰鍚嶇О
*/
- @ApiModelProperty(value= "璐ㄦ鏍囪瘑")
- private Long inspectId;
-
- /**
- * 渚涘簲鍟嗘壒娆�
- */
- @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
- private String splrBtch;
-
- /**
- * ASN鍗曟嵁,甯﹀嚭PO鍗�
- */
- @ApiModelProperty(value= "ASN鍗曟嵁,甯﹀嚭PO鍗�")
- @TableField(exist = false)
- private String asnOrder;
-
- /**
- * ERP鍑瘉
- */
- @ApiModelProperty(value= "ERP鍑瘉")
- @TableField(exist = false)
- private String erpToken;
-
- /**
- * ERP鍗曞彿
- */
- @ApiModelProperty(value= "ERP鍗曞彿")
- @TableField(exist = false)
- private String erpOrder;
-
- /**
- * ERP搴撳瓨鍦板潃
- */
- @ApiModelProperty(value= "ERP搴撳瓨鍦板潃")
- @TableField(exist = false)
- private String erpStkAdr;
-
- /**
- * 搴撲綅鏍囪瘑
- */
- @ApiModelProperty(value= "搴撲綅鏍囪瘑")
- private Long locId;
-
- /**
- * 瀹瑰櫒缂栫爜
- */
- @ApiModelProperty(value= "瀹瑰櫒缂栫爜")
- private String barcode;
-
- /**
- * 閲囪喘鍗曚綅
- */
- @ApiModelProperty(value= "閲囪喘鍗曚綅")
- private Double purPrice;
-
- /**
- * 閿佸畾鍘熷洜
- */
- @ApiModelProperty(value= "閿佸畾鍘熷洜")
- private String lockReason;
-
- /**
- * 閿佸畾鐘舵��
- */
- @ApiModelProperty(value= "閿佸畾鐘舵��")
- private Short lockStatus;
-
- /**
- * 閿佸畾浜�
- */
- @ApiModelProperty(value= "閿佸畾浜�")
- private String locker;
-
- /**
- * 閿佸畾鏃堕棿
- */
- @ApiModelProperty(value= "閿佸畾鏃堕棿")
- private Date lockedTime;
+ @ApiModelProperty(value= "鍖呰鍚嶇О")
+ private String packName;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -265,35 +209,27 @@
public StockItem() {}
- public StockItem(Long stockId,Long matnrId,Long asnItemId, String code,String matnrk,Double anfme,Double workQty,Double qty,Double weight,String unit,Long shipperId,String splrId,String brand,String batch,String prodTime,Long inspectId,String splrBtch,String asnOrder,String erpToken,String erpOrder,String erpStkAdr,Long locId,String barcode,Double purPrice,String lockReason,Short lockStatus,String locker,Date lockedTime,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.stockId = stockId;
+ public StockItem(Long orderId,String orderCode,Long sourceItemId,Long matnrId,String matnrCode,String maktx,Double anfme,String stockUnit,Double workQty,Double purQty,String purUnit,Double qty,String splrCode,String batch,String splrBatch,String splrName,String trackCode,String barcode,String prodTime,String packName,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.stockId = orderId;
+ this.stockCode = orderCode;
+ this.sourceItemId = sourceItemId;
this.matnrId = matnrId;
- this.asnItemId = asnItemId;
- this.matnrCode = code;
- this.maktx = matnrk;
+ this.matnrCode = matnrCode;
+ this.maktx = maktx;
this.anfme = anfme;
+ this.stockUnit = stockUnit;
this.workQty = workQty;
+ this.purQty = purQty;
+ this.purUnit = purUnit;
this.qty = qty;
- this.weight = weight;
- this.unit = unit;
- this.shipperId = shipperId;
- this.splrId = splrId;
- this.brand = brand;
+ this.splrCode = splrCode;
this.batch = batch;
- this.prodTime = prodTime;
- this.inspectId = inspectId;
- this.splrBtch = splrBtch;
- this.asnOrder = asnOrder;
- this.erpToken = erpToken;
- this.erpOrder = erpOrder;
- this.erpStkAdr = erpStkAdr;
- this.locId = locId;
+ this.splrBatch = splrBatch;
+ this.splrName = splrName;
+ this.trackCode = trackCode;
this.barcode = barcode;
- this.purPrice = purPrice;
- this.lockReason = lockReason;
- this.lockStatus = lockStatus;
- this.locker = locker;
- this.lockedTime = lockedTime;
+ this.prodTime = prodTime;
+ this.packName = packName;
this.status = status;
this.deleted = deleted;
this.tenantId = tenantId;
@@ -342,14 +278,14 @@
// null // 澶囨敞
// );
- public String getStockId$(){
- StockService service = SpringUtils.getBean(StockService.class);
- Stock stock = service.getById(this.stockId);
- if (!Cools.isEmpty(stock)){
- return String.valueOf(stock.getId());
- }
- return null;
- }
+// public String getStockId$(){
+// StockService service = SpringUtils.getBean(StockService.class);
+// Stock stock = service.getById(this.stockId);
+// if (!Cools.isEmpty(stock)){
+// return String.valueOf(stock.getId());
+// }
+// return null;
+// }
public String getMatnrId$(){
MatnrService service = SpringUtils.getBean(MatnrService.class);
@@ -360,14 +296,14 @@
return null;
}
- public String getShipperId$(){
- CompanysService service = SpringUtils.getBean(CompanysService.class);
- Companys shipper = service.getById(this.shipperId);
- if (!Cools.isEmpty(shipper)){
- return String.valueOf(shipper.getName());
- }
- return null;
- }
+// public String getShipperId$(){
+// CompanysService service = SpringUtils.getBean(CompanysService.class);
+// Companys shipper = service.getById(this.shipperId);
+// if (!Cools.isEmpty(shipper)){
+// return String.valueOf(shipper.getName());
+// }
+// return null;
+// }
// public String getSplrId$(){
// SupplierService service = SpringUtils.getBean(SupplierService.class);
@@ -378,30 +314,30 @@
// return null;
// }
//
- public String getInspectId$(){
- QlyInspectService service = SpringUtils.getBean(QlyInspectService.class);
- QlyInspect qlyInspect = service.getById(this.inspectId);
- if (!Cools.isEmpty(qlyInspect)){
- return String.valueOf(qlyInspect.getCode());
- }
- return null;
- }
-
- public String getLocId$(){
- LocService service = SpringUtils.getBean(LocService.class);
- Loc loc = service.getById(this.locId);
- if (!Cools.isEmpty(loc)){
- return String.valueOf(loc.getCode());
- }
- return null;
- }
-
- public String getLockedTime$(){
- if (Cools.isEmpty(this.lockedTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
- }
+// public String getInspectId$(){
+// QlyInspectService service = SpringUtils.getBean(QlyInspectService.class);
+// QlyInspect qlyInspect = service.getById(this.inspectId);
+// if (!Cools.isEmpty(qlyInspect)){
+// return String.valueOf(qlyInspect.getCode());
+// }
+// return null;
+// }
+//
+// public String getLocId$(){
+// LocService service = SpringUtils.getBean(LocService.class);
+// Loc loc = service.getById(this.locId);
+// if (!Cools.isEmpty(loc)){
+// return String.valueOf(loc.getCode());
+// }
+// return null;
+// }
+//
+// public String getLockedTime$(){
+// if (Cools.isEmpty(this.lockedTime)){
+// return "";
+// }
+// return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
+// }
public String getStatus$(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1