提交代码

@@ -248,6 +248,7 @@ public class ChmConsignmentService {
         try {
             Date pushTime = DateUtils.timeStampToDate(Long.valueOf(timeStamp));
 
+            //1、将请求转换为运单
             ChmConsignment chmConsignment=this.convertToChmConsignment(mawb,pushTime,creator);
             List<ChmConsignmentDetail> chmConsignmentDetailList = new ArrayList<>();
             mawb.getMawbDetailList().forEach(detail ->{
@@ -256,8 +257,11 @@ public class ChmConsignmentService {
             chmConsignment.setChmConsignmentDetailList(chmConsignmentDetailList);
 
 
-            //校验 7天+运单 ，如果有数据并且 还未报关就更新，如果数据就插入
+            //2、校验 7天+运单 ，如果有数据并且 还未报关就更新，如果数据就插入
             ChmConsignment chmConsignmentDB=this.findChmConsignmentByConsignmentCode(mawb.getBillNo(), DateUtils.addDate(DateUtils.getCurrentDate(),-7));
+
+
+            //3、新增或更新
             //新增：如果没有就插入
             if (Objects.equals(chmConsignmentDB,null)){
                 log.info("新增主单"+ mawb.getBillNo());
@@ -298,9 +302,8 @@ public class ChmConsignmentService {
                     chmConsignmentDB.setChmConsignmentDetailList(null);
                 }
 
-
-
                 chmConsignment.setId(chmConsignmentDB.getId());
+                chmConsignment.setCreateTime(chmConsignmentDB.getCreateTime());
                 chmConsignment.setUpdateTime(pushTime);
                 ChmConsignment updateResult = this.saveChmConsignment(chmConsignment);
                 if(!Objects.equals(updateResult,null)){