diff --git a/src/main/java/com/dev/swms/server/model/shipping/WaveDoc.java b/src/main/java/com/dev/swms/server/model/shipping/WaveDoc.java index 1b37f80..9aff1c3 100644 --- a/src/main/java/com/dev/swms/server/model/shipping/WaveDoc.java +++ b/src/main/java/com/dev/swms/server/model/shipping/WaveDoc.java @@ -113,9 +113,16 @@ public class WaveDoc extends AbstractMoveDoc { private int longtiem=0;//时长 private int hjqQty=0;//货架工作站数 private int lkqQty=0; + /** 0-原逻辑，1-新逻辑 */ + private int logic=0; - + public int getLogic() { + return logic; + } + public void setLogic(int logic) { + this.logic = logic; + } public int getLxqQty() { return lxqQty; } diff --git a/src/main/java/com/dev/swms/server/model/shipping/waveDoc.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/waveDoc.hbm.xml index 284a4a4..65d18e2 100644 --- a/src/main/java/com/dev/swms/server/model/shipping/waveDoc.hbm.xml +++ b/src/main/java/com/dev/swms/server/model/shipping/waveDoc.hbm.xml @@ -81,7 +81,7 @@ - + addTaskToWaveDocDetail( List ids,Date date1,Date date2 ,Integer longtiem,Integer lxqQty, - Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty); + Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty,Integer logic); //PDA领取合单任务， @Transactional void receiveBillTask(String taskids, Long workerId); diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java index 82d6bf1..8a3ae5a 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultNewWaveDocManager.java @@ -332,7 +332,7 @@ public class DefaultNewWaveDocManager extends DefaultBaseManager implements } if(Tasks.size()>0){ - pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty); + pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty,1); } try { 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 dce1fb9..527171e 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 @@ -8477,7 +8477,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick @Override public List addTaskToWaveDocDetail( List ids,Date date1,Date date2 ,Integer longtiem, - Integer lxqQty,Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty) { + Integer lxqQty,Integer hjqQty,Integer lkqQty,boolean ddq,String pickCode,Integer taskqty,Integer logic) { WaveDoc waveDoc=EntityFactory.getEntity(WaveDoc.class); waveDoc.setCode(TimeNumberUtils.getwaveDocCode()); waveDoc.setWarehouse(WarehouseHolder.getWarehouse()); @@ -8492,6 +8492,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick waveDoc.setHjqQty(hjqQty); waveDoc.setLongtiem(longtiem); waveDoc.setApplyDoc(pickCode); + waveDoc.setLogic(logic); waveDoc.setStartDate(date1); waveDoc.setEndDate(date2); waveDoc.setPrintCount(taskqty);//拆分行数 diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java index bf78ff2..c2fd41b 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultWaveDocManager.java @@ -2699,7 +2699,7 @@ public class DefaultWaveDocManager extends DefaultBaseManager implements } if(Tasks.size()>0){ - pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty); + pickTicketManager.addTaskToWaveDocDetail(Tasks, date1, date2, longtiem, lxqQty, hjqQty, lkqQty, ddq9, pickCode, taskQty,0); } try { diff --git a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml index 82c5106..f1d6e5c 100644 --- a/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml +++ b/src/webapp/WEB-INF/classes/config/origen/menuConfig.xml @@ -140,7 +140,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml index 783c1d7..4f90c63 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainNewWaveDocPage.xml @@ -1,7 +1,7 @@ - + = {beginDate} and CONVERT(varchar(100), waveDoc.createDate, 23)<= {endDate}) ~/ ) + and waveDoc.logic=1 order by waveDoc.id desc ]]> diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocPage.xml index 84dddc3..25881bc 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainWaveDocPage.xml @@ -56,6 +56,7 @@ /~beginDate: AND CONVERT(varchar(100), waveDoc.createDate, 23) = {beginDate} ~/ /~endDate: or (CONVERT(varchar(100), waveDoc.createDate, 23)>= {beginDate} and CONVERT(varchar(100), waveDoc.createDate, 23)<= {endDate}) ~/ ) + and waveDoc.logic=0 order by waveDoc.id desc ]]> diff --git a/src/webapp/WEB-INF/classes/dataSourceContext.xml b/src/webapp/WEB-INF/classes/dataSourceContext.xml index 5f32692..e0ca07a 100644 --- a/src/webapp/WEB-INF/classes/dataSourceContext.xml +++ b/src/webapp/WEB-INF/classes/dataSourceContext.xml @@ -24,10 +24,10 @@ - + jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest - jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwtest + WMSDB