委托方增加bug，oms线路修复，o-t报关修改

mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java

@@ -316,7 +316,7 @@ public class UserShipperApplicationService {
         if (ObjectUtil.isNull(configSwitch)) {
             throw new ServiceException("获取组织配置失败");
         }
-        List<UserEntity> userEntities = userMapper.selectByUserPhone(userShipperDO.getUserPhone());
+        List<UserEntity> userEntities = userMapper.selectByUserPhone(userShipperDO.getUserAccount());
         if (userEntities.size()>0){
             throw new ServiceException("账户名已存在");
         }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java

@@ -80,5 +80,5 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     Integer getOrdIsQueue(Long organizationId);
 
-    List<UserEntity> selectByUserPhone(String userPhone);
+    List<UserEntity> selectByUserPhone(String userAccount);
 }

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -800,7 +800,7 @@
         SELECT is_queue from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where ORGANIZATION_ID = #{organizationId}
     </select>
     <select id="selectByUserPhone" resultType="com.mhd.user.domain.userAggregate.entity.UserEntity">
-        select * from "USER" where user_phone = #{userPhone} and del_flag = 1
+        select * from "USER" where user_account = #{userAccount} and del_flag = 1
     </select>
 
 </mapper>

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/po/BusinessDocumentOrderPO.java

@@ -520,6 +520,10 @@ public class BusinessDocumentOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String route;
 
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String routeName;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String containerType;

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -212,6 +212,8 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                     tmsOrderAddDTO.setOrganizationId(organizationId);
                     tmsOrderAddDTO.setLoginUser(loginUser);
                     tmsOrderAddDTO.setGoodsNumber(businessDocumentOrder.getGoodsNumber());
+                    tmsOrderAddDTO.setIsDeclare(businessDocumentOrder.getIsDeclare().intValue());
+                    tmsOrderAddDTO.setIsDeclare(businessDocumentOrder.getIsDeclare() != null ? businessDocumentOrder.getIsDeclare().intValue() : null);
                     String mainOrderNum = businessDocumentOrder.getMainOrderNum();
                     if (mainOrderNum != null) {
                         tmsOrderAddDTO.setBusinessMainOrder(mainOrderNum);

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -207,6 +207,9 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @ApiModelProperty("运输线路")
     private String route;
 
+    @ApiModelProperty("运输线路")
+    private String routeName;
+
     @ApiModelProperty("发票编号")
     @Excel(name = "发票编号")
     private String invoiceNumber;

mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml

@@ -201,8 +201,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 --             GROUP BY child.MAIN_ORDER_NUM
 --         ) tms_count ON tms_count.MAIN_ORDER_NUM = bdo.goods_number
         SELECT bdo.*,
-               NVL(tms_count.total, 0) AS tms_order_status_count
+               NVL(tms_count.total, 0) AS tms_order_status_count,
+               NVL(tr.ROUTE_NAME, bdo.route) AS routeName
         FROM business_document_order bdo
+            left join NGWL_TEST_WLHY.tms_route tr on tr.id = bdo.route
                  LEFT JOIN (
             SELECT child.MAIN_ORDER_NUM, COUNT(1) AS total
             FROM business_document_order child

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -29,13 +29,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             eo.*,
             bdo.main_order_num,
             bdo.RECIPIENT_NAME,
-            bdo.train_no
+            bdo.train_no,
+            NVL(tr.ROUTE_NAME, bdo.route) AS routeName
         FROM
             execute_order eo
                 LEFT JOIN
             BUSINESS_DOCUMENT_ORDER bdo
             ON
                 eo.BUSINESS_DOCUMENT_NUMBER = bdo.goods_number
+                left join NGWL_TEST_WLHY.tms_route tr on tr.id = bdo.route
     </sql>
 
     <sql id="selectExecuteOrderPo1">