From 039e55987ff3ed06c80843eed4d3b76bd968e434 Mon Sep 17 00:00:00 2001
From: yangyufu <yangyufu@hailiang.com>
Date: Mon, 17 Aug 2026 14:13:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(frp=5Fpaper):=20=E8=B0=83=E6=95=B4=E7=BA=B8?=
 =?UTF-8?q?=E5=BC=A0=E7=A9=BA=E5=8D=B7=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8E=E9=80=80=E8=B4=A7SAP=E8=BF=87=E8=B4=A6=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增管件信息为空预警时间过滤条件，限制查询2026-07-01之后的记录
- 增加纸管材质为空的条件判断
- 销售出库过账日期由业务日期改为确认日期
---
 .../sch/tasks/frp_paper/mapper/FrpOrPaperEmptyMapper.xml      | 2 ++
 .../st/returns/service/impl/InAndOutRetrunServiceImpl.java    | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/frp_paper/mapper/FrpOrPaperEmptyMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/frp_paper/mapper/FrpOrPaperEmptyMapper.xml
index 6ec9ccff7..3573fdd2d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/frp_paper/mapper/FrpOrPaperEmptyMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/frp_paper/mapper/FrpOrPaperEmptyMapper.xml
@@ -66,6 +66,7 @@
                                         sub.container_name = dis.pcsn
                                             and sub.package_box_sn = dis.box_no
                                             and sub.bill_id = dis.iostorinv_id
+                                            and sub.insert_time >='2026-07-01'
                          left join md_cs_customerbase cust on
                          cust.cust_code = sub.customer_name
                          left join (
@@ -101,6 +102,7 @@
                    and mst.is_delete = '0'
                    and mst.bill_status = '99'
                    and IFNULL(sub.sub_type, '') = ''
+                   and (plan.paper_tube_material IS NULL or plan.paper_tube_material ='')
              ) m
                  inner join st_ivt_structivt sis on  m.pcsn = sis.pcsn
         where m.paper_code is null or m.paper_code = ''
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
index 645586c51..46b15a25d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
@@ -689,7 +689,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
 
                     JSONObject paramSapMst = new JSONObject();
                     paramSapMst.put("ZACTION", "P");
-                    paramSapMst.put("BUDAT", jo_mst.getString("biz_date"));
+                    // 2026 年 8月15日 由业务日期改为确认日期
+                    String confitData = DateUtil.format(jo_mst.getDate("confirm_time"), "yyyy-MM-dd");
+                    paramSapMst.put("BUDAT", confitData);
                     paramSapMst.put("ZZYGYF", jo_mst.getString("estimated_freight"));
                     paramSapMst.put("ZZYZFY", jo_mst.getString("run_freight"));
                     paramSapMst.put("ZZXCFY", jo_mst.getString("unload_freight"));