Ver Fonte

维多利亚

24282 há 2 anos atrás
pai
commit
74f605b124

+ 4 - 2
hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockCheckrecordServiceImpl.java

@@ -98,11 +98,13 @@ public class StockCheckrecordServiceImpl extends ServiceImpl<StockCheckrecordMap
         // 盘点到的rfid
         List<String> rfidList = map.remove(stockHouseId);
 
-        ArrayList<String> copyRfidList = new ArrayList<>(rfidList);
+        List<String> copyRfidList = new ArrayList<>(rfidList);
 
         // 默认在库rfid
         List<Map<String, Object>> inHouseList = stockDetailService.listMaps(Wrappers.<StockDetail>query()
-                .select("RfidCode rfidCode"));
+                .select("RfidCode rfidCode")
+                .eq("IsDelete", 0)
+                .eq("StockHouseId", stockHouseId));
 
         for (Map<String, Object> map : inHouseList) {
             String rfidCode = Convert.toStr(map.get("rfidCode"));

+ 1 - 0
hx-service/victoriatourist/src/main/java/com/fjhx/mapper/product/ProductInfoMapper.xml

@@ -22,6 +22,7 @@
                mature_expected_sales,
                clearance_period,
                product_spu_id,
+               specs,
                CASE
                    WHEN datediff(now(), computing_time) &lt; new_products_day THEN 1
                    WHEN datediff(now(), computing_time) &lt; (new_products_day + grow_up_day) THEN 2