Merge branch 'refs/heads/dev_WMS20260401' into dev

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java

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

@@ -2783,6 +2783,18 @@ public class UserApplicationService {
             }
             sysUser.setUserShipperPo(userShipperPo1);
             sysUser.setVehiclePo(vehiclePo);
+            if (userPo.getLineManagementId() != null && !userPo.getLineManagementId().isEmpty()) {
+                sysUser.setLineManagementId(userPo.getLineManagementId());
+            }
+            if (userPo.getRouteCode() != null && !userPo.getRouteCode().isEmpty()) {
+                sysUser.setRouteCode(userPo.getRouteCode());
+            }
+            if (userPo.getRouteName() != null && !userPo.getRouteName().isEmpty()) {
+                sysUser.setRouteName(userPo.getRouteName());
+            }
+            if (userPo.getDeliveryOrder() != null && !userPo.getDeliveryOrder().isEmpty()) {
+                sysUser.setDeliveryOrder(userPo.getDeliveryOrder());
+            }
         }
         return sysUser;
     }
@@ -5232,4 +5244,14 @@ public class UserApplicationService {
     public UserPo selectUserTableByUserId(Long userId){
         return userDomainService.selectByUserId(userId);
     }
+
+
+    public void updateLineManagement(CustomerDO customerDO) {
+        if (customerDO.getUserId() == null){
+            throw new ServiceException("用户id不能为空");
+        }
+        UserDO userDO = new UserDO();
+        BeanUtils.copyProperties(customerDO, userDO);
+        userDomainService.updateUser(userDO);
+    }
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java

@@ -192,4 +192,17 @@ public class UserEntity extends BaseVOEntity {
 
   @ApiModelProperty("税号")
   private String taxNumber;
+
+
+  @ApiModelProperty("路线id")
+  private String lineManagementId;
+
+  @ApiModelProperty("路线编码")
+  private String routeCode;
+
+  @ApiModelProperty("路线名称")
+  private String routeName;
+
+  @ApiModelProperty("配送顺序")
+  private String deliveryOrder;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/CustomerDO.java

@@ -78,4 +78,16 @@ public class CustomerDO extends BaseVOEntity {
 
     @ApiModelProperty(name = "备注")
     private String userRemark;
+
+    @ApiModelProperty("路线id")
+    private String lineManagementId;
+
+    @ApiModelProperty("路线编码")
+    private String routeCode;
+
+    @ApiModelProperty("路线名称")
+    private String routeName;
+
+    @ApiModelProperty("配送顺序")
+    private String deliveryOrder;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserDO.java

@@ -281,4 +281,16 @@ public class UserDO extends BaseVOEntity {
 
     @ApiModelProperty("税号")
     private String taxNumber;
+
+    @ApiModelProperty("路线id")
+    private String lineManagementId;
+
+    @ApiModelProperty("路线编码")
+    private String routeCode;
+
+    @ApiModelProperty("路线名称")
+    private String routeName;
+
+    @ApiModelProperty("配送顺序")
+    private String deliveryOrder;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/CustomerDTO.java

@@ -19,15 +19,12 @@ public class CustomerDTO extends BaseVOEntity {
     private Long userId;
 
     @ApiModelProperty("职务/角色权限字符，控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)")
-    @NotBlank(message = "角色编码不能为空")
     private String roleCode;
 
     @ApiModelProperty("货主/供应商/客户编码")
-    @NotBlank(message = "货主/供应商/客户编码不能为空")
     private String userMemberCode;
 
     @ApiModelProperty("货主/供应商/客户名称")
-    @NotBlank(message = "货主/供应商/客户名称不能为空")
     private String userName;
 
     @ApiModelProperty("联系人")
@@ -77,4 +74,16 @@ public class CustomerDTO extends BaseVOEntity {
 
     @ApiModelProperty(name = "备注")
     private String userRemark;
+
+    @ApiModelProperty("路线id")
+    private String lineManagementId;
+
+    @ApiModelProperty("路线编码")
+    private String routeCode;
+
+    @ApiModelProperty("路线名称")
+    private String routeName;
+
+    @ApiModelProperty("配送顺序")
+    private String deliveryOrder;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserDTO.java

@@ -247,4 +247,16 @@ public class UserDTO extends BaseVOEntity {
 
     @ApiModelProperty(value = "紧急联系电话")
     private String emergencyContactPhone;
+
+    @ApiModelProperty("路线id")
+    private String lineManagementId;
+
+    @ApiModelProperty("路线编码")
+    private String routeCode;
+
+    @ApiModelProperty("路线名称")
+    private String routeName;
+
+    @ApiModelProperty("配送顺序")
+    private String deliveryOrder;
 }

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserAPI.java

@@ -941,6 +941,24 @@ public class UserAPI extends BaseController {
         }
     }
 
+    @Log(title = "新增修改客户线路", description ="新增修改客户线路",businessType = BusinessType.UPDATE)
+    @ApiOperation("新增修改客户线路")
+    @PostMapping("/updateLineManagement")
+    public AjaxResult updateLineManagement(@Valid  @RequestBody CustomerDTO customerDTO) {
+        try {
+            CustomerDO customerDO = new CustomerDO();
+            BeanUtils.copyProperties(customerDTO,customerDO);
+            userApplicationService.updateLineManagement(customerDO);
+            return AjaxResult.success();
+        } catch (com.mhd.common.core.exception.ServiceException e) {
+            e.printStackTrace();
+            return AjaxResult.error(500, e.getMessage());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return AjaxResult.error(500, "操作失败:" + e.getMessage());
+        }
+    }
+
     @Log(title = "作废货主、供应商、客户", description ="作废货主、供应商、客户",businessType = BusinessType.UPDATE)
     @ApiOperation("作废货主、供应商、客户")
     @PostMapping("/nullifyCustomer")

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

@@ -80,7 +80,11 @@
                a.payment_account,
                a.invoice_title,
                a.tax_number,
-               b.SETTLEMENT_CURRENCY
+               b.SETTLEMENT_CURRENCY,
+               a.LINE_MANAGEMENT_ID,
+               a.ROUTE_CODE,
+               a.ROUTE_NAME,
+               a.DELIVERY_ORDER
         FROM "USER" a left join USER_SHIPPER b on a.user_id = b.user_id
         where a.del_flag = 1
     </sql>
@@ -244,6 +248,19 @@
             and a.user_id = #{userId}
         </if>
 
+        <if test="lineManagementId != null and lineManagementId != ''">
+            and a.line_management_id = #{lineManagementId}
+        </if>
+        <if test="routeCode != null and routeCode != ''">
+            and a.route_code = #{routeCode}
+        </if>
+        <if test="routeName != null and routeName != ''">
+            and a.route_name = #{routeName}
+        </if>
+        <if test="deliveryOrder != null and deliveryOrder != ''">
+            and a.delivery_order = #{deliveryOrder}
+        </if>
+
         <!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
         <if test="organizationId != null">
             <!-- 如果设置了 organizationId，添加 organization_id 条件 -->