Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/mapper/xml/MaterialBasicMapper.xml

@@ -16,6 +16,7 @@
 			a.handled_by,
 			a.handled_by_office,
 			a.purchase_date,
+			a.purchase_mode as purchaseModeType,
 			(case a.purchase_mode
 				when 1 then '办公室采购'
 				when 2 then '自行采购'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/purchase/service/dto/MaterialInfoDto.java

@@ -53,6 +53,11 @@ public class MaterialInfoDto {
     private String purchaseMode;
 
     /**
+     *采购方式（判断是否展示入库记录及入库）
+     */
+    private String purchaseModeType;
+
+    /**
      *采购金额（元）
      */
     private String tradeTotalPrice;

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

@@ -78,6 +78,11 @@ public class WareHouseBasicService {
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
             queryWrapper.like("b.trade_name", dto.getTradeName());
         }
+        queryWrapper.and(wq ->{
+            wq.eq("a.`status`","0")
+                    .or()
+                    .eq("a.`status`","5");
+        });
 
         return basicMapper.wareHouseHistoryList(page, queryWrapper);
     }
@@ -93,6 +98,12 @@ public class WareHouseBasicService {
             queryWrapper.like("b.goods_name", dto.getTradeName());
         }
 
+        queryWrapper.and(wq ->{
+            wq.eq("a.`status`","0")
+                    .or()
+                    .eq("a.`status`","5");
+        });
+
         return basicMapper.collectHistoryList(page, queryWrapper);
     }
 
@@ -434,9 +445,15 @@ public class WareHouseBasicService {
         // 入库时间
         String[] contractDates = dto.getWareHouseDates();
         if (contractDates != null) {
-
             queryWrapper.between("a.ware_house_date", contractDates[0], contractDates[1]);
         }
+        if (dto.getStatusTwo() != null) {
+            queryWrapper.and(wq ->{
+                wq.eq("a.`status`",dto.getStatusTwo()[0])
+                        .or()
+                        .eq("a.`status`",dto.getStatusTwo()[1]);
+            });
+        }
 
         return basicMapper.findList(page, queryWrapper);
     }

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

@@ -17,6 +17,11 @@ import java.util.List;
 @Data
 public class WareHouseDto {
 
+    /**
+     * 采购申请查看入库记录所需
+     */
+    private String[] statusTwo;
+
     //入库编号（字典值）
     public static final String BIZ_CODE = "28";