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"));