作业人员名称

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java

@@ -385,7 +385,8 @@ public class StockInOrder extends BaseVOEntity {
 
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java

@@ -446,7 +446,8 @@ public class StockInOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java

@@ -438,7 +438,8 @@ public class StockInOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java

@@ -427,7 +427,8 @@ public class StockOutOrder extends BaseVOEntity {
 
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java

@@ -453,7 +453,8 @@ public class StockOutOrderPO extends BaseVOEntity {
     private String khdm;
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -496,6 +496,9 @@ public class StockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
 
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
+
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java

@@ -435,7 +435,8 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
 
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -486,7 +486,8 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     private Date createTimeTo;
     @ApiModelProperty("作业人用户ID")
     private Long workUserId;
-
+    @ApiModelProperty("作业人用户")
+    private String workUserName;
     @ApiModelProperty("作业任务接收状态")
     private String workTaskReceiveStatus;
 

mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml

@@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pushStatus"    column="PUSH_STATUS"    />
         <result property="pushTime"    column="PUSH_TIME"    />
         <result property="workUserId"    column="WORK_USER_ID"    />
+        <result property="workUserName"    column="WORK_USER_NAME"    />
         <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
         <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
     </resultMap>
@@ -137,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a."TO", a.CONTACT_PERSON, a.VEHICLE_INFO, a.CONSIGNMENT_NO, a.TEL, a.DRIVER_SIGNATURE, a.FAX, a.DECLARATION_AREA, a.MANUFACTURER,
         a.CUSTOMS_BROKER_INFO, a.DELIVERY_ADDRESS, a.ENTRY_EXIT_CUSTOMS, a.ORIGIN_DESTINATION_COUNTRY, a.CARRIER, a.CONTAINER_NO,
         a.TRANSPORT_METHOD, a.SUPERVISION_METHOD, a.CUSTOMS_INSPECTION, a.NEED_CUSTOMS_DECLARATION, a.NEED_TRANSPORT,
-        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID
+        a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.stock_in_order,a.business_order_no,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID,a.WORK_USER_NAME
     </sql>
 
     <sql id="joinStockInOrderPo">

mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml

@@ -101,6 +101,7 @@
         <result property="pushStatus"    column="PUSH_STATUS"    />
         <result property="pushTime"    column="PUSH_TIME"    />
         <result property="workUserId"    column="WORK_USER_ID"    />
+        <result property="workUserName"    column="WORK_USER_NAME"    />
         <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
         <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
     </resultMap>
@@ -123,7 +124,7 @@
         a.CUSTOMS_DECLARER_INFO,a.DELIVERY_ADDR,a.ENTRY_EXIT_CUSTOMS,a.DEPARTURE_ARRIVAL_COUNTRY,a.CARRIER,a.CONTAINER_NO,a.CONTAINER_NO_NAME,a.OUTBOUND_DATE,
         a.COMPLETE_TIME,a.ORDER_DATE,a.TRANSPORT_MODE_CODE,a.TRANSPORT_MODE_NAME,a.SUPERVISION_MODE_CODE,a.SUPERVISION_MODE_NAME,
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.billing_json,a.SETTLEMENT_CURRENCY,
-        a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID
+        a.SALESMAN_ID,a.SALESMAN_NAME,a.business_order_no,a.RETURN_QUANTITY,a.WORK_USER_ID,a.WORK_TASK_RECEIVE_STATUS,a.TASK_ISSUE_USER_ID,a.WORK_USER_NAME
     </sql>