计划单，成本分配

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/controller/SyCapacityControlController.java

@@ -65,11 +65,12 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr
 	//@AutoLog(value = "产能控制-分页列表查询")
 	@ApiOperation(value="产能控制-分页列表查询", notes="产能控制-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<SyCapacityControl>> queryPageList(String supplier,String cvenCodeType,String supplierState,
+	public Result<IPage<SyCapacityControl>> queryPageList(String supplier,String cvenCodeType,String supplierState,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		List<SyCapacityControl> pageList = syCapacityControlService.query(supplier,cvenCodeType,supplierState,pageNo,pageSize);
+		Page<SyCapacityControl> page = new Page<SyCapacityControl>(pageNo,pageSize);
+		IPage<SyCapacityControl> pageList = syCapacityControlService.query(page,supplier,cvenCodeType,supplierState,pageNo,pageSize);
 		return Result.OK(pageList);
 	}
 	

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/SyCapacityControlMapper.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.capacity.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -16,7 +18,7 @@ public interface SyCapacityControlMapper extends BaseMapper<SyCapacityControl> {
     @Override
     int insert(@Param("entity") SyCapacityControl entity);
 
-    List<SyCapacityControl> query(@Param("supplier")String supplier,@Param("cvenCodeType")String cvenCodeType,
-                                  @Param("state")String state,@Param("pageIndex")Integer pageIndex,
-                                  @Param("pageSize")Integer pageSize);
+    IPage<SyCapacityControl> query(@Param("page") Page<SyCapacityControl> page, @Param("supplier")String supplier, @Param("cvenCodeType")String cvenCodeType,
+                                   @Param("state")String state, @Param("pageIndex")Integer pageIndex,
+                                   @Param("pageSize")Integer pageSize);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/xml/SyCapacityControlMapper.xml

@@ -22,7 +22,6 @@
             and supplier_state=#{state}
         </if>
         order by id desc
-        offset #{pageIndex} rows
-        fetch next #{pageSize} rows only
+
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/ISyCapacityControlService.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.capacity.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,5 +15,5 @@ import java.util.List;
  */
 public interface ISyCapacityControlService extends IService<SyCapacityControl> {
     int insert( SyCapacityControl entity);
-    List<SyCapacityControl> query(String supplier,String cvenCodeType,String state, Integer pageIndex,Integer pageSize);
+    IPage<SyCapacityControl> query(Page<SyCapacityControl> page, String supplier, String cvenCodeType, String state, Integer pageIndex, Integer pageSize);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/impl/SyCapacityControlServiceImpl.java

@@ -1,6 +1,8 @@
 package org.jeecg.modules.capacity.service.impl;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import org.jeecg.modules.capacity.mapper.SyCapacityControlMapper;
 import org.jeecg.modules.capacity.service.ISyCapacityControlService;
@@ -31,8 +33,8 @@ public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlM
     }
 
     @Override
-    public List<SyCapacityControl> query(String supplier,String cvenCodeType,String state, Integer pageIndex, Integer pageSize) {
+    public IPage<SyCapacityControl> query(Page<SyCapacityControl> page, String supplier, String cvenCodeType, String state, Integer pageIndex, Integer pageSize) {
         pageIndex=(pageIndex-1)*pageSize;
-        return syCapacityControlMapper.query(supplier,cvenCodeType,state, pageIndex, pageSize);
+        return syCapacityControlMapper.query(page,supplier,cvenCodeType,state, pageIndex, pageSize);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationFabricMapper.xml

@@ -40,7 +40,7 @@
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%带%') and (oti.cInvCCode != '0499' or oti.cInvName like '%带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%带%')
-		GROUP BY oti.cInvName
+		GROUP BY oti.cInvName,ot.iUnitQuantity
 		) tab
 		left join
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
@@ -101,7 +101,7 @@
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%带%') and (oti.cInvCCode != '0499' or oti.cInvName like '%带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%带%')
-		GROUP BY oti.cInvName
+		GROUP BY oti.cInvName,ot.iUnitQuantity
 		) tab
 		left join
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
@@ -252,7 +252,7 @@ select
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%') and oti.cInvName = #{goodName}
-		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
+		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%带%') and (oti.cInvCCode != '0499' or oti.cInvName like '%带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%带%')
 		GROUP BY ot.cFree1
 		) tab
 		left join
@@ -266,7 +266,7 @@ select
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		 and om.cPOID like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499' and i.cInvCCode != '0299' and i.cInvName = #{goodName}
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%') and i.cInvName = #{goodName}
 		 and rs.cBatch like CONCAT(#{code},'%')
 		GROUP BY rs.cFree1
 		)tab1 on tab1.cInvName=tab.goodsName and tab1.color = tab.color
@@ -286,7 +286,7 @@ select
 		join UFDATA_103_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%') and oti.cInvName = #{goodName}
-		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%') and oti.cInvCCode != '0399' and oti.cInvCCode != '0499'
+		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%带%') and (oti.cInvCCode != '0499' or oti.cInvName like '%带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%带%')
 		GROUP BY ot.cFree1
 		) tab
 		left join
@@ -300,10 +300,9 @@ select
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		 and om.cPOID like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%') and i.cInvCCode != '0399' and i.cInvCCode != '0499' and i.cInvCCode != '0299' and i.cInvName = #{goodName}
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%') and i.cInvName = #{goodName}
 		 and rs.cBatch like CONCAT(#{code},'%')
 		GROUP BY rs.cFree1
 		)tab1 on tab1.cInvName=tab.goodsName and tab1.color = tab.color
-
 	</select>
 </mapper>