diff --git a/src/main/java/com/dev/swms/server/model/inventory/Inventory.java b/src/main/java/com/dev/swms/server/model/inventory/Inventory.java
index e6a8517..b577d5c 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/Inventory.java
+++ b/src/main/java/com/dev/swms/server/model/inventory/Inventory.java
@@ -76,9 +76,18 @@ public class Inventory extends VersionalEntity {
/** 处理数量 */
private double handleQuantity;
private String moveStatus;//移动工作站
+ /** 备注 */
+ private String description;
-
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
public String getMoveStatus() {
return moveStatus;
}
diff --git a/src/main/java/com/dev/swms/server/model/inventory/InventoryView.java b/src/main/java/com/dev/swms/server/model/inventory/InventoryView.java
index 31126ab..97d9deb 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/InventoryView.java
+++ b/src/main/java/com/dev/swms/server/model/inventory/InventoryView.java
@@ -57,8 +57,15 @@ public class InventoryView extends Entity{
private String lts_name;//库位属性
private String strExtend3;//标准价
private String strExtend2;//币种
+ private String invDes;//冻结备注
+ public String getInvDes() {
+ return invDes;
+ }
+ public void setInvDes(String invDes) {
+ this.invDes = invDes;
+ }
public Double getWeight() {
return weight;
}
diff --git a/src/main/java/com/dev/swms/server/model/inventory/inventory.hbm.xml b/src/main/java/com/dev/swms/server/model/inventory/inventory.hbm.xml
index 9a5549b..d7d6714 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/inventory.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/inventory/inventory.hbm.xml
@@ -67,7 +67,8 @@
-
+
+
diff --git a/src/main/java/com/dev/swms/server/model/inventory/inventoryView.hbm.xml b/src/main/java/com/dev/swms/server/model/inventory/inventoryView.hbm.xml
index a7f7907..749b93c 100644
--- a/src/main/java/com/dev/swms/server/model/inventory/inventoryView.hbm.xml
+++ b/src/main/java/com/dev/swms/server/model/inventory/inventoryView.hbm.xml
@@ -53,5 +53,6 @@
+
\ No newline at end of file
diff --git a/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java b/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
index 35b352c..5a8a362 100644
--- a/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
+++ b/src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
@@ -392,7 +392,7 @@ public interface InventoryManager extends BaseManager{
//冻结库存
@Transactional
- void frozenInv(List ids);
+ void frozenInv(List ids,String des);
//解冻库存
@Transactional
diff --git a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
index abdf0c9..9a04831 100644
--- a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
+++ b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
@@ -3124,12 +3124,13 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
}
}
@Override
- public void frozenInv(List ids) {
+ public void frozenInv(List ids,String des) {
for(long id:ids){
List inventories = selectInventory1(id);
for (Inventory inv : inventories) {
// inv.setStatuss(inv.getStatus());
inv.setStatus("冻结");
+ inv.setDescription(des);
commonDao.store(inv);
addInventoryLog(InventoryLogType.FROZEN, 1, "", inv.getLocation(), null, inv.getItemKey(),
inv.getStorageDate(), inv.getSOI(), inv.getQuantity(), null, inv.getStatus(), inv.getId(), "冻结", null,0,inv.getBarCode(),null,null);
@@ -3145,9 +3146,10 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
for (Inventory inv : inventories) {
inv.setStatus("已入库");
// inv.setStatuss("");
+ inv.setDescription(null);
commonDao.store(inv);
addInventoryLog(InventoryLogType.FROZEN, 1, "", inv.getLocation(), null, inv.getItemKey(),
- inv.getStorageDate(), inv.getSOI(), inv.getQuantity(), null, inv.getStatus(), inv.getId(), "移位", null,0,inv.getBarCode(),null,null);
+ inv.getStorageDate(), inv.getSOI(), inv.getQuantity(), null, inv.getStatus(), inv.getId(), "解冻", null,0,inv.getBarCode(),null,null);
}
}
}
diff --git a/src/test/yao/2024.sql b/src/test/yao/2024.sql
index d057630..ca34df0 100644
--- a/src/test/yao/2024.sql
+++ b/src/test/yao/2024.sql
@@ -386,4 +386,9 @@ GO
----------20241211
ALTER TABLE RECEIVED_RECORD add sap_Status varchar(20) COLLATE Chinese_PRC_CI_AS NULL;
-GO
\ No newline at end of file
+
+GO
+---------20241218
+ALTER TABLE INVENTORY add description varchar(200) COLLATE Chinese_PRC_CI_AS NULL;
+
+GO
diff --git a/src/webapp/WEB-INF/classes/config/origen/inventory/editInventoryStatus.xml b/src/webapp/WEB-INF/classes/config/origen/inventory/editInventoryStatus.xml
index 0a58ff7..1ae6b7a 100644
--- a/src/webapp/WEB-INF/classes/config/origen/inventory/editInventoryStatus.xml
+++ b/src/webapp/WEB-INF/classes/config/origen/inventory/editInventoryStatus.xml
@@ -6,19 +6,19 @@
height="130">
-
-
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+