2026-01-19

领料申请管理页面
在新增时增加一个“出库类别”
材料明细页签的【批量编辑】功能要能修改领料仓库

src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java

@@ -203,6 +203,9 @@ public class SOIssueNotifyHeader extends QueryPage implements Serializable {
     @TableField("work_center_no")
     private String workCenterNo;
 
+    @TableField("category")
+    private String category;
+
     public String getConfirmStatus() {
         return confirmStatus;
     }

src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml

@@ -149,9 +149,10 @@
         a.required_qty_count,
         a.order_qty,
         a.show_in_query_flag,
-        a.category
+        r.crdname as category
         FROM inbound_notification_head as a
         left join Supplier as b on a.site = b.site and a.supplier_id = b.SupplierID
+        left join Rdstyle r on a.category = r.crdcode and r.bRdFlag = '入'
         <where>
             a.site in (select site from AccessSite where userID = #{query.userName})
             and a.bu_no in (select bu_no from AccessBu where username = #{query.userName})

src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml

@@ -14,10 +14,10 @@
     <insert id="createNotify">
         insert into SOIssueNotifyHeader (NotifyNo,Site,NotifyDate,UserName,EnteredDate,Receiver,DepartmentID,Remark,CreditFlag,IssueFlag,IssueResult,PlanIssueDate,
         RealIssueDate,Status,HaveIssueRecordFlag,CalcFlag,NeedApproveFlag,ApprovedFlag,Approver,ApproveDate,WarehouseID,
-        RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu, work_center_no)
+        RecordVersion,OutWorkOrderFlag,ProjectID,OrderType,AuthRuleID,bu, work_center_no, category)
         values(#{notifyNo},#{site},#{notifyDate},#{userName},#{enteredDate},#{receiver},#{departmentID},#{remark},#{creditFlag},#{issueFlag},#{issueResult},#{planIssueDate},
         #{realIssueDate},#{status},#{haveIssueRecordFlag},#{calcFlag},#{needApproveFlag},#{approvedFlag},#{approver},#{approveDate},#{warehouseID},
-        #{recordVersion},#{outWorkOrderFlag},#{projectID},#{orderType},#{authRuleID},#{bu}, #{workCenterNo})
+        #{recordVersion},#{outWorkOrderFlag},#{projectID},#{orderType},#{authRuleID},#{bu}, #{workCenterNo}, #{category})
     </insert>
     <update id="updateNotifyBu">
         update SOIssueNotifyHeader set bu=#{bu} where site=#{site} and NotifyNo=#{notifyNo}
@@ -233,6 +233,7 @@
         a.PlanIssueDate,
         a.RealIssueDate,
         a.Status,
+        r.crdname as category,
         a.HaveIssueRecordFlag,
         a.CalcFlag,
         a.NeedApproveFlag,
@@ -256,6 +257,7 @@
         w.WorkCenterDesc as workCenterDesc
         from SOIssueNotifyHeader a
         left join workcenter w on a.site = w.site and a.bu = w.bu_no and a.work_center_no = w.WorkCenterNo
+        left join Rdstyle r on a.category = r.crdcode and r.bRdFlag = '出'
         <where>
             a.site in (select site from AccessSite where userID = #{query.loginUserName})
             and bu in (select bu_no from AccessBu where username = #{query.loginUserName})

src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml

@@ -46,10 +46,11 @@
         a.out_warehouse,
         a.customer_order_no,
         a.show_in_query_flag,
-        a.category
+        r.crdname as category
         FROM outbound_notification_head AS a
         LEFT JOIN Customer AS b ON a.site = b.site AND LTRIM(RTRIM(a.customer_id)) = b.CustomerID
         LEFT JOIN Supplier AS s ON a.site = s.site AND (NULLIF(LTRIM(RTRIM(a.customer_id)), '') IS NULL OR b.CustomerID IS NULL) AND LTRIM(RTRIM(a.customer_id)) = s.SupplierID
+        LEFT JOIN Rdstyle r ON a.category = r.crdcode AND r.bRdFlag = '出'
         <where>
             a.site IN (SELECT site FROM AccessSite WHERE userID = #{query.userName})
             AND a.bu_no IN (SELECT bu_no FROM AccessBu WHERE username = #{query.userName})

src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml

@@ -39,7 +39,14 @@
             AND a.bu_no = #{query.buNo}
         </if>
         <if test="query.documentType != null and query.documentType != ''">
-            AND a.document_type = #{query.documentType}
+            <choose>
+                <when test="query.documentType == '移库调拨'">
+                    AND a.document_type IN ('跨区调拨-出库', '跨区调拨-入库')
+                </when>
+                <otherwise>
+                    AND a.document_type = #{query.documentType}
+                </otherwise>
+            </choose>
         </if>
         <if test="query.rollNo != null and query.rollNo != ''">
             AND a.roll_no LIKE '%' + #{query.rollNo} + '%'
@@ -88,7 +95,14 @@
             AND a.bu_no = #{query.buNo}
         </if>
         <if test="query.documentType != null and query.documentType != ''">
-            AND a.document_type = #{query.documentType}
+            <choose>
+                <when test="query.documentType == '移库调拨'">
+                    AND a.document_type IN ('跨区调拨-出库', '跨区调拨-入库')
+                </when>
+                <otherwise>
+                    AND a.document_type = #{query.documentType}
+                </otherwise>
+            </choose>
         </if>
         <if test="query.rollNo != null and query.rollNo != ''">
             AND a.roll_no LIKE '%' + #{query.rollNo} + '%'