Merge remote-tracking branch 'gitee/0.8.X' into 0.8.X

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

@@ -127,59 +127,61 @@ public class WmsMaterialCoilVo {
     private String remark;
 
     // ========== 关联对象属性 ==========
-    
+
     /**
      * 所在库区信息
      */
     private WmsWarehouseVo warehouse;
-    
+
     /**
      * 下一库区信息
      */
     private WmsWarehouseVo nextWarehouse;
-    
+
     /**
      * 二维码信息
      */
     private WmsGenerateRecordVo qrcodeRecord;
-    
+
     /**
      * 原材料信息（当itemType为raw_material时）
      */
     private WmsRawMaterialVo rawMaterial;
-    
+
     /**
      * 产品信息（当itemType为product时）
      */
     private Object product; // 产品VO待定义
-    
+
     /**
      * BOM列表（原材料对应的BOM项目信息）
      */
     private List<WmsBomItemVo> bomItemList;
 
     // ========== 统计相关属性 ==========
-    
+
     /**
      * 库区名称（用于统计查询）
      */
     private String warehouseName;
-    
+
     /**
      * 钢卷数量（用于统计查询）
      */
     private Long coilCount;
-    
+
     /**
      * 总毛重（用于统计查询）
      */
     private BigDecimal totalGrossWeight;
-    
+
     /**
      * 总净重（用于统计查询）
      */
     private BigDecimal totalNetWeight;
 
 
+
+
 }
 

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

@@ -1,5 +1,8 @@
 package com.klp.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.klp.domain.WmsMaterialCoil;
 import com.klp.domain.vo.WmsMaterialCoilVo;
 import com.klp.common.core.mapper.BaseMapperPlus;
@@ -34,5 +37,7 @@ public interface WmsMaterialCoilMapper extends BaseMapperPlus<WmsMaterialCoilMap
      * @return 分布情况列表
      */
     List<Map<String, Object>> getDistributionByItemType(@Param("itemType") String itemType, @Param("itemId") Long itemId);
+
+    Page<WmsMaterialCoilVo> selectVoPagePlus(Page<Object> build,@Param("ew") QueryWrapper<WmsMaterialCoil> lqw);
 }
 

klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.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.page.TableDataInfo;
 import com.klp.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -152,11 +153,28 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
      */
     @Override
     public TableDataInfo<WmsMaterialCoilVo> queryPageList(WmsMaterialCoilBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<WmsMaterialCoil> lqw = buildQueryWrapper(bo);
-        Page<WmsMaterialCoilVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        QueryWrapper<WmsMaterialCoil> qw = buildQueryWrapperPlus(bo);
+        Page<WmsMaterialCoilVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), qw);
         return TableDataInfo.build(result);
     }
 
+    private QueryWrapper<WmsMaterialCoil> buildQueryWrapperPlus(WmsMaterialCoilBo bo) {
+        QueryWrapper<WmsMaterialCoil> qw = Wrappers.query();
+        qw.like(StringUtils.isNotBlank(bo.getEnterCoilNo()), "mc.enter_coil_no", bo.getEnterCoilNo());
+        qw.like(StringUtils.isNotBlank(bo.getCurrentCoilNo()), "mc.current_coil_no", bo.getCurrentCoilNo());
+        qw.like(StringUtils.isNotBlank(bo.getSupplierCoilNo()), "mc.supplier_coil_no", bo.getSupplierCoilNo());
+        qw.eq(bo.getDataType() != null, "mc.data_type", bo.getDataType());
+        qw.eq(bo.getWarehouseId() != null, "mc.warehouse_id", bo.getWarehouseId());
+        qw.eq(bo.getHasMergeSplit() != null, "mc.has_merge_split", bo.getHasMergeSplit());
+        qw.eq(bo.getStatus() != null, "mc.status", bo.getStatus());
+        qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType());
+        qw.eq(bo.getItemId() !=null, "mc.item_id", bo.getItemId());
+        //逻辑删除
+        qw.eq("mc.del_flag", 0);
+        return qw;
+    }
+
+
     /**
      * 查询钢卷物料表列表
      */