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 97d9deb..f58e699 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 @@ -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; } 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 749b93c..3d716f8 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 @@ -29,6 +29,7 @@ + diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java index 925b748..a9abad2 100644 --- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java +++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceRespManager.java @@ -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); diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java index 01e5330..e7cdaac 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultMoveDocManager.java @@ -4209,17 +4209,17 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc public void autoInLibraryTask() { //查询入库任务 List libraryTaskView1s2 = commonDao.findByQuery(" from LibraryTaskView1 ltask " - + " where ltask.classification='入库' "); + + " where ltask.classification in ('入库','入空托') "); for(LibraryTaskView1 libraryTaskView2 : libraryTaskView1s2) { List 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; } } diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java index 527171e..1602a76 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java @@ -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 invs = commonDao.findByQuery(invsql); diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml index fd847fa..8f2d57e 100644 --- a/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainLocationStorageJhPage.xml @@ -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 @@ - + @@ -136,9 +138,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/inventory/maintainOAXuliehaoPage.xml b/src/webapp/WEB-INF/classes/config/origen/inventory/maintainOAXuliehaoPage.xml index 0aec83c..16009a8 100644 --- a/src/webapp/WEB-INF/classes/config/origen/inventory/maintainOAXuliehaoPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/inventory/maintainOAXuliehaoPage.xml @@ -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 ]]> @@ -155,6 +156,7 @@ +