root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge_0523' into master_merge_0523

Browse Source
This commit is contained in:
liyongde
2026-08-17 14:16:38 +08:00
parent 22239d491d 039e55987f
commit 4d3093a003
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/frp_paper/mapper/FrpOrPaperEmptyMapper.xml
View File

@@ -66,6 +66,7 @@
sub.container_name = dis.pcsn sub.container_name = dis.pcsn
and sub.package_box_sn = dis.box_no and sub.package_box_sn = dis.box_no
and sub.bill_id = dis.iostorinv_id and sub.bill_id = dis.iostorinv_id
and sub.insert_time >='2026-07-01'
left join md_cs_customerbase cust on left join md_cs_customerbase cust on
cust.cust_code = sub.customer_name cust.cust_code = sub.customer_name
left join ( left join (
@@ -101,6 +102,7 @@
and mst.is_delete = '0' and mst.is_delete = '0'
and mst.bill_status = '99' and mst.bill_status = '99'
and IFNULL(sub.sub_type, '') = '' and IFNULL(sub.sub_type, '') = ''
and (plan.paper_tube_material IS NULL or plan.paper_tube_material ='')
) m ) m
inner join st_ivt_structivt sis on m.pcsn = sis.pcsn inner join st_ivt_structivt sis on m.pcsn = sis.pcsn
where m.paper_code is null or m.paper_code = '' where m.paper_code is null or m.paper_code = ''

4
lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -689,7 +689,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
JSONObject paramSapMst = new JSONObject(); JSONObject paramSapMst = new JSONObject();
paramSapMst.put("ZACTION", "P"); 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("ZZYGYF", jo_mst.getString("estimated_freight"));
paramSapMst.put("ZZYZFY", jo_mst.getString("run_freight")); paramSapMst.put("ZZYZFY", jo_mst.getString("run_freight"));
paramSapMst.put("ZZXCFY", jo_mst.getString("unload_freight")); paramSapMst.put("ZZXCFY", jo_mst.getString("unload_freight"));