入库查询签名列表以及详情

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

@@ -105,6 +105,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="workUserName"    column="WORK_USER_NAME"    />
         <result property="workTaskReceiveStatus"    column="WORK_TASK_RECEIVE_STATUS"    />
         <result property="taskIssueUserId"    column="TASK_ISSUE_USER_ID"    />
+        <result property="signatureStatus"    column="SIGNATURE_STATUS"    />
+        <result property="signatureTime"    column="SIGNATURE_TIME"    />
+        <result property="signaturePic"    column="SIGNATURE_PIC"    />
+        <result property="signatureRemark"    column="SIGNATURE_REMARK"    />
     </resultMap>
 
     <sql id="selectStockInOrderPo">
@@ -138,7 +142,8 @@ 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.WORK_USER_NAME
+        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,
+        a.SIGNATURE_STATUS, a.SIGNATURE_TIME, a.SIGNATURE_PIC, a.SIGNATURE_REMARK
     </sql>
 
     <sql id="joinStockInOrderPo">
@@ -356,6 +361,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="queryUserId != null">
             and a.TASK_ISSUE_USER_ID like concat('%', #{queryUserId}, '%')
         </if>
+        <!-- PDA入库签名列表：作业任务人员模糊查询 -->
+        <if test="workUserNameLike != null and workUserNameLike != ''">
+            and a.WORK_USER_NAME like concat('%', #{workUserNameLike}, '%')
+        </if>
+        <!-- PDA入库签名列表：按签名状态精确查询 -->
+        <if test="signatureStatus != null">
+            and a.SIGNATURE_STATUS = #{signatureStatus}
+        </if>
         <!-- 报关相关字段查询条件 -->
         <if test="to != null and to != ''">
             and a."TO" like concat('%', #{to}, '%')