杰生重构

hx-service-api/service-flow-api/src/main/java/com/fjhx/feign/IFlowClient.java

@@ -32,8 +32,8 @@ public interface IFlowClient {
      * @param cacheData  缓存数据
      */
     @GetMapping(CREATE)
-    R<ExampleResult> create(@RequestParam("flowLinkNo") Long flowLinkNo,
-                            @RequestParam("code") String code,
+    R<ExampleResult> create(@RequestParam(value = "flowLinkNo", required = false) Long flowLinkNo,
+                            @RequestParam(value = "code", required = false) String code,
                             @RequestParam(value = "nodeCode", required = false) String nodeCode,
                             @RequestParam(value = "title", required = false) String title,
                             @RequestParam(value = "remarks", required = false) String remarks,
@@ -47,7 +47,7 @@ public interface IFlowClient {
      * @return 按钮对象
      */
     @GetMapping(GET_JUMP_VO)
-    R<JumpVo> getJumpVo(@RequestParam("buttonId") Long buttonId,
+    R<JumpVo> getJumpVo(@RequestParam(value = "buttonId", required = false) Long buttonId,
                         @RequestParam(value = "nodeCode", required = false) String nodeCode);
 
     /**
@@ -66,12 +66,13 @@ public interface IFlowClient {
      * 撤回
      */
     @PostMapping(WITHDRAW)
-    R withdraw(@RequestParam Long withdrawExampleInfoId, @RequestParam Long withdrawExampleDetailsId);
+    R withdraw(@RequestParam(value = "withdrawExampleInfoId", required = false) Long withdrawExampleInfoId,
+               @RequestParam(value = "withdrawExampleDetailsId", required = false) Long withdrawExampleDetailsId);
 
     /**
      * 撤销
      */
     @PostMapping(REVOKE)
-    R revoke(@RequestParam Long revokeExampleInfoId);
+    R revoke(@RequestParam(value = "revokeExampleInfoId", required = false) Long revokeExampleInfoId);
 
 }

hx-service/storage-restructure/src/main/java/com/fjhx/controller/check/CheckController.java

@@ -1,16 +1,20 @@
 package com.fjhx.controller.check;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.check.CheckInfo;
+import com.fjhx.base.Condition;
+import com.fjhx.entity.water.Water;
+import com.fjhx.entity.water.WaterTag;
 import com.fjhx.params.check.CheckInfoVo;
-import org.springblade.core.tool.api.R;
 import com.fjhx.service.check.CheckInfoService;
+import com.fjhx.service.water.WaterTagService;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,26 +32,35 @@ public class CheckController {
     @Autowired
     private CheckInfoService checkInfoService;
 
+    @Autowired
+    private WaterTagService waterTagService;
+
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
-        Page<CheckInfo> result = checkInfoService.getPage(condition);
+    public R page(@RequestBody Condition condition) {
+        Page<Map<String, Object>> result = checkInfoService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/getInHouseTagList")
+    public R getInHouseTagList(@RequestBody WaterTag waterTag) {
+        List<WaterTag> result = waterTagService.getInHouseTagList(waterTag);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody CheckInfoVo checkVo){
+    public R add(@RequestBody CheckInfoVo checkVo) {
         checkInfoService.add(checkVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody CheckInfoVo checkVo){
+    public R edit(@RequestBody CheckInfoVo checkVo) {
         checkInfoService.edit(checkVo);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody CheckInfoVo checkVo){
+    public R delete(@RequestBody CheckInfoVo checkVo) {
         checkInfoService.delete(checkVo);
         return R.success();
     }

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/check/CheckInfoMapper.java

@@ -1,7 +1,12 @@
 package com.fjhx.mapper.check;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.check.CheckInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +18,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CheckInfoMapper extends BaseMapper<CheckInfo> {
 
+    Page<Map<String, Object>> getPage(@Param("page") Page<Object> page, @Param("ew") QueryWrapper<Object> wrapper);
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/check/CheckInfoMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mapper.check.CheckInfoMapper">
+
+    <select id="getPage" resultType="java.util.Map">
+        select m.technology_type,
+               m.code  materialCode,
+               m.name  materialName,
+               sh.name houseName,
+               cd.stock_count,
+               cd.stock_quantity,
+               cd.stock_house_id,
+               cd.material_id
+        from check_detail cd
+                 left join material m on cd.material_id = m.id
+                 left join stock_house sh on cd.stock_house_id = sh.id
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/check/CheckMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fjhx.mapper.check.CheckMapper">
-
-</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/service/check/CheckInfoService.java

@@ -1,6 +1,7 @@
 package com.fjhx.service.check;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
 import com.fjhx.base.StorageBaseService;
 import com.fjhx.entity.check.CheckInfo;
 import com.fjhx.params.check.CheckInfoVo;
@@ -17,7 +18,7 @@ import java.util.Map;
  */
 public interface CheckInfoService extends StorageBaseService<CheckInfo> {
 
-    Page<CheckInfo> getPage(Map<String, String> condition);
+    Page<Map<String, Object>> getPage(Condition condition);
 
     void add(CheckInfoVo checkVo);
 

hx-service/storage-restructure/src/main/java/com/fjhx/service/check/impl/CheckInfoServiceImpl.java

@@ -1,10 +1,12 @@
 package com.fjhx.service.check.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.Condition;
 import com.fjhx.constants.HouseConstant;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.WebSocketConstant;
@@ -19,7 +21,6 @@ import com.fjhx.service.check.CheckDetailService;
 import com.fjhx.service.check.CheckInfoService;
 import com.fjhx.service.stock.StockService;
 import com.fjhx.service.water.WaterTagService;
-import com.fjhx.utils.WrapperUtil;
 import org.springblade.core.tool.utils.ThreadUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,15 +56,16 @@ public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo
     private CheckDetailService checkDetailService;
 
     @Override
-    public Page<CheckInfo> getPage(Map<String, String> condition) {
+    public Page<Map<String, Object>> getPage(Condition condition) {
+        String keyword = condition.getKeyword();
+        Integer status = condition.getStatus();
 
-        QueryWrapper<CheckInfo> wrapper = Wrappers.query();
+        QueryWrapper<Object> wrapper = Wrappers.query();
+        wrapper.and(ObjectUtil.isNotEmpty(keyword),
+                        q -> q.like("m.name", keyword).or().like("m.code", keyword))
+                .eq(ObjectUtil.isNotEmpty(status), "cd.complete_check", status);
 
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<CheckInfo> page = page(condition, wrapper);
-        return page;
+        return baseMapper.getPage(condition.getPage(), wrapper);
     }
 
     @Override
@@ -92,7 +94,7 @@ public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo
 
         WebSocketServer.sendInfo(WebSocketConstant.WEB_STOCK_PROGRAM, WebSocketConstant.OPERATING_UPPER_COMPUTER, data);
 
-        ThreadUtil.sleep(1000);
+        ThreadUtil.sleep(1000 * 60 * 10);
 
         data.clear();
         data.put("type", 9);
@@ -115,7 +117,6 @@ public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo
             savaCheckDetailList(errorMaterialId, checkId);
         }
 
-
     }
 
     /**
@@ -204,7 +205,6 @@ public class CheckInfoServiceImpl extends ServiceImpl<CheckInfoMapper, CheckInfo
             checkDetail.setCompleteCheck(StatusConstant.NO);
             checkDetail.setStockHouseId(HouseConstant.GROUND_FLOOR_ID);
 
-
             return checkDetail;
         }).collect(Collectors.toList());
 

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/WaterTagService.java

@@ -38,4 +38,6 @@ public interface WaterTagService extends StorageBaseService<WaterTag> {
 
     void editInHouse(Enum<?> typeEnum, List<WaterTag> waterTagList, Long stockHouseId);
 
+    List<WaterTag> getInHouseTagList(WaterTag waterTag);
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterTagServiceImpl.java

@@ -245,6 +245,22 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
 
     }
 
+    @Override
+    public List<WaterTag> getInHouseTagList(WaterTag waterTag) {
+        Long stockHouseId = waterTag.getStockHouseId();
+        Long materialId = waterTag.getMaterialId();
+
+        Assert.notEmpty(stockHouseId, "仓库id不能为空");
+        Assert.notEmpty(materialId, "物料id不能为空");
+        
+        return list(q -> q
+                .eq(WaterTag::getStockHouseId, stockHouseId)
+                .eq(WaterTag::getMaterialId, materialId)
+                .eq(WaterTag::getInHouse, StatusConstant.YES)
+                .eq(WaterTag::getUseStatus, StatusConstant.YES)
+        );
+    }
+
     /**
      * 解析excel文件中的数据
      */