opt:工单数量更新

mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/AsyncLuceneAppender.java

@@ -42,7 +42,6 @@ public class AsyncLuceneAppender extends AspectLogbackAsyncAppender {
             if (mdcPropertyMap.getClass().getName().contains("SynchronizedMap")){
                 mdcPropertyMap.put("traceId",traceId);
             }
-            MDC.clear();
         }
         super.append(event);
     }

mes/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java

@@ -41,7 +41,7 @@ public class RedissonUtils {
             ex.printStackTrace();
             throw ex;
         }finally {
-            if (isLock){
+            if (isLock && lock.isHeldByCurrentThread()){
                 lock.unlock();
             }
         }

mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java

@@ -46,7 +46,7 @@ public class DruidFilter extends FilterEventAdapter {
         try {
             count=statement.getUpdateCount();
         }catch (Exception ex){ }
-        if (StringUtils.isNotBlank(traceId) && count>0) {
+        if (count>0) {
             if (size > 0) {
                 Collection<JdbcParameter> values = statement.getParameters().values();
                 List<Object> params = new ArrayList<>();
@@ -64,7 +64,7 @@ public class DruidFilter extends FilterEventAdapter {
         ResultSetProxy rs = super.statement_getResultSet(chain, statement);
         String executeSql = statement.getLastExecuteSql();
         String traceId = MDC.get("traceId");
-        if (StringUtils.isNotBlank(traceId)){
+        if (true){
             int result = 0;
             if (rs != null) {
                 ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class);

mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java

@@ -363,7 +363,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
         }
         Iterator<String> iterator = param.keySet().iterator();
         Map<String, PdmProduceWorkorder> map = workorderService.list(new QueryWrapper<PdmProduceWorkorder>()
-                .in("workorder_code", param.keySet()))
+                .in("workorder_code", param.keySet())
+                .eq("workorder_status",WorkerOrderEnum.PRODUCTING.getCode()))
                 .stream().collect(HashMap::new, (k, v) -> k.put(v.getWorkorder_code(), v), HashMap::putAll);
         Date now = new Date();
         BigDecimal divide = new BigDecimal(0);