From 64d7e6c0112afa64f6a3fed1dfe615576ecc4625 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 19 Jan 2026 16:54:37 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-19=20=E9=A2=86=E6=96=99=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=20=E5=9C=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E2=80=9C=E5=87=BA=E5=BA=93=E7=B1=BB=E5=88=AB=E2=80=9D=20?= =?UTF-8?q?=E6=9D=90=E6=96=99=E6=98=8E=E7=BB=86=E9=A1=B5=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E3=80=90=E6=89=B9=E9=87=8F=E7=BC=96=E8=BE=91=E3=80=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=A6=81=E8=83=BD=E4=BF=AE=E6=94=B9=E9=A2=86=E6=96=99?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../orderIssure/vo/SOIssueNotifyHeader.java | 3 +++ .../InboundNotificationHeadMapper.xml | 3 ++- .../mapper/orderIssure/IssureNotifyMapper.xml | 6 ++++-- .../OutboundNotificationHeadMapper.xml | 3 ++- .../warehouse/LabelTransactionLogMapper.xml | 18 ++++++++++++++++-- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java b/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java index 44b33f7..58d251a 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/vo/SOIssueNotifyHeader.java +++ b/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; } diff --git a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml b/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml index b525aa4..9f87d6d 100644 --- a/src/main/resources/mapper/inboundNotification/InboundNotificationHeadMapper.xml +++ b/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 = '入' 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}) diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 429941e..7381652 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -14,10 +14,10 @@ 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}) 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 = '出' a.site in (select site from AccessSite where userID = #{query.loginUserName}) and bu in (select bu_no from AccessBu where username = #{query.loginUserName}) diff --git a/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml b/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml index d2c683a..2bee824 100644 --- a/src/main/resources/mapper/outboundNotification/OutboundNotificationHeadMapper.xml +++ b/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 = '出' 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}) diff --git a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml index f112db2..3ca1364 100644 --- a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml +++ b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml @@ -39,7 +39,14 @@ AND a.bu_no = #{query.buNo} - AND a.document_type = #{query.documentType} + + + AND a.document_type IN ('跨区调拨-出库', '跨区调拨-入库') + + + AND a.document_type = #{query.documentType} + + AND a.roll_no LIKE '%' + #{query.rollNo} + '%' @@ -88,7 +95,14 @@ AND a.bu_no = #{query.buNo} - AND a.document_type = #{query.documentType} + + + AND a.document_type IN ('跨区调拨-出库', '跨区调拨-入库') + + + AND a.document_type = #{query.documentType} + + AND a.roll_no LIKE '%' + #{query.rollNo} + '%'