1

ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/ProductionRegularController.java

@@ -146,6 +146,24 @@ public class ProductionRegularController {
                 )
         );
     }
+    @ApiOperation("白条分配")
+    @PostMapping("/listFenPei")
+    public AjaxResult listFenPei(
+            @RequestBody ProductionRegularPlanRequest planRequest, HttpServletRequest request) {
+
+        return success(productionRegularService.list(
+                new QueryWrapper<ProductionRegular>()
+                        .eq("org_id", tokenService.getLoginOrgId(request)).
+                        eq("is_fenpei",0).
+                        eq(StringUtils.isNotEmpty(planRequest.getAnimalTag()), "animal_identification", planRequest.getAnimalTag())
+                        .eq(StringUtils.isNotEmpty(planRequest.getBatch()), "pig_batch", planRequest.getBatch())
+                        .eq(StringUtils.isNotEmpty(planRequest.getProductionDate()), "production_date", planRequest.getProductionDate())
+                        .eq(StringUtils.isNotEmpty(planRequest.getLevel()), "grade", planRequest.getLevel())
+                        .eq(StringUtils.isNotEmpty(planRequest.getVariety()), "variety", planRequest.getVariety())
+                        .eq(StringUtils.isNotEmpty(planRequest.getWhiteNo()), "white_strip_num", planRequest.getWhiteNo())
+                )
+        );
+    }
 
     @ApiOperation("生产常规分页")
     @PostMapping("/page")

ruoyi-admin/src/main/java/com/ruoyi/web/base/controller/ProductionWhiteStripAllocationController.java

@@ -62,6 +62,18 @@ public class ProductionWhiteStripAllocationController {
                         .eq("org_id", tokenService.getLoginOrgId(request))
         ));
     }
+    @ApiOperation("批量修改状态")
+    @PostMapping("/editAllStatus")
+    public AjaxResult editAllStatus(@RequestBody Map<String, String> paramsMap) throws Exception {
+        String ids = paramsMap.get("ids");
+        for (String id : ids.split(",")) {
+            ProductionWhiteStripAllocation productionWhiteStripAllocation = new ProductionWhiteStripAllocation();
+            productionWhiteStripAllocation.setId(Integer.parseInt(id));
+            productionWhiteStripAllocation.setCompletionStatus(1);
+            productionWhiteStripAllocationService.updateById(productionWhiteStripAllocation);
+        }
+        return success();
+    }
 
     @ApiOperation("白条分配分页")
     @GetMapping("/page")

ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/ProductionRegular.java

@@ -108,6 +108,7 @@ public class ProductionRegular  extends Base {
    @TableField(exist =  false)
     private int qualityInspectionResult;
     private int isFenge;
+    private int isFenpei;
 
 
 }

ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/ProductionWhiteStripAllocation.java

@@ -88,7 +88,7 @@ public class ProductionWhiteStripAllocation  extends Base {
     private String coatColor;
 
     @ApiModelProperty(value = "完成分配状态")
-    private String completionStatus;
+    private int completionStatus;
 
     @ApiModelProperty(value = "生猪批次")
     private String pigBatch;

ruoyi-admin/src/main/java/com/ruoyi/web/base/domain/param/ProductionRegularPlanRequest.java

@@ -1,18 +1,27 @@
 package com.ruoyi.web.base.domain.param;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class ProductionRegularPlanRequest extends  PageRequest{
 
     private  String  productionWorkshop;
     private  String productionPlanNumber;
+
+    private  String batch;
     private  String pigBatch;
+    private  String level;
+
     private  String productionDate;
+    private  String shipDate;
+    private  String whiteNo;
 
 
-    private  String   gradel;
 
+    private  String   gradel;
+    private  String   animalTag;
     private  String processingType;
     private  String startDate;
     private  String endDate;