提交代码

@@ -64,7 +64,7 @@ public class Constant {
 
     public static String NATURE_EXEMPTION ="natureExemption_";
 
-
+    public static String DECLARED_DOC_TYPE="declaredDocType_";
 
 
 

@@ -86,6 +86,20 @@ public class ChmConsignment implements Serializable {
     @Column(name = "THROUGH_STOP_PORT")
     private String throughStopPort;
 
+
+    /**
+     * 报关单类型ID
+     */
+    @ManyToOne(targetEntity = DictionaryEntries.class)
+    @JoinColumn(name = "DECLARED_DOC_TYPE_ID")
+    private DictionaryEntries declaredDocTypeDic;
+
+    /**
+     * 报关单类型
+     */
+    @Column(name = "DECLARED_DOC_TYPE")
+    private String declaredDocType;
+
     /**
      * 运费(币制)ID
      */
@@ -334,6 +348,26 @@ public class ChmConsignment implements Serializable {
     private String consStatus;
 
 
+    /**
+     * 生产核销位海关编码
+     */
+    @Column(name = "OWNER_CODE")
+    private String ownerCode;
+
+    /**
+     * 生产核销单位
+     */
+    @Column(name = "OWNER_NAME")
+    private String ownerName;
+
+
+    /**
+     * 生产核销单位编码
+     */
+    @Column(name = "OWNER_CODE_SCC")
+    private String ownerCodeScc;
+
+
     @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL)
     private List<ChmConsignmentDetail> chmConsignmentDetailList;
 

@@ -44,7 +44,7 @@ public class ChmConsignmentService {
         ChmConsignment result = new ChmConsignment();
         try{
             //进出口标志:固定值	E
-            //报关类型:填写固定值EX，但字典表里没有这个值
+            //TODO 报关类型:填写固定值EX，但字典表里没有这个值
 //            result.setDeclaredDocTypeDic();
 //            result.setDeclaredCode();
             //申报单位代码:固定值	1111980005
@@ -70,12 +70,16 @@ public class ChmConsignmentService {
             result.setTaxNature(levyTypeDictionaryEntries.getChineseName());
             //报关/转关关系标志:固定值0  ，但数据字典里没有0
 
+
             //经停港/指运港
             ChmCarryPort chmCarryPort =Constant.chmCarryPortCache.get(mawb.getDistinatePort());
             result.setThroughStopPortDic(chmCarryPort);
             result.setThroughStopPort(chmCarryPort.getPortNo());
 
-            //报关标志
+            //TODO 报关标志【待确认】
+            DictionaryEntries declaredDocTypeDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.DECLARED_DOC_TYPE + mawb.getEdiId());
+            result.setDeclaredDocTypeDic(declaredDocTypeDictionaryEntries);
+            result.setDeclaredDocType(declaredDocTypeDictionaryEntries.getChineseName());
 
             //海关编号
             result.setCustomsNo(mawb.getEntryId());
@@ -84,18 +88,23 @@ public class ChmConsignmentService {
             result.setTransCurrencyDic(currencyDictionaryEntries);
             result.setTransCurrency(currencyDictionaryEntries.getChineseName());
 
-            //运费标记:固定值	3
+            //TODO 运费标记:固定值	3 【iclear中， 和成交方式相关，只有成交方式 1、2 时，才能传 3 】
+
+
             //运费总价
             result.setTransCost(mawb.getFeeRate());
             //毛重
             result.setGrossWeight(BigDecimal.valueOf(mawb.getGrossWet()));
             //出入境关闭:固定值	0101
             //录入人名称:固定值	必填项，但填的值是空值
+
             //保险费币制
             DictionaryEntries insuranceDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.CURRENCY_SYSTEM+mawb.getInsurCurr());
             result.setInsuranceCostCurrencyDic(insuranceDictionaryEntries);
             result.setInsuranceCostCurrency(insuranceDictionaryEntries.getChineseName());
-            //保险费标记
+
+            //保险费标记 ,根据transMode决定
+
             //保险费／率
             result.setInsuranceCost(mawb.getInsurRate());
             //备案号
@@ -109,9 +118,12 @@ public class ChmConsignmentService {
             //杂费／率
             result.setOtherCost(mawb.getOtherRate());
             //杂费标志
-            //消费使用/生产销售单位代码
+            //TODO 消费使用/生产销售单位代码
+            result.setOwnerCode(mawb.getOwnerCode());
+            //TODO 消费使用/生产销售单位名称
+            result.setOwnerName(mawb.getOwnerName());
+
 
-            //消费使用/生产销售单位名称
             //件数
             result.setCounts(mawb.getPackNo().longValue());
             //预录入编号
@@ -148,19 +160,26 @@ public class ChmConsignmentService {
             result.setPackageType(packageTypeDictionaryEntries.getChineseName());
 
 
-            //生产核销单位统一信用代码---报关形式类型
-            //消费使用/生产销售单位单位统一编码
+            //TODO 生产核销单位统一信用代码---报关形式类型
+            result.setTradeCoSCC(mawb.getTradeCodeScc());
+
+
+            //TODO 消费使用/生产销售单位单位统一编码
+            result.setOwnerCodeScc(mawb.getOwnerCodeScc());
+
+
             //贸易国别
             DictionaryEntries tradeAreaCodeDictionaryEntries=Constant.dictionaryEntriesCache.get(Constant.COUNTRY+mawb.getTradeAreaCode());
             result.setTradeAreaCodeDic(tradeAreaCodeDictionaryEntries);
             result.setTradeAreaCode(tradeAreaCodeDictionaryEntries.getChineseName());
 
-
-
             //标记及号码
             result.setDeclaredRemark(mawb.getMarkNo());
+
             //入境口岸代码：固定值	310302
+
             //存放地点：固定值	空值
+
             //申报人员姓名---报关员证号
             result.setDeclaredUnitName(mawb.getDeclareName());
             //境外发货人代码