diff --git a/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java index 7c72ac1..4927553 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java @@ -229,34 +229,13 @@ public interface ASNManager extends BaseManager{ @Transactional void importXLMASN(File file); - //泰普尔线上 + //泰普尔线上入库 @Transactional void importASN2(File file); - //泰普尔出库入库导入 + //出入库通用模板导入-入库 @Transactional - void crkImport(File file,String type); - - //丝涟出库入库导入 - @Transactional - void sealyImport(File file,String type); - - //智筑出库入库导入 - @Transactional - void zhizhuImport(File file,String type); - - //Emma出库入库导入 - @Transactional - void emmaImport(File file,String type); - - - //舒达入库导入 - @Transactional - void sertaImport(File file); - - //星侃入库导入 - @Transactional - void xingkanImport(File file); + void inAndOutImport(File file,String type); //一键收货 @Transactional 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 192d290..51861bf 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 @@ -1567,6 +1567,15 @@ public class DefaultASNManager extends DefaultBaseManager implements StringBuffer sb3=new StringBuffer(); HashMap code_map=new HashMap(); HashMap code_map_old=new HashMap(); + //仓库：1000-上海汇锐比仓；1002-北京仓 + //默认月台：上海仓-上海月台；北京仓-北京月台 + long dockId =WarehouseHolder.getWarehouse().getId()==1000?1:123511; + Location dock=this.load(Location.class, dockId); + //默认客户：上海仓-泰普尔；北京仓-北京泰普尔 + long structureId=WarehouseHolder.getWarehouse().getId()==1000?1:39; + Structure structure=this.load(Structure.class, structureId); + Map itemMap= new HashMap(); + Map locationMap= new HashMap(); for (int i = 8; i Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ", + List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+structureId+" ", new String[] { "code"},new Object[] {code}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); + }else{ + itemMap.put(code, Items.get(0)); } String regex = ";|；"; @@ -1597,6 +1608,8 @@ public class DefaultASNManager extends DefaultBaseManager implements new String[] { "code"},new Object[] {name}); if(Locations.size()<=0){ sb2.append((i+1)+"行"+name+";"); + }else{ + locationMap.put(name, Locations.get(0)); } } } @@ -1679,8 +1692,8 @@ public class DefaultASNManager extends DefaultBaseManager implements asn.setToName(shf); asn.setStatus(ASNStatus.OPEN); asn.setUserTracking(); - asn.setDock(this.load(Location.class, 1L));//默认收货月台 - asn.setCompany(this.load(Structure.class, 1L));//默认泰普尔 + asn.setDock(dock);//默认收货月台 + asn.setCompany(structure);//默认泰普尔 asn.setBillType(this.load(BillType.class, 131L));//默认入库单 asn.setOrderDate(new Date()); asn.setWarehouse(WarehouseHolder.getWarehouse()); @@ -1688,8 +1701,8 @@ public class DefaultASNManager extends DefaultBaseManager implements commonDao.store(asn); } - Location loc=null; - HashMap map = new HashMap(); + + HashMap map = new HashMap(); String regex = ";|；"; //包含;号一对多 List locs = Arrays.asList(loc_Code.split(regex)); @@ -1705,24 +1718,15 @@ public class DefaultASNManager extends DefaultBaseManager implements name=l; qty= expectedQuantity; } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } + Location loc=locationMap.get(name); - map.put(loc.getId(), Integer.parseInt(qty)); + map.put(loc, Integer.parseInt(qty)); } } - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()>0){ - item=Items.get(0); - } - + Item item =itemMap.get(code); + if(asn.getToName().indexOf("上海正品仓")!=-1){ qualityStatus="正品"; @@ -1741,7 +1745,7 @@ public class DefaultASNManager extends DefaultBaseManager implements if(PackageUnits.size()>0){ pu=PackageUnits.get(0); } - for(Map.Entry entry : map.entrySet()){ + for(Map.Entry entry : map.entrySet()){ oldCode=dh; ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); ad.setAsn(asn); @@ -1759,7 +1763,7 @@ public class DefaultASNManager extends DefaultBaseManager implements ad.setExpectedQuantity(entry.getValue()); ad.setExpectedQtyOfMasterUnit(entry.getValue()); ad.setPackageUnit(pu); - ad.setDock(this.load(Location.class, entry.getKey())); + ad.setDock(entry.getKey()); ad.setQualityStatus(qualityStatus); Integer lineNo=getlineNo(asn); if(lineNo==0){ @@ -1848,6 +1852,15 @@ public class DefaultASNManager extends DefaultBaseManager implements StringBuffer sb3=new StringBuffer(); HashMap code_map_old=new HashMap(); HashMap code_map=new HashMap(); + //仓库：1000-上海汇锐比仓；1002-北京仓 + //默认月台：上海仓-上海月台；北京仓-北京月台 + long dockId =WarehouseHolder.getWarehouse().getId()==1000?1:123511; + Location dock=this.load(Location.class, dockId); + //默认客户：上海仓-泰普尔；北京仓-北京泰普尔 + long structureId=WarehouseHolder.getWarehouse().getId()==1000?1:39; + Structure structure=this.load(Structure.class, structureId); + Map itemMap= new HashMap(); + Map locationMap= new HashMap(); for (int i = 1; i Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ", + List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+structure.getId()+" ", new String[] { "code"},new Object[] {code}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); + }else{ + itemMap.put(code, Items.get(0)); } String regex = ";|；"; //包含;号一对多 @@ -1877,6 +1892,8 @@ public class DefaultASNManager extends DefaultBaseManager implements new String[] { "code"},new Object[] {name}); if(Locations.size()<=0){ sb2.append((i+1)+"行"+name+";"); + }else{ + locationMap.put(name, Locations.get(0)); } } } @@ -1931,7 +1948,7 @@ public class DefaultASNManager extends DefaultBaseManager implements String loc_Code=sheet.getCell(9,i).getContents().trim();//库位 String propC1=sheet.getCell(10,i).getContents().trim();//批次 Location loc=null; - HashMap map = new HashMap(); + HashMap map = new HashMap(); if(itemCode==null || itemCode.length() <=0){ break; } @@ -1956,22 +1973,14 @@ public class DefaultASNManager extends DefaultBaseManager implements qty= quantity; } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Integer.parseInt(qty)); + + Location location=locationMap.get(name); + map.put(location, Integer.parseInt(qty)); } } - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } + Item item =itemMap.get(itemCode); PackageUnit pu =null; List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", @@ -1991,9 +2000,9 @@ public class DefaultASNManager extends DefaultBaseManager implements asn.setWarehouse(WarehouseHolder.getWarehouse()); asn.setStatus(ASNStatus.OPEN); asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); + asn.setDock(dock); asn.setUserID(UserHolder.getUser().getId()); - asn.setCompany(this.load(Structure.class, 1L)); + asn.setCompany(structure); asn.setUserName(UserHolder.getUser().getName()); asn.setUpdateTime(new Date()); asn.setOrderDate(new Date()); @@ -2007,7 +2016,7 @@ public class DefaultASNManager extends DefaultBaseManager implements commonDao.store(asn); } - for(Map.Entry entry : map.entrySet()){ + for(Map.Entry entry : map.entrySet()){ oldCode=relatedBill1; ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); ad.setAsn(asn); @@ -2021,7 +2030,7 @@ public class DefaultASNManager extends DefaultBaseManager implements ad.setExpectedQuantity(entry.getValue()); ad.setExpectedQtyOfMasterUnit(entry.getValue()); ad.setPackageUnit(pu); - ad.setDock(this.load(Location.class, entry.getKey())); + ad.setDock(entry.getKey()); Integer lineNo=getlineNo(asn); if(lineNo==0){ ad.setLineNo(1); @@ -2044,1084 +2053,6 @@ public class DefaultASNManager extends DefaultBaseManager implements } } - @Override - public void crkImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - StringBuffer sb3=new StringBuffer(); - StringBuffer sb4=new StringBuffer(); - HashMap code_map_old=new HashMap(); - HashMap code_map=new HashMap(); - - for (int i = 1; i CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - String regex = ";|；"; - //包含;号一对多 - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - }else{ - name=l; - } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()<=0){ - sb2.append((i+1)+"行"+name+";"); - } - } - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb3.append((i+1)+"行"+store+";"); - } - } - - if(propC1!=null&&propC1.length()>0){ - String pattern = "^\\d{4}-\\d{2}-\\d{2}-?\\d*$"; - Pattern r = Pattern.compile(pattern); - Matcher m = r.matcher(propC1); - if (m.find( )) { - System.out.println("验证成功:" + m.group(0) ); - } else { - sb4.append((i+1)+"行"+propC1+";"); - } - } - - if(!code_map_old.containsKey(relatedBill1)){ - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - throw new BusinessException("订单号"+relatedBill1+"订单号已导入"); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"库位不存在!"); - } - - if(sb3!=null&&!sb3.toString().equals("")){ - throw new BusinessException(sb3.toString()+"门店不存在!"); - } - - if(sb4!=null&&!sb4.toString().equals("")){ - throw new BusinessException(sb4.toString()+"到货日期格式错误!格式为:yyyy-MM-dd-X(X为数字)或yyyy-MM-dd!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - ASN asn =null; - for (int i = 1; i map = new HashMap(); - if(itemCode==null || itemCode.length() <=0){ - break; - } - if(code_map_old.containsKey(relatedBill1)){ - continue;//如果已存在的单号，不需要读取了 - } - - //包含;号一对多 - String regex = ";|；"; - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - String qty=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - qty=l.substring(name.length()+1, l.length()); - }else{ - name=l; - qty= quantity; - } - - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Integer.parseInt(qty)); - - } - } - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - asn=ASNs.get(0); - }else{ - asn=EntityFactory.getEntity(ASN.class); - asn.setCode(this.bussinessCodeManager.getCodeForYm("RP",5)); - asn.setRelatedBill1(relatedBill1); - asn.setWarehouse(WarehouseHolder.getWarehouse()); - asn.setStatus(ASNStatus.OPEN); - asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); - asn.setUserID(UserHolder.getUser().getId()); - asn.setCompany(this.load(Structure.class, 1L)); - asn.setUserName(UserHolder.getUser().getName()); - asn.setUpdateTime(new Date()); - asn.setOrderDate(new Date()); - if(type.equals("1")){ - asn.setBeLine(true); - }else{ - asn.setBeLine(false); - } - commonDao.store(asn); - } - - if(md!=null&&md.length()>0){ - if(asn.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {md}); - if(Stores.size()>0){ - store=Stores.get(0); - asn.setStore(store); - Contact fromContact =new Contact(); - fromContact.setPerson(store.getContact().getPerson()); - fromContact.setTelephone(store.getContact().getTelephone()); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(store.getAddress().getAddress()); - asn.setFromAddress(fromAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex2 = ";|；"; - String[] des = khdz.split(regex2); - Contact fromContact =new Contact(); - fromContact.setPerson(des[0]); - fromContact.setTelephone(des[1]); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(des[2]); - asn.setFromAddress(fromAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - for(Map.Entry entry : map.entrySet()){ - oldCode=relatedBill1; - ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); - Location dock=this.load(Location.class, entry.getKey()); - ad.setAsn(asn); - ad.setItem(item); - LotInfo lotInfo =new LotInfo(); - lotInfo.setPropC1(propC1); - Date propD1=returnDate(propC1); - if(tsbz!=null&&tsbz.length()>0){ - lotInfo.setPropLC1(tsbz); - }else{ - lotInfo.setPropLC1(null); - } - lotInfo.setPropD1(propD1); - ad.setLotInfo(lotInfo); - ad.setExpectedQuantity(entry.getValue()); - ad.setExpectedQtyOfMasterUnit(entry.getValue()); - ad.setPackageUnit(pu); - ad.setDock(dock); - Integer lineNo=getlineNo(asn); - if(lineNo==0){ - ad.setLineNo(1); - }else{ - ad.setLineNo(lineNo+1); - } - ad.setQualityStatus(zldj); - commonDao.store(ad); - System.out.println(i); - Refresh(asn.getId()); - } - } - - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void sealyImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - StringBuffer sb3=new StringBuffer(); - StringBuffer sb4=new StringBuffer(); - HashMap code_map_old=new HashMap(); - HashMap code_map=new HashMap(); - - for (int i = 1; i CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=13 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - String regex = ";|；"; - //包含;号一对多 - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - }else{ - name=l; - } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()<=0){ - sb2.append((i+1)+"行"+name+";"); - } - } - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb3.append((i+1)+"行"+store+";"); - } - } - - if(propC1!=null&&propC1.length()>0){ - String pattern = "^\\d{4}-\\d{2}-\\d{2}-?\\d*$"; - Pattern r = Pattern.compile(pattern); - Matcher m = r.matcher(propC1); - if (m.find( )) { - System.out.println("验证成功:" + m.group(0) ); - } else { - sb4.append((i+1)+"行"+propC1+";"); - } - } - - if(!code_map_old.containsKey(relatedBill1)){ - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"库位不存在!"); - } - - if(sb3!=null&&!sb3.toString().equals("")){ - throw new BusinessException(sb3.toString()+"门店不存在!"); - } - - if(sb4!=null&&!sb4.toString().equals("")){ - throw new BusinessException(sb4.toString()+"到货日期格式错误!格式为:yyyy-MM-dd-X(X为数字)或yyyy-MM-dd!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - ASN asn =null; - for (int i = 1; i map = new HashMap(); - if(itemCode==null || itemCode.length() <=0){ - break; - } - if(code_map_old.containsKey(relatedBill1)){ - continue;//如果已存在的单号，不需要读取了 - } - - //包含;号一对多 - String regex = ";|；"; - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - String qty=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - qty=l.substring(name.length()+1, l.length()); - }else{ - name=l; - qty= quantity; - } - - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Integer.parseInt(qty)); - - } - } - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - asn=ASNs.get(0); - }else{ - asn=EntityFactory.getEntity(ASN.class); - asn.setCode(this.bussinessCodeManager.getCodeForYm("RP",5)); - asn.setRelatedBill1(relatedBill1); - asn.setWarehouse(WarehouseHolder.getWarehouse()); - asn.setStatus(ASNStatus.OPEN); - asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); - asn.setUserID(UserHolder.getUser().getId()); - asn.setCompany(this.load(Structure.class, 13L)); - asn.setUserName(UserHolder.getUser().getName()); - asn.setUpdateTime(new Date()); - asn.setOrderDate(new Date()); - if(type.equals("1")){ - asn.setBeLine(true); - }else{ - asn.setBeLine(false); - } - commonDao.store(asn); - } - - if(md!=null&&md.length()>0){ - if(asn.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {md}); - if(Stores.size()>0){ - store=Stores.get(0); - asn.setStore(store); - Contact fromContact =new Contact(); - fromContact.setPerson(store.getContact().getPerson()); - fromContact.setTelephone(store.getContact().getTelephone()); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(store.getAddress().getAddress()); - asn.setFromAddress(fromAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex2 = ";|；"; - String[] des = khdz.split(regex2); - Contact fromContact =new Contact(); - fromContact.setPerson(des[0]); - fromContact.setTelephone(des[1]); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(des[2]); - asn.setFromAddress(fromAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=13 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - for(Map.Entry entry : map.entrySet()){ - oldCode=relatedBill1; - ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); - Location dock=this.load(Location.class, entry.getKey()); - ad.setAsn(asn); - ad.setItem(item); - LotInfo lotInfo =new LotInfo(); - lotInfo.setPropC1(propC1); - Date propD1=returnDate(propC1); - if(tsbz!=null&&tsbz.length()>0){ - lotInfo.setPropLC1(tsbz); - }else{ - lotInfo.setPropLC1(null); - } - lotInfo.setPropD1(propD1); - ad.setLotInfo(lotInfo); - ad.setExpectedQuantity(entry.getValue()); - ad.setExpectedQtyOfMasterUnit(entry.getValue()); - ad.setPackageUnit(pu); - ad.setDock(dock); - Integer lineNo=getlineNo(asn); - if(lineNo==0){ - ad.setLineNo(1); - }else{ - ad.setLineNo(lineNo+1); - } - ad.setQualityStatus(zldj); - commonDao.store(ad); - System.out.println(i); - Refresh(asn.getId()); - } - } - - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void zhizhuImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - StringBuffer sb3=new StringBuffer(); - StringBuffer sb4=new StringBuffer(); - HashMap code_map_old=new HashMap(); - HashMap code_map=new HashMap(); - - for (int i = 1; i CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=5 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - String regex = ";|；"; - //包含;号一对多 - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - }else{ - name=l; - } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()<=0){ - sb2.append((i+1)+"行"+name+";"); - } - } - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb3.append((i+1)+"行"+store+";"); - } - } - - if(propC1!=null&&propC1.length()>0){ - String pattern = "^\\d{4}-\\d{2}-\\d{2}-?\\d*$"; - Pattern r = Pattern.compile(pattern); - Matcher m = r.matcher(propC1); - if (m.find( )) { - System.out.println("验证成功:" + m.group(0) ); - } else { - sb4.append((i+1)+"行"+propC1+";"); - } - } - - if(!code_map_old.containsKey(relatedBill1)){ - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"库位不存在!"); - } - - if(sb3!=null&&!sb3.toString().equals("")){ - throw new BusinessException(sb3.toString()+"门店不存在!"); - } - - if(sb4!=null&&!sb4.toString().equals("")){ - throw new BusinessException(sb4.toString()+"到货日期格式错误!格式为:yyyy-MM-dd-X(X为数字)或yyyy-MM-dd!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - ASN asn =null; - for (int i = 1; i map = new HashMap(); - if(itemCode==null || itemCode.length() <=0){ - break; - } - if(code_map_old.containsKey(relatedBill1)){ - continue;//如果已存在的单号，不需要读取了 - } - - //包含;号一对多 - String regex = ";|；"; - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - String qty=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - qty=l.substring(name.length()+1, l.length()); - }else{ - name=l; - qty= quantity; - } - - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Integer.parseInt(qty)); - - } - } - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - asn=ASNs.get(0); - }else{ - asn=EntityFactory.getEntity(ASN.class); - asn.setCode(this.bussinessCodeManager.getCodeForYm("RP",5)); - asn.setRelatedBill1(relatedBill1); - asn.setWarehouse(WarehouseHolder.getWarehouse()); - asn.setStatus(ASNStatus.OPEN); - asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); - asn.setUserID(UserHolder.getUser().getId()); - asn.setCompany(this.load(Structure.class, 5L)); - asn.setUserName(UserHolder.getUser().getName()); - asn.setUpdateTime(new Date()); - asn.setOrderDate(new Date()); - if(type.equals("1")){ - asn.setBeLine(true); - }else{ - asn.setBeLine(false); - } - commonDao.store(asn); - } - - if(md!=null&&md.length()>0){ - if(asn.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {md}); - if(Stores.size()>0){ - store=Stores.get(0); - asn.setStore(store); - Contact fromContact =new Contact(); - fromContact.setPerson(store.getContact().getPerson()); - fromContact.setTelephone(store.getContact().getTelephone()); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(store.getAddress().getAddress()); - asn.setFromAddress(fromAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex2 = ";|；"; - String[] des = khdz.split(regex2); - Contact fromContact =new Contact(); - fromContact.setPerson(des[0]); - fromContact.setTelephone(des[1]); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(des[2]); - asn.setFromAddress(fromAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=5 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - for(Map.Entry entry : map.entrySet()){ - oldCode=relatedBill1; - ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); - Location dock=this.load(Location.class, entry.getKey()); - ad.setAsn(asn); - ad.setItem(item); - LotInfo lotInfo =new LotInfo(); - lotInfo.setPropC1(propC1); - Date propD1=returnDate(propC1); - if(tsbz!=null&&tsbz.length()>0){ - lotInfo.setPropLC1(tsbz); - }else{ - lotInfo.setPropLC1(null); - } - lotInfo.setPropD1(propD1); - ad.setLotInfo(lotInfo); - ad.setExpectedQuantity(entry.getValue()); - ad.setExpectedQtyOfMasterUnit(entry.getValue()); - ad.setPackageUnit(pu); - ad.setDock(dock); - Integer lineNo=getlineNo(asn); - if(lineNo==0){ - ad.setLineNo(1); - }else{ - ad.setLineNo(lineNo+1); - } - ad.setQualityStatus(zldj); - commonDao.store(ad); - System.out.println(i); - Refresh(asn.getId()); - } - } - - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void emmaImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - StringBuffer sb3=new StringBuffer(); - StringBuffer sb4=new StringBuffer(); - HashMap code_map_old=new HashMap(); - HashMap code_map=new HashMap(); - - for (int i = 1; i Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); - if(Structures.size()<=0){ - throw new BusinessException(kh+"客户不存在!"); - } - String propC1=sheet.getCell(6,i).getContents().trim();//到货日期 - String loc_Code=sheet.getCell(7,i).getContents().trim();//库位 - String store=sheet.getCell(8,i).getContents().trim();//门店地址 - String zldj=sheet.getCell(5,i).getContents().trim();//质量等级 - List CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+Structures.get(0).getId()+" ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - String regex = ";|；"; - //包含;号一对多 - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - }else{ - name=l; - } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()<=0){ - sb2.append((i+1)+"行"+name+";"); - } - } - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb3.append((i+1)+"行"+store+";"); - } - } - - if(propC1!=null&&propC1.length()>0){ - String pattern = "^\\d{4}-\\d{2}-\\d{2}-?\\d*$"; - Pattern r = Pattern.compile(pattern); - Matcher m = r.matcher(propC1); - if (m.find( )) { - System.out.println("验证成功:" + m.group(0) ); - } else { - sb4.append((i+1)+"行"+propC1+";"); - } - } - - if(!code_map_old.containsKey(relatedBill1)){ - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"库位不存在!"); - } - - if(sb3!=null&&!sb3.toString().equals("")){ - throw new BusinessException(sb3.toString()+"门店不存在!"); - } - - if(sb4!=null&&!sb4.toString().equals("")){ - throw new BusinessException(sb4.toString()+"到货日期格式错误!格式为:yyyy-MM-dd-X(X为数字)或yyyy-MM-dd!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - ASN asn =null; - for (int i = 1; i map = new HashMap(); - if(kh==null || kh.length() <=0){ - break; - } - if(code_map_old.containsKey(relatedBill1)){ - continue;//如果已存在的单号，不需要读取了 - } - - //包含;号一对多 - String regex = ";|；"; - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - String qty=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - qty=l.substring(name.length()+1, l.length()); - }else{ - name=l; - qty= quantity; - } - - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Integer.parseInt(qty)); - - } - } - - //客户 - Structure structure=null; - List Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); - if(Structures.size()>0){ - structure=Structures.get(0); - } - - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - asn=ASNs.get(0); - }else{ - asn=EntityFactory.getEntity(ASN.class); - asn.setCode(this.bussinessCodeManager.getCodeForYm("RP",5)); - asn.setRelatedBill1(relatedBill1); - asn.setWarehouse(WarehouseHolder.getWarehouse()); - asn.setStatus(ASNStatus.OPEN); - asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); - asn.setUserID(UserHolder.getUser().getId()); - asn.setCompany(structure); - asn.setUserName(UserHolder.getUser().getName()); - asn.setUpdateTime(new Date()); - asn.setOrderDate(new Date()); - if(type.equals("1")){ - asn.setBeLine(true); - }else{ - asn.setBeLine(false); - } - commonDao.store(asn); - } - - if(md!=null&&md.length()>0){ - if(asn.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {md}); - if(Stores.size()>0){ - store=Stores.get(0); - asn.setStore(store); - Contact fromContact =new Contact(); - fromContact.setPerson(store.getContact().getPerson()); - fromContact.setTelephone(store.getContact().getTelephone()); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(store.getAddress().getAddress()); - asn.setFromAddress(fromAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex2 = ";|；"; - String[] des = khdz.split(regex2); - Contact fromContact =new Contact(); - fromContact.setPerson(des[0]); - fromContact.setTelephone(des[1]); - asn.setFromContact(fromContact); - Address fromAddress = new Address(); - fromAddress.setAddress(des[2]); - asn.setFromAddress(fromAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id="+structure.getId()+" ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - for(Map.Entry entry : map.entrySet()){ - oldCode=relatedBill1; - ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); - Location dock=this.load(Location.class, entry.getKey()); - ad.setAsn(asn); - ad.setItem(item); - LotInfo lotInfo =new LotInfo(); - lotInfo.setPropC1(propC1); - Date propD1=returnDate(propC1); - if(tsbz!=null&&tsbz.length()>0){ - lotInfo.setPropLC1(tsbz); - }else{ - lotInfo.setPropLC1(null); - } - lotInfo.setPropD1(propD1); - ad.setLotInfo(lotInfo); - ad.setExpectedQuantity(entry.getValue()); - ad.setExpectedQtyOfMasterUnit(entry.getValue()); - ad.setPackageUnit(pu); - ad.setDock(dock); - Integer lineNo=getlineNo(asn); - if(lineNo==0){ - ad.setLineNo(1); - }else{ - ad.setLineNo(lineNo+1); - } - ad.setQualityStatus(zldj); - commonDao.store(ad); - System.out.println(i); - Refresh(asn.getId()); - } - } - - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - @Override public void oneKeyReceive(List ids) { for(Long id : ids){ @@ -3141,232 +2072,33 @@ public class DefaultASNManager extends DefaultBaseManager implements return count; } - @Override - public void sertaImport(File file) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - StringBuffer sb4=new StringBuffer(); - HashMap code_map_old=new HashMap(); - HashMap code_map=new HashMap(); - - for (int i = 1; i CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=2 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - String regex = ";|；"; - //包含;号一对多 - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - }else{ - name=l; - } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()<=0){ - sb2.append((i+1)+"行"+name+";"); - } - } - } - - - if(propC1!=null&&propC1.length()>0){ - String pattern = "^\\d{4}-\\d{2}-\\d{2}-?\\d*$"; - Pattern r = Pattern.compile(pattern); - Matcher m = r.matcher(propC1); - if (m.find( )) { - System.out.println("验证成功:" + m.group(0) ); - } else { - sb4.append((i+1)+"行"+propC1+";"); - } - } - - if(!code_map_old.containsKey(relatedBill1)){ - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - throw new BusinessException("订单号"+relatedBill1+"订单号已导入"); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"库位不存在!"); - } - - if(sb4!=null&&!sb4.toString().equals("")){ - throw new BusinessException(sb4.toString()+"到货日期格式错误!格式为:yyyy-MM-dd-X(X为数字)或yyyy-MM-dd!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - ASN asn =null; - for (int i = 1; i map = new HashMap(); - if(itemCode==null || itemCode.length() <=0){ - break; - } - if(code_map_old.containsKey(relatedBill1)){ - continue;//如果已存在的单号，不需要读取了 - } - - //包含;号一对多 - String regex = ";|；"; - List locs = Arrays.asList(loc_Code.split(regex)); - if(locs.size()>0){ - for(String l:locs){ - String name=""; - String qty=""; - int result1 = l.indexOf("*"); - if(result1!=-1){ - name=l.substring(0, l.indexOf("*")); - qty=l.substring(name.length()+1, l.length()); - }else{ - name=l; - qty= quantity; - } - - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Double.parseDouble(qty)); - - } - } - List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(ASNs.size()>0){ - asn=ASNs.get(0); - }else{ - asn=EntityFactory.getEntity(ASN.class); - asn.setCode(this.bussinessCodeManager.getCodeForYm("RP",5)); - asn.setRelatedBill1(relatedBill1); - asn.setWarehouse(WarehouseHolder.getWarehouse()); - asn.setStatus(ASNStatus.OPEN); - asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); - asn.setUserID(UserHolder.getUser().getId()); - asn.setCompany(this.load(Structure.class, 2L)); - asn.setUserName(UserHolder.getUser().getName()); - asn.setUpdateTime(new Date()); - asn.setOrderDate(new Date()); - asn.setBeLine(false); - commonDao.store(asn); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=2 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - for(Map.Entry entry : map.entrySet()){ - oldCode=relatedBill1; - ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); - Location dock=this.load(Location.class, entry.getKey()); - ad.setAsn(asn); - ad.setItem(item); - LotInfo lotInfo =new LotInfo(); - lotInfo.setPropC1(propC1); - Date propD1=returnDate(propC1); - if(tsbz!=null&&tsbz.length()>0){ - lotInfo.setPropLC1(tsbz); - }else{ - lotInfo.setPropLC1(null); - } - lotInfo.setPropD1(propD1); - ad.setLotInfo(lotInfo); - ad.setExpectedQuantity(entry.getValue()); - ad.setExpectedQtyOfMasterUnit(entry.getValue()); - ad.setPackageUnit(pu); - ad.setDock(dock); - Integer lineNo=getlineNo(asn); - if(lineNo==0){ - ad.setLineNo(1); - }else{ - ad.setLineNo(lineNo+1); - } - ad.setQualityStatus(zldj); - commonDao.store(ad); - System.out.println(i); - Refresh(asn.getId()); - } - } - - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } @Override - public void xingkanImport(File file) { + public void inAndOutImport(File file,String type) { Workbook workbook; try { workbook = Workbook.getWorkbook(file); Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 StringBuffer sb1=new StringBuffer(); StringBuffer sb2=new StringBuffer(); + StringBuffer sb3=new StringBuffer(); StringBuffer sb4=new StringBuffer(); HashMap code_map_old=new HashMap(); HashMap code_map=new HashMap(); - + Map structureMap=new HashMap(); + Map storeMap=new HashMap(); + Map itemMap=new HashMap(); + Map locationMap=new HashMap(); + //默认月台：上海仓-上海月台；北京仓-北京月台 + long dockId=0; + if(WarehouseHolder.getWarehouse().getId()==1000){ + dockId=1; + }else if(WarehouseHolder.getWarehouse().getId()==1001){ + dockId=80757; + }else if(WarehouseHolder.getWarehouse().getId()==1002){ + dockId=123511; + } + Location dock=this.load(Location.class, dockId); for (int i = 1; i CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", @@ -3390,12 +2122,16 @@ public class DefaultASNManager extends DefaultBaseManager implements List Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); if(Structures.size()<=0){ throw new BusinessException(kh+"客户不存在!"); + }else{ + structureMap.put(kh, Structures.get(0)); } List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+Structures.get(0).getId()+" ", new String[] { "code"},new Object[] {code}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); + }else{ + itemMap.put(code, Items.get(0)); } String regex = ";|；"; //包含;号一对多 @@ -3413,10 +2149,22 @@ public class DefaultASNManager extends DefaultBaseManager implements new String[] { "code"},new Object[] {name}); if(Locations.size()<=0){ sb2.append((i+1)+"行"+name+";"); + }else{ + locationMap.put(name, Locations.get(0)); } } } + if(store!=null && store.length()>0){ + List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", + new String[] { "name"},new Object[] {store}); + if(Stores.size()<=0){ + sb3.append((i+1)+"行"+store+";"); + }else{ + storeMap.put(store, Stores.get(0)); + } + } + if(propC1!=null&&propC1.length()>0){ String pattern = "^\\d{4}-\\d{2}-\\d{2}-?\\d*$"; @@ -3449,6 +2197,10 @@ public class DefaultASNManager extends DefaultBaseManager implements throw new BusinessException(sb2.toString()+"库位不存在!"); } + if(sb3!=null&&!sb3.toString().equals("")){ + throw new BusinessException(sb3.toString()+"门店不存在!"); + } + if(sb4!=null&&!sb4.toString().equals("")){ throw new BusinessException(sb4.toString()+"到货日期格式错误!格式为:yyyy-MM-dd-X(X为数字)或yyyy-MM-dd!"); } @@ -3468,8 +2220,9 @@ public class DefaultASNManager extends DefaultBaseManager implements String zldj=sheet.getCell(5,i).getContents().trim();//质量等级 String propC1=sheet.getCell(6,i).getContents().trim();//到货日期 String loc_Code=sheet.getCell(7,i).getContents().trim();//库位 - Location loc=null; - HashMap map = new HashMap(); + String md=sheet.getCell(8,i).getContents().trim();//门店地址 + String khdz=sheet.getCell(9,i).getContents().trim();//客户地址 + HashMap map = new HashMap(); if(kh==null || kh.length() <=0){ break; } @@ -3493,20 +2246,13 @@ public class DefaultASNManager extends DefaultBaseManager implements qty= quantity; } - List Locations = commonDao.findByQuery(" from Location l where l.code=:code and l.warehouse.id="+WarehouseHolder.getWarehouse().getId()+" ", - new String[] { "code"},new Object[] {name}); - if(Locations.size()>0){ - loc=Locations.get(0); - } - map.put(loc.getId(), Integer.parseInt(qty)); + Location Location=locationMap.get(name); + map.put(Location, Integer.parseInt(qty)); } } - Structure structure=null; - List Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); - if(Structures.size()>0){ - structure=Structures.get(0); - } + Structure structure=structureMap.get(kh); + List ASNs=this.commonDao.findByQuery("from ASN asn where asn.relatedBill1=:relatedBill1 ", new String[]{"relatedBill1"},new Object[]{relatedBill1}); if(ASNs.size()>0){ @@ -3518,23 +2264,50 @@ public class DefaultASNManager extends DefaultBaseManager implements asn.setWarehouse(WarehouseHolder.getWarehouse()); asn.setStatus(ASNStatus.OPEN); asn.setBillType(this.load(BillType.class, 131L)); - asn.setDock(this.load(Location.class, 1L)); + asn.setDock(dock); asn.setUserID(UserHolder.getUser().getId()); asn.setCompany(structure); asn.setUserName(UserHolder.getUser().getName()); asn.setUpdateTime(new Date()); asn.setOrderDate(new Date()); - asn.setBeLine(false); + if(type.equals("1")){ + asn.setBeLine(true); + }else{ + asn.setBeLine(false); + } commonDao.store(asn); } + + if (md != null && md.length() > 0) { + if (asn.getStore() == null) { + Store store = storeMap.get(md); + asn.setStore(store); + Contact fromContact = new Contact(); + fromContact.setPerson(store.getContact().getPerson()); + fromContact.setTelephone(store.getContact().getTelephone()); + asn.setFromContact(fromContact); + Address fromAddress = new Address(); + fromAddress.setAddress(store.getAddress().getAddress()); + asn.setFromAddress(fromAddress); + } + + } - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id="+structure.getId()+" ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - + if(khdz!=null&&khdz.length()>0){ + //名称；电话；店址 + String regex2 = ";|；"; + String[] des = khdz.split(regex2); + Contact fromContact =new Contact(); + fromContact.setPerson(des[0]); + fromContact.setTelephone(des[1]); + asn.setFromContact(fromContact); + Address fromAddress = new Address(); + fromAddress.setAddress(des[2]); + asn.setFromAddress(fromAddress); + } + + Item item =itemMap.get(itemCode); + PackageUnit pu =null; List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", new String[] { "id"},new Object[] {item.getId()}); @@ -3542,10 +2315,9 @@ public class DefaultASNManager extends DefaultBaseManager implements pu=PackageUnits.get(0); } - for(Map.Entry entry : map.entrySet()){ + for(Map.Entry entry : map.entrySet()){ oldCode=relatedBill1; ASNDetail ad=EntityFactory.getEntity(ASNDetail.class); - Location dock=this.load(Location.class, entry.getKey()); ad.setAsn(asn); ad.setItem(item); LotInfo lotInfo =new LotInfo(); @@ -3561,7 +2333,7 @@ public class DefaultASNManager extends DefaultBaseManager implements ad.setExpectedQuantity(entry.getValue()); ad.setExpectedQtyOfMasterUnit(entry.getValue()); ad.setPackageUnit(pu); - ad.setDock(dock); + ad.setDock(entry.getKey()); Integer lineNo=getlineNo(asn); if(lineNo==0){ ad.setLineNo(1); @@ -3573,6 +2345,7 @@ public class DefaultASNManager extends DefaultBaseManager implements System.out.println(i); Refresh(asn.getId()); } + } } catch (BiffException e) { @@ -3739,7 +2512,4 @@ public class DefaultASNManager extends DefaultBaseManager implements e.printStackTrace(); } } - - - } diff --git a/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java index ae176b5..5db343b 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/PickTicketManager.java @@ -347,7 +347,7 @@ public interface PickTicketManager extends BaseManager { @Transactional void importPickTicket(File file); - //线下导入 + //泰普尔线下导入 @Transactional void importPickTicketTP(File file); @@ -359,21 +359,9 @@ public interface PickTicketManager extends BaseManager { @Transactional void importPickTicketTP2(File file); - //泰普尔-线下出入库导入 + //出库入导入-出库 @Transactional - void issuereceiptImport(File file,String type); - - //丝涟出入库导入 - @Transactional - void sealyPtImport(File file,String type); - - //智筑出入库导入 - @Transactional - void zhiZhuPtImport(File file,String type); - - //Emma出入库导入 - @Transactional - void emmaPtImport(File file,String type); + void inAndOutImport(File file,String type); //手工分配 @Transactional @@ -383,10 +371,6 @@ public interface PickTicketManager extends BaseManager { @Transactional void cancellAllocate(List ids); - //舒达出入库导入 - @Transactional - void sertaImport(File file); - //星侃出入库导入 @Transactional void xinKanImport(File file); 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 3bd17f4..dff2e5d 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 @@ -2168,20 +2168,35 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements workbook = Workbook.getWorkbook(file); // Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 for(int s=0;s code_map_old=new HashMap(); HashMap code_map=new HashMap(); + Map itemMap=new HashMap(); + //默认月台：上海仓-上海月台；杭州仓；北京仓-北京月台 + long dockId=0; + if(WarehouseHolder.getWarehouse().getId()==1000){ + dockId=79602; + }else if(WarehouseHolder.getWarehouse().getId()==1001){ + dockId=99619; + }else if(WarehouseHolder.getWarehouse().getId()==1002){ + dockId=123512; + } + Location dock=this.load(Location.class, dockId); + long structureId=WarehouseHolder.getWarehouse().getId()==1000?1:39; + Structure structure=this.load(Structure.class, structureId); for(int i = 8; i Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ", + List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+structureId+" ", new String[] { "code"},new Object[] {code}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); + }else{ + itemMap.put(code, Items.get(0)); } if(!code_map_old.containsKey(dh)){ @@ -2245,8 +2260,8 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements pt.setWarehouse(WarehouseHolder.getWarehouse()); pt.setStatus(PickTicketStatus.OPEN); pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); - pt.setCompany(this.load(Structure.class, 1L)); + pt.setDock(dock); + pt.setCompany(structure); pt.setBillType(this.load(BillType.class, 132L)); pt.setOrderDate(new Date()); pt.setIntendShipDate(new Date()); @@ -2254,12 +2269,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements commonDao.store(pt); } - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()>0){ - item=Items.get(0); - } + Item item =itemMap.get(code); if(pt.getFromName().indexOf("上海正品仓")!=-1){ qualityStatus="正品"; @@ -2319,16 +2329,31 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements StringBuffer sb1=new StringBuffer(); HashMap code_map_old=new HashMap(); HashMap code_map=new HashMap(); + Map itemMap=new HashMap(); + //默认月台：上海仓-上海月台；杭州仓；北京仓-北京月台 + long dockId=0; + if(WarehouseHolder.getWarehouse().getId()==1000){ + dockId=79602; + }else if(WarehouseHolder.getWarehouse().getId()==1001){ + dockId=99619; + }else if(WarehouseHolder.getWarehouse().getId()==1002){ + dockId=123512; + } + Location dock=this.load(Location.class, dockId); + long structureId=WarehouseHolder.getWarehouse().getId()==1000?1:39; + Structure structure=this.load(Structure.class, structureId); for(int i = 8; i Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ", + List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+structureId+" ", new String[] { "code"},new Object[] {code}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); + }else{ + itemMap.put(code, Items.get(0)); } if(!code_map_old.containsKey(dh)){ @@ -2391,8 +2416,8 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements pt.setWarehouse(WarehouseHolder.getWarehouse()); pt.setStatus(PickTicketStatus.OPEN); pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); - pt.setCompany(this.load(Structure.class, 1L)); + pt.setDock(dock); + pt.setCompany(structure); pt.setBillType(this.load(BillType.class, 132L)); pt.setOrderDate(new Date()); pt.setIntendShipDate(new Date()); @@ -2400,12 +2425,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements commonDao.store(pt); } - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()>0){ - item=Items.get(0); - } + Item item =itemMap.get(code); if(pt.getFromName().indexOf("上海正品仓")!=-1){ qualityStatus="正品"; @@ -3378,10 +3398,25 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Workbook workbook; try { workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(2);// 得到excel第一页的内容 + Sheet sheet = workbook.getSheet(1);// 得到excel第二页的内容 StringBuffer sb1=new StringBuffer(); HashMap code_map_old=new HashMap(); HashMap code_map=new HashMap(); + Map structureMap=new HashMap(); + Map billTypeMap=new HashMap(); + Map storeMap=new HashMap(); + Map itemMap=new HashMap(); + long dockId=0; + if(WarehouseHolder.getWarehouse().getId()==1000){ + dockId=79602; + }else if(WarehouseHolder.getWarehouse().getId()==1001){ + dockId=99619; + }else if(WarehouseHolder.getWarehouse().getId()==1002){ + dockId=123512; + } + Location dock=this.load(Location.class, dockId); + long structureId=WarehouseHolder.getWarehouse().getId()==1000?1:39; + Structure structure=this.load(Structure.class, structureId); for (int i = 1; i Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - }else{ - throw new BusinessException("第"+(i+1)+"行"+itemCode+"货品不存在!"); - } + Item item =itemMap.get(itemCode); PackageUnit pu =null; List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", @@ -3496,7 +3526,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements } @Override - public void issuereceiptImport(File file,String type) { + public void inAndOutImport(File file,String type) { Workbook workbook; try { workbook = Workbook.getWorkbook(file); @@ -3505,24 +3535,51 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements StringBuffer sb2=new StringBuffer(); HashMap code_map=new HashMap(); HashMap code_map_old=new HashMap(); + Map structureMap=new HashMap(); + Map billTypeMap=new HashMap(); + Map storeMap=new HashMap(); + Map itemMap=new HashMap(); + long dockId=0; + if(WarehouseHolder.getWarehouse().getId()==1000){ + dockId=79602; + }else if(WarehouseHolder.getWarehouse().getId()==1001){ + dockId=99619; + }else if(WarehouseHolder.getWarehouse().getId()==1002){ + dockId=123512; + } + Location dock=this.load(Location.class, dockId); for (int i = 1; i Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); + if(Structures.size()<=0){ + throw new BusinessException(kh+"客户不存在!"); + }else{ + structureMap.put(kh, Structures.get(0)); + } //单据类型 BillType billType=null; List BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); if(BillTypes.size()<=0){ throw new BusinessException(billtype+"单据类型不存在!"); + }else{ + billTypeMap.put(billtype, BillTypes.get(0)); } - String store=sheet.getCell(7,i).getContents().trim();//门店 + List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=1 ", new String[] { "code"},new Object[] {code}); if(Items.size()<=0){ sb1.append((i+1)+"行"+code+";"); + }else{ + itemMap.put(code, Items.get(0)); } if(store!=null && store.length()>0){ @@ -3530,10 +3587,12 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements new String[] { "name"},new Object[] {store}); if(Stores.size()<=0){ sb2.append((i+1)+"行"+store+";"); + }else{ + storeMap.put(store, Stores.get(0)); } } - String zldj=sheet.getCell(4,i).getContents().trim();//质量等级 + String zldj=sheet.getCell(5,i).getContents().trim();//质量等级 List CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", new String[] { "name"},new Object[] {zldj}); @@ -3569,16 +3628,19 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements String oldCode=""; PickTicket pt =null; for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()>0){ - billType=BillTypes.get(0); - } + BillType billType=billTypeMap.get(billtype); + + //客户 + Structure structure=structureMap.get(kh); + List PickTickets = commonDao.findByQuery(" from PickTicket pt where pt.relatedBill1=:relatedBill1 ", new String[] { "relatedBill1"},new Object[] {relatedBill1}); if(PickTickets.size()>0){ @@ -3604,640 +3666,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements pt.setWarehouse(WarehouseHolder.getWarehouse()); pt.setStatus(PickTicketStatus.OPEN); pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); - pt.setCompany(this.load(Structure.class, 1L)); - pt.setBillType(billType);//出库单 - pt.setOrderDate(new Date()); - if(type.equals("1")){ - pt.setBeLine(true);//线上 - }else{ - pt.setBeLine(false);//线下 - } - commonDao.store(pt); - } - - if(mddz!=null&&mddz.length()>0){ - if(pt.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {mddz}); - if(Stores.size()>0){ - store=Stores.get(0); - pt.setStore(store); - pt.setShipToName(store.getName()); - Contact shipToContact=new Contact(); - shipToContact.setPerson(store.getContact().getPerson()); - shipToContact.setTelephone(store.getContact().getTelephone()); - pt.setShipToContact(shipToContact); - Address shipToAddress = new Address(); - shipToAddress.setAddress(store.getAddress().getAddress()); - pt.setShipToAddress(shipToAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex = ";|；"; - String[] des = khdz.split(regex); - pt.setShipToName(des[0]); - Contact shipToContact=new Contact(); - shipToContact.setPerson(des[0]); - shipToContact.setTelephone(des[1]); - pt.setShipToContact(shipToContact); - Address shipToAddress = new Address(); - shipToAddress.setAddress(des[2]); - pt.setShipToAddress(shipToAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=1 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - oldCode=relatedBill1; - PickTicketDetail ptd=EntityFactory.getEntity(PickTicketDetail.class); - ptd.setPickTicket(pt); - ptd.setItem(item); - ptd.setOrderQuantity(convertDouble(quantity)); - ptd.setOrderQtyOfMasterUnit(convertDouble(quantity)); - ptd.setPackageUnit(pu); - Integer lineNo=getlineNo(pt); - if(lineNo==0){ - ptd.setLineNo(1); - }else{ - ptd.setLineNo(lineNo+1); - } - ptd.setQualityStatus(zldj);// - NewLotInfo newLotInfo =new NewLotInfo(); - if(tsbz!=null&&tsbz.length()>0){ - newLotInfo.setPropL1(tsbz); - }else{ - newLotInfo.setPropL1(null); - } - ptd.setNewLotInfo(newLotInfo); - commonDao.store(ptd); - System.out.println(i); - Refresh(pt.getId()); - } - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void sealyPtImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - HashMap code_map=new HashMap(); - HashMap code_map_old=new HashMap(); - for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()<=0){ - throw new BusinessException(billtype+"单据类型不存在!"); - } - String store=sheet.getCell(7,i).getContents().trim();//门店 - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=13 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb2.append((i+1)+"行"+store+";"); - } - } - - List CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - if(!code_map_old.containsKey(relatedBill1)){ - List PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(PickTickets.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - //sb.append("第"+(i+1)+"订单号"+relatedBill1+"订单号已导入"); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"门店不存在!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - PickTicket pt =null; - for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()>0){ - billType=BillTypes.get(0); - } - - List PickTickets = commonDao.findByQuery(" from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[] { "relatedBill1"},new Object[] {relatedBill1}); - if(PickTickets.size()>0){ - pt=PickTickets.get(0); - }else{ - pt=EntityFactory.getEntity(PickTicket.class); - pt.setCode(this.bussinessCodeManager.getCodeForYm("CP",5)); - pt.setRelatedBill1(relatedBill1); - pt.setIntendShipDate(new Date()); - pt.setWarehouse(WarehouseHolder.getWarehouse()); - pt.setStatus(PickTicketStatus.OPEN); - pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); - pt.setCompany(this.load(Structure.class, 13L)); - pt.setBillType(billType);//出库单 - pt.setOrderDate(new Date()); - if(type.equals("1")){ - pt.setBeLine(true);//线上 - }else{ - pt.setBeLine(false);//线下 - } - commonDao.store(pt); - } - - if(mddz!=null&&mddz.length()>0){ - if(pt.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {mddz}); - if(Stores.size()>0){ - store=Stores.get(0); - pt.setStore(store); - pt.setShipToName(store.getName()); - Contact shipToContact=new Contact(); - shipToContact.setPerson(store.getContact().getPerson()); - shipToContact.setTelephone(store.getContact().getTelephone()); - pt.setShipToContact(shipToContact); - Address shipToAddress = new Address(); - shipToAddress.setAddress(store.getAddress().getAddress()); - pt.setShipToAddress(shipToAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex = ";|；"; - String[] des = khdz.split(regex); - pt.setShipToName(des[0]); - Contact shipToContact=new Contact(); - shipToContact.setPerson(des[0]); - shipToContact.setTelephone(des[1]); - pt.setShipToContact(shipToContact); - Address shipToAddress = new Address(); - shipToAddress.setAddress(des[2]); - pt.setShipToAddress(shipToAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=13 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - oldCode=relatedBill1; - PickTicketDetail ptd=EntityFactory.getEntity(PickTicketDetail.class); - ptd.setPickTicket(pt); - ptd.setItem(item); - ptd.setOrderQuantity(convertDouble(quantity)); - ptd.setOrderQtyOfMasterUnit(convertDouble(quantity)); - ptd.setPackageUnit(pu); - Integer lineNo=getlineNo(pt); - if(lineNo==0){ - ptd.setLineNo(1); - }else{ - ptd.setLineNo(lineNo+1); - } - ptd.setQualityStatus(zldj);// - NewLotInfo newLotInfo =new NewLotInfo(); - if(tsbz!=null&&tsbz.length()>0){ - newLotInfo.setPropL1(tsbz); - }else{ - newLotInfo.setPropL1(null); - } - ptd.setNewLotInfo(newLotInfo); - commonDao.store(ptd); - System.out.println(i); - Refresh(pt.getId()); - } - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void zhiZhuPtImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - HashMap code_map=new HashMap(); - HashMap code_map_old=new HashMap(); - for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()<=0){ - throw new BusinessException(billtype+"单据类型不存在!"); - } - String store=sheet.getCell(7,i).getContents().trim();//门店 - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=5 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb2.append((i+1)+"行"+store+";"); - } - } - - List CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - if(!code_map_old.containsKey(relatedBill1)){ - List PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(PickTickets.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - //sb.append("第"+(i+1)+"订单号"+relatedBill1+"订单号已导入"); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"门店不存在!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - PickTicket pt =null; - for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()>0){ - billType=BillTypes.get(0); - } - - List PickTickets = commonDao.findByQuery(" from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[] { "relatedBill1"},new Object[] {relatedBill1}); - if(PickTickets.size()>0){ - pt=PickTickets.get(0); - }else{ - pt=EntityFactory.getEntity(PickTicket.class); - pt.setCode(this.bussinessCodeManager.getCodeForYm("CP",5)); - pt.setRelatedBill1(relatedBill1); - pt.setIntendShipDate(new Date()); - pt.setWarehouse(WarehouseHolder.getWarehouse()); - pt.setStatus(PickTicketStatus.OPEN); - pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); - pt.setCompany(this.load(Structure.class, 5L)); - pt.setBillType(billType);//出库单 - pt.setOrderDate(new Date()); - if(type.equals("1")){ - pt.setBeLine(true);//线上 - }else{ - pt.setBeLine(false);//线下 - } - commonDao.store(pt); - } - - if(mddz!=null&&mddz.length()>0){ - if(pt.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {mddz}); - if(Stores.size()>0){ - store=Stores.get(0); - pt.setStore(store); - pt.setShipToName(store.getName()); - Contact shipToContact=new Contact(); - shipToContact.setPerson(store.getContact().getPerson()); - shipToContact.setTelephone(store.getContact().getTelephone()); - pt.setShipToContact(shipToContact); - Address shipToAddress = new Address(); - shipToAddress.setAddress(store.getAddress().getAddress()); - pt.setShipToAddress(shipToAddress); - } - } - - } - - if(khdz!=null&&khdz.length()>0){ - //名称；电话；店址 - String regex = ";|；"; - String[] des = khdz.split(regex); - pt.setShipToName(des[0]); - Contact shipToContact=new Contact(); - shipToContact.setPerson(des[0]); - shipToContact.setTelephone(des[1]); - pt.setShipToContact(shipToContact); - Address shipToAddress = new Address(); - shipToAddress.setAddress(des[2]); - pt.setShipToAddress(shipToAddress); - } - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id=5 ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - oldCode=relatedBill1; - PickTicketDetail ptd=EntityFactory.getEntity(PickTicketDetail.class); - ptd.setPickTicket(pt); - ptd.setItem(item); - ptd.setOrderQuantity(convertDouble(quantity)); - ptd.setOrderQtyOfMasterUnit(convertDouble(quantity)); - ptd.setPackageUnit(pu); - Integer lineNo=getlineNo(pt); - if(lineNo==0){ - ptd.setLineNo(1); - }else{ - ptd.setLineNo(lineNo+1); - } - ptd.setQualityStatus(zldj);// - NewLotInfo newLotInfo =new NewLotInfo(); - if(tsbz!=null&&tsbz.length()>0){ - newLotInfo.setPropL1(tsbz); - }else{ - newLotInfo.setPropL1(null); - } - ptd.setNewLotInfo(newLotInfo); - commonDao.store(ptd); - System.out.println(i); - Refresh(pt.getId()); - } - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Override - public void emmaPtImport(File file,String type) { - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - StringBuffer sb2=new StringBuffer(); - HashMap code_map=new HashMap(); - HashMap code_map_old=new HashMap(); - for (int i = 1; i Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); - if(Structures.size()<=0){ - throw new BusinessException(kh+"客户不存在!"); - } - - //单据类型 - BillType billType=null; - List BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()<=0){ - throw new BusinessException(billtype+"单据类型不存在!"); - } - - List CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - String store=sheet.getCell(8,i).getContents().trim();//门店 - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id="+Structures.get(0).getId()+" ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - - if(store!=null && store.length()>0){ - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {store}); - if(Stores.size()<=0){ - sb2.append((i+1)+"行"+store+";"); - } - } - - if(!code_map_old.containsKey(relatedBill1)){ - List PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(PickTickets.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - //sb.append("第"+(i+1)+"订单号"+relatedBill1+"订单号已导入"); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - if(sb2!=null&&!sb2.toString().equals("")){ - throw new BusinessException(sb2.toString()+"门店不存在!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - PickTicket pt =null; - for (int i = 1; i CommonCodes=commonDao.findByQuery(" from CommonCode c where c.name=:name and c.codeType='质量状态' ", - new String[] { "name"},new Object[] {zldj}); - if(CommonCodes.isEmpty()){ - throw new BusinessException("第"+(i+1)+"行，请检查模板中质量状态列!"); - } - - //单据类型 - BillType billType=null; - List BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()>0){ - billType=BillTypes.get(0); - } - - //客户 - Structure structure=null; - List Structures = commonDao.findByQuery(" from Structure s where s.code='"+kh+"' "); - if(Structures.size()>0){ - structure=Structures.get(0); - } - - List PickTickets = commonDao.findByQuery(" from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[] { "relatedBill1"},new Object[] {relatedBill1}); - if(PickTickets.size()>0){ - pt=PickTickets.get(0); - }else{ - pt=EntityFactory.getEntity(PickTicket.class); - pt.setCode(this.bussinessCodeManager.getCodeForYm("CP",5)); - pt.setRelatedBill1(relatedBill1); - pt.setIntendShipDate(new Date()); - pt.setWarehouse(WarehouseHolder.getWarehouse()); - pt.setStatus(PickTicketStatus.OPEN); - pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); + pt.setDock(dock); pt.setCompany(structure); pt.setBillType(billType);//出库单 pt.setOrderDate(new Date()); @@ -4251,11 +3680,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements if(mddz!=null&&mddz.length()>0){ if(pt.getStore()==null){ - Store store =null; - List Stores = commonDao.findByQuery(" from Store s where upper(s.name)=upper(:name) ", - new String[] { "name"},new Object[] {mddz}); - if(Stores.size()>0){ - store=Stores.get(0); + Store store =storeMap.get(mddz); pt.setStore(store); pt.setShipToName(store.getName()); Contact shipToContact=new Contact(); @@ -4265,7 +3690,6 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Address shipToAddress = new Address(); shipToAddress.setAddress(store.getAddress().getAddress()); pt.setShipToAddress(shipToAddress); - } } } @@ -4284,12 +3708,8 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements pt.setShipToAddress(shipToAddress); } - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id="+structure.getId()+" ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } + Item item =itemMap.get(itemCode); + PackageUnit pu =null; List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", @@ -4331,7 +3751,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements e.printStackTrace(); } } - + @Override public void manualAllocate(Map params, List id) { PickTicketDetail pickTicketDetail = commonDao.load(PickTicketDetail.class, id.get(0)); @@ -4401,152 +3821,6 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements return count; } - @Override - public void sertaImport(File file) { - - Workbook workbook; - try { - workbook = Workbook.getWorkbook(file); - Sheet sheet = workbook.getSheet(0);// 得到excel第一页的内容 - StringBuffer sb1=new StringBuffer(); - HashMap code_map=new HashMap(); - HashMap code_map_old=new HashMap(); - for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()<=0){ - throw new BusinessException(billtype+"单据类型不存在!"); - } - List Items = commonDao.findByQuery(" from Item l where (l.code=:code or l.largeClass=:code or l.centerClass=:code or l.smallClass=:code ) and l.disabled=0 and l.company.id=2 ", - new String[] { "code"},new Object[] {code}); - if(Items.size()<=0){ - sb1.append((i+1)+"行"+code+";"); - } - - - if(!code_map_old.containsKey(relatedBill1)){ - List PickTickets=this.commonDao.findByQuery("from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[]{"relatedBill1"},new Object[]{relatedBill1}); - if(PickTickets.size()>0){ - code_map_old.put(relatedBill1, relatedBill1); - throw new BusinessException("订单号"+relatedBill1+"订单号已导入"); - }else{ - code_map.put(relatedBill1, relatedBill1); - } - } - - - } - - if(sb1!=null&&!sb1.toString().equals("")){ - throw new BusinessException(sb1.toString()+"货品不存在!"); - } - - if(code_map.size()<=0){ - return; - } - String oldCode=""; - PickTicket pt =null; - for (int i = 1; i BillTypes = commonDao.findByQuery(" from BillType bt where bt.name like '%"+billtype+"%' "); - if(BillTypes.size()>0){ - billType=BillTypes.get(0); - } - - List PickTickets = commonDao.findByQuery(" from PickTicket pt where pt.relatedBill1=:relatedBill1 ", - new String[] { "relatedBill1"},new Object[] {relatedBill1}); - if(PickTickets.size()>0){ - pt=PickTickets.get(0); - }else{ - pt=EntityFactory.getEntity(PickTicket.class); - pt.setCode(this.bussinessCodeManager.getCodeForYm("CP",5)); - pt.setRelatedBill1(relatedBill1); - pt.setIntendShipDate(new Date()); - pt.setWarehouse(WarehouseHolder.getWarehouse()); - pt.setStatus(PickTicketStatus.OPEN); - pt.setUserTracking(); - pt.setDock(this.load(Location.class, 79602L)); - pt.setCompany(this.load(Structure.class, 2L)); - pt.setBillType(billType);//出库单 - pt.setOrderDate(new Date()); - pt.setBeLine(false); - commonDao.store(pt); - } - - - Item item =null; - List Items = commonDao.findByQuery(" from Item item where (item.code=:code or item.largeClass=:code or item.centerClass=:code or item.smallClass=:code ) and item.disabled=0 and item.company.id="+2+" ", - new String[] { "code"},new Object[] {itemCode}); - if(Items.size()>0){ - item=Items.get(0); - } - - PackageUnit pu =null; - List PackageUnits = commonDao.findByQuery(" from PackageUnit pu where pu.item.id=:id ", - new String[] { "id"},new Object[] {item.getId()}); - if(PackageUnits.size()>0){ - pu=PackageUnits.get(0); - } - - oldCode=relatedBill1; - PickTicketDetail ptd=EntityFactory.getEntity(PickTicketDetail.class); - ptd.setPickTicket(pt); - ptd.setItem(item); - ptd.setOrderQuantity(convertDouble(quantity)); - ptd.setOrderQtyOfMasterUnit(convertDouble(quantity)); - ptd.setPackageUnit(pu); - Integer lineNo=getlineNo(pt); - if(lineNo==0){ - ptd.setLineNo(1); - }else{ - ptd.setLineNo(lineNo+1); - } - ptd.setQualityStatus(zldj);// - NewLotInfo newLotInfo =new NewLotInfo(); - if(tsbz!=null&&tsbz.length()>0){ - newLotInfo.setPropL1(tsbz); - }else{ - newLotInfo.setPropL1(null); - } - ptd.setNewLotInfo(newLotInfo); - commonDao.store(ptd); - System.out.println(i); - Refresh(pt.getId()); - } - } catch (BiffException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } @Override public void xinKanImport(File file) { diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportPage.xml index 5ab816e..d5f6a47 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportPage.xml @@ -14,7 +14,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml index b9186d0..8af96df 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml @@ -15,7 +15,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml index 6f0f084..7cec126 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml @@ -14,7 +14,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editSealyImport.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editSealyImport.xml index 87aa179..b6aebd8 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/editSealyImport.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editSealyImport.xml @@ -14,7 +14,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml index 5b3d8ee..ad575ed 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml @@ -1,18 +1,20 @@ - + + + - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml index 3d47f40..467bedb 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml @@ -14,7 +14,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml index e94376a..1e206d0 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml @@ -48,7 +48,6 @@ WHERE 1=1 and asn.beLine=1 and asn.billType.name!='退货入库单' - and company.id=1 and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml index f4594c9..2f632ce 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml @@ -48,7 +48,6 @@ WHERE 1=1 and asn.beLine=0 and asn.billType.name!='退货入库单' - and company.id=1 and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) ) diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml index c4957f5..833f4d6 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml @@ -5,14 +5,16 @@ + + - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml index 8291754..9a942da 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml index 7e64747..0599d13 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml index ed818b6..b0f840d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml @@ -10,7 +10,6 @@ - diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml index 2640406..6c9a4da 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml @@ -10,7 +10,6 @@ - diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml index 9002f83..9fc38f7 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml @@ -15,7 +15,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml index 7322153..962532e 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml @@ -15,7 +15,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml index d25a3a9..18a9128 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml @@ -67,8 +67,6 @@ left join pickTicket.dock dock where 1=1 and pickTicket.beLine=1 - and company.beCompany=true - and company.id=1 and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ )) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml index bc047dc..7ad56b9 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml @@ -68,8 +68,6 @@ left join pickTicket.dock dock where 1=1 and pickTicket.beLine=0 - and company.beCompany=true - and company.id=1 and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ )) and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS}) or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS}) diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml index 9f1cfdf..f8f2e84 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml @@ -1,18 +1,21 @@ - + + + + - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml index 3232c1f..71a7925 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml @@ -1,21 +1,21 @@ - + - + - + - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml index a35368b..359e748 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/crkImportPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/crkImportPage.xml deleted file mode 100644 index 5ab816e..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/crkImportPage.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml deleted file mode 100644 index b9186d0..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/crkImportXSPage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml deleted file mode 100644 index 6f0f084..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editEmmaImport.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editSealyImport.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/editSealyImport.xml deleted file mode 100644 index 87aa179..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editSealyImport.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml deleted file mode 100644 index 5b3d8ee..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editXingkanImportImportASNPage.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml deleted file mode 100644 index 3d47f40..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/editZhizhuImport.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml deleted file mode 100644 index e94376a..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainTempurASN2Page.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - = {order.beginDate} ~/ - /~order.endDate: AND asn.orderDate <= {order.endDate} ~/ - /~receive.beginDate: AND asn.receivedDate >= {receive.beginDate} ~/ - /~receive.endDate: AND asn.receivedDate <= {receive.endDate} ~/ - /~asn.userName: AND asn.userName LIKE {asn.userName} ~/ - order by asn.orderDate desc ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml deleted file mode 100644 index f4594c9..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/maintainTempurASNPage.xml +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - = {order.beginDate} ~/ - /~order.endDate: AND asn.orderDate <= {order.endDate} ~/ - /~receive.beginDate: AND asn.receivedDate >= {receive.beginDate} ~/ - /~receive.endDate: AND asn.receivedDate <= {receive.endDate} ~/ - /~asn.userName: AND asn.userName LIKE {asn.userName} ~/ - order by asn.orderDate desc ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml deleted file mode 100644 index c4957f5..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/receiving/sertaImportASNPage.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml deleted file mode 100644 index 8291754..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/editSealyPtImport.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml deleted file mode 100644 index 7e64747..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/emmaPtImportPage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml deleted file mode 100644 index ed818b6..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/importPickTicketTPCusPage.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml deleted file mode 100644 index 2640406..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/importPickTicketTPPage.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml deleted file mode 100644 index 9002f83..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/issuereceiptImport2Page.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml deleted file mode 100644 index 7322153..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/issuereceiptImportPage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml deleted file mode 100644 index d25a3a9..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketTP2Page.xml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = {pickTicket.orderDate.begin} ~/ - /~pickTicket.orderDate.end: AND pickTicket.orderDate <= {pickTicket.orderDate.end} ~/ - /~pickTicket.shipDate.begin: AND pickTicket.shipDate >= {pickTicket.shipDate.begin} ~/ - /~pickTicket.shipDate.end: AND pickTicket.shipDate <= {pickTicket.shipDate.end} ~/ - /~userName: AND pickTicket.userName LIKE {userName} ~/ - /~pickTicket.waveCode: and pickTicket.waveCode like {pickTicket.waveCode} ~/ - /~pickTicket.carrier.id: AND carrier.id = {pickTicket.carrier.id} ~/ - /~pickTicket.dock.id: AND dock.id = {pickTicket.dock.id} ~/ - order by pickTicket.id desc]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0) ]]> - - - 0) ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml deleted file mode 100644 index bc047dc..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainPickTicketTPPage.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = {pickTicket.orderDate.begin} ~/ - /~pickTicket.orderDate.end: AND pickTicket.orderDate <= {pickTicket.orderDate.end} ~/ - /~pickTicket.shipDate.begin: AND pickTicket.shipDate >= {pickTicket.shipDate.begin} ~/ - /~pickTicket.shipDate.end: AND pickTicket.shipDate <= {pickTicket.shipDate.end} ~/ - /~userName: AND pickTicket.userName LIKE {userName} ~/ - /~pickTicket.waveCode: and pickTicket.waveCode like {pickTicket.waveCode} ~/ - /~pickTicket.carrier.id: AND carrier.id = {pickTicket.carrier.id} ~/ - /~pickTicket.dock.id: AND dock.id = {pickTicket.dock.id} ~/ - order by pickTicket.id desc]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0) ]]> - - - 0) ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml deleted file mode 100644 index 9f1cfdf..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/sertaImportPage.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml deleted file mode 100644 index 3232c1f..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/xinKanImportPage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/hrbwms/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml b/target/hrbwms/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml deleted file mode 100644 index a35368b..0000000 --- a/target/hrbwms/WEB-INF/classes/config/origen/shipping/zhiZhuptImportPage.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - -