fix:完成生产订单条件查询

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ProductionPlanController.java

@@ -5,14 +5,15 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.service.ProductionPlanService;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  * 生产计划管理接口
  */
@@ -25,7 +26,8 @@ public class ProductionPlanController extends BaseController {
     private final ProductionPlanService productionPlanService;
 
     @GetMapping("/PageList")
-    public TableDataInfo<ProductionPlanVo> selectPageProductionPlan(@Validated ProductionPlanBo productionPlanBo, PageQuery pageQuery){
-        return productionPlanService.selectVoPage(productionPlanBo, pageQuery);
+    public TableDataInfo<ProductionPlanVo> selectPageProductionPlan(@RequestBody Map<String,Object> params){
+        PageQuery pageQuery = new PageQuery((Integer) params.get("pageSize"), (Integer) params.get("pageNum"));
+        return productionPlanService.selectVoPage(params, pageQuery);
     }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/ProductionPlan.java

@@ -3,13 +3,15 @@ package org.dromara.productionManagement.domain;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.util.Date;
 
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @TableName("fa_kuyou_plan")
-public class ProductionPlan {
+public class ProductionPlan extends TenantEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/bo/ProductionPlanBo.java

@@ -1,16 +1,20 @@
 package org.dromara.productionManagement.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
 import java.util.Date;
 
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ProductionPlan.class, reverseConvertGenerate = false)
-public class ProductionPlanBo{
+public class ProductionPlanBo extends BaseEntity {
 
     /**
      * 主键
@@ -160,47 +164,65 @@ public class ProductionPlanBo{
     /**
      * 烧花,0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isBurnFlowers;
 
     /**
      * 定位,0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isLocation;
 
     /**
      * 快返,0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isQuickReturn;
 
     /**
      * 作废0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isToVoid;
 
     /**
      * 复色，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isMulticolor;
 
     /**
      * 首单，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isFirstOrder;
 
     /**
      * 首次加工，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isFirstProcessing;
 
     /**
      * 紧急，0否，1是
      */
+    @Min(value = 0,message = "超出范围，0否，1是")
+    @Max(value = 1,message = "超出范围，0否，1是")
     private int isUrgent;
 
     /**
      * 1排产中，2.产前确认中，3.打印中，4.后整中，5烧花中，6.入库
      */
     @NotNull(message = "工艺状态不能为空")
+    @Min(value = 1,message = "1排产中，2.产前确认中，3.打印中，4.转印中，5.烧花中，6.后整中，7.待发货，8.已发货，9.已确认发货，10.作废，11.白布配货")
+    @Max(value = 11,message = "1排产中，2.产前确认中，3.打印中，4.转印中，5.烧花中，6.后整中，7.待发货，8.已发货，9.已确认发货，10.作废，11.白布配货")
     private int craftStatus;
 
     /**
@@ -279,22 +301,18 @@ public class ProductionPlanBo{
     private String isSys;
 
     /**
-     *
+     * 转印时间
      */
     private Date zhuanyinTime;
 
     /**
-     *
+     * 数码印花厂Id
      */
     private int outFactoryId;
 
     /**
-     *
+     * 烧花工厂Id
      */
     private int shFactoryId;
 
-    /**
-     * 成衣厂
-     */
-    private String garmentFactory;
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/domain/vo/ProductionPlanVo.java

@@ -2,10 +2,12 @@ package org.dromara.productionManagement.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.bulk.domain.vo.UserOrderTemplateVo;
 import org.dromara.bulk.domain.vo.UserOrderVo;
 import org.dromara.commodityManagement.domain.vo.DiBuVo;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.customerManagement.domain.vo.CustomerVo;
 import org.dromara.productionManagement.domain.ProductionPlan;
 
@@ -13,9 +15,9 @@ import java.util.Date;
 import java.util.List;
 
 @Data
-
+@EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = ProductionPlan.class)
-public class ProductionPlanVo{
+public class ProductionPlanVo extends BaseEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/ProductionPlanService.java

@@ -2,13 +2,14 @@ package org.dromara.productionManagement.service;
 
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 
+import java.util.Map;
+
 /**
  * 生产计划服务层
  */
 public interface ProductionPlanService {
 
-    TableDataInfo<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery);
+    TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery);
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/ProductionPlanServiceImpl.java

@@ -7,12 +7,13 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.domain.ProductionPlan;
-import org.dromara.productionManagement.domain.bo.ProductionPlanBo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.dromara.productionManagement.service.ProductionPlanService;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * 生产计划服务层实现
  */
@@ -23,11 +24,30 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
     private final ProductionPlanMapper productionPlanMapper;
 
     @Override
-    public TableDataInfo<ProductionPlanVo> selectVoPage(ProductionPlanBo productionPlanBo, PageQuery pageQuery) {
+    public TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery) {
         QueryWrapper<ProductionPlan> qw = new QueryWrapper<>();
-        qw.eq("p.craft_status",productionPlanBo.getCraftStatus());
-        qw.eq(null != productionPlanBo.getUserId(),"p.user_id", productionPlanBo.getUserId());
-        qw.eq(StringUtils.isNotBlank(productionPlanBo.getGarmentFactory()),"gi.garment_factory", productionPlanBo.getGarmentFactory());
+        qw.eq("p.craft_status",params.get("craftStatus"));
+        qw.eq(null != params.get("userId"),"p.user_id", params.get("userId"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("garmentFactory")),"gi.garment_factory", params.get("garmentFactory"));
+        qw.like(StringUtils.isNotBlank((CharSequence) params.get("scNo")),"p.sc_no", params.get("scNo"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("bulkNumber")),"gi.goods_type_extend_1_id", params.get("bulkNumber"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("baseCloth")),"gi.base_cloth", params.get("baseCloth"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("itemNumber")),"gi.item_number", params.get("itemNumber"));
+        qw.between((params.get("beginTime") != null && params.get("endTime") != null),"p.purchase_time", params.get("beginTime"), params.get("endTime"));
+        qw.eq(null != params.get("isFirstProcessing"), "p.is_first_processing", params.get("isFirstProcessing"));
+        qw.eq(null != params.get("isFirstOrder"), "p.is_first_order", params.get("isFirstOrder"));
+        qw.eq(null != params.get("isMulticolor"), "p.is_multicolor", params.get("isMulticolor"));
+        qw.eq(null != params.get("isQuickReturn"), "p.is_quick_return", params.get("isQuickReturn"));
+        qw.eq(null != params.get("isBurnFlowers"), "p.is_burn_flowers", params.get("isBurnFlowers"));
+        qw.eq(null != params.get("printStatus"), "p.print_status", params.get("printStatus"));
+        qw.eq(null != params.get("isBuHuo"), "p.is_buhuo", params.get("isBuHuo"));
+        qw.eq(null != params.get("isUrgent"), "p.is_urgent", params.get("isUrgent"));
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("isSys")), "p.is_sys", params.get("isSys"));
+        qw.eq(null != params.get("craftAttrBo"), "gi.goods_type_extend_3_attr", params.get("craftAttrBo"));//构建完整的工艺扩展信息对象的JSON数据
+        qw.eq(StringUtils.isNotBlank((CharSequence) params.get("brandGroup")),"gi.brand_group", params.get("brandGroup"));
+        qw.eq(null != params.get("outFactoryId"),"p.out_factory_id", params.get("outFactoryId"));
+        qw.eq(null != params.get("shFactoryId"),"p.sh_factory_id", params.get("shFactoryId"));
+
         Page<ProductionPlanVo> page = productionPlanMapper.selectProductionPlanVo(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }