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

klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java

@@ -94,7 +94,7 @@ public class WmsMaterialCoilController extends BaseController {
      * 独立的统计接口，使用与分页列表相同的查询条件
      */
     @PostMapping("/statisticsList")
-    public R<Map<String, BigDecimal>> getStatistics(WmsMaterialCoilBo bo) {
+    public R<Map<String, BigDecimal>> getStatistics(@RequestBody WmsMaterialCoilBo bo) {
         return R.ok(iWmsMaterialCoilService.getStatistics(bo));
     }
 

klp-wms/src/main/java/com/klp/domain/WmsBonusPool.java

@@ -27,6 +27,10 @@ public class WmsBonusPool extends BaseEntity {
      */
     @TableId(value = "pool_id")
     private Long poolId;
+    /**
+     * 奖金池名称
+     */
+    private String poolName;
     /**
      * 产线
      */

klp-wms/src/main/java/com/klp/domain/bo/WmsBonusPoolBo.java

@@ -26,6 +26,11 @@ public class WmsBonusPoolBo extends BaseEntity {
      */
     private Long poolId;
 
+    /**
+     * 奖金池名称
+     */
+    private String poolName;
+
     /**
      * 产线
      */

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

@@ -29,6 +29,12 @@ public class WmsBonusPoolVo extends BaseEntity {
     @ExcelProperty(value = "主键ID")
     private Long poolId;
 
+    /**
+     * 奖金池名称
+     */
+    @ExcelProperty(value = "奖金池名称")
+    private String poolName;
+
     /**
      * 产线
      */

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

@@ -61,6 +61,7 @@ public class WmsBonusPoolServiceImpl implements IWmsBonusPoolService {
     private LambdaQueryWrapper<WmsBonusPool> buildQueryWrapper(WmsBonusPoolBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<WmsBonusPool> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getPoolName()), WmsBonusPool::getPoolName, bo.getPoolName());
         lqw.eq(StringUtils.isNotBlank(bo.getProductionLine()), WmsBonusPool::getProductionLine, bo.getProductionLine());
         lqw.eq(bo.getBonusTime() != null, WmsBonusPool::getBonusTime, bo.getBonusTime());
         lqw.eq(bo.getBonusStartTime() != null, WmsBonusPool::getBonusStartTime, bo.getBonusStartTime());

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

@@ -6,6 +6,7 @@
 
     <resultMap type="com.klp.domain.WmsBonusPool" id="WmsBonusPoolResult">
         <result property="poolId" column="pool_id"/>
+        <result property="poolName" column="pool_name"/>
         <result property="productionLine" column="production_line"/>
         <result property="bonusTime" column="bonus_time"/>
         <result property="bonusStartTime" column="bonus_start_time"/>