ding

hx-service/storage/src/main/java/com/fjhx/listener/WebSocketEventListener.java

@@ -141,7 +141,6 @@ public class WebSocketEventListener {
 
         MessageEntity messageEntity;
         synchronized (businessType == 1 ? warehousingLock : issueLock) {
-            long l = System.currentTimeMillis();
             messageEntity = this.map.get(sessionId);
 
             if (messageEntity == null) {
@@ -157,9 +156,6 @@ public class WebSocketEventListener {
                 rfidList.add(rfid);
                 messageEntity.getData().put("rfidList", rfidList);
             }
-
-            long l2 = System.currentTimeMillis();
-            System.out.println(l2 - l);
         }
     }
 

hx-service/storage/src/main/java/com/fjhx/material/mapper/MaterialMapper.xml

@@ -50,6 +50,8 @@
         FROM stock_tag st
                  LEFT JOIN stock_detail sd ON st.rfidCode = sd.rfidCode AND sd.IsDelete = 0
                  LEFT JOIN material m ON m.CODE = st.MaterialCode
+                 LEFT JOIN stock_waterdetial swd
+                           ON swd.RfidCode = st.RfidCode AND swd.IsDelete = 0 AND swd.StockChangeType IN (20, 23)
             ${ew.customSqlSegment}
     </select>
 

hx-service/storage/src/main/java/com/fjhx/material/mapper/impl/MaterialServiceImpl.java

@@ -61,7 +61,8 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialSMapper, Material>
         QueryWrapper<Object> wrapper = Wrappers.query()
                 .eq("st.IsDelete", StatusConstant.NO)
                 .in("st.rfidCode", rfidList)
-                .isNull("sd.id");
+                .isNull("sd.id")
+                .isNull("swd.id");
 
         return baseMapper.getInRfidData(wrapper);
     }