供应商产能报表

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

@@ -62,40 +62,45 @@ public class SupplierCapacityController extends JeecgController<SupplierCapacity
    @AutoLog(value = "供应链产能报表查询-通过条件查询")
    @ApiOperation(value="供应链产能报表查询-通过条件查询", notes="供应链产能报表查询-通过条件查询")
    @RequestMapping(value = "/list",method = RequestMethod.GET)
-   public Result<IPage<SupplierCapacity>> list(SupplierCapacityDto supplierCapacityDto, HttpServletRequest req){
+   public Result<IPage<SupplierCapacity>> list(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                               @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                               SupplierCapacityDto supplierCapacityDto,
+                                               HttpServletRequest req){
       //System.out.println("开始月份"+supplierCapacityDto.getStartDate().getMonth());
       //System.out.println("结束月份"+supplierCapacityDto.getEndDate().getMonth());
       //System.out.println("开始年份"+new SimpleDateFormat("yyyy").format(supplierCapacityDto.getStartDate()));
       //System.out.println("结束年份"+new SimpleDateFormat("yyyy").format(supplierCapacityDto.getEndDate()));
       Result<IPage<SupplierCapacity>> result = new Result<IPage<SupplierCapacity>>();
       QueryWrapper<SupplierCapacityDto> queryWrapper = new QueryWrapper<>();//初始化
-      if(supplierCapacityDto.getCsrccode()!=null&& !supplierCapacityDto.getCsrccode().trim().equals("") &&StringUtils.isNotBlank(supplierCapacityDto.getCsrccode())){//订单号
-         queryWrapper.eq("p.csrccode",supplierCapacityDto.getCsrccode());
+      if(supplierCapacityDto.getCsrccode()!=null&& !supplierCapacityDto.getCsrccode().trim().equals("") &&StringUtils.isNotBlank(supplierCapacityDto.getCsrccode())){
+         queryWrapper.eq("p.csrccode",supplierCapacityDto.getCsrccode());;//订单号
       }
-      if(supplierCapacityDto.getVenName()!=null&& !supplierCapacityDto.getVenName().trim().equals("") &&StringUtils.isNotBlank(supplierCapacityDto.getVenName())){//供应商
-         queryWrapper.eq("p.cVenName",supplierCapacityDto.getVenName());
+      if(supplierCapacityDto.getVenName()!=null&& !supplierCapacityDto.getVenName().trim().equals("") &&StringUtils.isNotBlank(supplierCapacityDto.getVenName())){
+         queryWrapper.eq("p.cVenCode",supplierCapacityDto.getVenName());//供应商名称
       }
-      if(supplierCapacityDto.getPlanLotNumber()!=null&& !supplierCapacityDto.getPlanLotNumber().trim().equals("") &&StringUtils.isNotBlank(supplierCapacityDto.getPlanLotNumber())){//计划单号
-         queryWrapper.eq("p.cPlanLotNumber",supplierCapacityDto.getPlanLotNumber());
+      if(supplierCapacityDto.getPlanLotNumber()!=null&& !supplierCapacityDto.getPlanLotNumber().trim().equals("") &&StringUtils.isNotBlank(supplierCapacityDto.getPlanLotNumber())){
+         queryWrapper.eq("p.cPlanLotNumber",supplierCapacityDto.getPlanLotNumber());//计划单号
       }
-     if(supplierCapacityDto.getStartDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getStartDate().toString())){//起始月份
+     /*if(supplierCapacityDto.getStartDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getStartDate().toString())){
+         //起始月份
          queryWrapper.ge("month(p.dArriveDate)",supplierCapacityDto.getStartDate().getMonth()+1);
-        queryWrapper.ge("year(p.dArriveDate)",new SimpleDateFormat("yyyy").format(supplierCapacityDto.getStartDate()));
+         queryWrapper.ge("year(p.dArriveDate)",new SimpleDateFormat("yyyy").format(supplierCapacityDto.getStartDate()));
       }
-      if(supplierCapacityDto.getEndDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getEndDate().toString())){//结束月份
+      if(supplierCapacityDto.getEndDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getEndDate().toString())){
+          //结束月份
          queryWrapper.le("month(p.dArriveDate)",supplierCapacityDto.getEndDate().getMonth()+1);
          queryWrapper.le("year(p.dArriveDate)",new SimpleDateFormat("yyyy").format(supplierCapacityDto.getEndDate()));
-      }
-     /* if(supplierCapacityDto.getStartDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getStartDate().toString())){//起始日期
+      }*/
+      if(supplierCapacityDto.getStartDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getStartDate().toString())){//起始日期
          queryWrapper.ge("p.dArriveDate",supplierCapacityDto.getStartDate());
       }
       if(supplierCapacityDto.getEndDate()!=null&&StringUtils.isNotBlank(supplierCapacityDto.getEndDate().toString())){//结束日期
          queryWrapper.le("p.dArriveDate",supplierCapacityDto.getEndDate());
-      }*/
-      if(supplierCapacityDto.getPlanLotNumber()!=null&& !supplierCapacityDto.getPlanLotNumber().trim().equals("") && StringUtils.isNotBlank(supplierCapacityDto.getOrderType())){//订单类型
-         queryWrapper.eq("p.iOrderType",supplierCapacityDto.getOrderType());
       }
-      Page<SupplierCapacity> page = new Page<SupplierCapacity>(supplierCapacityDto.getPageNo(), supplierCapacityDto.getPageSize());
+      if(supplierCapacityDto.getOrderType()!=null&& !supplierCapacityDto.getOrderType().trim().equals("") && StringUtils.isNotBlank(supplierCapacityDto.getOrderType())){//订单类型
+         queryWrapper.eq("p.iOrderType",supplierCapacityDto.getOrderType());//订单类型iOrderType
+      }
+      Page<SupplierCapacity> page = new Page<SupplierCapacity>(pageNo, pageSize);
       IPage<SupplierCapacity> pageList = SupplierCapacityService.selectPage(page, queryWrapper);
       result.setSuccess(true);
       result.setResult(pageList);

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

@@ -26,10 +26,12 @@ public class SupplierCapacityDto {
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "开始日期")
     private Date startDate;//开始日期*/
 
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "结束日期")
     private Date endDate;//结束日期
 
     /*@ApiModelProperty(value = "开始月份")
@@ -38,10 +40,10 @@ public class SupplierCapacityDto {
     @ApiModelProperty(value = "结束月份")
     private Integer endDate;//结束月份*/
 
-    @ApiModelProperty(value = "当前页面")
+/*    @ApiModelProperty(value = "当前页面")
     private Integer pageNo=1;//当前页面
 
     @ApiModelProperty(value = "页面大小")
-    private Integer pageSize=20;//页面大小
+    private Integer pageSize=20;//页面大小*/
 
 }

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

@@ -14,8 +14,8 @@
         cVenName cVenCode,
         cVCName cVenCodeType,
         '采购订单' iOrderType,
-        iQuantity,
-        iReceivedQTY,
+        isnull(iQuantity,0),
+        isnull(iReceivedQTY,0),
         cComUnitName unit,
         month(dArriveDate) arriveMonth,
         dArriveDate,
@@ -90,8 +90,8 @@
             cVenName cVenCode,
             cVCName cVenCodeType,
             '采购订单' iOrderType,
-            iQuantity,
-            iReceivedQTY,
+            isnull(iQuantity,0) iQuantity,
+            isnull(iReceivedQTY,0) iReceivedQTY,
             cComUnitName unit,
             month(dArriveDate) arriveMonth,
             dArriveDate,
@@ -113,8 +113,8 @@
             cVenName cVenCode,
             cVCName cVenCodeType,
             '委外订单' iOrderType,
-            iQuantity,
-            iReceivedQTY,
+            isnull(iQuantity,0) iQuantity,
+            isnull(iReceivedQTY,0) iReceivedQTY,
             cComUnitName unit,
             month(dArriveDate) arriveMonth,
             dArriveDate,