齐套率报表

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.documents.shippingDetails.controller;
 
 import java.io.File;
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -1141,16 +1142,19 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  * @return
 	  */
 	 @RequestMapping(value = "/exportXlsShipping")
-	 public ModelAndView exportXlsShipping(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
+	 public Result<List<SyShippingDetailsVo>> exportXlsShipping(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
 									   String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,String isElement,
 									   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									   HttpServletRequest req){
+																HttpServletResponse req){
 
+		 Result<List<SyShippingDetailsVo>> result = new Result<List<SyShippingDetailsVo>>();
 		 IPage<SyShippingDetailsVo> pageList = null;
 
 		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 
+		 SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd"); // 月日年
+
 		 if(oConvertUtils.isNotEmpty(syShippingDetails.getDocumentNo())){
 			 queryWrapper.like("t.documentNo",syShippingDetails.getDocumentNo());
 		 }
@@ -1197,12 +1201,51 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 pageList = syShippingDetailsService.queryShippingDetails(page, queryWrapper);
 		 }
 
-		 //Step.3 调用AutoPoi导出Excel
-		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-		 mv.addObject(NormalExcelConstants.FILE_NAME, "发运明细数据");
-		 mv.addObject(NormalExcelConstants.CLASS, SyShippingDetailsVo.class);
-		 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("发运明细数据", "导出人:admin" , "发运明细"));
-		 mv.addObject(NormalExcelConstants.DATA_LIST, pageList.getRecords());
-		 return mv;
+		 org.jeecgframework.poi.excel.entity.TemplateExportParams params = new org.jeecgframework.poi.excel.entity.TemplateExportParams("D:\\单证模板\\出运明细列表.xlsx");
+
+		 Map<String,Object> map = new HashMap<>();
+		 List<Map<String,Object>> listMap = new ArrayList<Map<String,Object>>();
+
+		 BigDecimal orderQuantity = BigDecimal.ZERO;
+		 BigDecimal price = BigDecimal.ZERO;
+		 try {
+			 //集合转map
+			 for (SyShippingDetailsVo li : pageList.getRecords()) {
+
+			 	li.setPreDeliveryDate1(sf.format(li.getPreDeliveryDate()));
+				 orderQuantity = orderQuantity.add(li.getOrderQuantity());
+				 BigDecimal p = new BigDecimal(li.getSalesUnitPrice()).multiply(li.getOrderQuantity());
+				 li.setPrice(p);
+				 price = price.add(p);
+
+				 Field[] fieldsList = li.getClass().getDeclaredFields();
+				 Map<String, Object> mapList = new HashMap<String, Object>();
+				 for (Field field : fieldsList) {
+					 field.setAccessible(true);
+					 mapList.put(field.getName(), field.get(li));
+				 }
+				 listMap.add(mapList);
+			 }
+			 map.put("orderQuantity",orderQuantity);
+			 map.put("price",price);
+			 map.put("item", listMap);
+
+			 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+
+			 ServletOutputStream outputStream = req.getOutputStream();
+
+			 workbook.write(outputStream);
+
+		 }catch (Exception ex){
+			 ex.printStackTrace();
+			 log.error("导出失败：" + ex.getMessage());
+			 ex.printStackTrace();
+
+		 }
+		 result.setSuccess(true);
+		 result.setMessage("导出成功！");
+		 result.setResult(pageList.getRecords());
+
+		 return result;
 	 }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyShippingDetailsVo.java

@@ -8,6 +8,7 @@ import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -87,6 +88,8 @@ public class SyShippingDetailsVo {
     @Excel(name = "预发货日期", width = 20, format = "yyyy-MM-dd")
     @ApiModelProperty(value = "预发货日期")
     private java.util.Date preDeliveryDate;
+    //Stirng格式预发货日期
+    private String preDeliveryDate1;
 
     /**发货数量*/
     @Excel(name = "发货数量", width = 15)
@@ -304,6 +307,8 @@ public class SyShippingDetailsVo {
 
     //单位
     private String masterMetering;
+    //金额
+    private BigDecimal price;
 
 
     //导出条件

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

@@ -9,6 +9,8 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.report.entity.FullSetRate;
+import org.jeecg.modules.report.entity.FullSetRateList;
+import org.jeecg.modules.report.entity.FullSetRateSubInfo;
 import org.jeecg.modules.report.service.IFullSetRateService;
 import org.jeecg.modules.report.service.impl.FullSetRateServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,29 +49,46 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
         Result<IPage<FullSetRate>> result = new Result<IPage<FullSetRate>>();
         Page<FullSetRate> page = new Page<FullSetRate>(pageNo,pageSize);
         QueryWrapper<FullSetRate> queryWrapper = new QueryWrapper<>();
-        if(oConvertUtils.isNotEmpty(fullSetRate.getPlanNo())){
-            queryWrapper.like("a.cCode",fullSetRate.getPlanNo());
+        if(oConvertUtils.isNotEmpty(fullSetRate.getSubcontractOrderNo())){
+            queryWrapper.like("a.cCode",fullSetRate.getSubcontractOrderNo());
         }
-        queryWrapper.groupBy("a.MOID");
+       // if(oConvertUtils.isNotEmpty(fullSetRate.getBeginDate())){
+            queryWrapper.between("b.dPreDate","2022-09-21","2022-09-21");//fullSetRate.getBeginDate(),fullSetRate.getEndDate()
+       // }
+//        if(oConvertUtils.isNotEmpty(fullSetRate.getSection())){
+//            queryWrapper.like("a.cCode",fullSetRate.getSection());
+//        }
+//        //颜色
+//        if(oConvertUtils.isNotEmpty(fullSetRate.getColor())){
+//            queryWrapper.like("b.cFree1",fullSetRate.getColor());
+//        }
+
+        queryWrapper.isNotNull("om.cCode");
+        queryWrapper.groupBy("a.ID");
         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;
 
         for(FullSetRate li:pageList.getRecords()){
-            //查询委外订单子表与发货或日期信息
-            List<FullSetRate> queryMomain = fullSetRateService.queryMOMain(li.getMoID());
+
+            //查询销售订单子表预发货日期信息
+            QueryWrapper<FullSetRate> queryWrapper1 = new QueryWrapper<>();
+            queryWrapper1.eq("ID",li.getID());
+            queryWrapper1.between("dPreDate","2022-09-21","2022-09-21");
+            List<FullSetRate> querySomain = fullSetRateService.querySOMain(queryWrapper1);
+
             //循环子表
-            for(FullSetRate momian:queryMomain){
-                moDeilsIDList.add(momian.getMODetailsID());
+            for(FullSetRate momian:querySomain){
+
+                moDeilsIDList.add(momian.getISOsID());
                 //查询销售出库单获取累计准时出库数量,获取累计延迟出库数量
-              List<FullSetRate> salesIssueList = fullSetRateService.querySalesIssue(momian.getMODetailsID());
+                List<FullSetRate> salesIssueList = fullSetRateService.querySalesIssue(momian.getISOsID());
                 for(FullSetRate sa:salesIssueList){
                     Long saTime = sf.parse(sa.getDeliveryDate()).getTime();
                     Long moTime = sf.parse(momian.getDeliveryDate()).getTime();
@@ -84,12 +103,14 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
                     }
                 }
             }
+            //获取委外订单数量且赋值
+            String subcontractOrderQuantity = fullSetRateService.queryOMMOdetilQuantity(moDeilsIDList);
+            li.setSubcontractOrderQuantity(subcontractOrderQuantity);
+
             //累计准时出库数量赋值
             li.setCumulativeOnTimeDeliveryQuantity(cumulativeOnTimeDeliveryQuantity);
             //累计延迟出库数量赋值
             li.setCumulativeDelayedDeliveryQty(cumulativeDelayedDeliveryQty);
-            //预计发货日期（最早）赋值
-            li.setEstimatedDeliveryDate(queryMomain.get(0).getDeliveryDate());
             //最早出库日期赋值,最晚出库日期赋值
             List<FullSetRate> dateTimeList = fullSetRateService.querySalesIssueDate(moDeilsIDList);
             li.setEarliestIssueDate(dateTimeList.get(dateTimeList.size()-1).getDeliveryDate());
@@ -99,6 +120,21 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
             li.setDeliveryRate(deliveryRate);
 
 
+            li.setSoIDsID(moDeilsIDList);
+
+            //齐套率赋值
+//            int i = 0;
+//            BigDecimal avg = BigDecimal.ZERO;
+//            List<FullSetRateList> list = fullSetRateService.queryOMMOdetilList(moDeilsIDList);
+//            for(FullSetRateList rate :list){
+//                //获取最小齐套率且赋值
+//                List<FullSetRateSubInfo> setRate = fullSetRateService.queryOMMOmainSubInfo(rate.getMODetailsID());
+//                rate.setSetRate(setRate.get(0).getSetRate());
+//                avg = avg.add(new BigDecimal(setRate.get(0).getSetRate()));
+//                i++;
+//            }
+//            BigDecimal rate = avg.divide(new BigDecimal(i),2,BigDecimal.ROUND_HALF_UP);
+//            li.setFullSetRate(rate.toString());
         }
 
         result.setMessage("查询成功！");
@@ -109,4 +145,50 @@ public class FullSetRateController extends JeecgController<FullSetRate, IFullSet
 
     }
 
+
+    /**
+     * 齐套率列表明细查询
+     * @return
+     */
+    @GetMapping(value = "/queryOMMOdetilList")
+    public Result<List<FullSetRateList>> queryOMMOdetilList(List<String> iSOsID){
+
+        Result<List<FullSetRateList>> result = new Result<List<FullSetRateList>>();
+
+        List<FullSetRateList> list = fullSetRateService.queryOMMOdetilList(iSOsID);
+
+        for(FullSetRateList li:list){
+            //获取最小齐套率且赋值
+            List<FullSetRateSubInfo> setRate = fullSetRateService.queryOMMOmainSubInfo(li.getMODetailsID());
+            li.setSetRate(setRate.get(0).getSetRate());
+        }
+
+        result.setSuccess(true);
+        result.setMessage("查询成功！");
+        result.setResult(list);
+
+        return result;
+
+    }
+
+
+    /**
+     * 齐套率子件查询
+     * @param mODetailsID
+     * @return
+     */
+    @GetMapping(value = "/queryOMMOmainSubInfo")
+    public Result<List<FullSetRateSubInfo>> queryOMMOmainSubInfo(String mODetailsID){
+
+        Result<List<FullSetRateSubInfo>> result = new Result<>();
+
+        List<FullSetRateSubInfo> list = fullSetRateService.queryOMMOmainSubInfo(mODetailsID);
+
+        result.setSuccess(true);
+        result.setMessage("查询成功！");
+        result.setResult(list);
+
+        return result;
+    }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FullSetRate.java

@@ -5,6 +5,7 @@ import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 齐套率报表列表实体类
@@ -55,10 +56,15 @@ public class FullSetRate {
 
 
     //其他条件所需字段
-    private String MODetailsID;
-    private String moID;
+    private String iSOsID;
+    private String ID;
+    List<String> soIDsID;
 
     //查询条件所需字段
-    private String planNo;
+    private String beginDate;
+    private String endDate;
+    private String section;
+    private String color;
+    private String smllPo;
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FullSetRateList.java

@@ -0,0 +1,37 @@
+package org.jeecg.modules.report.entity;
+
+
+import lombok.Data;
+
+/**
+ * 齐套率明细字段
+ */
+@Data
+public class FullSetRateList {
+
+    //计划到货日期
+    private String dArriveDate;
+    //小PO
+    private String smallPo;
+    //物料编码
+    private String cInvCode;
+    //物料名称
+    private String cInvName;
+    //颜色
+    private String clour;
+    //分销点
+    private String distributionPoint;
+    //packID
+    private String packId;
+    //交期
+    private String deliveryDate;
+    //委外订单数量
+    private String subcontractOrderQuantity;
+    //齐套率
+    private String setRate;
+
+    //累计入库数量
+    private String cumulativeReceiptQty;
+
+    private String mODetailsID;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/entity/FullSetRateSubInfo.java

@@ -0,0 +1,35 @@
+package org.jeecg.modules.report.entity;
+
+
+import lombok.Data;
+
+/**
+ * 齐套率子件信息
+ */
+@Data
+public class FullSetRateSubInfo {
+
+    //标准用量
+    private String quantityUsed;
+
+    //应领数量合计
+    private String totalQuantityReceivable;
+
+    //已领数量合计
+    private String totalCollectedQuantity;
+
+    //颜色
+    private String clour;
+
+    //克重
+    private String gramWeight;
+
+    //尺码
+    private String size;
+
+    //门幅
+    private String doorframe;
+
+    //齐套率
+    private String setRate;
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/FullSetRateMapper.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.report.entity.FullSetRate;
+import org.jeecg.modules.report.entity.FullSetRateList;
+import org.jeecg.modules.report.entity.FullSetRateSubInfo;
 
 import java.util.List;
 
@@ -18,9 +20,19 @@ public interface FullSetRateMapper extends BaseMapper<FullSetRate> {
     //查询销售出库单 获取累计准时出库数量，累计延迟出库数量
     public List<FullSetRate> querySalesIssue(@Param("moDeilsID") String moDeilsID);
 
-    //查询委外订单子表信息
-    public List<FullSetRate> queryMOMain(@Param("moId") String moId);
+    //查询销售订单子表信息
+    public List<FullSetRate> querySOMain(@Param("ew") QueryWrapper<FullSetRate> queryWrapper);
 
     //查询销售出库单获取最早最晚出库日期
     public List<FullSetRate> querySalesIssueDate(@Param("moDeilsID") List<String> moDeilsID);
+
+    //查询委外订单数量
+    public String queryOMMOdetilQuantity(@Param("isosid") List<String> isosid);
+
+    //查询委外订单明细
+    public List<FullSetRateList> queryOMMOdetilList(@Param("isosid") List<String> isosid);
+
+    //查询委外子件信息
+    public List<FullSetRateSubInfo> queryOMMOmainSubInfo(@Param("mODetailsID") String mODetailsID);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FullSetTateMapper.xml

@@ -3,20 +3,18 @@
 <mapper namespace="org.jeecg.modules.report.mapper.FullSetRateMapper">
     
     <select id="queryListInfo" resultType="org.jeecg.modules.report.entity.FullSetRate">
-
-        select a.MOID,min(b.csoordercode) as sourceOrderNo,max(c.cDefine22) as styleNumber,
-        sum(c.iQuantity) as salesOrderQuantity,min(a.cCode) as subcontractOrderNo,sum(b.iQuantity) as subcontractOrderQuantity,
-        min(c.dPreDate) as deliveryDate,min(d.cDepName) as department,min(p.cPersonName) as salesman,
-        sum(c.iQuantity) as salesOrderQuantity1,sum(c.iFHQuantity) as cumulativeIssueQuantity,
-        (sum(c.iQuantity)-sum(c.iFHQuantity)) as quantityNotIssued from OM_MOMain a
-left join OM_MODetails b
-on a.MOID = b.MOID
-left join SO_SODetails c
-on b.isosid = c.iSOsID
+select max(a.ID) as ID,max(a.cSOCode) as sourceOrderNo, max(b.cDefine22) as styleNumber,sum(b.iQuantity) as salesOrderQuantity,
+max(om.cCode) as subcontractOrderNo,min(b.dPreDate) as deliveryDate,min(d.cDepName) as department,
+min(p.cPersonName) as salesman,sum(b.iQuantity) as salesOrderQuantity1,sum(b.iFHQuantity) as cumulativeIssueQuantity,
+ (sum(b.iQuantity)-sum(b.iFHQuantity)) as quantityNotIssued,min(b.dPreDate) as estimatedDeliveryDate from SO_SOMain a
+left join SO_SODetails b
+on a.ID = b.ID
+left join (select a.cCode as cCode,b.isosid as isosid,a.cDepCode,a.cPersonCode from OM_MOMain a left join OM_MODetails b on a.MOID = b.MOID) as om
+on b.iSOsID = om.isosid
 left join Department d
-on a.cDepCode = d.cDepCode
+on om.cDepCode = d.cDepCode
 left join Person p
-on a.cPersonCode = p.cPersonCode
+on om.cPersonCode = p.cPersonCode
 ${ew.customSqlSegment}
 
     </select>
@@ -29,25 +27,57 @@ ${ew.customSqlSegment}
     where b.iorderdid = #{moDeilsID}
     </select>
 
-    <select id="queryMOMain" resultType="org.jeecg.modules.report.entity.FullSetRate">
-
-      select a.isosid as MODetailsID,b.dPreDate as deliveryDate from OM_MODetails a
-        left join SO_SODetails b
-        on a.isosid = b.iSOsID
-        where a.MOID = #{moId}
-        order by b.dPreDate asc
-
+    <select id="querySOMain" resultType="org.jeecg.modules.report.entity.FullSetRate">
+      select iSOsID as iSOsID,dPreDate as deliveryDate from SO_SODetails
+      ${ew.customSqlSegment}
     </select>
 
     <select id="querySalesIssueDate" resultType="org.jeecg.modules.report.entity.FullSetRate">
         select a.dDate as deliveryDate from rdrecord32 a
     left join rdrecords32 b
     on a.ID = b.ID
-    where b.iorderdid in
+    where b.iorderdid  in
     <foreach collection="moDeilsID" item="item" separator="," open="(" close=")">
         #{item}
     </foreach>
     order by a.dDate desc
     </select>
 
+    <select id="queryOMMOdetilQuantity" resultType="String">
+        select sum(iQuantity) as 'iQuantity' from OM_MODetails
+        where isosid in
+        <foreach collection="isosid" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </select>
+
+    <select id="queryOMMOdetilList" resultType="org.jeecg.modules.report.entity.FullSetRateList">
+     select a.MODetailsID as mODetailsID,a.dArriveDate as dArriveDate,a.cDefine28 as smallPo, a.cInvCode as cInvCode,b.cInvName as cInvName,
+     a.cFree1 as clour,a.cDefine29 as distributionPoint,a.cDefine32 as packId,c.dPreDate as deliveryDate,
+     a.iQuantity as subcontractOrderQuantity,a.iReceivedQTY as cumulativeReceiptQty
+     from OM_MODetails a
+     left join Inventory b
+     on a.cInvCode = b.cInvCode
+     left join SO_SODetails c
+     on a.isosid = c.iSOsID
+     where a.isosid in
+        <foreach collection="isosid" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+
+    </select>
+
+    <select id="queryOMMOmainSubInfo" resultType="org.jeecg.modules.report.entity.FullSetRateSubInfo">
+
+select cInvCode,sum(iUnitQuantity) as quantityUsed,sum(iSendQTY) as totalCollectedQuantity,
+sum(iQuantity) as totalQuantityReceivable,
+max(cFree1) as clour,max(cFree6) as gramWeight,max(cFree2) as size,max(cDefine23) as doorframe,
+(sum(iSendQTY)/sum(iQuantity)) as setRate
+from OM_MOMaterials
+where MoDetailsID = #{mODetailsID} group by cInvCode order by (sum(iSendQTY)/sum(iQuantity))
+
+    </select>
+
+
+
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/IFullSetRateService.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.report.entity.FullSetRate;
+import org.jeecg.modules.report.entity.FullSetRateList;
+import org.jeecg.modules.report.entity.FullSetRateSubInfo;
 import org.jeecg.modules.report.entity.SoSoDetails;
 
 import java.util.List;
@@ -21,9 +23,18 @@ public interface IFullSetRateService extends IService<FullSetRate> {
     //查询销售出库单
     public List<FullSetRate> querySalesIssue(String moDeilsID);
 
-    //查询委外订单子表每条预发货日期信息
-    public List<FullSetRate> queryMOMain(String moId);
+    //查询销售订单子表每条预发货日期信息
+    public List<FullSetRate> querySOMain(QueryWrapper<FullSetRate> queryWrapper);
 
     //查询销售出库单获取最早最晚出库日期
     public List<FullSetRate> querySalesIssueDate(List<String> moDeilsID);
+
+    //查询委外订单数量
+    public String queryOMMOdetilQuantity(List<String> isosid);
+
+    //查询委外订单明细
+    public List<FullSetRateList> queryOMMOdetilList(List<String> isosid);
+
+    //查询委外子件信息
+    public List<FullSetRateSubInfo> queryOMMOmainSubInfo(String mODetailsID);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FullSetRateServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.report.entity.FullSetRate;
+import org.jeecg.modules.report.entity.FullSetRateList;
+import org.jeecg.modules.report.entity.FullSetRateSubInfo;
 import org.jeecg.modules.report.mapper.FullSetRateMapper;
 import org.jeecg.modules.report.service.IFullSetRateService;
 import org.springframework.stereotype.Service;
@@ -35,12 +37,27 @@ public class FullSetRateServiceImpl extends ServiceImpl<FullSetRateMapper, FullS
     }
 
     @Override
-    public List<FullSetRate> queryMOMain(String moId) {
-        return fullSetRateMapper.queryMOMain(moId);
+    public List<FullSetRate> querySOMain(QueryWrapper<FullSetRate> queryWrapper) {
+        return fullSetRateMapper.querySOMain(queryWrapper);
     }
 
     @Override
     public List<FullSetRate> querySalesIssueDate(List<String> moDeilsID) {
         return fullSetRateMapper.querySalesIssueDate(moDeilsID);
     }
+
+    @Override
+    public String queryOMMOdetilQuantity(List<String> isosid) {
+        return fullSetRateMapper.queryOMMOdetilQuantity(isosid);
+    }
+
+    @Override
+    public List<FullSetRateList> queryOMMOdetilList(List<String> isosid) {
+        return fullSetRateMapper.queryOMMOdetilList(isosid);
+    }
+
+    @Override
+    public List<FullSetRateSubInfo> queryOMMOmainSubInfo(String mODetailsID) {
+        return fullSetRateMapper.queryOMMOmainSubInfo(mODetailsID);
+    }
 }