南歧nc65对接

2025-12-06 08:58:04 +08:00
parent 7efbe3d404
commit 7ff3054dc9
11 changed files with 93 additions and 25 deletions
@@ -236,9 +236,9 @@ public class UserDTO extends BaseVOEntity {
    @ApiModelProperty(name = "有效期管理  0-否  1-是")
    private Integer validityPeriodManagement;

-    @ApiModelProperty(name = "业务员nc编码")
+    @ApiModelProperty("业务员nc编码")
    private String salespersonNcCode;

-    @ApiModelProperty(name = "制单员nc编码")
+    @ApiModelProperty( "制单员nc编码")
    private String documentPreparerNcCode;
 }
@@ -191,7 +191,7 @@ public class UserShipperDTO extends UserDTO {
    @ApiModelProperty(name = "备注信息")
    private String remark;

-    @ApiModelProperty(name = "客户nc编码")
+    @ApiModelProperty("客户nc编码")
    private String customerNcCode;

 }
@@ -18,13 +18,15 @@ spring:
  cloud:
    nacos:
      discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
        #server-addr: mhd-nacos:8848
+      server-addr: 116.204.23.92:8848
      config:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
        # 线上测试环境配置 容器名+端口号
        #server-addr: mhd-nacos:8848
+        server-addr: 116.204.23.92:8848
        group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
        file-extension: yml   #默认properties
        # 共享配置
@@ -75,7 +75,7 @@
               a.department_id,
               a.ding_user_id,
               a.ding_dept_id,
-               a.validity_period_management
+               a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code
        FROM `user` a
        where a.del_flag = 1
    </sql>
@@ -139,7 +139,7 @@
 			    b.monthly_settlement_flag,
 			    a.user_auth_status,
               b.original_receipt_flag,
-               b.freight_node
+               b.freight_node,b.customer_nc_code
        FROM `user` a
                 LEFT JOIN `user_shipper` b ON a.user_id = b.user_id
                 left join (select user_id, GROUP_CONCAT(r.role_name separator '&amp;') roleName