feat(wms): 新增钢卷待操作联查

- 在WmsCoilPendingActionMapper中添加selectVoPagePlus方法支持自定义查询
- 在WmsCoilPendingActionMapper.xml中实现selectVoPagePlus的SQL映射逻辑
- 修改WmsCoilPendingActionServiceImpl中的queryPageList方法以使用新的查询方式
- 新增buildQueryWrapperPlus方法构建更复杂的查询条件
- 在WmsCoilPendingActionVo中增加enterCoilNo、supplierCoilNo、itemId和itemType字段用于展示更多信息

klp-wms/src/main/java/com/klp/domain/vo/WmsCoilPendingActionVo.java

@@ -145,5 +145,10 @@ public class WmsCoilPendingActionVo extends BaseEntity implements Serializable {
      * 重量
      */
     private Double weight;
+
+    private String enterCoilNo;
+    private String supplierCoilNo;
+    private Long itemId;
+    private String itemType;
 }
 

klp-wms/src/main/java/com/klp/mapper/WmsCoilPendingActionMapper.java

@@ -1,8 +1,11 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.common.core.mapper.BaseMapperPlus;
 import com.klp.domain.WmsCoilPendingAction;
 import com.klp.domain.vo.WmsCoilPendingActionVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 钢卷待操作Mapper接口
@@ -12,5 +15,6 @@ import com.klp.domain.vo.WmsCoilPendingActionVo;
  */
 public interface WmsCoilPendingActionMapper extends BaseMapperPlus<WmsCoilPendingActionMapper, WmsCoilPendingAction, WmsCoilPendingActionVo> {
 
+    Page<WmsCoilPendingActionVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<WmsCoilPendingAction> lqw);
 }
 

klp-wms/src/main/java/com/klp/service/impl/WmsCoilPendingActionServiceImpl.java

@@ -1,6 +1,7 @@
 package com.klp.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.klp.common.core.domain.PageQuery;
 import com.klp.common.core.page.TableDataInfo;
 import com.klp.common.utils.StringUtils;
@@ -45,11 +46,27 @@ public class WmsCoilPendingActionServiceImpl implements IWmsCoilPendingActionSer
      */
     @Override
     public TableDataInfo<WmsCoilPendingActionVo> queryPageList(WmsCoilPendingActionBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapper(bo);
-        Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<WmsCoilPendingAction> lqw = buildQueryWrapperPlus(bo);
+        Page<WmsCoilPendingActionVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
+    private QueryWrapper<WmsCoilPendingAction> buildQueryWrapperPlus(WmsCoilPendingActionBo bo) {
+        QueryWrapper<WmsCoilPendingAction> qw = Wrappers.query();
+        qw.eq(bo.getCoilId() != null, "wcpa.coil_id", bo.getCoilId());
+        qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "wcpa.current_coil_no", bo.getCurrentCoilNo());
+        qw.eq(bo.getActionType() != null, "wcpa.action_type", bo.getActionType());
+        qw.eq(bo.getActionStatus() != null, "wcpa.action_status", bo.getActionStatus());
+        qw.eq(bo.getWarehouseId() != null, "wcpa.warehouse_id", bo.getWarehouseId());
+        qw.eq(bo.getPriority() != null, "wcpa.priority", bo.getPriority());
+        qw.like(StringUtils.isNotBlank(bo.getSourceType()), "wcpa.source_type", bo.getSourceType());
+        qw.orderByDesc("wcpa.create_time");
+        qw.orderByDesc("wcpa.scan_time");
+        //逻辑删除
+        qw.eq("wcpa.del_flag", 0);
+        return qw;
+    }
+
     /**
      * 查询钢卷待操作列表
      */

klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml

@@ -26,6 +26,30 @@
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
     </resultMap>
+    <select id="selectVoPagePlus" resultType="com.klp.domain.vo.WmsCoilPendingActionVo">
+        select
+            wcpa.action_id as actionId,
+            wcpa.coil_id as coilId,
+            wcpa.current_coil_no as currentCoilNo,
+            wcpa.action_type as actionType,
+            wcpa.action_status as actionStatus,
+            wcpa.scan_time as scanTime,
+            wcpa.scan_device as scanDevice,
+            wcpa.priority as priority,
+            wcpa.source_type as sourceType,
+            wcpa.warehouse_id as warehouseId,
+            wcpa.operator_id as operatorId,
+            wcpa.operator_name as operatorName,
+            wcpa.process_time as processTime,
+            wcpa.complete_time as completeTime,
+            wmc.enter_coil_no as enterCoilNo,
+            wmc.supplier_coil_no as supplierCoilNo,
+            wmc.item_id as itemId,
+            wmc.item_type as itemType
+        from wms_coil_pending_action wcpa
+                 LEFT JOIN wms_material_coil wmc ON wcpa.coil_id = wmc.coil_id AND wmc.del_flag = 0
+        ${ew.customSqlSegment}
+    </select>
 
 </mapper>