齐套率报表更新

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -1197,8 +1197,10 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 		 Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
 		 if(flourOrGarment.equals("0")){//面辅料
+			 queryWrapper.eq("1",1);
 			 pageList = syShippingDetailsService.queryShippingDetailsGarment(page, queryWrapper);
 		 }else{//成衣
+			 queryWrapper.eq("1",1);
 			 pageList = syShippingDetailsService.queryShippingDetails(page, queryWrapper);
 		 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/FullSetRateController.java

@@ -57,6 +57,7 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
         if(oConvertUtils.isNotEmpty(fullSetRate.getBeginDate())){
             queryWrapper.between("b.dPreDate",fullSetRate.getBeginDate(),fullSetRate.getEndDate());//"2022-07-01","2022-07-30"
         }
+        //部门
         if(oConvertUtils.isNotEmpty(fullSetRate.getDepartment())){
             queryWrapper.eq("d.cDepName",fullSetRate.getDepartment());
         }
@@ -68,17 +69,21 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
         if(oConvertUtils.isNotEmpty(fullSetRate.getSubcontractOrderNo())){
             queryWrapper.like("om.cCode",fullSetRate.getSubcontractOrderNo());
         }
-        //交期
-        if(oConvertUtils.isNotEmpty(fullSetRate.getDeliveryDate())){
-            queryWrapper.eq("b.dPreDate",fullSetRate.getDeliveryDate());
-        }
+//        //交期
+//        if(oConvertUtils.isNotEmpty(fullSetRate.getDeliveryDate())){
+//            queryWrapper.eq("b.dPreDate",fullSetRate.getDeliveryDate());
+//        }
         //业务员
         if(oConvertUtils.isNotEmpty(fullSetRate.getSalesman())){
             queryWrapper.eq("p.cPersonName",fullSetRate.getSalesman());
         }
-        //销售订单数量
-        if(oConvertUtils.isNotEmpty(fullSetRate.getSalesOrderQuantity())){
-            queryWrapper.eq("b.iQuantity",fullSetRate.getSalesOrderQuantity());
+//        //销售订单数量
+//        if(oConvertUtils.isNotEmpty(fullSetRate.getSalesOrderQuantity())){
+//            queryWrapper.eq("b.iQuantity",fullSetRate.getSalesOrderQuantity());
+//        }
+        //小PO
+        if(oConvertUtils.isNotEmpty(fullSetRate.getSmllPo())){
+            queryWrapper.eq("b.cDefine28",fullSetRate.getSmllPo());
         }
 
         queryWrapper.isNotNull("om.cCode");
@@ -86,16 +91,17 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
         IPage<FullSetRate> pageList = fullSetRateService.queryListInfo(page,queryWrapper);
 
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
-        //销售订单子表集合
-        List<String> moDeilsIDList = new ArrayList<>();
-        //累计准时出库数量
-        BigDecimal cumulativeOnTimeDeliveryQuantity = BigDecimal.ZERO;
-        //累计延迟出库数量
-        BigDecimal cumulativeDelayedDeliveryQty = BigDecimal.ZERO;
-        //委外订单数量
-        BigDecimal subcontractOrderQuantity = BigDecimal.ZERO;
 
         for(FullSetRate li:pageList.getRecords()){
+            //销售订单子表集合
+            List<String> moDeilsIDList = new ArrayList<>();
+
+            //累计准时出库数量
+            BigDecimal cumulativeOnTimeDeliveryQuantity = BigDecimal.ZERO;
+            //累计延迟出库数量
+            BigDecimal cumulativeDelayedDeliveryQty = BigDecimal.ZERO;
+            //委外订单数量
+            BigDecimal subcontractOrderQuantity = BigDecimal.ZERO;
 
             //查询销售订单子表预发货日期信息
             QueryWrapper<FullSetRate> queryWrapper1 = new QueryWrapper<>();
@@ -105,7 +111,6 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
 
             //循环子表
             for(FullSetRate momian:querySomain){
-
                 moDeilsIDList.add(momian.getISOsID());
                 //查询销售出库单获取累计准时出库数量,获取累计延迟出库数量
                 List<FullSetRate> salesIssueList = fullSetRateService.querySalesIssue(momian.getISOsID());
@@ -129,6 +134,7 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
                 }else {
                     subcontractOrderQuantity = subcontractOrderQuantity.add(new BigDecimal(subcontractOrderQuantity1));
                 }
+
             }
             //委外订单数量赋值
             li.setSubcontractOrderQuantity(subcontractOrderQuantity.toString());