染损增加查询条件，预装箱单更改单据状态

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/controller/DyeLossController.java

@@ -60,7 +60,13 @@ public class DyeLossController extends JeecgController<DyeLoss, IDyeLossService>
             queryWrapper.eq("a.cCode",dyeLossDto.getCode());//订单号
         }
         if(oConvertUtils.isNotEmpty(dyeLossDto.getVenName())){
-            queryWrapper.eq("c.cVenName",dyeLossDto.getVenName());//供应商名称
+            queryWrapper.eq("a.cVenName",dyeLossDto.getVenName());//供应商名称
+        }
+        if(oConvertUtils.isNotEmpty(dyeLossDto.getColor())){
+            queryWrapper.eq("b.cfree1",dyeLossDto.getColor());//颜色
+        }
+        if(oConvertUtils.isNotEmpty(dyeLossDto.getCinvcode())){
+            queryWrapper.eq("d.cinvcode",dyeLossDto.getCinvcode());//物料编码
         }
         /*if(dyeLossDto.getOrderType()!=null && !dyeLossDto.getOrderType().trim().equals("") &&StringUtils.isNotBlank(dyeLossDto.getOrderType())){
             queryWrapper.eq("a.iOrderType",dyeLossDto.getOrderType());//订单类型

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/dto/DyeLossDto.java

@@ -12,11 +12,18 @@ public class DyeLossDto {
     @ApiModelProperty(value = "供应商名称")
     private String venName;//供应商名称
 
+    @ApiModelProperty(value = "计划单号")
+    private String planLotNumber;//计划单号
+
+    @ApiModelProperty(value = "物料编码")
+    private String cinvcode;//物料编码
+
+    @ApiModelProperty(value = "颜色")
+    private String color;//颜色
+
    /* @ApiModelProperty(value = "订单类型")
     private String orderType;//订单类型*/
 
-    @ApiModelProperty(value = "计划单号")
-    private String planLotNumber;//计划单号
 
    /* @ApiModelProperty(value = "销售订单号")
     private String csocode;//销售订单号*/

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -410,7 +410,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 				 result.setSuccess(false);
 				 return result;
 			 }
-			 syPreAssembledPackingList2.setStatus("2");//修改为取消提交状态
+			 syPreAssembledPackingList2.setStatus("0");//修改为取消提交状态
 			 boolean bool= syPreAssembledPackingListService.updateById(syPreAssembledPackingList2);//修改提交状态
 			 if(bool==true){
 				 result.setMessage("已取消提交!");