材料费详情+比对

module_kzks/src/main/java/org/jeecg/modules/projectCostHuiji/service/impl/ProjectCostHuijiServiceImpl.java

@@ -265,18 +265,8 @@ public class ProjectCostHuijiServiceImpl extends ServiceImpl<ProjectCostHuijiMap
                     for (CompletableFuture<List<ProjectCostHuijiExportVO>> sonFuture : completableFutures) {
                         projectCostHuijiListVOAll.addAll(sonFuture.join());
                     }
-                    System.out.println("查询数据结束的时间:"+ sformat.format(DateUtils.getDate()));
-                    System.out.println("开始缓存数据的时间:"+ sformat.format(DateUtils.getDate()));
-
-                    //for(ProjectCostHuijiExportVO projectCostHuijiListVO:projectCostHuijiListVOS){
-                    //    List<ProjectCostHuijiExportVO> projectCostHuijiListVOS1 = children1(projectCostHuijiListVO.getTaskno());//主任务及批产的主任务
-                    //    List<ProjectCostHuijiExportVO> projectCostHuijiListVOS2 = children2(projectCostHuijiListVO.getTaskno());//子任务及批产的子任务
-                    //    projectCostHuijiListVOAll.add(projectCostHuijiListVO);//父级数据
-                    //    projectCostHuijiListVOAll.addAll(projectCostHuijiListVOS1);//主任务及批产的主任务
-                    //    projectCostHuijiListVOAll.addAll(projectCostHuijiListVOS2);//子任务及批产的子任务
-                    //}
                 }
-                System.out.println("数据缓存结束的时间:"+ sformat.format(DateUtils.getDate()));
+                System.out.println("查询数据结束的时间:"+ sformat.format(DateUtils.getDate()));
             }
 
         }else if(role.equals(AuthMark.DEPT_LEADER)){//部门领导 根据部门查

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/mapper/xml/WzOutboundOrderHMapper.xml

@@ -65,7 +65,8 @@
         wlmc,
         ggxh,
         sfzsl,
-        cgdj
+        cgdj,
+        nbdj
         FROM wz_outbound_order_b wb
         WHERE ckdh IN (SELECT ckdh
         FROM wz_outbound_order_h h

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/service/impl/WzOutboundOrderHServiceImpl.java

@@ -15,6 +15,7 @@ import org.jeecg.modules.wzOutboundOrder.mapper.WzOutboundOrderHMapper;
 import org.jeecg.modules.wzOutboundOrder.service.IWzOutboundOrderHService;
 import org.jeecg.modules.wzOutboundOrder.vo.CLFCompareResultVO;
 import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
+import org.jeecg.modules.wzOutboundOrderBNew.mapper.WzOutboundOrderBNewMapper;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
@@ -47,6 +48,11 @@ public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMap
 
     @Autowired
     private RedisUtil redisUtil;
+
+    @Autowired
+    @SuppressWarnings("all")
+    private WzOutboundOrderBNewMapper orderBNewMapper;
+
     /**查询列表*/
     public List<WzOutboundOrderH> wzHlist(Wrapper<WzOutboundOrderH> queryWrapper) {
         return this.getBaseMapper().selectList(queryWrapper);
@@ -80,17 +86,20 @@ public class WzOutboundOrderHServiceImpl extends ServiceImpl<WzOutboundOrderHMap
 
     @Override
     public List<CLfCompareDO> getCLFCompareDoListByTaskNoList(String tasknos) {
-        return hMapper.getCLFCompareDoListByTaskNoList(tasknos);
+        //return hMapper.getCLFCompareDoListByTaskNoList(tasknos);
+        return orderBNewMapper.getCLFCompareDoListByTaskNoList(tasknos);
     }
 
     @Override
     public List<WzOutboundOrderBDetailListVO> getClfList(String taskno) {
-        return hMapper.getClfList(taskno);
+        //return hMapper.getClfList(taskno);
+        return orderBNewMapper.getClfList(taskno);
     }
 
     @Override
     public List<CLfCompareDO> getCLFCompareDoListByTaskNoListHasPcCode(String taskno,Boolean hasPcCode,Double proportion) {
-        return hMapper.getCLFCompareDoListByTaskNoListHasPcCode(taskno,hasPcCode,proportion);
+        //return hMapper.getCLFCompareDoListByTaskNoListHasPcCode(taskno,hasPcCode,proportion);
+        return orderBNewMapper.getCLFCompareDoListByTaskNoListHasPcCode(taskno,hasPcCode,proportion);
     }
 
     @Override

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/vo/WzOutboundOrderBDetailListVO.java

@@ -15,7 +15,7 @@ public class WzOutboundOrderBDetailListVO implements Serializable {
     /**id*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
-    private java.lang.Integer id;
+    private java.lang.String id;
     /**出库单号*/
     @Excel(name = "出库单号", width = 15)
     @ApiModelProperty(value = "出库单号")

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/WzOutboundOrderBNewMapper.java

@@ -4,6 +4,8 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
+import org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO;
+import org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO;
 import org.jeecg.modules.wzOutboundOrderBNew.entity.WzOutboundOrderBNew;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
@@ -24,4 +26,9 @@ public interface WzOutboundOrderBNewMapper extends BaseMapper<WzOutboundOrderBNe
     public int deleteByDate(@Param("currentyear") Integer currentyear);
 
 
+    List<WzOutboundOrderBDetailListVO> getClfList(@Param("taskno") String taskno);
+
+    List<CLfCompareDO> getCLFCompareDoListByTaskNoList(@Param("taskno") String taskno);
+
+    List<CLfCompareDO> getCLFCompareDoListByTaskNoListHasPcCode(@Param("taskno") String taskno,@Param("hasPcCode") Boolean hasPcCode,@Param("proportion") Double proportion);
 }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrderBNew/mapper/xml/WzOutboundOrderBNewMapper.xml

@@ -5,4 +5,74 @@
     <delete id="deleteByDate">
         delete from wz_outbound_order_b_new where year = #{currentyear}
     </delete>
+    <select id="getClfList" resultType="org.jeecg.modules.wzOutboundOrder.vo.WzOutboundOrderBDetailListVO">
+        select
+               id,
+               ckdh,
+               wzmc as wlmc,
+               wlbm,
+               cgdj,
+               nbdj,
+               sfsl as sfzsl
+        from wz_outbound_order_b_new
+        where tcrwh = #{taskno}
+    </select>
+    <select id="getCLFCompareDoListByTaskNoList"
+            resultType="org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO">
+
+        SELECT b.wlbm as wlbm,
+               b.wlmc as wlmc,
+               b.ggxh as ggxh,
+               b.totalAmount as totalAmount,
+               b.totalCount as totalCount,
+               totalAmount / totalCount as unitPrice,
+               #{taskno} as rwh
+        FROM (SELECT wlbm,
+                     wzmc as wlmc,
+                     ggxh,
+                     SUM(je) AS totalAmount,
+                     sum(sfsl)        AS totalCount
+              FROM wz_outbound_order_b_new
+              WHERE tcrwh = #{taskno}
+              GROUP BY wlbm,
+                       wzmc,
+                       ggxh) b
+    </select>
+    <select id="getCLFCompareDoListByTaskNoListHasPcCode"
+            resultType="org.jeecg.modules.wzOutboundOrder.entity.CLfCompareDO">
+
+        SELECT b.wlbm as wlbm,
+               b.wlmc as wlmc,
+               b.ggxh as ggxh,
+               b.totalAmount as totalAmount,
+               b.totalCount as totalCount,
+               totalAmount / totalCount as unitPrice,
+               #{taskno} as rwh,
+               #{hasPcCode} as hasPcCode,
+               #{proportion} as proportion
+        FROM (SELECT a.wlbm,
+                     a.wlmc,
+                     a.ggxh,
+                     SUM(je) AS totalAmount,
+                     sum(sfzsl) AS totalCount
+              FROM (SELECT wlbm,
+                           wzmc as wlmc,
+                           ggxh,
+                           sfsl as sfzsl,
+                           je
+                    FROM wz_outbound_order_b_new
+                    WHERE tcrwh IN ( select pcCode
+                                    from ky_task_info
+                                    where taskno = #{taskno}
+                                    UNION all
+                                    SELECT taskno
+                                    from ky_task_info
+                                    where refTaskNo in (select pcCode from ky_task_info where taskno = #{taskno}))
+                    ) a
+              GROUP BY a.wlbm,
+                       a.wlmc,
+                       a.ggxh) b
+
+
+    </select>
 </mapper>