仓码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>