diff --git a/src/main/java/com/dev/swms/server/model/base/Item.java b/src/main/java/com/dev/swms/server/model/base/Item.java index 54ae8f9..419b22c 100644 --- a/src/main/java/com/dev/swms/server/model/base/Item.java +++ b/src/main/java/com/dev/swms/server/model/base/Item.java @@ -108,7 +108,7 @@ public class Item extends Entity { private Double multipleOrder;//倍数订购 - private int codePat ;//码拍标准 + private int codePat ;//备案分类 /** */ private String sourceId; /** */ diff --git a/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java b/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java index 9e38678..1be6ac3 100644 --- a/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java +++ b/src/main/java/com/dev/swms/server/model/customs/CustomsRecord.java @@ -29,14 +29,14 @@ public class CustomsRecord extends Entity{ private Warehouse warehouse;//所属仓库 - private boolean neworold = false;//是否新旧;0旧备案;1:新备案 + private Integer neworold;//备案分类;77;127;140 - - public boolean isNeworold() { + + public Integer getNeworold() { return neworold; } - public void setNeworold(boolean neworold) { + public void setNeworold(Integer neworold) { this.neworold = neworold; } diff --git a/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml b/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml index f6ad2c8..7f918d4 100644 --- a/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml +++ b/src/main/java/com/dev/swms/server/model/customs/customsRecord.hbm.xml @@ -18,7 +18,7 @@ - + diff --git a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java index 7cbacb6..634e620 100644 --- a/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java +++ b/src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java @@ -1160,8 +1160,9 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo throw new BusinessException("该模版列数不正确,不能小于8"); } for (int i = 1; i ss=this.commonDao.findByQuery("from CustomsRecord s where (s.itemNumber=:itemNumber )", - new String[]{"itemNumber"},new Object[]{Integer.parseInt(xh)}); - if(ss.size()<=0){ - throw new BusinessException(i+1+"行项号"+xh+"不存在!"); - } CustomsRecord fb=null; if(fbxh!=null&&!fbxh.equals("")){ - List fs=this.commonDao.findByQuery("from CustomsRecord s where (s.itemNumber=:itemNumber )", - new String[]{"itemNumber"},new Object[]{Integer.parseInt(fbxh)}); - if(ss.size()<=0){ + List fs=this.commonDao.findByQuery("from CustomsRecord s where s.itemNumber=:itemNumber and s.noninsuranceTpey='非保' ", + new String[]{"itemNumber"},new Object[]{Integer.parseInt(xh)}); + if(fs.size()<=0){ throw new BusinessException(i+1+"行非保项号"+fbxh+"不存在!"); } fb=fs.get(0); } + List ss=this.commonDao.findByQuery("from CustomsRecord s where s.itemNumber=:itemNumber and s.neworold=:neworold and s.noninsuranceTpey='保税' ", + new String[]{"itemNumber","neworold"},new Object[]{Integer.parseInt(xh),Integer.parseInt(neworold)}); + if(ss.size()<=0){ + throw new BusinessException(i+1+"行项号"+xh+"不存在!"); + } + List items=commonDao.findByQuery("from Item t where t.code=:code ", new String[]{"code"},new Object[]{jjCode}); @@ -1218,7 +1219,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo item=items.get(0); }else{ item=EntityFactory.getEntity(Item.class); - + } item.setCode(jjCode); item.setBgxx(ss.get(0)); item.setItemCode(cusCode); @@ -1229,8 +1230,9 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo item.setCustomsRecord(fb); item.setLargeClass("恒温食品原料"); item.setWarehouse(WarehouseHolder.getWarehouse()); + item.setCodePat(Integer.parseInt(neworold));//备案分类 commonDao.store(item); - } + } } catch (BiffException e) { // TODO Auto-generated catch block diff --git a/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java b/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java index c7a6543..915979d 100644 --- a/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java +++ b/src/main/java/com/dev/swms/server/service/customs/CustomsRecordManager.java @@ -33,7 +33,7 @@ public interface CustomsRecordManager extends BaseManager{ //海关备案导入 @Transactional - public void customsRecordImport(File file,boolean neworold); + public void customsRecordImport(File file,int neworold); //非保项号导入 @Transactional public void customsNoninsurance(File file); diff --git a/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java b/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java index 2397b9c..64a4b8c 100644 --- a/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java +++ b/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java @@ -118,7 +118,7 @@ public class DefaultCustomsRecordManager extends DefaultBaseManager implements C } @Override - public void customsRecordImport(File file,boolean neworold) { + public void customsRecordImport(File file,int neworold) { try { //项号 商品编码,HSCODE 商品品名 申报单位 法定第一计量单位 法定第二计量单位 规格型号 作废 原产国 Workbook workbook = Workbook.getWorkbook(file); diff --git a/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml index 32dca3b..ef37866 100644 --- a/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/base/editItemDetailPage.xml @@ -3,7 +3,15 @@ - + + + + diff --git a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/edit140CustomsRecordImportPage.xml similarity index 74% rename from target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml rename to src/webapp/WEB-INF/classes/config/origen/customs/edit140CustomsRecordImportPage.xml index cf11188..572d0b0 100644 --- a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordImportPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/customs/edit140CustomsRecordImportPage.xml @@ -1,16 +1,16 @@ - + - + - + diff --git a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/edit140CustomsRecordPage.xml similarity index 90% rename from target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml rename to src/webapp/WEB-INF/classes/config/origen/customs/edit140CustomsRecordPage.xml index da4e410..75523eb 100644 --- a/target/jjwms/WEB-INF/classes/config/origen/customs/editCustomsRecordPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/customs/edit140CustomsRecordPage.xml @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@