From f3e969047dfab37cb448042af2b15048c603bce4 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 22 May 2024 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E5=B7=A5=E5=8D=95=E7=94=B5=E6=B0=94?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/common/utils/AcsUtil.java | 14 +++++++-------
 .../acs/service/impl/AcsToWmsServiceImpl.java      |  7 +++++--
 .../device/dao/mapper/PdmBiDeviceMapper.xml        |  2 +-
 .../src/main/resources/logback-spring.xml          |  8 +-------
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
index 8531bfe5..cc61a158 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
@@ -35,14 +35,14 @@ public class AcsUtil {
             result.put("data", new JSONObject());
             return result;
         }
-        String acsParam = "acs_url";
-        JSONObject jsonObject = list.getJSONObject(0);
-        String acs = jsonObject.getString("acs");
-        if (StringUtils.isNotEmpty(acs)){
-            acsParam=acs;
-        }
+//        String acsParam = "acs_url";
+//        JSONObject jsonObject = list.getJSONObject(0);
+//        String acs = jsonObject.getString("acs");
+//        if (StringUtils.isNotEmpty(acs)){
+//            acsParam=acs;
+//        }
         //ACS地址：127.0.0.1:8010
-        String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(acsParam).getValue();
+        String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue();
 
         String url = acsUrl + api;
         try {
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java
index ec9db7d4..c2fcdf2c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java
@@ -358,14 +358,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
     @Override
     @Async
     public void feedOrderRealQty(JSONObject param) {
-        String today = DateUtil.today().replace("-", "");
+
         if (CollectionUtils.isEmpty(param)){
             return;
         }
+        String today = DateUtil.format(new Date(), "yyMMdd");
+        String yesterday = DateUtil.format(DateUtil.yesterday(), "yyMMdd");
+
         Iterator<String> check = param.keySet().iterator();
         while (check.hasNext()){
             String key = check.next();
-            if (!key.contains(today)){
+            if (!key.contains(today) && !key.contains(yesterday)){
                 check.remove();
             }
         }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
index 45309c33..18f53bb3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
@@ -55,7 +55,7 @@
         where
         sch_base_point.point_type = '4' and pdm_bi_device.is_used = true
         AND pdm_bi_device.is_used = true and is_artificial = false
-        and workprocedure_id = #{workprocedure_id}
+        and pdm_bi_device.workprocedure_id = #{workprocedure_id}
         <if test="material_id != null and material_id != ''">
             and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')
         </if>
diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
index c7bc5d88..f75cb32d 100644
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -80,7 +80,7 @@
 
     <springProfile name="dev3">
         <root level="info">
-            <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
@@ -88,9 +88,6 @@
         <logger name="org.springframework" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
-        <logger name="org.nl" level="WARN" additivity="true">
-            <appender-ref ref="CONSOLE"/>
-        </logger>
         <logger name="org.hibernate" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>
@@ -114,9 +111,6 @@
         <root level="info">
             <appender-ref ref="asyncLuceneAppender"/>
         </root>
-        <logger name="org.nl" level="WARN" additivity="true">
-            <appender-ref ref="CONSOLE"/>
-        </logger>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>
         </logger>