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

提交姚界面调整，丢失代码

main
userName 2025-02-16 11:58:04 +08:00
parent b6e7db5a3b
commit 60484ef5d7
7 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ public class InventoryView extends Entity{
private String soi;//
private Date propD1;//生产日期
private Date propD2;//失效日期
private Date propD3;//预计取回日期
private String kqName;//库区
private Date storageDate;//存货日期
private boolean lock;//盘点锁定
@ -60,6 +61,13 @@ public class InventoryView extends Entity{
private String invDes;//冻结备注
public Date getPropD3() {
return propD3;
}
public void setPropD3(Date propD3) {
this.propD3 = propD3;
}
public String getInvDes() {
return invDes;
}

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

@ -29,6 +29,7 @@
<property name="validity" column="validity" type="boolean" />
<property name="propD1" column="propD1" type="date" />
<property name="propD2" column="propD2" type="date" />
<property name="propD3" column="propD3" type="date" />
<property name="kqName" column="kqName" type="string" length="50" />
<property name="storageDate" column="storageDate" type="date" />
<property name="beSAPItem" type="boolean" column="Be_SAP_Item" />

1
src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java
View File

@ -1447,6 +1447,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
lotInfo.setPropC9(company);
lotInfo.setPropLC3(metaValue);
lotInfo.setPropLC4(currencyType);
asnDetail.setExpectedQuantity(quantity);//订单数量
asnDetail.setItem(item);//物料描述(货品)(物料料号)
asnDetail.setLotInfo(lotInfo);

19
src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java
View File

@ -4209,17 +4209,17 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
public void autoInLibraryTask() {
//查询入库任务
List<LibraryTaskView1> libraryTaskView1s2 = commonDao.findByQuery(" from LibraryTaskView1 ltask "
+ " where ltask.classification='入库' ");
+ " where ltask.classification in ('入库','入空托') ");
for(LibraryTaskView1 libraryTaskView2 : libraryTaskView1s2) {
List<LibraryTask> libraryTasks2 = commonDao.findByQuery(" from LibraryTask ltask where "
+ " ltask.status='"+STATUS.UNAUDITED+"' and ltask.classification='入库' "
+ " ltask.status='"+STATUS.UNAUDITED+"' and ltask.classification in('入库','入空托') "
+ " and ltask.relationCode='"+libraryTaskView2.getRelationCode()+"'"
+ " order by ltask.seq asc");
if(libraryTasks2.size()>0) {
LibraryTask libraryTask=libraryTasks2.get(0);
if(libraryTask.getClassification()!=null&&
libraryTask.getClassification().equals("入库")) {
(libraryTask.getClassification().equals("入库")||libraryTask.getClassification().equals("入空托"))) {
for (int i = 0; i < libraryTasks2.size(); i++) {
LibraryTask libraryTask1=libraryTasks2.get(i);
@ -5517,7 +5517,8 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
libraryTask.setRelationCode(t1.getRelationCode());//
commonDao.store(libraryTask);
listTasks.add(libraryTask);
xh=true;
break;
}else {
//目标位置浅位托盘，没有任务，产生移位到深位的任务，再将移位托盘放在浅位。
@ -5540,7 +5541,8 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
libraryTask.setRelationCode(t2.getRelationCode());//
commonDao.store(libraryTask);
listTasks.add(libraryTask);
xh=true;
break;
}
}else {
@ -5556,7 +5558,8 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
libraryTask.setRelationCode(t1.getRelationCode());//
commonDao.store(libraryTask);
listTasks.add(libraryTask);
xh=true;
break;
//
}
}else {
@ -5566,11 +5569,13 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
null,"出库","1");
listTasks.add(t1);
libraryTask.setSeq(t1.getSeq()+1);
libraryTask.setRelationCode(t1.getRelationCode());
commonDao.store(libraryTask);
listTasks.add(libraryTask);
xh=true;
break;
}
}

6
src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
View File

@ -4140,6 +4140,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
}else {
invsql += " AND inv.itemKey.lotInfo.propD2 is null ";
}
//是否是退料
if(task.getStrBill10()!=null) {
invsql += " AND inv.statuss='"+task.getStrBill10()+"' ";
}else {
invsql += " AND inv.statuss is null ";
}
}
invsql+=" order by inv.queuedQuantity desc ";
List<Inventory> invs = commonDao.findByQuery(invsql);

10
src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml
View File

@ -61,6 +61,7 @@
ls.warehouseArea.name,
ls.type,
ls.status,
ls.beAuto,
ls.sqType,
ls.gdType,
ls.rdType,
@ -80,7 +81,6 @@
ls.gzzCode,
ls.connectionPort,
ls.agvZone,
ls.beAuto,
ls.disabled
from LocationStorage as ls
left join ls.warehouseArea as warehouseArea
@ -107,7 +107,9 @@
<column id="ls.status" title="状态" visible="true" horizonAlign="center"
verticalAlign="middle" dataType="enum" format="enumFormat"
formatParam="WarehouseAreaStatus" />
<column id="ls.beAuto" title="自动下发" visible="true"
horizonAlign="center" verticalAlign="middle" format="booleanFormat"
formatParam="beAuto" />
<column id="ls.sqType" title="深浅类型" visible="true"
horizonAlign="center" verticalAlign="middle" dataType="enum" format="enumFormat"
formatParam="SqType"/>
@ -136,9 +138,7 @@
<column id="ls.gzzCode" title="工作站编号" visible="true" horizonAlign="center" />
<column id="ls.connectionPort" title="到站编号" visible="true" horizonAlign="center" />
<column id="ls.agvZone" title="AGV库区" visible="true" horizonAlign="center" />
<column id="ls.beAuto" title="自动下发" visible="true"
horizonAlign="center" verticalAlign="middle" format="booleanFormat"
formatParam="beAuto" />
<column id="ls.disabled" title="是否失效" visible="true"
horizonAlign="center" verticalAlign="middle" format="booleanFormat"
formatParam="disabled" />

6
src/webapp/WEB-INF/classes/config/origen/inventory/maintainOAXuliehaoPage.xml
View File

@ -107,6 +107,7 @@
inventory.propC9,
inventory.strExtend2,
inventory.strExtend3,
inventory.propD3,
inventory.kqName,
inventory.storageDate,
inventory.lock
@ -130,8 +131,8 @@
/~inventory.propC9 : and inventory.propC9 = {inventory.propC9} ~/
/~inventory.lock : and inventory.lock = {inventory.lock} ~/
and (1=1
/~beginDate: AND CONVERT(varchar(100), inventory.storageDate, 23) >= {beginDate} ~/
/~endDate: or CONVERT(varchar(100), inventory.storageDate, 23)>= {beginDate} and CONVERT(varchar(100), inventory.storageDate, 23)<= {endDate} ~/
/~beginDate: AND CONVERT(varchar(100), inventory.storageDate, 23) = {beginDate} ~/
/~endDate: or (CONVERT(varchar(100), inventory.storageDate, 23)>= {beginDate} and CONVERT(varchar(100), inventory.storageDate, 23)<= {endDate}) ~/
)
order by inventory.locCode,inventory.propC1
]]></datasource>
@ -155,6 +156,7 @@
<column id="inventory.propC9" title="工厂" visible="true" horizonAlign="center" />
<column id="inventory.strExtend2" title="币种" visible="true" horizonAlign="center" />
<column id="inventory.strExtend3" title="原值" visible="true" horizonAlign="center" />
<column id="inventory.propD3" title="预计取回日期" visible="true" horizonAlign="center" />
<column id="inventory.kqName" title="库区" visible="true" horizonAlign="center" />
<column id="inventory.storageDate1" title="存货日期" visible="true" horizonAlign="center" format="dateFormatter"/>
<!-- <column id="inventory.storageDate2" title="存货时间" visible="true" horizonAlign="center" format="dateTiemFormatter"/> -->