供应商产能报表修改排序逻辑

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

@@ -160,7 +160,7 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
          queryWrapper.eq("p.cVenCodeType",supplierCapacityDto.getCVenCodeType());//供应商类型cVenCodeType
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getItemNumber())){//款号
-         queryWrapper.like("p.itemnumber",supplierCapacityDto.getItemNumber());//供应商类型cVenCodeType
+         queryWrapper.like("p.itemnumber",supplierCapacityDto.getItemNumber());//款号
       }
       if(oConvertUtils.isNotEmpty(supplierCapacityDto.getCDepCode())){//部门
          queryWrapper.eq("p.cDepCode",supplierCapacityDto.getCDepCode());//部门

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/SupplierCapacityMapper.java

@@ -33,7 +33,7 @@ public interface SupplierCapacityMapper extends BaseMapper<SupplierCapacity> {
 
     List<SupplierCapacityVo3> excel003(@Param("ew")QueryWrapper<SupplierCapacityDto> queryWrapper);
 
-    IPage<SupplierCapacity> selectPage(  @Param("ew") QueryWrapper<SupplierCapacityDto> queryWrapper);
+    IPage<SupplierCapacity> selectPage(@Param("ew")QueryWrapper<SupplierCapacityDto> queryWrapper);
 
     List<SupplierCapacity> selectPage2(@Param("begin")Integer begin, @Param("end")Integer end, @Param("ew")QueryWrapper<SupplierCapacityDto> queryWrapper);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/SupplierCapacityMapper.xml

@@ -144,149 +144,43 @@
 
     <select id="excel001" resultType="org.jeecg.modules.scas.entity.vo.SupplierCapacityVo1">
         --部门	供应商	月份	数量	累计入库数量	能耗（能耗相加的汇总）--汇合
-   /* select
-        p.cDepCode,
-        p.cVenCode,
-        p.arriveMonth,
-        sum(p.iQuantity) iQuantity,
-        sum(p.iReceivedQTY) iReceivedQTY,
-        sum(p.coefficient) coefficient
-         from (
-            select  cDepname cDepCode,
-				cVenName cVenCode,
-				month(dArriveDate) arriveMonth,
-				iQuantity iQuantity,
-				iReceivedQTY iReceivedQTY,
-				cast(isnull(cInvDefine1,'0') as decimal) coefficient
-				from PO_Pomain
-				left join PO_Podetails on PO_Podetails.POID=PO_Pomain.POID
-				left join Department on  Department.cdepcode=PO_Pomain.cDepCode
-				left join Person on	Person.cPersonCode=PO_Pomain.cPersonCode
-				left join Vendor on Vendor.cVenCode=PO_Pomain.cVenCode
-				left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
-				left join Inventory on PO_Podetails.cInvCode=Inventory.cInvCode
-				--order by cDepCode,cVenCode,arriveMonth
-					union all
-                select	cDepname cDepCode,
-				cVenName cVenCode,
-				month(dArriveDate) arriveMonth,
-				iQuantity,
-				iReceivedQTY,
-				cast(isnull(cInvDefine1,'0') as decimal) coefficient
-				from OM_MOMain
-				left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
-				left join Department on  Department.cdepcode=OM_MOMain.cDepCode
-				left join Person on	Person.cPersonCode=OM_MOMain.cPersonCode
-				left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
-				left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
-				left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-				--order by cDepCode,cVenCode,arriveMonth
-        )p
-        group by p.cDepCode,p.cVenCode,p.arriveMonth
-        order by p.cDepCode,p.cVenCode,p.arriveMonth*/
         select
-        p.cDepCode,
-        p.cVenCode,
-        p.dArriveDate,
-        sum(p.iQuantity) iQuantity,
-        sum(p.iReceivedQTY) iReceivedQTY,
-        sum(p.coefficient*p.iQuantity) coefficient
-         from Supplier_Capacity_Test p
-           ${ew.customSqlSegment}
-        group by p.cDepCode,p.cVenCode,p.dArriveDate
-        order by p.cDepCode,p.cVenCode,p.dArriveDate
+            p.cDepCode,
+            p.cVenCode,
+            p.dArriveDate,
+            ideporder,
+            sum(p.iQuantity) iQuantity,
+            sum(p.iReceivedQTY) iReceivedQTY,
+            sum(p.coefficient*p.iQuantity) coefficient
+        from Supplier_Capacity_Test p
+        left join  Department
+        on p.cDepCode=cdepname
+        ${ew.customSqlSegment}
+        group by p.cDepCode,p.dArriveDate,ideporder, p.cVenCode
+        order by ideporder,p.dArriveDate
     </select>
 
     <select id="excel002" resultType="org.jeecg.modules.scas.entity.vo.SupplierCapacityVo2">
+        --部门	月份	数量	累计入库数量	能耗（能耗相加的汇总）
+        select
+            p.cDepCode,
+            p.dArriveDate,
+            ideporder,
+            sum(p.iQuantity) iQuantity,
+            sum(p.iReceivedQTY) iReceivedQTY,
+            sum(p.coefficient*p.iQuantity) coefficient
+        from Supplier_Capacity_Test p
+        left join  Department
+        on p.cDepCode=cdepname
+        ${ew.customSqlSegment}
+        group by p.cDepCode,p.dArriveDate,ideporder
+        order by ideporder,p.dArriveDate
 
-         --部门	月份	数量	累计入库数量	能耗（能耗相加的汇总）
-       /* select  p.cDepCode,
-                p.arriveMonth,
-                sum(p.iQuantity) iQuantity,
-                sum(p.iReceivedQTY) iReceivedQTY,
-                sum(p.coefficient) coefficient
-                from(
-                select
-                    cDepname cDepCode,
-					month(dArriveDate) arriveMonth,
-					iQuantity,
-					iReceivedQTY,
-					cast(isnull(cInvDefine1,'0') as decimal) coefficient
-					from PO_Pomain
-					left join PO_Podetails on PO_Podetails.POID=PO_Pomain.POID
-					left join Department on  Department.cdepcode=PO_Pomain.cDepCode
-					left join Person on	Person.cPersonCode=PO_Pomain.cPersonCode
-					left join Vendor on Vendor.cVenCode=PO_Pomain.cVenCode
-					left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
-					left join Inventory on PO_Podetails.cInvCode=Inventory.cInvCode
-           union all
-                    select
-                      cDepname cDepCode,
-					month(dArriveDate) arriveMonth,
-					iQuantity,
-					iReceivedQTY,
-					cast(isnull(cInvDefine1,'0') as decimal) coefficient
-					from OM_MOMain
-					left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
-					left join Department on  Department.cdepcode=OM_MOMain.cDepCode
-					left join Person on	Person.cPersonCode=OM_MOMain.cPersonCode
-					left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
-					left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
-					left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-                )p
-					group by p.cDepCode,p.arriveMonth
-					order  by p.cDepCode,p.arriveMonth*/
-     select
-        p.cDepCode,
-        p.dArriveDate,
-        sum(p.iQuantity) iQuantity,
-        sum(p.iReceivedQTY) iReceivedQTY,
-        sum(p.coefficient*p.iQuantity) coefficient
-         from Supplier_Capacity_Test p
-           ${ew.customSqlSegment}
-   group by p.cDepCode,p.dArriveDate
-    order  by p.cDepCode,p.dArriveDate
     </select>
 
 
     <select id="excel003" resultType="org.jeecg.modules.scas.entity.vo.SupplierCapacityVo3">
          --供应商	月份	数量	累计入库数量	能耗（能耗相加的汇总）
-    /*select
-        p.cVenCode,
-        p.arriveMonth,
-        sum(p.iQuantity) iQuantity,
-        sum(p.iReceivedQTY) iReceivedQTY,
-        sum(p.coefficient) coefficient
-         from(
-        select	ROW_NUMBER() OVER(ORDER BY cVenName) index1,
-            cVenName cVenCode,
-            month(dArriveDate) arriveMonth,
-            iQuantity iQuantity,
-            iReceivedQTY iReceivedQTY,
-            cast(isnull(cInvDefine1,'0') as decimal) coefficient
-            from PO_Pomain
-            left join PO_Podetails on PO_Podetails.POID=PO_Pomain.POID
-            left join Department on  Department.cdepcode=PO_Pomain.cDepCode
-            left join Person on	Person.cPersonCode=PO_Pomain.cPersonCode
-            left join Vendor on Vendor.cVenCode=PO_Pomain.cVenCode
-            left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
-            left join Inventory on PO_Podetails.cInvCode=Inventory.cInvCode
-        union all
-        select	ROW_NUMBER() OVER(ORDER BY cVenName) index1,
-            cVenName cVenCode,
-            month(dArriveDate) arriveMonth,
-            iQuantity iQuantity,
-            iReceivedQTY iReceivedQTY,
-            cast(isnull(cInvDefine1,'0') as decimal) coefficient
-            from OM_MOMain
-            left join OM_MODetails on OM_MODetails.moid=OM_MOMain.moid
-            left join Department on  Department.cdepcode=OM_MOMain.cDepCode
-            left join Person on	Person.cPersonCode=OM_MOMain.cPersonCode
-            left join Vendor on Vendor.cVenCode=OM_MOMain.cVenCode
-            left join VendorClass on VendorClass.cVCCode=Vendor.cVCCode
-            left join Inventory on OM_MODetails.cInvCode=Inventory.cInvCode
-    )p group by p.cVenCode,p.arriveMonth
-         order by p.cVenCode,p.arriveMonth*/
          select
             p.cVenCode,
             p.dArriveDate,
@@ -294,7 +188,7 @@
             sum(p.iReceivedQTY) iReceivedQTY,
             sum(p.coefficient*p.iQuantity) coefficient
          from Supplier_Capacity_Test p
-           ${ew.customSqlSegment}
+         ${ew.customSqlSegment}
          group by p.cVenCode,p.dArriveDate
          order by p.cVenCode,p.dArriveDate
     </select>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/service/impl/SupplierCapacityServiceImpl.java

@@ -59,6 +59,7 @@ public class SupplierCapacityServiceImpl extends ServiceImpl<SupplierCapacityMap
     @Override
     @DS("multi-three")
     public IPage<SupplierCapacity>  selectPage2(Integer pageNo, Integer pageSize, QueryWrapper<SupplierCapacityDto> queryWrapper) {
+        long startTime = System.currentTimeMillis();
         List<SupplierCapacity> pageList= supplierCapacityMapper.selectPage2((pageNo*pageSize-pageSize+1),pageSize*pageNo,queryWrapper);
         long count=supplierCapacityMapper.selectCounts(queryWrapper);
         IPage<SupplierCapacity> page= new Page<SupplierCapacity>(pageNo, pageSize);
@@ -69,6 +70,8 @@ public class SupplierCapacityServiceImpl extends ServiceImpl<SupplierCapacityMap
             pages++;
         }
         page.setPages(pages);
+        long endTime2 = System.currentTimeMillis();
+        System.out.println("供应商产能报表查询时间：" + (endTime2 - startTime) + "ms");
         return page;
     }