报表

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/controller/ProductionScheduleController.java

@@ -15,10 +15,7 @@ import org.jeecg.modules.productionScheduleReport.entity.ProductionScheduleCaiGo
 import org.jeecg.modules.productionScheduleReport.entity.ProductionScheduleWeiWai;
 import org.jeecg.modules.productionScheduleReport.service.ProductionScheduleService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
@@ -40,50 +37,60 @@ public class ProductionScheduleController {
     @AutoLog(value = "生产进度报表-分页列表查询")
     @ApiOperation(value="生产进度报表-分页列表查询", notes="生产进度报表-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<ProductionSchedule>> queryPageList(ProductionSchedule productionSchedule,
+    public Result<IPage<ProductionSchedule>> queryPageList(ProductionSchedule productionSchedule,String dPreDateB,String dPreDateE,
                                                             @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                             HttpServletRequest req) {
         Result<IPage<ProductionSchedule>> result = new Result<IPage<ProductionSchedule>>();
-        QueryWrapper<ProductionSchedule> queryWrapper = new QueryWrapper<>();
-//        QueryWrapper<ProductionSchedule> queryWrapper = QueryGenerator.initQueryWrapper(productionSchedule, req.getParameterMap());
-//        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+
         Page<ProductionSchedule> page = new Page<ProductionSchedule>(pageNo, pageSize);
-        // 汇总数据只取成衣订单，根据存货分类区分是否成衣还是面料
-        queryWrapper.eq("len(f.cInvCCode)",6);
-        if(productionSchedule != null){
+
+        QueryWrapper<ProductionSchedule> queryWrapper = new QueryWrapper<>();
 
             if(StringUtils.isNotBlank(productionSchedule.getCSOCode())){//销售订单号
-                queryWrapper.eq("a.cSOCode",productionSchedule.getCSOCode());
-            }
-            if(StringUtils.isNotBlank(productionSchedule.getCDepName())){//部门
-                queryWrapper.eq("c.cDepName",productionSchedule.getCDepName());
-            }
-            if(StringUtils.isNotBlank(productionSchedule.getCInvName())){//物料名称
-                queryWrapper.eq("f.cInvName",productionSchedule.getCInvName());
+                queryWrapper.eq("ss.cSOCode",productionSchedule.getCSOCode());
             }
-            if(StringUtils.isNotBlank(productionSchedule.getCDefine12())){//成衣加工厂
-                queryWrapper.eq("a.cDefine12",productionSchedule.getCDefine12());
+//            if(StringUtils.isNotBlank(productionSchedule.getCDepName())){//部门
+//                queryWrapper.eq("c.cDepName",productionSchedule.getCDepName());
+//            }
+//            if(StringUtils.isNotBlank(productionSchedule.getCInvName())){//物料名称
+//                queryWrapper.eq("f.cInvName",productionSchedule.getCInvName());
+//            }
+//            if(StringUtils.isNotBlank(productionSchedule.getCDefine12())){//成衣加工厂
+//                queryWrapper.eq("a.cDefine12",productionSchedule.getCDefine12());
+//            }
+//            if(StringUtils.isNotBlank(productionSchedule.getCPersonName())){//业务员
+//                queryWrapper.eq("d.cPersonName",productionSchedule.getCPersonName());
+//            }
+//            if(StringUtils.isNotBlank(productionSchedule.getCSOCode())){//计划单号
+//                queryWrapper.eq("a.cSOCode",productionSchedule.getCSOCode());
+//            }
+//            if(StringUtils.isNotBlank(productionSchedule.getDDate())){//订单日期
+//                queryWrapper.eq("CONVERT(nvarchar(10),a.dDate,121)",productionSchedule.getDDate());
+//            }
+//            if(StringUtils.isNotBlank(productionSchedule.getColor())){//颜色
+//                queryWrapper.eq("b.cFree1",productionSchedule.getColor());
+//            }
+            if(StringUtils.isNotBlank(dPreDateB)){//交期
+                queryWrapper.between("s.dPreDate",dPreDateB,dPreDateE);
+             }
+
+        IPage<ProductionSchedule> pageList = productionScheduleService.selectByPage(page,queryWrapper);
+
+        //获取计划号
+        for(ProductionSchedule li:pageList.getRecords()){
+            //截取计划号
+            int indexof = li.getPlanCode().indexOf("SY");
+            if(indexof !=-1) {
+                int g = li.getPlanCode().indexOf("-", indexof);
+                if (g < 0) {
+                    li.setPlanCode(li.getPlanCode().substring(indexof));
+                } else {
+                    li.setPlanCode(li.getPlanCode().substring(indexof, g));
+                }
             }
-            if(StringUtils.isNotBlank(productionSchedule.getCPersonName())){//业务员
-                queryWrapper.eq("d.cPersonName",productionSchedule.getCPersonName());
-            }
-            if(StringUtils.isNotBlank(productionSchedule.getCSOCode())){//计划单号
-                queryWrapper.eq("a.cSOCode",productionSchedule.getCSOCode());
-            }
-            if(StringUtils.isNotBlank(productionSchedule.getDDate())){//订单日期
-                queryWrapper.eq("CONVERT(nvarchar(10),a.dDate,121)",productionSchedule.getDDate());
-            }
-            if(StringUtils.isNotBlank(productionSchedule.getColor())){//颜色
-                queryWrapper.eq("b.cFree1",productionSchedule.getColor());
-            }
-            if(StringUtils.isNotBlank(productionSchedule.getDPreDateBT())){//交期
-                queryWrapper.eq("CONVERT(nvarchar(10),a.dPreDateBT,121)",productionSchedule.getDPreDateBT());
-            }
-
         }
 
-        IPage<ProductionSchedule> pageList = productionScheduleService.selectByPage(page, queryWrapper);
         result.setSuccess(true);
         result.setResult(pageList);
         result.setMessage("查询成功");
@@ -92,60 +99,36 @@ public class ProductionScheduleController {
 
     /**
      * 生产进度报表-查看详情
-     * @param soCode 销售订单号
-     * @param marCode 存货编码
-     * @param itemNumber 款号
-     * @param color 颜色
-     * @param planCode 计划号
+
      * @return
      */
     @AutoLog(value = "生产进度报表-查看详情")
     @ApiOperation(value="生产进度报表-查看详情", notes="生产进度报表-查看详情")
     @GetMapping(value = "/getView")
-    public Result<ProductionSchedule> getView(String soCode,String marCode,String itemNumber,String color,String planCode){
+    public Result<ProductionSchedule> getView(String soCode){
         Result<ProductionSchedule> result = new Result<ProductionSchedule>();
-        result.setSuccess(false);
-        if(!StringUtils.isNotBlank(soCode)){
-            result.setMessage("销售订单号不能为空");
-            return result;
-        }
-        if(!StringUtils.isNotBlank(marCode)){
-            result.setMessage("存货编码不能为空");
-            return result;
-        }
-        if(!StringUtils.isNotBlank(itemNumber)){
-            result.setMessage("款号不能为空");
-            return result;
-        }
-        if(!StringUtils.isNotBlank(color)){
-            result.setMessage("颜色不能为空");
-            return result;
-        }
-        if(!StringUtils.isNotBlank(planCode)){
-            result.setMessage("计划号不能为空");
-            return result;
-        }
-        QueryWrapper<ProductionSchedule> queryWrapper = new QueryWrapper<>();
 
-        queryWrapper.eq("len(f.cInvCCode)",6);
-        queryWrapper.eq("a.cSOCode",soCode);
-        queryWrapper.eq("b.cInvCode",marCode);
-        queryWrapper.eq("b.cDefine22",itemNumber);
-        queryWrapper.eq("b.cFree1",color);
-        queryWrapper.eq("p.PlanCode",planCode);
+        QueryWrapper<ProductionSchedule> queryWrapper = new QueryWrapper<>();
+        if(StringUtils.isBlank(soCode)){//销售订单号
+           result.setMessage("销售订单号不能为空");
+           result.setSuccess(false);
+           return result;
+        }else{
+            queryWrapper.eq("ss.cSOCode",soCode);
+        }
 
         ProductionSchedule entity = new ProductionSchedule();
-        List<ProductionSchedule> list = productionScheduleService.selectByView(queryWrapper); // 详情数据
-        if(list.size() > 0){
-            entity = list.get(0);
-        }
+//        List<ProductionSchedule> list = productionScheduleService.selectByView(queryWrapper); // 详情数据
+//        if(list.size() > 0){
+//            entity = list.get(0);
+//        }
 
         //根据计划号 查询采购订单
-        List<ProductionScheduleCaiGou> selectCaiGou = productionScheduleService.selectCaiGou(planCode);
-        entity.setProductionScheduleCaiGou(selectCaiGou);
+//        List<ProductionScheduleCaiGou> selectCaiGou = productionScheduleService.selectCaiGou(planCode);
+//        entity.setProductionScheduleCaiGou(selectCaiGou);
         //根据计划号查询委外订单
-        List<ProductionScheduleWeiWai> selectWeiWai = productionScheduleService.selectWeiWai(planCode);
-        entity.setProductionScheduleWeiWai(selectWeiWai);
+//        List<ProductionScheduleWeiWai> selectWeiWai = productionScheduleService.selectWeiWai(planCode);
+//        entity.setProductionScheduleWeiWai(selectWeiWai);
 
         result.setResult(entity);
 
@@ -163,7 +146,4 @@ public class ProductionScheduleController {
         return list;
     }
 
-    public static void main(String[] args) {
-        System.out.println(getToken());
-    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/entity/ProductionSchedule.java

@@ -10,6 +10,9 @@ import java.util.List;
  */
 @Data
 public class ProductionSchedule {
+
+    //订单子表ID
+    private String iSOsID;
     @ApiModelProperty(value = "部门")
     private String cDepName;// ;// 部门
     @ApiModelProperty(value = "业务员")
@@ -60,4 +63,9 @@ public class ProductionSchedule {
     private List<ProductionScheduleWeiWai> productionScheduleWeiWai;
     @ApiModelProperty(value = "生产进度报表（采购订单数据）")
     private List<ProductionScheduleCaiGou> ProductionScheduleCaiGou;
+
+
+    //查询条件
+    private String stateTime;
+    private String endTime;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/entity/ProductionScheduleRdrecord.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.productionScheduleReport.entity;
+
+
+import lombok.Data;
+
+/**
+ * 入库单实体类
+ */
+@Data
+public class ProductionScheduleRdrecord {
+
+    private String cc;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/mapper/ProductionScheduleMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface ProductionScheduleMapper extends BaseMapper<ProductionSchedule> {
 
-    IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page, @Param("ew") QueryWrapper<ProductionSchedule> queryWrapper);
+    public IPage<ProductionSchedule> selectByPage(@Param("page") IPage<ProductionSchedule> page,@Param("ew") QueryWrapper<ProductionSchedule> queryWrapper);
 
     List<ProductionSchedule> selectByPage(@Param("ew") QueryWrapper<ProductionSchedule> queryWrapper);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/mapper/xml/ProductionScheduleMapper.xml

@@ -3,88 +3,107 @@
 <mapper namespace="org.jeecg.modules.productionScheduleReport.mapper.ProductionScheduleMapper">
 
     <select id="selectByPage" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
-        select -- top 100
-              c.cDepName -- 部门
-             ,d.cPersonName -- 业务员
-             ,a.cSOCode -- 销售订单号
-             ,p.PlanCode planCode-- 计划单号
-             ,e.cCusName -- 客户
-             ,a.cDefine12 -- 成衣加工厂
-             ,b.cInvCode -- 存货编码
-             ,f.cInvName -- 存货名称
-             ,b.cDefine22 itemNumber -- 款号
-             ,b.cFree1 color-- 颜色
-             ,min(a.dPreDateBT) dPreDateBT -- 交期
-             ,sum(b.iQuantity) iQuantity --订单数量
-             ,sum(b.iTaxUnitPrice) iTaxUnitPrice -- 原币含税单价
-             ,sum(b.iSum) total_sum -- 总额（原币）
-             ,sum(b.iNatSum/b.iQuantity) bb_price -- 单价（本币）
-             ,sum(b.iNatSum) iNatSum -- 总额（本币）
-             ,sum(b.icostsum) icostsum -- 实际发票成本
-             ,sum(b.foutquantity) foutquantity --已出库数量
-             ,sum(b.iKPQuantity) iKPQuantity --累计开票数量
-             ,sum(b.iKPMoney) iKPMoney -- 累计开票金额
-             ,f.pictureGUid pictureId -- 图片id
-             ,min(a.dDate) dDate -- 单据日期
-        from SO_SOMain a
-                 left join SO_SODetails b on a.id = b.id
 
-                 left join mps_netdemand m on a.cSOCode = m.SoCode and m.OrgDemSeq = b.iRowNo
-                 left join mps_plancode p on m.ProjectId = p.plancodeid
+select t.* from (
+SELECT  max(o.omCode) as planCode,max(c.PictureGUID) as pictureId,
+        max(ss.csocode) as cSOCode,max(de.cDepName) as cDepName,max(pe.cPersonName) as cPersonName,max(s.icostsum) as icostsum,
+        max(v.cVenName) as cDefine12,max(s.cInvCode) as cInvCode,max(s.cInvName) as cInvName,max(s.cdefine22) as itemNumber,
+        max(s.cFree1) as color,max(s.dPreDate) as dPreDateBT,sum(s.iQuantity) as iQuantity,max(s.iTaxUnitPrice) as iTaxUnitPrice,
+        sum(s.iSum) as totalSum,max(s.iNatUnitPrice) as bbPrice,max(s.iNatSum) as iNatSum,sum(s.foutquantity) as foutquantity,sum(s.iKPQuantity) as iKPQuantity
+           FROM  UFDATA_901_2021.dbo.SO_SODetails s
+        inner JOIN UFDATA_901_2021.dbo.SO_SOMain ss on ss.ID= s.ID
+        inner JOIN (
+                     SELECT
+                     om.cCode AS omCode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_901_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_901_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+                     WHERE
+                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+
+                     ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode
+        inner JOIN UFDATA_901_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
+        inner JOIN UFDATA_901_2021.dbo.Inventory c on c.cInvCode=s.cInvCode
+        inner JOIN UFDATA_901_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_901_2021.dbo.Department de ON ss.cDepCode = de.cDepCode
+        inner JOIN UFDATA_901_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode
+        ${ew.customSqlSegment} and c.cInvCcode like '19%'
+         GROUP BY v.cVenName
+        union all
+
+        SELECT max(o.omCode) as planCode,max(c.PictureGUID) as pictureId,
+        max(ss.csocode) as cSOCode,max(de.cDepName) as cDepName,max(pe.cPersonName) as cPersonName,max(s.icostsum) as icostsum,
+        max(v.cVenName) as cDefine12,max(s.cInvCode) as cInvCode,max(s.cInvName) as cInvName,max(s.cdefine22) as itemNumber,
+        max(s.cFree1) as color,max(s.dPreDate) as dPreDateBT,sum(s.iQuantity) as iQuantity,max(s.iTaxUnitPrice) as iTaxUnitPrice,
+        sum(s.iSum) as totalSum,max(s.iNatUnitPrice) as bbPrice,max(s.iNatSum) as iNatSum,sum(s.foutquantity) as foutquantity,sum(s.iKPQuantity) as iKPQuantity
+        FROM  UFDATA_903_2021.dbo.SO_SODetails a
+        inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
+        inner JOIN (
+                     SELECT
+                     om.cCode AS omCode, od.csoordercode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_903_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+                     WHERE
+                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+                     ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
+        inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
+        inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
+        inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_903_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_903_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode
+        inner join UFDATA_902_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+        inner join UFDATA_902_2021.dbo.po_podetails g on g.POID=f.POID
+        inner join UFDATA_902_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+        inner join UFDATA_902_2021.dbo.so_somain ss on ss.id=s.id
+        inner join UFDATA_902_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode
+        inner JOIN UFDATA_902_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode
+        ${ew.customSqlSegment} and  cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001')
+        and c.cInvCcode like '19%'
+        GROUP BY v.cVenName
 
-                 left join Department c on c.cDepCode = a.cDepCode
-                 left join person d on d.cPersonCode = a.cPersonCode
-                 left join Customer e on e.cCusCode = a.cCusCode
-                 left join Inventory f on f.cInvCode = b.cInvCode
+        union all
 
-            ${ew.customSqlSegment} and p.plancode is not null
+        SELECT max(o.omCode) as planCode,max(c.PictureGUID) as pictureId,
+        max(ss.csocode) as cSOCode,max(de.cDepName) as cDepName,max(pe.cPersonName) as cPersonName,max(s.icostsum) as icostsum,
+        max(v.cVenName) as cDefine12,max(s.cInvCode) as cInvCode,max(s.cInvName) as cInvName,max(s.cdefine22) as itemNumber,
+        max(s.cFree1) as color,max(s.dPreDate) as dPreDateBT,sum(s.iQuantity) as iQuantity,max(s.iTaxUnitPrice) as iTaxUnitPrice,
+        sum(s.iSum) as totalSum,max(s.iNatUnitPrice) as bbPrice,max(s.iNatSum) as iNatSum,sum(s.foutquantity) as foutquantity,sum(s.iKPQuantity) as iKPQuantity
+        FROM  UFDATA_903_2021.dbo.SO_SODetails a
+        inner JOIN UFDATA_903_2021.dbo.SO_SOMain b on b.ID= a.ID
+        inner JOIN (
+                     SELECT
+                     om.cCode AS omCode, od.csoordercode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_903_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_903_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+                     WHERE
+                     om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
+                     ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
+        inner JOIN UFDATA_903_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
+        inner JOIN UFDATA_903_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
+        inner JOIN UFDATA_903_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_903_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_903_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode
+        inner join UFDATA_901_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+        inner join UFDATA_901_2021.dbo.po_podetails g on g.POID=f.POID
+        inner join UFDATA_901_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+        inner join UFDATA_901_2021.dbo.so_somain ss on ss.id=s.id
+        inner join UFDATA_901_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode
+        inner JOIN UFDATA_901_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode
+          ${ew.customSqlSegment} and cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001')  and c.cInvCcode like '19%'
+
+        GROUP BY v.cVenName ) t
 
-        group by
-            c.cDepName -- 部门
-               ,d.cPersonName -- 业务员
-               ,a.cSOCode -- 销售订单号
-               ,e.cCusName -- 客户
-               ,a.cDefine12 -- 成衣加工厂
-               ,b.cInvCode -- 存货编码
-               ,f.cInvName -- 存货名称
-               ,b.cDefine22 -- 款号
-               ,b.cFree1-- 颜色
-               ,f.pictureGUid -- 图片id
-                ,p.PlanCode
     </select>
    <select id="selectByPageXXXXX" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">
 
-        select --top 100
-            c.cDepName -- 部门
-             ,d.cPersonName -- 业务员
-             ,a.cSOCode -- 销售订单号
-             ,a.cSOCode planCode-- 计划单号
-             ,e.cCusName -- 客户
-             ,a.cDefine12 -- 成衣加工厂
-             ,b.cInvCode -- 存货编码
-             ,f.cInvName -- 存货名称
-             ,b.cDefine22 itemNumber -- 款号
-             ,b.cFree1 color-- 颜色
-             ,a.dPreDateBT -- 交期
-             ,b.iQuantity --订单数量
-             ,b.iTaxUnitPrice -- 原币含税单价
-             ,b.iSum total_sum -- 总额（原币）
-             ,b.iNatSum/b.iQuantity bb_price -- 单价（本币）
-             ,b.iNatSum -- 总额（本币）
-             ,b.icostsum -- 实际发票成本
-             ,b.foutquantity --已出库数量
-             ,b.iKPQuantity --累计开票数量
-             ,b.iKPMoney -- 累计开票金额
-             ,f.pictureGUid pictureId -- 图片id
-             ,a.dDate dDate -- 单据日期
-        from SO_SOMain a
-                 left join SO_SODetails b on a.id = b.id
-                 left join Department c on c.cDepCode = a.cDepCode
-                 left join person d on d.cPersonCode = a.cPersonCode
-                 left join Customer e on e.cCusCode = a.cCusCode
-                 left join Inventory f on f.cInvCode = b.cInvCode
-        ${ew.customSqlSegment}
-
     </select>
     
     <select id="selectPicture" resultType="org.jeecg.modules.productionScheduleReport.entity.ProductionSchedule">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/service/ProductionScheduleService.java

@@ -12,10 +12,16 @@ import java.util.List;
 
 
 public interface ProductionScheduleService extends IService<ProductionSchedule> {
+    //查询列表界面
     @DS("multi-three")
-    public IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page, QueryWrapper<ProductionSchedule> queryWrapper);
+    public IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page,QueryWrapper<ProductionSchedule> queryWrapper);
+
+    //查询详情
     @DS("multi-three")
     public List<ProductionSchedule> selectByView(QueryWrapper<ProductionSchedule> queryWrapper);
+
+
+
     @DS("multi-three")
     public List<ProductionSchedule> selectPicture(String pictureId);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/productionScheduleReport/service/impl/ProductionScheduleImpl.java

@@ -21,11 +21,13 @@ public class ProductionScheduleImpl extends ServiceImpl<ProductionScheduleMapper
     private ProductionScheduleMapper productionScheduleMapper;
 
     @Override
-    @DS("multi-three")
-    public IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page, QueryWrapper<ProductionSchedule> queryWrapper) {
+    @DS("multi-one")
+    public IPage<ProductionSchedule> selectByPage(IPage<ProductionSchedule> page,QueryWrapper<ProductionSchedule> queryWrapper) {
         return productionScheduleMapper.selectByPage(page, queryWrapper);
     }
 
+
+
     @Override
     @DS("multi-three")
     public List<ProductionSchedule> selectByView(QueryWrapper<ProductionSchedule> queryWrapper){