采购修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/mapper/xml/CollectBasicMapper.xml

@@ -14,7 +14,7 @@
 			a.trade_name,
 			a.trade_number
 		FROM
-			material_management_warehouse_summary a
+			material_management_warehouse_basics a
 			${ew.customSqlSegment}
 		ORDER BY a.update_date DESC
     </select>

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -48,6 +48,7 @@
 			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0 GROUP BY e.goods_name) b
 			on a.trade_name = b.goods_name and b.status = 5
 
+			LEFT JOIN material_management_warehouse_basics bas on a.basic_id = bas.id
 			left join material_management_type c on a.ware_house_type = c.id
 			${ew.customSqlSegment}
 			GROUP BY a.trade_name

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/WareHouseBasicService.java

@@ -455,6 +455,11 @@ public class WareHouseBasicService {
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
             queryWrapper.like("a.trade_name", dto.getTradeName());
         }
+        queryWrapper.and(wq ->{
+            wq.eq("bas.`status`","0")
+                    .or()
+                    .eq("bas.`status`","5");
+        });
 //        if (StringUtils.isNotEmpty(dto.getWareHouseMan())) {
 //            queryWrapper.like("a.ware_house_man", dto.getWareHouseMan());
 //        }
@@ -464,7 +469,7 @@ public class WareHouseBasicService {
 
         //入库类型
         if (StringUtils.isNotEmpty(dto.getWareHouseType())) {
-            queryWrapper.eq("c.name", dto.getWareHouseType());
+            queryWrapper.eq("c.id", dto.getWareHouseType());
         }
 
         // 入库时间