Merge remote-tracking branch 'origin/master'

hx-service/storage/src/main/java/com/fjhx/attachment/controller/StockAttachmentController.java

@@ -25,11 +25,6 @@ public class StockAttachmentController {
     @Autowired
     private StockAttachmentService stockAttachmentService;
 
-    @GetMapping("/helloWord")
-    public R helloWord() {
-        return R.success("hello word");
-    }
-
     @PostMapping("/page")
     public R page(@RequestBody Map<String, String> condition) {
         Page<StockAttachment> result = stockAttachmentService.getPage(condition);

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -77,8 +77,6 @@
         from stock_detail sd
                  inner join material m on sd.MaterialCode = m.code
         where sd.IsDelete = 0
-          and m.TechnologyType is not null
-          and m.TechnologyType != 4
     </select>
 
     <select id="remainingTodayPage" resultType="java.util.LinkedHashMap">

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -427,8 +427,8 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
         // 工艺类型
         String technologyType = condition.get("technologyType");
         if (ObjectUtil.isNotEmpty(technologyType)) {
-            if (technologyType.equals("4")) {
-                wrapper.in("m.TechnologyType", 0, 1, 2);
+            if (technologyType.equals("5")) {
+                wrapper.in("m.TechnologyType", 0, 1, 2, 4);
             } else {
                 wrapper.eq("m.TechnologyType", technologyType);
             }