承运订单/托运订单

bug-fix:SAS-745;SAS-686

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

@@ -1562,7 +1562,7 @@ public class AcceptCarriageOrderService {
         saveLogisticsOrder(orderDTO, lOrderId, orderStatus, lOrderNo);
         saveLogisticsOrderAddress(orderDTO, lOrderId);
         saveLogisticsOrderGoods(orderDTO, lOrderId, lOrderNo);
-        saveLogisticsOrderContract(orderDTO, lOrderId);
+        saveLogisticsOrderContract(orderDTO, lOrderId, infoResDto);
         saveLogisticsOrderTrack(lOrderId, orderStatus);
         saveLogisticsOrderUnit(orderDTO, lOrderId);
         saveMongoDb(orderDTO, orderStatus, lOrderId, lOrderNo, infoResDto);
@@ -1852,14 +1852,14 @@ public class AcceptCarriageOrderService {
      * @param orderDTO 页面请求参数
      * @param lOrderId 主体id
      */
-    private void saveLogisticsOrderContract(AddOrderDTO orderDTO, Long lOrderId) {
+    private void saveLogisticsOrderContract(AddOrderDTO orderDTO, Long lOrderId, ContractCommonInfoResDto infoResDto) {
         KwtLogisticsOrderContract contract = new KwtLogisticsOrderContract();
         contract.setId(new IdWorker(NumberConstant.ONE).nextId());
         contract.setContractId(Long.parseLong(orderDTO.getContractId()));
         contract.setLOrderId(lOrderId);
-        contract.setContractNo(orderDTO.getContractNo());
-        contract.setContractName(orderDTO.getContractName());
-        contract.setSigningWay(orderDTO.getSigningWay());
+        contract.setContractNo(orderDTO.getContractNo() == null ? infoResDto.getContractCode() : orderDTO.getContractNo());
+        contract.setContractName(orderDTO.getContractName() == null ? infoResDto.getContactName() : orderDTO.getContractName());
+        contract.setSigningWay(orderDTO.getSigningWay() == null ? String.valueOf(infoResDto.getSigningWay()) : orderDTO.getSigningWay());
         contract.setStatus(NumberConstant.ZERO);
         contract.setCreateBy(LoginUserHolder.getUserId());
         contract.setCreateTime(new Date());

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

@@ -995,7 +995,7 @@ public class ConsignOrderService {
         saveConsignLogisticsOrder(addOrderDTO, lOrderId, orderStatus, lOrderNo);
         saveConsignLogisticsOrderAddress(addOrderDTO, lOrderId);
         saveConsignLogisticsOrderGoods(addOrderDTO, lOrderId, lOrderNo);
-        saveConsignLogisticsOrderContract(addOrderDTO, lOrderId);
+        saveConsignLogisticsOrderContract(addOrderDTO, lOrderId,infoResDto);
         saveConsignLogisticsOrderTrack(lOrderId, orderStatus);
         saveConsignLogisticsOrderUnit(addOrderDTO, lOrderId);
         saveMongoDb(addOrderDTO, orderStatus, lOrderId, lOrderNo, infoResDto);
@@ -1154,15 +1154,15 @@ public class ConsignOrderService {
      * @param addOrderDTO 页面请求参数
      * @param lOrderId    主体id
      */
-    private void saveConsignLogisticsOrderContract(AddOrderDTO addOrderDTO, Long lOrderId) {
+    private void saveConsignLogisticsOrderContract(AddOrderDTO addOrderDTO, Long lOrderId,ContractCommonInfoResDto infoResDto) {
         //托运
         KwtLogisticsOrderContract consignContract = new KwtLogisticsOrderContract();
         consignContract.setId(new IdWorker(NumberConstant.ONE).nextId());
         consignContract.setContractId(Long.parseLong(addOrderDTO.getContractId()));
         consignContract.setLOrderId(lOrderId);
-        consignContract.setContractNo(addOrderDTO.getContractNo());
-        consignContract.setContractName(addOrderDTO.getContractName());
-        consignContract.setSigningWay(addOrderDTO.getSigningWay());
+        consignContract.setContractNo(addOrderDTO.getContractNo() == null ? infoResDto.getContractCode() : addOrderDTO.getContractNo());
+        consignContract.setContractName(addOrderDTO.getContractName() == null ? infoResDto.getContactName() : addOrderDTO.getContractName());
+        consignContract.setSigningWay(addOrderDTO.getSigningWay() == null ? String.valueOf(infoResDto.getSigningWay()) : addOrderDTO.getSigningWay());
         consignContract.setStatus(NumberConstant.ZERO);
         consignContract.setCreateBy(LoginUserHolder.getUserId());
         consignContract.setCreateTime(new Date());

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -732,22 +732,17 @@
         FROM
         kwt_logistics_order a
         LEFT JOIN kwt_logistics_order_address b ON a.id = b.l_order_id
-        AND b.address_type = 1
+        AND b.address_type = 1 AND b.del_flag = 0
         LEFT JOIN kwt_logistics_order_address c ON a.id = c.l_order_id
-        AND c.address_type = 2
+        AND c.address_type = 2 AND c.del_flag = 0
         LEFT JOIN kwt_logistics_order_unit d ON a.id = d.l_order_id
-        AND d.unit_type = 1
+        AND d.unit_type = 1 AND d.del_flag = 0
         LEFT JOIN kwt_logistics_order_unit e ON a.id = e.l_order_id
         AND e.unit_type = 2
-        LEFT JOIN kwt_logistics_order_goods g ON a.id = g.id
-        LEFT JOIN kwt_logistics_order_contract f ON a.id = f.id
+        LEFT JOIN kwt_logistics_order_goods g ON a.id = g.l_order_id  AND g.del_flag = 0
+        LEFT JOIN kwt_logistics_order_contract f ON a.id = f.l_order_id AND f.del_flag = 0
         <where>
             a.del_flag = 0
-            AND b.del_flag = 0
-            AND c.del_flag = 0
-            AND d.del_flag = 0
-            AND f.del_flag = 0
-            AND g.del_flag = 0
             <if test="type == 1">
                 and d.top_ent_id = #{entId} or d.ent_id = #{entId}
             </if>
@@ -803,22 +798,17 @@
         FROM
         kwt_logistics_order a
         LEFT JOIN kwt_logistics_order_address b ON a.id = b.l_order_id
-        AND b.address_type = 1
+        AND b.address_type = 1 AND b.del_flag = 0
         LEFT JOIN kwt_logistics_order_address c ON a.id = c.l_order_id
-        AND c.address_type = 2
+        AND c.address_type = 2 AND c.del_flag = 0
         LEFT JOIN kwt_logistics_order_unit d ON a.id = d.l_order_id
-        AND d.unit_type = 1
+        AND d.unit_type = 1 AND d.del_flag = 0
         LEFT JOIN kwt_logistics_order_unit e ON a.id = e.l_order_id
         AND e.unit_type = 2
-        LEFT JOIN kwt_logistics_order_goods g ON a.id = g.id
-        LEFT JOIN kwt_logistics_order_contract f ON a.id = f.id
+        LEFT JOIN kwt_logistics_order_goods g ON a.id = g.l_order_id  AND g.del_flag = 0
+        LEFT JOIN kwt_logistics_order_contract f ON a.id = f.l_order_id AND f.del_flag = 0
         <where>
             a.del_flag = 0
-            AND b.del_flag = 0
-            AND c.del_flag = 0
-            AND d.del_flag = 0
-            AND f.del_flag = 0
-            AND g.del_flag = 0
             <if test="type == 1">
                 and d.top_ent_id = #{entId} or d.ent_id = #{entId}
             </if>