出库任务增加订单号

ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppTaskController.java

@@ -907,6 +907,10 @@ public class AppTaskController extends BaseController
                 appTask.setCkType(tMiStock1.getCkType());
                 appTask.setTaskPriority(1);
                 appTask.setDestination("127");
+                //wms生成的统一编号
+                appTask.setOrderId(orderId);
+                //库存编号
+                appTask.setStockId(tMiStock1.getStockId());
                 appTaskService.insertAppTask(appTask);
             }
 

ruoyi-system/src/main/java/com/ruoyi/app/domain/AppTask.java

@@ -20,7 +20,7 @@ public class AppTask extends BaseEntity
 
     /** 任务号 */
     private String taskId;
-
+    //订单号
     private String orderId;
 
     public String getOrderId() {
@@ -89,6 +89,16 @@ public class AppTask extends BaseEntity
 
     @Excel(name = "库位号")
     private String locationId;
+//    @Excel(name = "库存编号")
+    private String stockId;
+
+    public String getStockId() {
+        return stockId;
+    }
+
+    public void setStockId(String stockId) {
+        this.stockId = stockId;
+    }
 
     //1.零捡 2：全量
     private Integer ckType;

ruoyi-system/src/main/resources/mapper/app/AppPmsOrderOutMapper.xml

@@ -21,10 +21,11 @@
         <result property="orderStatus"    column="order_status"    />
         <result property="isLock"    column="is_lock"    />
         <result property="orderId"    column="order_id"    />
+        <result property="stockId"    column="stock_id"    />
     </resultMap>
 
     <sql id="selectAppPmsOrderOutVo">
-        select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id from app_pms_order_out
+        select record_id, list_id, order_type, customer_id, goods_id, goods_num, goods_desc, spare1, spare2,pick_num,tr_num,shelves_num,stock_num,order_status,is_lock,order_id,stock_id from app_pms_order_out
     </sql>
 
     <select id="selectAppPmsOrderOutList" parameterType="AppPmsOrderOut" resultMap="AppPmsOrderOutResult">
@@ -38,6 +39,7 @@
             <if test="orderStatus != null  and orderStatus != ''"> and order_status = #{orderStatus}</if>
             <if test="isLock != null  and isLock != ''"> and is_lock = #{isLock}</if>
             <if test="orderId != null  and orderId != ''"> and order_id = #{orderId}</if>
+            <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>
         </where>
     </select>
 
@@ -65,6 +67,7 @@
             <if test="orderStatus != null">order_status,</if>
             <if test="isLock != null">is_lock,</if>
             <if test="orderId != null">order_id,</if>
+            <if test="stockId != null">stock_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordId != null">#{recordId},</if>
@@ -83,6 +86,7 @@
             <if test="orderStatus != null">#{orderStatus},</if>
             <if test="isLock != null">#{isLock},</if>
             <if test="orderId != null">#{orderId},</if>
+            <if test="stockId != null">#{stockId},</if>
          </trim>
     </insert>
 
@@ -102,6 +106,8 @@
             <if test="shelvesNum != null">shelves_num = #{shelvesNum},</if>
             <if test="stockNum != null">stock_num = #{stockNum},</if>
             <if test="isLock != null">is_lock = #{isLock},</if>
+            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="stockId != null">stock_id = #{stockId},</if>
         </trim>
         where record_id = #{recordId}
     </update>