Merge remote-tracking branch 'iClear-api/master'

wei.zhou
Commit c602e194c7c4a5e3387927cfd8faa4bd1807c385 c602e194 2 parents 654f2833 c1bd1336
Showing 6 changed files with 68 additions and 28 deletions
doc/建表语句.sql
src/main/java/com/erry/iclear/dateInterface/api/request/Mawb.java
src/main/java/com/erry/iclear/dateInterface/common/Constant.java
src/main/java/com/erry/iclear/dateInterface/entity/ChmConsignment.java
src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentDetailService.java
src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentService.java
--- a/doc/建表语句.sql
View file @c602e19
+++ b/doc/建表语句.sql
View file @c602e19
@@ -139,6 +139,22 @@ CREATE TABLE T_ICLEAR_API_MAWBDETAIL(
 ---ALTER TABLE T_ICLEAR_API_MAWB ADD SOURCE_TYPE VARCHAR(10);
 ALTER TABLE T_CHM_CONSIGNMENT_DETAIL ADD DETAILID VARCHAR(50);
+--添加tsn口岸
+INSERT into T_AU_ORGANIZATION(CODE,NAME,TYPE_ID,PARENT_ID,[LEVEL],CREATE_USER_ID,CREATE_TIME)VALUES('tsn','tsn口岸',84534,1,6,5503,GETDATE())
+
+--添加tsn口岸操作员01
+insert into T_AU_USER (LOGIN_NAME,USERNAME,PASSWORD,IS_VALID,VISIBLE,CREATE_TIME,VERSION,CHANGE_PASSWORD,ORG_ID,ORG_NAME,INIT_OWNER_NAME,TYPE_ID,TYPE_NAME)VALUES('tsnczy1','TSN操作员01','985111aed0bc0920dce9b362de2b1fa122a5ccdd6ac2a8e9b3ae5cfa58169f7725830de4566b7c43',1,1,GETDATE(),0,1,(select ID from T_AU_ORGANIZATION where code = 'tsn'),(select NAME from T_AU_ORGANIZATION where code = 'tsn'),1,(select ID from T_BI_DICTIONARY_ENTRIES where ID = 84534),(select CHINESE_NAME from T_BI_DICTIONARY_ENTRIES where ID = 84534))
+
+--添加tsn口岸操作员02
+insert into T_AU_USER (LOGIN_NAME,USERNAME,PASSWORD,IS_VALID,VISIBLE,CREATE_TIME,VERSION,CHANGE_PASSWORD,ORG_ID,ORG_NAME,INIT_OWNER_NAME,TYPE_ID,TYPE_NAME)VALUES('tsnczy2','TSN操作员02','985111aed0bc0920dce9b362de2b1fa122a5ccdd6ac2a8e9b3ae5cfa58169f7725830de4566b7c43',1,1,GETDATE(),0,1,(select ID from T_AU_ORGANIZATION where code = 'tsn'),(select NAME from T_AU_ORGANIZATION where code = 'tsn'),1,(select ID from T_BI_DICTIONARY_ENTRIES where ID = 84534),(select CHINESE_NAME from T_BI_DICTIONARY_ENTRIES where ID = 84534))
+
+--添加权限
+insert into T_AU_USER_ROLES (USER_ID,ROLE_ID,VERSION)VALUES(53573,3910,0);
+insert into T_AU_USER_ROLES (USER_ID,ROLE_ID,VERSION)VALUES(53574,3910,0);
+
+--数据字段中添加天津口岸
+insert INTO T_BI_DICTIONARY_ENTRIES(CODE,CHINESE_NAME,ENGLISH_NAME,DESCRIPTION,STATUS,DICT_ID,DICT_CODE,ORDINAL)VALUES('port_tsn','TSN','TSN','TSN',1,'50161','port',50)
+
--- a/src/main/java/com/erry/iclear/dateInterface/api/request/Mawb.java
View file @c602e19
+++ b/src/main/java/com/erry/iclear/dateInterface/api/request/Mawb.java
View file @c602e19
@@ -96,7 +96,6 @@ public class Mawb implements Serializable {
     private String ediId;
     @ApiModelProperty(value = "海关编号", name = "EntryId", example = "001")
-    @NotBlank(message="参数entryId不能为空")
     @Column(name = "ENTRYID")
     private String entryId;
--- a/src/main/java/com/erry/iclear/dateInterface/common/Constant.java
View file @c602e19
+++ b/src/main/java/com/erry/iclear/dateInterface/common/Constant.java
View file @c602e19
@@ -25,6 +25,28 @@ public class Constant {
      */
     public static Map<String , DictionaryEntries> dictionaryEntriesCache = new HashMap<>();
+    //运单类型
+    public static final String  CONS_TYPE = "consType";
+    /**
+     * A类型
+     */
+    public static final String  consType_A = "consType_A";
+    /**
+     * B类型
+     */
+    public static final String  consType_B = "consType_B";
+    /**
+     * C类型
+     */
+    public static final String  consType_C = "consType_C";
+    /**
+     * D类型
+     */
+    public static final String  consType_D = "consType_D";
+    /**
+     * tsn口岸
+     */
+    public static final String PORT_TSN = "port_tsn";
     /**
      * 货源地
      */
--- a/src/main/java/com/erry/iclear/dateInterface/entity/ChmConsignment.java
View file @c602e19
+++ b/src/main/java/com/erry/iclear/dateInterface/entity/ChmConsignment.java
View file @c602e19
@@ -376,8 +376,10 @@ public class ChmConsignment implements Serializable {
     /**
      * 运单类型ID
      */
-    @Column(name = "CONS_TYPE_ID")
+    @JsonIgnore
-    private String consTypeId;
+    @ManyToOne(targetEntity = DictionaryEntries.class)
+    @JoinColumn(name = "CONS_TYPE_ID")
+    private DictionaryEntries consTypeId;
     /**
      * 运单类型
@@ -385,6 +387,13 @@ public class ChmConsignment implements Serializable {
     @Column(name = "CONS_TYPE")
     private String consType;
+    @JsonIgnore
+    @ManyToOne(targetEntity = DictionaryEntries.class)
+    @JoinColumn(name = "PORT_ID")
+    private DictionaryEntries portId;
+
+    @Column(name = "PORT_NAME")
+    private String portName;
     @OneToMany(mappedBy = "chmConsignment", cascade = CascadeType.ALL)
     private List<ChmConsignmentDetail> chmConsignmentDetailList;
--- a/src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentDetailService.java
View file @c602e19
+++ b/src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentDetailService.java
View file @c602e19
@@ -54,12 +54,13 @@ public class ChmConsignmentDetailService {
             //第一计量单位（法定单位）
             DictionaryEntries firstUnitDictionaryEntries = Constant.dictionaryEntriesCache.get(Constant.TRANSACTION_UNIT+ mawbDetail.getFirstUnit());
             result.setUnitLegalFirstId(firstUnitDictionaryEntries);
-            result.setKnockdownUnit(firstUnitDictionaryEntries.getChineseName());
+            result.setUnitLegalFirst(firstUnitDictionaryEntries.getChineseName());
             //第一法定数量
             result.setQtyLegalFirst(BigDecimal.valueOf(mawbDetail.getFirstQty().doubleValue()));
             //成交计量单位
-            DictionaryEntries knockdownUnitEntries = Constant.dictionaryEntriesCache.get(Constant.TRANSACTION_UNIT+ mawbDetail.getFirstUnit());
+            //2021年7月8日 成交单位有修改，原取值第一法定计量单位，先取值成交单位。xjq
+            DictionaryEntries knockdownUnitEntries = Constant.dictionaryEntriesCache.get(Constant.TRANSACTION_UNIT+ mawbDetail.getGunit());
             result.setKnockdownUnitDic(knockdownUnitEntries);
             result.setKnockdownUnit(knockdownUnitEntries.getChineseName());
             //商品规格、型号
--- a/src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentService.java
View file @c602e19
+++ b/src/main/java/com/erry/iclear/dateInterface/service/ChmConsignmentService.java
View file @c602e19
@@ -154,9 +154,9 @@ public class ChmConsignmentService {
             }
             //运单类型
-            DictionaryEntries consType = Constant.dictionaryEntriesCache.get(Constant.MSG_TYPE_D);
+            DictionaryEntries consType = Constant.dictionaryEntriesCache.get(Constant.consType_D);
             if(consType != null){
-                result.setConsTypeId(String.valueOf(consType.getId()));
+                result.setConsTypeId(consType);
                 result.setConsType(consType.getChineseName());
             }
@@ -238,6 +238,13 @@ public class ChmConsignmentService {
                 result.setConsStatus(transferWaybillStatusDictionaryEntries.getChineseName());
             }
+            //添加TSN口岸
+            DictionaryEntries portTSN = Constant.dictionaryEntriesCache.get(Constant.PORT_TSN);
+            if (!Objects.equals(portTSN,null)){
+                result.setPortId(portTSN);
+                result.setPortName(portTSN.getChineseName());
+            }
+
             //西门子数据都为TSN口岸，可通过口岸查询查看
             if (creator.equals("IDE")){
                 result.setDeclaredPort("TSN");
@@ -355,7 +362,6 @@ public class ChmConsignmentService {
                 //条件1、状态为 待申报海关
                 //条件2、本次推送时间 > 上次推送的时间
             }else if(!Objects.equals(chmConsignmentDB,null)
-                    //TODO 确定是不是transferWaybillStatus_5
                     && Objects.equals(chmConsignmentDB.getConsStatusDic().getCode(),"transferWaybillStatus_5")
                     //TODO 提交时需要打开
                     && pushTime.getTime()>chmConsignmentDB.getUpdateTime().getTime()
@@ -365,28 +371,15 @@ public class ChmConsignmentService {
                 //由于订单明细中，无法确定唯一一条数据，所以无法做到update，只能先删除在插入
-//                for(ChmConsignmentDetail newDetail:chmConsignment.getChmConsignmentDetailList()){
+                for(ChmConsignmentDetail newDetail:chmConsignment.getChmConsignmentDetailList()){
-//                    for(ChmConsignmentDetail oldDetail: chmConsignmentDB.getChmConsignmentDetailList()){
+                    for(ChmConsignmentDetail oldDetail: chmConsignmentDB.getChmConsignmentDetailList()){
-//                        if(Objects.equals(newDetail.getSkuCode(),oldDetail.getSkuCode())){
+                        if(Objects.equals(newDetail.getDetailId(),oldDetail.getDetailId())){
-//                            //newDetail.setChmConsignment(chmConsignmentDB);
+                            //newDetail.setChmConsignment(chmConsignmentDB);
-//                            newDetail.setId(oldDetail.getId());
+                            newDetail.setId(oldDetail.getId());
-//                        }
+                        }
-//                    }
+                    }
-//                }
-                //TODO 因为现在有了DetailId，所以可以根据DetailID进行更新，所以需要改为  update，去的掉detele的动作
-                List<Long> detailIdList = new ArrayList();
-                chmConsignmentDB.getChmConsignmentDetailList().forEach(detail->{
-                    detailIdList.add(detail.getId());
-                });
-                if(detailIdList.size()>0){
-                    chmConsignmentDetailService.deleteChmConsignmentDetailBatch(detailIdList);
-                    chmConsignmentDB.setChmConsignmentDetailList(null);
                 }
-
-
-
-
                 chmConsignment.setId(chmConsignmentDB.getId());
                 chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime());
                 chmConsignment.setUpdateTime(pushTime);