diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index b2cf03555..9d0b72d48 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -1237,7 +1237,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { String feishu_time = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_TIME").getValue(); LocalDateTime today8AM; - if (StrUtil.isEmpty(feishu_time)) { + if (StrUtil.equals(feishu_time,"-")) { // 1. 当天早上 8 点:将当前时间的时、分、秒、纳秒设为 8:00:00 today8AM = now.withHour(7) .withMinute(59) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index a2ef039da..4bd0af4f7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -1298,7 +1298,7 @@ IF 输入.flag = "7" QUERY SELECT - FLOOR(UNIX_TIMESTAMP(DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 1 DAY), '%Y-%m-%d 08:00:00')) * 1000) AS '日期', + FLOOR(UNIX_TIMESTAMP(DATE_FORMAT(DATE_SUB(输入.end_time, INTERVAL 1 DAY), '%Y-%m-%d 08:00:00')) * 1000) AS '日期', CASE WHEN DATE_FORMAT(mst.confirm_time, '%H:%i:%s') >= '08:00:00' AND DATE_FORMAT(mst.confirm_time, '%H:%i:%s') <= '19:59:59' THEN '白班' @@ -1313,7 +1313,7 @@ cust.cust_code AS '客户编码', sub.customer_description AS '客户名称', cust.sales_owner AS '业务员', - sub.thickness AS '规格', + sub.thickness_request AS '规格', sub.width_standard AS '尺寸(mm)(客户要求幅宽)', sub.width AS '实际尺寸(mm)(实际幅宽)', CONCAT(SUBSTRING_INDEX(SUBSTRING_INDEX(mb.material_name, '|', 3), '|', -1), '*',