Youchain
/
ZhongWei_Old2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

冻结备注

main
userName 2024-12-18 17:15:17 +08:00
parent 85162aa45b
commit d694e3c161
9 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/dev/swms/server/model/inventory/Inventory.java
View File

@ -76,8 +76,17 @@ public class Inventory extends VersionalEntity {
/** 处理数量 */ /** 处理数量 */
private double handleQuantity; private double handleQuantity;
private String moveStatus;//移动工作站 private String moveStatus;//移动工作站
/** 备注 */
private String description;
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public String getMoveStatus() { public String getMoveStatus() {
return moveStatus; return moveStatus;

7
src/main/java/com/dev/swms/server/model/inventory/InventoryView.java
View File

@ -57,8 +57,15 @@ public class InventoryView extends Entity{
private String lts_name;//库位属性 private String lts_name;//库位属性
private String strExtend3;//标准价 private String strExtend3;//标准价
private String strExtend2;//币种 private String strExtend2;//币种
private String invDes;//冻结备注
public String getInvDes() {
return invDes;
}
public void setInvDes(String invDes) {
this.invDes = invDes;
}
public Double getWeight() { public Double getWeight() {
return weight; return weight;
} }

3
src/main/java/com/dev/swms/server/model/inventory/inventory.hbm.xml
View File

@ -67,7 +67,8 @@
<property name="counPlan" column="coun_Plan" type="string" /> <property name="counPlan" column="coun_Plan" type="string" />
<property name="beAdjust" column="beAdjust" type="boolean" /> <property name="beAdjust" column="beAdjust" type="boolean" />
<property name="handleQuantity" type="double" column="handleQuantity" /> <property name="handleQuantity" type="double" column="handleQuantity" />
<property name="moveStatus" column="moveStatus" type="string" /> <property name="moveStatus" column="moveStatus" type="string" length="50"/>
<property name="description" column="description" type="string" length="200"/>
</class> </class>
<query name="getAllInventoryByWarehouseCompany"> <query name="getAllInventoryByWarehouseCompany">

1
src/main/java/com/dev/swms/server/model/inventory/inventoryView.hbm.xml
View File

@ -53,5 +53,6 @@
<property name="lts_name" column="lts_name" type="string" length="50" /> <property name="lts_name" column="lts_name" type="string" length="50" />
<property name="strExtend2" column="STR_EXTEND2" type="string" length="50" /> <property name="strExtend2" column="STR_EXTEND2" type="string" length="50" />
<property name="strExtend3" column="STR_EXTEND3" type="string" length="50" /> <property name="strExtend3" column="STR_EXTEND3" type="string" length="50" />
<property name="invDes" column="invDes" type="string" length="50" />
</class> </class>
</hibernate-mapping> </hibernate-mapping>

2
src/main/java/com/dev/swms/server/service/inventory/InventoryManager.java
View File

@ -392,7 +392,7 @@ public interface InventoryManager extends BaseManager{
//冻结库存 //冻结库存
@Transactional @Transactional
void frozenInv(List<Long> ids); void frozenInv(List<Long> ids,String des);
//解冻库存 //解冻库存
@Transactional @Transactional

6
src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java
View File

@ -3124,12 +3124,13 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
} }
} }
@Override @Override
public void frozenInv(List<Long> ids) { public void frozenInv(List<Long> ids,String des) {
for(long id:ids){ for(long id:ids){
List<Inventory> inventories = selectInventory1(id); List<Inventory> inventories = selectInventory1(id);
for (Inventory inv : inventories) { for (Inventory inv : inventories) {
// inv.setStatuss(inv.getStatus()); // inv.setStatuss(inv.getStatus());
inv.setStatus("冻结"); inv.setStatus("冻结");
inv.setDescription(des);
commonDao.store(inv); commonDao.store(inv);
addInventoryLog(InventoryLogType.FROZEN, 1, "", inv.getLocation(), null, inv.getItemKey(), 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);
@ -3145,9 +3146,10 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven
for (Inventory inv : inventories) { for (Inventory inv : inventories) {
inv.setStatus("已入库"); inv.setStatus("已入库");
// inv.setStatuss(""); // inv.setStatuss("");
inv.setDescription(null);
commonDao.store(inv); commonDao.store(inv);
addInventoryLog(InventoryLogType.FROZEN, 1, "", inv.getLocation(), null, inv.getItemKey(), 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);
} }
} }
} }

5
src/test/yao/2024.sql
View File

@ -386,4 +386,9 @@ GO
----------20241211 ----------20241211
ALTER TABLE RECEIVED_RECORD add sap_Status varchar(20) COLLATE Chinese_PRC_CI_AS NULL; ALTER TABLE RECEIVED_RECORD add sap_Status varchar(20) COLLATE Chinese_PRC_CI_AS NULL;
GO
---------20241218
ALTER TABLE INVENTORY add description varchar(200) COLLATE Chinese_PRC_CI_AS NULL;
GO GO

10
src/webapp/WEB-INF/classes/config/origen/inventory/editInventoryStatus.xml
View File

@ -6,19 +6,19 @@
height="130"> height="130">
<inputUIs> <inputUIs>
<hidden id="inventory.id" reserve="false" /> <hidden id="inventory.id" reserve="false" />
<text id="inventory.status" title="qualityCode" row="3" col="1" <text id="inventory.description" title="备注" row="3" col="1"
readOnly="false" required="false" reserve="false" forceOverride="false" readOnly="false" required="true" reserve="false" forceOverride="false"
inVisible="false" trimSpace="false" /> inVisible="false" trimSpace="false" />
</inputUIs> </inputUIs>
<buttons> <buttons>
<commit id="save" title="save" enableType="single" invisible="false"> <commit id="save" title="save" enableType="single" invisible="false">
<mappings> <mappings>
<mapping id="parentIds" className="list" /> <mapping id="parentIds" className="list" />
<mapping id="inventory.status" className="string" /> <mapping id="inventory.description" className="string" />
</mappings> </mappings>
<actions> <actions>
<action managerName="inventoryManager" methodName="editInventoryStatus" <action managerName="inventoryManager" methodName="frozenInv"
parameter="parentIds,inventory.status" /> parameter="parentIds,inventory.description" />
</actions> </actions>
<forwards> <forwards>
<forward name="refreshWindow" newEnabled="true" <forward name="refreshWindow" newEnabled="true"

35
src/webapp/WEB-INF/classes/config/origen/inventory/maintainXuliehaoPage.xml
View File

@ -119,6 +119,7 @@
inventory.singleItem, inventory.singleItem,
inventory.validity, inventory.validity,
inventory.storageDate, inventory.storageDate,
inventory.invDes,
inventory.propC7, inventory.propC7,
inventory.lock inventory.lock
FROM InventoryView inventory FROM InventoryView inventory
@ -173,25 +174,29 @@
<column id="inventory.validity" title="是否有效期管理" visible="true" <column id="inventory.validity" title="是否有效期管理" visible="true"
horizonAlign="center" format="booleanFormat"/> horizonAlign="center" format="booleanFormat"/>
<column id="inventory.storageDate" title="存货日期" visible="true" horizonAlign="center" format="dateFormatter"/> <column id="inventory.storageDate" title="存货日期" visible="true" horizonAlign="center" format="dateFormatter"/>
<column id="inventory.invDes" title="冻结备注" visible="true" horizonAlign="center" />
<column id="inventory.propC7" title="归属人" visible="true" horizonAlign="center" /> <column id="inventory.propC7" title="归属人" visible="true" horizonAlign="center" />
<column id="inventory.lock" title="盘点锁定" visible="true" horizonAlign="center" format="booleanFormat"/> <column id="inventory.lock" title="盘点锁定" visible="true" horizonAlign="center" format="booleanFormat"/>
</columns> </columns>
<buttons> <buttons>
<commit id="frozenInv" title="冻结库存" <popup id="editInventoryStatus" title="冻结库存" enableType="single" invisible="false" containId="true" pageId="editInventoryStatus">
enableType="multi" invisible="false" confirmMessage="确认是否冻结库存?"> <enableExpression><![CDATA[(${inventory.status}=='已入库'&&${inventory.queuedQuantity}<=0)]]></enableExpression>
<enableExpression><![CDATA[(${inventory.status}=='已入库'&&${inventory.queuedQuantity}<=0)]]></enableExpression> </popup>
<mappings> <!-- <commit id="frozenInv" title="冻结库存" -->
<mapping id="ids" className="list" /> <!-- enableType="multi" invisible="false" confirmMessage="确认是否冻结库存?"> -->
</mappings> <!-- <enableExpression><![CDATA[(${inventory.status}=='已入库'&&${inventory.queuedQuantity}<=0)]]></enableExpression> -->
<actions> <!-- <mappings> -->
<action managerName="inventoryManager" methodName="frozenInv" <!-- <mapping id="ids" className="list" /> -->
parameter="ids" /> <!-- </mappings> -->
</actions> <!-- <actions> -->
<forwards> <!-- <action managerName="inventoryManager" methodName="frozenInv" -->
<forward name="refreshWindow" newEnabled="true" <!-- parameter="ids" /> -->
editEnabled="true" /> <!-- </actions> -->
</forwards> <!-- <forwards> -->
</commit> <!-- <forward name="refreshWindow" newEnabled="true" -->
<!-- editEnabled="true" /> -->
<!-- </forwards> -->
<!-- </commit> -->
<commit id="frozenInvs" title="解冻库存" <commit id="frozenInvs" title="解冻库存"
enableType="multi" invisible="false" confirmMessage="确认是否冻结库存?"> enableType="multi" invisible="false" confirmMessage="确认是否冻结库存?">
<enableExpression><![CDATA[(${inventory.status}=='冻结')]]></enableExpression> <enableExpression><![CDATA[(${inventory.status}=='冻结')]]></enableExpression>