仓码pda改造;

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

@@ -101,6 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pushByName"    column="PUSH_BY_NAME"    />
         <result property="pushStatus"    column="PUSH_STATUS"    />
         <result property="pushTime"    column="PUSH_TIME"    />
+        <result property="workUserId"    column="WORK_USER_ID"    />
+        <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
+        <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -134,7 +137,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.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
     </sql>
 
     <sql id="joinStockInOrderPo">
@@ -585,4 +588,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND in_order_number = #{inOrderNumber}
     </select>
 
+    <select id="queryWarehouseUserId" resultMap="java.lang.String" resultType="java.lang.String">
+        SELECT WM_CONCAT(CORRELATION_ID) AS userIds
+        FROM ASSOCIATION_WAREHOUSE
+        WHERE warehouse_id = #{warehouseId} AND del_flag = 1 AND organization_id = #{organizationId} AND top_organization_id = #{topOrganizationId}
+    </select>
+
 </mapper>

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

@@ -100,6 +100,9 @@
         <result property="pushByName"    column="PUSH_BY_NAME"    />
         <result property="pushStatus"    column="PUSH_STATUS"    />
         <result property="pushTime"    column="PUSH_TIME"    />
+        <result property="workUserId"    column="WORK_USER_ID"    />
+        <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
+        <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
     </resultMap>
 
 
@@ -120,7 +123,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.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
     </sql>
 
 
@@ -170,6 +173,15 @@
                 </otherwise>
             </choose>
         </if>
+        <if test="statusList != null and statusList.size > 0 ">
+            and a.status in
+            <foreach collection="statusList" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="queryUserId != null">
+            and a.TASK_ISSUE_USER_ID like concat('%', #{queryUserId}, '%')
+        </if>
         <!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 -->
         <if test="gtStatus != null ">
             and a.status &gt; #{gtStatus}