装箱单增加单据状态查询条件

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

@@ -86,40 +86,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @Autowired
     private IDxpDataPlanService iDxpDataPlanService;
 
-    /**
-     * 分页列表查询
-     *
-     * @param syPreAssembledPackingList
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-/*
-	@AutoLog(value = "预装箱单主表-分页列表查询")
-	@ApiOperation(value="预装箱单主表-分页列表查询", notes="预装箱单主表-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<SyPreAssembledPackingList>> queryPageList(SyPreAssembledPackingList syPreAssembledPackingList,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<SyPreAssembledPackingList> queryWrapper = new QueryWrapper<>();
-
-		if(oConvertUtils.isNotEmpty(syPreAssembledPackingList.getOrderNumber())){
-			queryWrapper.eq("a.order_number",syPreAssembledPackingList.getOrderNumber());//订单号
-		}
-		if(oConvertUtils.isNotEmpty(syPreAssembledPackingList.getItemNumber())){
-			queryWrapper.eq("a.item_number",syPreAssembledPackingList.getItemNumber());//款号
-		}
-		if(oConvertUtils.isNotEmpty(syPreAssembledPackingList.getProductName())){
-			queryWrapper.eq("a.product_Name",syPreAssembledPackingList.getProductName());//品名
-		}
-		queryWrapper.eq("a.del_flag","0");//默认查询未删除
-		Page<SyPreAssembledPackingList> page = new Page<SyPreAssembledPackingList>(pageNo, pageSize);
-		IPage<SyPreAssembledPackingList> pageList = syPreAssembledPackingListService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-*/
+
 
     /**
      * 分页列表查询
@@ -169,6 +136,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
             queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
         }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+        }
         // 小po 分销点
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
             queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
@@ -871,6 +841,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
             queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
         }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+        }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
             queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
         }
@@ -1089,6 +1062,9 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
             queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
         }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+        }
         //预发货日期
         if(oConvertUtils.isNotEmpty(stratDate)){//起始
             queryWrapper.ge("b.hod",stratDate);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -136,7 +136,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 				item1.setTotal(boxNumber);//该尺码件数
 
-				//item1.setRemainingQuantity(boxNumber);//该尺码的剩余数量
+				item1.setRemainingQuantity(boxNumber);//该尺码的剩余数量
 				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
 				//item1.setBoxNumber(boxNumber);//获取箱数
 				//boxNumber=boxNumber.divide(item.getPiecesBox(),6,BigDecimal.ROUND_HALF_UP);
@@ -572,7 +572,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						item1.setTotal(boxNumber);//该尺码件数
 						syPreAssembledPackingList.setTotal(syPreAssembledPackingList.getTotal().add(boxNumber));
 						item1.setActualPackingQty(size.getQuantity());//获取该尺码计划装箱数量
-
+						item1.setRemainingQuantity(boxNumber);//剩余数量
 						item1.setSize(size.getSize());//获取尺码
 						item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
 						item1.setSort(size.getNum());//获取序号

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -115,6 +115,9 @@ public class SyPackingListFabricController {
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
 			queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
 		}
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
+			queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
+		}
 		queryWrapper.eq("a.del_flag","0");
 		Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(pageNo, pageSize);
 		IPage<SyPackingListFabric> pageList = syPackingListFabricService.selectPage(page, queryWrapper);
@@ -672,6 +675,9 @@ public class SyPackingListFabricController {
 			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
 				 queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
 			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
+				 queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
+			 }
 			 queryWrapper.eq("a.del_flag","0");
 			 Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(1, 10000);
 			// List<SyPackingListFabric> packingListFabrics = syPackingListFabricService.selectPage(page, queryWrapper).getRecords();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -132,6 +132,9 @@ public class SyPackingListTailoringController {
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
 			queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
 		}
+		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
+			queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
+		}
 		if(oConvertUtils.isNotEmpty(stratDate)){
 			queryWrapper.ge("b.hod",stratDate);//起始日期
 		}
@@ -548,6 +551,9 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(endDate)){
 			 queryWrapper.le("b.hod",endDate);//结束日期
 		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
+			 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
+		 }
 		 Result result=new Result();
 		 try{
 			// QueryWrapper<SyPackingListTailoring> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoring, request.getParameterMap());
@@ -717,6 +723,9 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(endDate)){
 			 queryWrapper.le("b.hod",endDate);//结束日期
 		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
+			 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//状态
+		 }
 		 Result result=new Result();
 		 try{
 			 List<SyPackingListTailoringVo> syPackingListTailoringVos = syPackingListTailoringService.selectList(page,queryWrapper).getRecords();
@@ -729,7 +738,7 @@ public class SyPackingListTailoringController {
 			 List<SyPackingListTailoring> temps=new ArrayList<>();
 			 for (SyPackingListTailoringVo temp : syPackingListTailoringVos) {
 				 QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
-				 queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
+				 queryWrapper1.eq("id",temp.getId()).eq("del_flag ",0);//预装箱单主表id
 				 SyPackingListTailoring entity=syPackingListTailoringService.queryId(temp.getId());//已筛选删除状态
 				 temps.add(entity);
 			 }
@@ -912,9 +921,6 @@ public class SyPackingListTailoringController {
 					 }
 				 }
 				 if(x>3){
-					 System.out.println("\nstr\n"+str);
-					 System.out.println("\nstr1\n"+str1);
-					 System.out.println("\nstr2\n"+str2);
 					 //序号	账套号	ITEMCODE	PREPACK SKU	启始箱号	结束箱号	颜色(中英文)
 					 //外箱长度	外箱宽度	外箱高度	外箱净重	外箱毛重	NN.W
 					 //1	903	item_code	pre_packsku	1	20	COBALT