diff --git a/src/main/java/com/dev/swms/server/model/inventory/Task.java b/src/main/java/com/dev/swms/server/model/inventory/Task.java index 48681f3..2e03e15 100644 --- a/src/main/java/com/dev/swms/server/model/inventory/Task.java +++ b/src/main/java/com/dev/swms/server/model/inventory/Task.java @@ -140,7 +140,7 @@ public class Task extends VersionalEntity { private String strBill4;//合单库位 private String strBill5;//合单人 private String strBill6;//是否未未拆包装 - private String strBill7;// + private String strBill7;//库位的容器 private String strBill8;// private String strBill9;// private String strBill10;//退料属性（T） 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 2682b46..925b748 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 @@ -1100,9 +1100,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I PickTicketDetail ptd =null; List PickTicketDetails = commonDao.findByQuery(" from PickTicketDetail ptd where ptd.pickTicket.id=:id and ptd.lineNumber=:lineNumber ", new String[] { "id","lineNumber"},new Object[] {pTicket.getId(),lineNumber}); -// if(applyDoc) { -// -// } +// if (PickTicketDetails.size()>0) { ptd=PickTicketDetails.get(0); }else{ @@ -1748,8 +1746,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I }else { bequality=false; } - /*String strBill2=asn.has("strBill2") ? asn.getString("strBill2") : "";//序列号 - String PO=asn.has("PO") ? asn.getString("PO") : "";//PO号*/ + String strBill2=asn.has("strBill2") ? asn.getString("strBill2") : "";//序列号 String sourceId=asn.has("PO") ? asn.getString("PO") : "";//PO号=采购单号 String strBill1=asn.has("strBill1") ? asn.getString("strBill1") : "";//PO行项目号 @@ -1771,6 +1768,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I String ZNETPR=asn.has("ZNETPR") ? asn.getString("ZNETPR") : "0";//单价 String WAERS=asn.has("WAERS") ? asn.getString("WAERS") : "";//货币单位 String MENGE=asn.has("MENGE") ? asn.getString("MENGE") : "";//数量 + String requisitioner=asn.has("requisitioner") ? asn.getString("requisitioner") : "";//工号 List asns = commonDao.findByQuery(" from ASN asn where asn.code=:code ", new String[] { "code"},new Object[] {PO}); @@ -1993,11 +1991,11 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I lotInfo.setPropC2(propC2); lotInfo.setPropC3(propC3); lotInfo.setPropC5(propC5); + lotInfo.setPropC6(requisitioner); lotInfo.setPropC7(requestor); - if(item.getFeeType()!=null&&item.getFeeType().equals("OA")&& - requestor!=null&&requestor.length()>0) { - List list= commonDao.findByQuery(" from Personnel p where p.code='"+requestor+"'"); + requisitioner!=null&&requisitioner.length()>0) { + List list= commonDao.findByQuery(" from Personnel p where p.number='"+requisitioner+"'"); if(list.size()>0) { Personnel p=list.get(0); lotInfo.setPropC6(p.getNumber()); diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java index 458e8b8..15cbb72 100644 --- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java +++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultNewAutoAllocator.java @@ -404,7 +404,6 @@ public class DefaultNewAutoAllocator extends DefaultBaseManager implements NewAu }else { msg=msg+ptd.getItem().getCode()+",无匹配库存！ "; } -// shuaxinPick(pt);//刷新订单 }else{ throw new BusinessException("任务状态错误!"); diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java index e3bed47..5100744 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveManager.java @@ -542,10 +542,11 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements // task.setBillCode(task.getOldZrw()); // task.setEndRegion(task.getOldGzz()); // } - task.setAgvStatus(-1); +// if(task.getAgvStatus()>=1){ +// task.setAgvStatus(-1);//旧逻辑运行，状态不动,先注释 +// } task.setOldGzz(gongZuoZhan.code); - task.setStrBill9(lx+"-"+fenPei.chf_fz); task.setStrBill8(fenPei.twl); this.commonDao.store(task); @@ -1220,7 +1221,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements + " LEFT JOIN ITEM item ON item.id= ik.ITEM_ID " + " LEFT JOIN WAVE_DOC wd ON wd.id= t.WAVE_DOC_ID " + " WHERE 1 = 1 AND pt.BILL_TYPE_ID= 1094 and loc.ZONE_ID in (1763,1765,1766) " - + " AND t.agv_Status in (-1,1,2) " + + " AND t.agv_Status in (-2) " // (-1,1,2) + " AND t.WAVE_DOC_ID IS NOT NULL and t.END_REGION is not null and wd.code!='" + waveDocCode + "' " diff --git a/src/test/yao/2024.sql b/src/test/yao/2024.sql index ca34df0..e5755fe 100644 --- a/src/test/yao/2024.sql +++ b/src/test/yao/2024.sql @@ -392,3 +392,66 @@ GO ALTER TABLE INVENTORY add description varchar(200) COLLATE Chinese_PRC_CI_AS NULL; GO +-------2025-02-12 +ALTER TABLE task add OLD_GZZ varchar(100) COLLATE Chinese_PRC_CI_AS NULL; +GO +ALTER TABLE task add OLD_ZRW varchar(100) COLLATE Chinese_PRC_CI_AS NULL; +GO +ALTER TABLE WAVE_DOC add LOGIN int NULL; +GO +update WAVE_DOC set LOGIN=0 where LOGIN is null; +GO + +CREATE TABLE [dbo].[WAVE_DOC_SORT] ( + [ID] numeric(19) IDENTITY(1,1) NOT NULL, + [COLUME] varchar(50) COLLATE Chinese_PRC_CI_AS NULL, + [SORT] numeric(18) NULL, + [DISABLED] tinyint NULL, + [NAME] varchar(50) COLLATE Chinese_PRC_CI_AS NULL, + CONSTRAINT [PK__TASK_SOR__3214EC27C7F87A3A] PRIMARY KEY CLUSTERED ([ID]) +WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) +ON [PRIMARY] +) +ON [PRIMARY] +GO + +ALTER TABLE [dbo].[WAVE_DOC_SORT] SET (LOCK_ESCALATION = TABLE) +GO + +EXEC sp_addextendedproperty +'MS_Description', N'数据库字段名', +'SCHEMA', N'dbo', +'TABLE', N'WAVE_DOC_SORT', +'COLUMN', N'COLUME' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'排序', +'SCHEMA', N'dbo', +'TABLE', N'WAVE_DOC_SORT', +'COLUMN', N'SORT' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'禁用', +'SCHEMA', N'dbo', +'TABLE', N'WAVE_DOC_SORT', +'COLUMN', N'DISABLED' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'名称', +'SCHEMA', N'dbo', +'TABLE', N'WAVE_DOC_SORT', +'COLUMN', N'NAME' +GO + +EXEC sp_addextendedproperty +'MS_Description', N'排序规则创波', +'SCHEMA', N'dbo', +'TABLE', N'WAVE_DOC_SORT' + +ALTER TABLE LOCATION_STORAGE add be_auto tinyint NULL; +GO +update LOCATION_STORAGE set be_auto=0 where be_auto is null; +GO diff --git a/src/webapp/WEB-INF/classes/config/origen/base/maintainPersonnelPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/maintainPersonnelPage.xml index f757ece..c0655d4 100644 --- a/src/webapp/WEB-INF/classes/config/origen/base/maintainPersonnelPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/base/maintainPersonnelPage.xml @@ -18,7 +18,7 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editASNsPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editASNsPage.xml index fc89680..b334641 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/editASNsPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editASNsPage.xml @@ -86,6 +86,7 @@ asnDetail.strBill3, asnDetail.strBill2, asnDetail.lotInfo.propC3, + asnDetail.lotInfo.propC6, asnDetail.lotInfo.propC7, asnDetail.description FROM ASNDetail asnDetail @@ -117,6 +118,7 @@ + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editNullNewStockPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editNullNewStockPage.xml new file mode 100644 index 0000000..d32c601 --- /dev/null +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editNullNewStockPage.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml index f213842..f29605d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketPage.xml @@ -7,6 +7,9 @@ + @@ -73,6 +76,7 @@ or ( /~ordersAll: {ordersAll} = true~/ )) /~pickTicketDetail.newLotInfo.propC9: AND (pickTicketDetail.newLotInfo.propC9) = ({pickTicketDetail.newLotInfo.propC9}) ~/ /~pickTicket.sourceId: AND (pickTicket.sourceId) LIKE ({pickTicket.sourceId}) ~/ + /~pickTicket.sourceType: AND (pickTicket.sourceType) LIKE ({pickTicket.sourceType}) ~/ /~waveCode: AND (pickTicket.waveDoc.code) like ({waveCode}) ~/ /~seedWall: AND (pickTicket.executePlanNo) like ({seedWall}) ~/ /~pickTicket.collectNo: AND (pickTicket.collectNo) like RTRIM({pickTicket.collectNo}) ~/ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml index eb187ce..3a480aa 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml @@ -148,6 +148,8 @@ agv.dateTime3, agv.dateTime3, agv.jobPriorityType, + t.oldGzz, + t.oldZrw, szone.name, pickTicket.sourceType, billType.name, @@ -288,6 +290,8 @@ + +