提交新增合同文件校验

sckw-modules-api/sckw-contract-api/src/main/java/com/sckw/contract/api/model/dto/res/ContractLogisticsOrderResDto.java

@@ -61,11 +61,19 @@ public class ContractLogisticsOrderResDto implements Serializable {
      * 托运企业名称
      */
     private String consignEntName;
+    /**
+     * 托运企业电话
+     */
+    private String consignEntPhone;
 
     /**
      * 承运企业id
      */
     private Long acceptCarriageEntId;
+    /**
+     * 承运企业电话
+     */
+    private String acceptCarriageEntPhone;
 
     /**
      * 承运企业名称

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/AddLogisticOrderParam.java

@@ -160,5 +160,14 @@ public class AddLogisticOrderParam implements Serializable {
      */
     @NotBlank(message = "卸货详细地址不能为空")
     private String unLoadDetailAddress;
-
+    /**
+     * 卸货联系人
+     */
+    @NotBlank(message = "卸货联系人不能为空")
+    private String unloadContacts;
+    /**
+     * 卸货联系电话
+     */
+    @NotBlank(message = "卸货联系电话不能为空")
+    private String unloadPhone;
 }

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/model/param/LogisticInfo.java

@@ -89,26 +89,6 @@ public class LogisticInfo implements Serializable {
         private LocalDate startTime;
 
 
-
-        /**
-         * 卸货联系人
-         */
-        @NotBlank(message = "卸货联系人不能为空")
-        private String unloadContacts;
-
-        /**
-         * 卸货联系电话
-         */
-        @NotBlank(message = "卸货联系电话不能为空")
-        private String unloadPhone;
-
-        /**
-         * 卸货详细地址
-         */
-        @NotBlank(message = "卸货详细地址不能为空")
-        private String unloadDetailAddress;
-
-
         /**
          * 总量
          */

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/operateService/KwcContractTradeService.java

@@ -1740,8 +1740,10 @@ public class KwcContractTradeService {
                 new KwcContractLogisticsUnit());
         contractLogisticsOrderResDto.setConsignEntId(consignEnt.getEntId());
         contractLogisticsOrderResDto.setConsignEntName(consignEnt.getFirmName());
+        contractLogisticsOrderResDto.setConsignEntPhone(consignEnt.getPhone());
         contractLogisticsOrderResDto.setAcceptCarriageEntId(acceptCarriageEnt.getEntId());
         contractLogisticsOrderResDto.setAcceptCarriageEntName(acceptCarriageEnt.getFirmName());
+        contractLogisticsOrderResDto.setAcceptCarriageEntPhone(acceptCarriageEnt.getPhone());
         KwcContractLogisticsGoods goods = contractLogisticsGoodsMap.getOrDefault(log.getId(),
                 new KwcContractLogisticsGoods());
         contractLogisticsOrderResDto.setPrice(StringUtils.isNotBlank(goods.getPrice()) ? goods.getPrice() : log.getCommonPrice());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dubbo/TransportServiceImpl.java

@@ -1200,6 +1200,9 @@ public class TransportServiceImpl implements TransportRemoteService {
         addLogisticOrderDTO.setUnloadName(param.getUnloadName());
         addLogisticOrderDTO.setUnloadCityCode(param.getUnloadCityCode());
         addLogisticOrderDTO.setUnloadCityName(param.getUnloadCityName());
+        addLogisticOrderDTO.setUnLoadDetailAddress(param.getUnLoadDetailAddress());
+        addLogisticOrderDTO.setUnloadContacts(param.getUnloadContacts());
+        addLogisticOrderDTO.setUnloadPhone(param.getUnloadPhone());
         return addLogisticOrderDTO;
     }
 
@@ -1221,9 +1224,6 @@ public class TransportServiceImpl implements TransportRemoteService {
 //        info.setUnloadName(logistic.getUnloadName());
 //        info.setUnloadCityCode(logistic.getUnloadCityCode());
 //        info.setUnloadCityName(logistic.getUnloadCityName());
-        info.setUnloadContacts(logistic.getUnloadContacts());
-        info.setUnloadPhone(logistic.getUnloadPhone());
-        info.setUnloadDetailAddress(logistic.getUnloadDetailAddress());
         info.setAmount(logistic.getAmount());
         info.setAmountUnit(logistic.getAmountUnit());
         info.setLoss(logistic.getLoss());

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/AddLogisticOrderDTO.java

@@ -151,6 +151,21 @@ public class AddLogisticOrderDTO implements Serializable {
      */
     @NotBlank(message = "卸货城市名称不能为空")
     private String unloadCityName;
+    /**
+     * 卸货详细地址
+     */
+    @NotBlank(message = "卸货详细地址不能为空")
+    private String unLoadDetailAddress;
+    /**
+     * 卸货联系人
+     */
+    @NotBlank(message = "卸货联系人不能为空")
+    private String unloadContacts;
+    /**
+     * 卸货联系电话
+     */
+    @NotBlank(message = "卸货联系电话不能为空")
+    private String unloadPhone;
 
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticData.java

@@ -92,27 +92,6 @@ public  class LogisticData implements Serializable {
         private LocalDate startTime;
 
 
-
-
-        /**
-         * 卸货联系人
-         */
-        @NotBlank(message = "卸货联系人不能为空")
-        private String unloadContacts;
-
-        /**
-         * 卸货联系电话
-         */
-        @NotBlank(message = "卸货联系电话不能为空")
-        private String unloadPhone;
-
-        /**
-         * 卸货详细地址
-         */
-        @NotBlank(message = "卸货详细地址不能为空")
-        private String unloadDetailAddress;
-
-
         /**
          * 总量
          */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtAcceptCarriageOrderService.java

@@ -3304,6 +3304,7 @@ public class KwtAcceptCarriageOrderService {
         goods.setId(new IdWorker(NumberConstant.ONE).nextId());
         goods.setLOrderId(lOrderId);
         goods.setLOrderNo(lOrderNo);
+        goods.setGoodsId(orderDTO.getGoodsId());
         goods.setGoodsName(orderDTO.getGoodsName());
         goods.setGoodsType(orderDTO.getGoodsType());
         goods.setStatus(NumberConstant.ZERO);
@@ -3341,11 +3342,11 @@ public class KwtAcceptCarriageOrderService {
         unloadAddress.setAddressType(NumberConstant.TWO);
         unloadAddress.setName(orderDTO.getUnloadName());
 //        unloadAddress.setType();
-        unloadAddress.setContacts(x.getUnloadContacts());
-        unloadAddress.setPhone(x.getUnloadPhone());
+        unloadAddress.setContacts(orderDTO.getUnloadContacts());
+        unloadAddress.setPhone(orderDTO.getUnloadPhone());
         unloadAddress.setCityCode(orderDTO.getUnloadCityCode());
         unloadAddress.setCityName(orderDTO.getUnloadCityName());
-        unloadAddress.setDetailAddress(x.getUnloadDetailAddress());
+        unloadAddress.setDetailAddress(orderDTO.getun());
         unloadAddress.setEntryType(NumberConstant.FOUR);
         unloadAddress.setStatus(NumberConstant.ZERO);
         unloadAddress.setSort(NumberConstant.ZERO);