From cd55f83ee6fe0e3002df2018f50f4ca8d066b1e6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 24 一月 2026 14:16:18 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java        |   45 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java      |   42 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java            |   42 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java     |   42 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java   |   42 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java |   42 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java              |    5 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java           |   42 +++++++
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java        |   42 +++++++
 9 files changed, 343 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index 917aaf5..6228fea 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -252,6 +252,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public LocItem() {}
 
     public LocItem(Long locId,Long orderId,String type,Long orderItemId,Short wkType,Long matnrId,String maktx,String matnrCode,String trackCode,String unit,Double anfme,String batch,String splrBatch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
index fa8574c..0557023 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
@@ -238,6 +238,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public LocItemWorking() {}
 
     public LocItemWorking(Long locId,String locCode,Long orderId,String type,Long orderItemId,Short wkType,Long matnrId,String maktx,String platItemId,String platOrderCode,String platWorkCode,String projectCode,String matnrCode,String trackCode,String unit,Double anfme,Double qty,Double workQty,String batch,String splrBatch,Long splrId,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 69c696a..9444d95 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -271,6 +271,11 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    private String baseUnit;
+    private String useOrgId;
+    private String useOrgName;
+    private String erpClsId;
+
     /**
      * 澶囨敞
      */
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 7569030..5946b27 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -207,6 +207,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public TaskItem() {}
 
     public TaskItem(Long taskId,Long matnrId,String maktx,String matnrCode,String unit,Double anfme,String batch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
index 1e93f2f..d4b5554 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItemLog.java
@@ -182,6 +182,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public TaskItemLog() {}
 
     public TaskItemLog(Long taskId,Long taskItemId,Long matnrId,String maktx,String matnrCode,String unit,Double anfme,String batch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
index 4cefb08..b21a170 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItem.java
@@ -204,6 +204,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public WaitPakinItem() {}
 
     public WaitPakinItem(Long pakinId,String maktx,Long matnrId,String matnrCode,Double anfme,Double workQty,String unit,String fieldsIndex,Double qty,String batch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
index bd1b29f..dc70bbd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaitPakinItemLog.java
@@ -186,6 +186,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public WaitPakinItemLog() {}
 
     public WaitPakinItemLog(Long pakinId,Long pakinItemId,Long asnId,String asnCode,Long asnItemId,String trackCode,String maktx,Long matnrId,String matnrCode,Double anfme,Double workQty,String unit,String fieldsIndex,Double qty,String batch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index 844ab0a..8f15164 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -236,6 +236,48 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
     public WarehouseAreasItem() {}
 
     public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String trackCode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,Long splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index 8a9a608..49d56e5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -279,7 +279,50 @@
 
     @TableField(exist = false)
     private Double demandQty = 0.0;
-//
+
+    @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+    private String baseUnit;
+
+    @ApiModelProperty(value = "浣跨敤缁勭粐")
+    private String useOrgId;
+
+    @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+    private String useOrgName;
+
+    @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+    private String erpClsId;
+
+    @ApiModelProperty(value = "璁′环鍗曚綅")
+    private String priceUnitId;
+
+    @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+    private String inStockType;
+
+    @ApiModelProperty(value = "璐т富绫诲瀷")
+    private String ownerTypeId;
+
+    @ApiModelProperty(value = "璐т富")
+    private String ownerId;
+
+    @ApiModelProperty(value = "璐т富鍚嶇О")
+    private String ownerName;
+
+    @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+    private String keeperTypeId;
+
+    @ApiModelProperty(value = "淇濈鑰�")
+    private String keeperId;
+
+    @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+    private String keeperName;
+
+    @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+    private String targetWarehouseId;
+
+    @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+    private String sourceWarehouseId;
+
+    //
     public WkOrderItem() {}
 
     public WkOrderItem(Long asnId, String asnCode, Long poDetlId, String matnrCode, String poCode, Long matnrId, String matnk, Double anfme, String stockUnit, Double purQty, String purUnit, Double qty, String splrCode, String splrName, String qrcode, String barcode, String packName, Integer status, Integer ntyStatus, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {

--
Gitblit v1.9.1