diff --git a/src/main/java/com/dev/swms/server/model/shipping/PickTicketDetail.java b/src/main/java/com/dev/swms/server/model/shipping/PickTicketDetail.java index 8f49931..147d894 100644 --- a/src/main/java/com/dev/swms/server/model/shipping/PickTicketDetail.java +++ b/src/main/java/com/dev/swms/server/model/shipping/PickTicketDetail.java @@ -74,7 +74,7 @@ public class PickTicketDetail extends AbstractMoveDocDetail { private double weight;//重量--净重 /** 行号*/ - private String lineNumber; + private Integer lineNumber; private double realWeight;//实发重量--毛重 @@ -161,14 +161,12 @@ public class PickTicketDetail extends AbstractMoveDocDetail { } - public String getLineNumber() { + public Integer getLineNumber() { return lineNumber; } - - public void setLineNumber(String lineNumber) { + public void setLineNumber(Integer lineNumber) { this.lineNumber = lineNumber; } - public double getVolume() { return volume; } diff --git a/src/main/java/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml b/src/main/java/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml index 16a2602..ab85a7b 100644 --- a/src/main/java/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml +++ b/src/main/java/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml @@ -64,7 +64,7 @@ - + diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java index 3408ac4..f44845f 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java @@ -225,15 +225,12 @@ public class DefaultASNManager extends DefaultBaseManager implements ASNManager } public Integer getlineNo(ASN asn){ - List ASNDetails= commonDao.findByQuery("from ASNDetail ad where ad.asn.id=:id order by ad.lineNo desc ", + List list= commonDao.findByQuery("select max(ad.lineNo) from ASNDetail ad where ad.asn.id=:id ", new String[] { "id"},new Object[] {asn.getId() }); - Integer count=0; - if(ASNDetails.size()<=0){ - count=0; - }else{ - count=ASNDetails.get(0).getLineNo(); + if(list.get(0)==null){ + return 0; } - return count; + return list.get(0); } public void refreshweightandvolume(Long id) { 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 23e58b6..b503582 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 @@ -2018,9 +2018,9 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements pickTicket.addPickTicketDetail(planPickTicketDetail); Integer lineNo=getlineNo(pickTicket); if(lineNo==0){ - planPickTicketDetail.setLineNumber("1"); + planPickTicketDetail.setLineNumber(1); }else{ - planPickTicketDetail.setLineNumber(String.valueOf(lineNo+1)); + planPickTicketDetail.setLineNumber((lineNo+1)); } commonDao.store(planPickTicketDetail); if(item.getCompany().getId()==1003){ @@ -2055,15 +2055,11 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements } public Integer getlineNo(PickTicket pt){ - List pickTicketDetail= commonDao.findByQuery("from PickTicketDetail ptd where ptd.pickTicket.id=:id order by ptd.lineNumber desc ", - new String[] { "id"},new Object[] {pt.getId() }); - Integer count=0; - if(pickTicketDetail.size()<=0){ - count=0; - }else{ - count=Integer.parseInt(pickTicketDetail.get(0).getLineNumber()==null?"1":pickTicketDetail.get(0).getLineNumber()); + List list= commonDao.findByQuery("select max(ptd.lineNumber) from PickTicketDetail ptd where ptd.pickTicket.id="+pt.getId()+" "); + if(list.get(0)==null){ + return 0; } - return count; + return list.get(0); } public void shauxinInvQty(long itemId){ @@ -2670,6 +2666,20 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements workbook = Workbook.getWorkbook(file); Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 PickTicket pt=EntityFactory.getEntity(PickTicket.class); + List xhs=new ArrayList(); + + for (int i = 5; i < sheet.getRows(); i++) { + String xh = sheet.getCell(0, i).getContents().trim(); + xhs.add(xh); + } + + //判断序号是否有重复 + HashSet set = new HashSet(xhs); + if (xhs.size() > set.size()) { + throw new BusinessException("导入的文件中序号有重复请调整"); + + } + for (int i = 5; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); String barcode = sheet.getCell(1, i).getContents().trim(); @@ -2728,7 +2738,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements ptd.setOrderQuantity(Double.parseDouble(quantity)); ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity)); ptd.setPackageUnit(packageUnit); - ptd.setLineNumber(xh); + ptd.setLineNumber(Integer.parseInt(xh)); commonDao.store(ptd); Refresh(pt.getId());// 刷新 System.out.println((i+1)); @@ -2758,6 +2768,20 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements //序号 品番 中文名 英文名 数量 Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 PickTicket pt=EntityFactory.getEntity(PickTicket.class); + List xhs=new ArrayList(); + + for (int i = 8; i < sheet.getRows(); i++) { + String xh = sheet.getCell(0, i).getContents().trim(); + xhs.add(xh); + } + + //判断序号是否有重复 + HashSet set = new HashSet(xhs); + if (xhs.size() > set.size()) { + throw new BusinessException("导入的文件中序号有重复请调整"); + + } + for (int i = 8; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); String code = sheet.getCell(1, i).getContents().trim(); @@ -2828,7 +2852,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements ptd.setOrderQuantity(Double.parseDouble(quantity)); ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity)); ptd.setPackageUnit(packageUnit); - ptd.setLineNumber(xh); + ptd.setLineNumber(Integer.parseInt(xh)); commonDao.store(ptd); Refresh(pt.getId());// 刷新 System.out.println((i+1)); @@ -2857,6 +2881,19 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements //序号 品番 中文名 英文名 数量 Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 PickTicket pt=EntityFactory.getEntity(PickTicket.class); + List xhs=new ArrayList(); + + for (int i = 8; i < sheet.getRows(); i++) { + String xh = sheet.getCell(0, i).getContents().trim(); + xhs.add(xh); + } + + //判断序号是否有重复 + HashSet set = new HashSet(xhs); + if (xhs.size() > set.size()) { + throw new BusinessException("导入的文件中序号有重复请调整"); + + } for (int i = 8; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); String code = sheet.getCell(1, i).getContents().trim(); @@ -2927,7 +2964,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements ptd.setOrderQuantity(Double.parseDouble(quantity)); ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity)); ptd.setPackageUnit(packageUnit); - ptd.setLineNumber(xh); + ptd.setLineNumber(Integer.parseInt(xh)); commonDao.store(ptd); Refresh(pt.getId());// 刷新 System.out.println((i+1)); @@ -2957,6 +2994,19 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements //序号 品番 中文名 英文名 数量 Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 PickTicket pt=EntityFactory.getEntity(PickTicket.class); + List xhs=new ArrayList(); + + for (int i = 8; i < sheet.getRows(); i++) { + String xh = sheet.getCell(0, i).getContents().trim(); + xhs.add(xh); + } + + //判断序号是否有重复 + HashSet set = new HashSet(xhs); + if (xhs.size() > set.size()) { + throw new BusinessException("导入的文件中序号有重复请调整"); + + } for (int i = 8; i < sheet.getRows(); i++) { String xh = sheet.getCell(0, i).getContents().trim(); String code = sheet.getCell(1, i).getContents().trim(); @@ -3027,7 +3077,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements ptd.setOrderQuantity(Double.parseDouble(quantity)); ptd.setOrderQtyOfMasterUnit(Double.parseDouble(quantity)); ptd.setPackageUnit(packageUnit); - ptd.setLineNumber(xh); + ptd.setLineNumber(Integer.parseInt(xh)); commonDao.store(ptd); Refresh(pt.getId());// 刷新 System.out.println((i+1)); @@ -3465,7 +3515,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements asnDetail.setExpectedQuantity(ptd.getOrderQuantity()); asnDetail.setExpectedQtyOfMasterUnit(ptd.getOrderQuantity()); asnDetail.setPackageUnit(ptd.getPackageUnit()); - asnDetail.setLineNo(Integer.parseInt(ptd.getLineNumber())); + asnDetail.setLineNo(ptd.getLineNumber()); asnDetail.setCaCoefficient(ptd.getItem().getCAcoefficient() == null ? 0: ptd.getItem().getCAcoefficient()); asnDetail.setDock(ptd.getItem().getLocation()); commonDao.store(asnDetail); diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml index f5efe3c..5f668e5 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editASNPage.xml @@ -60,6 +60,7 @@ + ORDER BY asnDetail.id ]]> + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml index 675eab0..f28674b 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml @@ -62,6 +62,7 @@ + diff --git a/target/jrwms/WEB-INF/classes/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml b/target/jrwms/WEB-INF/classes/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml deleted file mode 100644 index 16a2602..0000000 --- a/target/jrwms/WEB-INF/classes/com/dev/swms/server/model/shipping/pickTicketDetail.hbm.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - wms_pickTicketDetail - START WITH 1000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 'PICK_ALL' - ]]> - - - 'PICK_ALL' - ]]> - - - 0 - AND detail.pickTicket.warehouse.id = :warehouseId - AND detail.item.id = :itemId - ]]> - - \ No newline at end of file diff --git a/target/jrwms/WEB-INF/classes/config/origen/receiving/editASNPage.xml b/target/jrwms/WEB-INF/classes/config/origen/receiving/editASNPage.xml deleted file mode 100644 index f5efe3c..0000000 --- a/target/jrwms/WEB-INF/classes/config/origen/receiving/editASNPage.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 then (floor(asnDetail.expectedQuantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(asnDetail.expectedQuantity,item.CAcoefficient)||pu.unit) end - else - case when asnDetail.expectedQuantity=0 then ' ' - when item.CAcoefficient=0 then (mod(asnDetail.expectedQuantity,item.CAcoefficient)) - when asnDetail.expectedQuantity0 then (floor(asnDetail.expectedQuantity/item.CAcoefficient)) end - end , - asnDetail.dock.code, - item.CAname, - CAST(asnDetail.expectedQuantity as integer), - pu.unit, - CAST(asnDetail.receivedQuantity as integer), - asnDetail.lotInfo.propD1, - asnDetail.lotInfo.propD2 - FROM ASNDetail asnDetail - left join asnDetail.item item - left join asnDetail.item.company as company - left join asnDetail.packageUnit pu - left join asnDetail.dock - WHERE 1=1 - /~asn.id: AND asnDetail.asn.id = {asn.id} ~/ - ORDER BY asnDetail.id desc ,asnDetail.PO, asnDetail.lineNo ASC]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/jrwms/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml b/target/jrwms/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml deleted file mode 100644 index 675eab0..0000000 --- a/target/jrwms/WEB-INF/classes/config/origen/shipping/editPickTicketPage.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 then (floor(pickTicketDetail.orderQuantity/item.CAcoefficient)||COALESCE(item.CAname,'箱')||mod(pickTicketDetail.orderQuantity,item.CAcoefficient)||pu.unit) end, item.CAname, - CAST(pickTicketDetail.orderQuantity as integer), - pu.unit, - item.location.code, - pickTicketDetail.newLotInfo.propD1, - pickTicketDetail.newLotInfo.propD2, - CAST(pickTicketDetail.preAllocatedQuantity as integer), - CAST(pickTicketDetail.allocatedQuantity as integer), - CAST(pickTicketDetail.pickedQuantity as integer), - CAST(pickTicketDetail.shippedQuantity as integer), - pu.unit as bzdw, - CAST(pickTicketDetail.kcQty as integer), - pu.unit as kcbzdw - FROM PickTicketDetail pickTicketDetail - left join pickTicketDetail.packageUnit pu - left join pickTicketDetail.item item - left join item.location - WHERE 1=1 - /~pickTicket.id: AND pickTicketDetail.pickTicket.id = {pickTicket.id}~/ - order by pickTicketDetail.id asc]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -