diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index 95c55a7f1..7f7fbfea2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -336,6 +336,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { sub_jo.put("posnr", json.getString("POSNR")); sub_jo.put("quanlity_in_box", 1); sub_jo.put("package_box_sn", package_box_sn); + sub_jo.put("sale_order_name", sale_order_name); sub_jo.put("width", width); sub_jo.put("length", length); sub_jo.put("status", "0"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java index 7edd9d50f..64352972a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoQueryBillInfo.java @@ -25,9 +25,9 @@ public class AutoQueryBillInfo { String nofity_day = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("NOFITY_DAY").getValue(); JSONArray send_rows = new JSONArray(); if (Integer.parseInt(nofity_day) == 0) { - send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'AC01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '')").getResultJSONArray(0); + send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND confirm_time > '2023-09-01' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '')").getResultJSONArray(0); } else { - send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND stor_code = 'AC01' AND upload_sap = '0' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) = " + nofity_day).getResultJSONArray(0); + send_rows = wo.query("bill_type = '1001' AND bill_status = '99' AND confirm_time > '2023-09-01' AND is_delete = '0' AND (IFNULL(carno,'') = '' OR IFNULL(trans_code,'') = '' OR IFNULL(estimated_freight,'') = '' OR IFNULL(order_number,'') = '' OR IFNULL(car_type,'') = '') AND TIMESTAMPDIFF(DAY,confirm_time,NOW()) >= " + nofity_day).getResultJSONArray(0); } this.sendInfo(send_rows); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 4a9ba09f7..9bbbd9822 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -203,7 +203,8 @@ public class InBillQueryServiceImpl implements InBillQueryService { Map mp = new LinkedHashMap<>(); mp.put("日期", (json.getString("confirm_time_class").substring(0,10)).replace("-","/")); mp.put("班次", json.getString("classes")); - mp.put("客户代码", json.getString("sale_order_name")); + mp.put("销售订单", json.getString("sale_order_name")); + mp.put("客户编码", json.getString("customer_name")); mp.put("规格", json.getString("thickness_request")); mp.put("尺寸(mm)(客户要求幅宽)", json.getString("width_standard")); mp.put("实际尺寸(mm)(实际幅宽)", json.getString("width")); diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 07dcd76a1..d85b33d7e 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -38,7 +38,7 @@ -