仓库管理修改

blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/vo/ToolingLibraryVO.java

@@ -62,4 +62,7 @@ public class ToolingLibraryVO {
     @Schema(description = "累计使用次数")
     String sumNum;
 
+	@Schema(description = "保养状态")
+	String muStatus;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/MeasuringUpkeepController.java

@@ -1,42 +1,36 @@
 package org.springblade.desk.device.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
 import jakarta.validation.Valid;
-
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.log.annotation.ApiLog;
-import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity;
 import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel;
 import org.springblade.desk.device.pojo.request.MeasuringUpkeepQuery;
+import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO;
 import org.springblade.desk.device.pojo.vo.ToolingLibraryVO;
-//import org.springblade.wms.feign.StRealtimeStockClient;
+import org.springblade.desk.device.service.IMeasuringUpkeepService;
-//import org.springblade.wms.pojo.vo.StRealtimeStockVO;
+import org.springblade.desk.device.wrapper.MeasuringUpkeepWrapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity;
-import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO;
-import org.springblade.desk.device.wrapper.MeasuringUpkeepWrapper;
-import org.springblade.desk.device.service.IMeasuringUpkeepService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.excel.util.ExcelUtil;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.servlet.http.HttpServletResponse;
-
 /**
  * 量具保养 控制器
  *
@@ -163,10 +157,10 @@ public class MeasuringUpkeepController extends BladeController {
     @GetMapping("/newlyAddedList")
     @ApiOperationSupport(order = 3)
     @Operation(summary = "量具保养新增页面列表", description = "传入stRealtimeStock，默认过滤量具类型仓库，按sumNum排序")
-    public R<IPage<ToolingLibraryVO>> pageToolsData(Query query) {
+    public R<IPage<ToolingLibraryVO>> pageToolsData(ToolingLibraryVO toolingLibrary, Query query) {
 
         if (StrUtil.isBlank(query.getAscs()) && StrUtil.isBlank(query.getDescs())) {
-            query.setDescs("sum_num"); // 默认按sumNum降序排序
+            query.setDescs("sum_num");
         }
 //        R<Page<StRealtimeStockVO>> measuringTools = client.getMeasuringTools(stRealtimeStock, query);
 //        Page<StRealtimeStockVO> data = measuringTools.getData();
@@ -177,7 +171,7 @@ public class MeasuringUpkeepController extends BladeController {
 //        pages.setCurrent(data.getCurrent());
 //        pages.setSize(data.getSize());
 //        pages.setPages(data.getPages());
-        IPage<ToolingLibraryVO> pages = measuringUpkeepService.selectToolingLibraryPage(Condition.getPage(query));
+        IPage<ToolingLibraryVO> pages = measuringUpkeepService.selectToolingLibraryPage(Condition.getPage(query), toolingLibrary);
         return R.data(pages);
     }
 

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.java

@@ -35,7 +35,7 @@ public interface MeasuringUpkeepMapper extends BaseMapper<MeasuringUpkeepEntity>
      * @param page 分页参数
      * @return List<ToolingLibraryVO>
      */
-    List<ToolingLibraryVO> selectToolingLibraryPage(IPage page);
+    List<ToolingLibraryVO> selectToolingLibraryPage(IPage page, @Param("toolingLibrary") ToolingLibraryVO toolingLibrary);
 
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/device/mapper/MeasuringUpkeepMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="mesMeasuringUpkeepResultMap" type="org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity">
         <result column="ID" property="id"/>
-        <result column="TENANT_ID" property="tenantId"/>
+<!--        <result column="TENANT_ID" property="tenantId"/>-->
         <result column="CREATE_USER" property="createUser"/>
         <result column="CREATE_TIME" property="createTime"/>
         <result column="CREATE_DEPT" property="createDept"/>
@@ -18,14 +18,14 @@
         <result column="MEMO" property="memo"/>
         <result column="CREATE_MAN" property="createMan"/>
         <result column="APPROVAL_STATUS" property="approvalStatus"/>
-        <result column="RLS_ID" property="rlsId"/>
+<!--        <result column="RLS_ID" property="rlsId"/>-->
     </resultMap>
 
     <!-- 定义结果映射 -->
     <resultMap id="MeasuringUpkeepVOResultMap" type="org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO">
         <!-- 基类字段映射 -->
         <id column="id" property="id"/>
-        <result column="TENANT_ID" property="tenantId"/>
+<!--        <result column="TENANT_ID" property="tenantId"/>-->
         <result column="CREATE_USER" property="createUser"/>
         <result column="CREATE_TIME" property="createTime"/>
         <result column="CREATE_DEPT" property="createDept"/>
@@ -38,7 +38,7 @@
         <result column="MEMO" property="memo"/>
         <result column="CREATE_MAN" property="createMan"/>
         <result column="APPROVAL_STATUS" property="approvalStatus"/>
-        <result column="RLS_ID" property="rlsId"/>
+<!--        <result column="RLS_ID" property="rlsId"/>-->
 
         <!-- 关联的ST_REALTIME_STOCK表字段映射 -->
         <result column="goods_id" property="goodsId"/>
@@ -150,23 +150,58 @@
         ORDER BY mmu.create_time DESC
     </select>
 
-    <select id="selectToolingLibraryPage" resultMap="stRealtimeStockResultMap">
+    <select id="selectToolingLibraryPage" resultType="org.springblade.desk.device.pojo.vo.ToolingLibraryVO">
         SELECT
         st.*,
         g.goods_name,
         g.goods_code,
         g.specifications,
         sh.sh_name,
-        sl.location
+        sl.location,
+        NVL(mu.status, 0) AS muStatus
         FROM ST_REALTIME_STOCK st
         LEFT JOIN ST_GOODS g ON st.goods_id = g.id
         LEFT JOIN ST_STOREHOUSE sh ON st.sh_id = sh.id
         LEFT JOIN ST_STORAGE_LOCATION sl ON st.sl_id = sl.id
+        LEFT JOIN MES_MEASURING_UPKEEP mu ON st.id = mu.mi_id
         <where>
             st.is_deleted = 0
             AND sh.is_deleted = 0
             <!-- 2. 固定条件：量具库（对应 StStorehouse.TYPE_RULE = 5） -->
             AND sh.type = 5
+
+            <if test="toolingLibrary != null
+                and (toolingLibrary.shName == null or toolingLibrary.shName == '')
+                and (toolingLibrary.location == null or toolingLibrary.location == '')
+                and (toolingLibrary.muStatus == null or toolingLibrary.muStatus == '')
+                and (toolingLibrary.goodsName == null or toolingLibrary.goodsName == '')
+                and (toolingLibrary.piNo == null or toolingLibrary.piNo == '')">
+                AND st.sum_num >= 270
+            </if>
+
+            <!-- 库房 -->
+            <if test="toolingLibrary != null and toolingLibrary.shName != null and toolingLibrary.shName != ''">
+                AND sh.sh_name LIKE '%' || #{toolingLibrary.shName} || '%'
+            </if>
+
+            <!-- 库位 -->
+            <if test="toolingLibrary != null and toolingLibrary.location != null and toolingLibrary.location != ''">
+                AND sl.location LIKE '%' || #{toolingLibrary.location} || '%'
+            </if>
+
+            <if test="toolingLibrary.muStatus != null and toolingLibrary.muStatus != ''">
+                AND mu.status = #{toolingLibrary.muStatus}
+            </if>
+
+            <!-- 物料名称 -->
+            <if test="toolingLibrary != null and toolingLibrary.goodsName != null and toolingLibrary.goodsName != ''">
+                AND g.goods_name LIKE '%' || #{toolingLibrary.goodsName} || '%'
+            </if>
+
+            <!-- 生产批次号 -->
+            <if test="toolingLibrary != null and toolingLibrary.piNo != null and toolingLibrary.piNo != ''">
+                AND st.pi_no LIKE '%' || #{toolingLibrary.piNo} || '%'
+            </if>
         </where>
     </select>
 

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/IMeasuringUpkeepService.java

@@ -34,7 +34,7 @@ public interface IMeasuringUpkeepService extends BaseService<MeasuringUpkeepEnti
      * @param page 分页参数
      * @return IPage<ToolingLibraryVO>
      */
-    IPage<ToolingLibraryVO> selectToolingLibraryPage(IPage<ToolingLibraryVO> page);
+    IPage<ToolingLibraryVO> selectToolingLibraryPage(IPage<ToolingLibraryVO> page, ToolingLibraryVO toolingLibrary);
 
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/MeasuringUpkeepServiceImpl.java

@@ -1,32 +1,23 @@
 package org.springblade.desk.device.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
+import org.springblade.desk.device.mapper.MeasuringUpkeepMapper;
-import org.springblade.desk.device.pojo.entity.MeasurementRecordsEntity;
-import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity;
 import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity;
 import org.springblade.desk.device.pojo.excel.MeasuringUpkeepExcel;
 import org.springblade.desk.device.pojo.request.MeasuringUpkeepQuery;
 import org.springblade.desk.device.pojo.vo.MeasuringUpkeepVO;
-import org.springblade.desk.device.mapper.MeasuringUpkeepMapper;
 import org.springblade.desk.device.pojo.vo.ToolingLibraryVO;
 import org.springblade.desk.device.service.IMeasuringUpkeepService;
-import org.springblade.desk.jobtransfer.pojo.vo.PostHandleVO;
-import org.springblade.system.cache.SysCache;
-import org.springblade.system.cache.UserCache;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.net.URI;
@@ -38,7 +29,6 @@ import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -69,8 +59,8 @@ public class MeasuringUpkeepServiceImpl extends BaseServiceImpl<MeasuringUpkeepM
     }
 
     @Override
-    public IPage<ToolingLibraryVO> selectToolingLibraryPage(IPage<ToolingLibraryVO> page) {
+    public IPage<ToolingLibraryVO> selectToolingLibraryPage(IPage<ToolingLibraryVO> page ,ToolingLibraryVO toolingLibrary) {
-        List<ToolingLibraryVO> dataList = baseMapper.selectToolingLibraryPage(page);
+        List<ToolingLibraryVO> dataList = baseMapper.selectToolingLibraryPage(page, toolingLibrary);
         return page.setRecords(dataList);
     }