feat: 科室往来出库明细

src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java

@@ -132,6 +132,18 @@ public class IoOrderDetailResultController extends BaseController {
         PageInfo<IoOrderDetailDeptResultResponse> pageInfo = new PageInfo<>(getOrderDeptResult(orderDetailResultRequest));
         return ResultVOUtils.page(pageInfo);
     }
+    /**
+     * 查询单据仓库带票出入库明细
+     *
+     * @param orderDetailResultRequest
+     * @return
+     */
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/resultDetail/filterOrderDeptSupList")
+    public BaseResponse filterOrderDeptSupList(FilterOrderDetailDeptResultRequest orderDetailResultRequest) {
+        PageInfo<IoOrderDetailDeptResultResponse> pageInfo = new PageInfo<>(getOrderDeptSupResult(orderDetailResultRequest));
+        return ResultVOUtils.page(pageInfo);
+    }
 
 
     public List<IoOrderDetailResultResponse> getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) {
@@ -187,6 +199,21 @@ public class IoOrderDetailResultController extends BaseController {
         return list;
     }
 
+    public List<IoOrderDetailDeptResultResponse> getOrderDeptSupResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest) {
+
+        FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
+        filterOrderRequest.setVueType(orderDetailResultRequest.getActionType());
+        List<String> actions = orderService.setActions(filterOrderRequest);
+        if (CollUtil.isEmpty(actions)) {
+            return Collections.emptyList();
+        }
+        orderDetailResultRequest.setActions(actions);
+
+        List<IoOrderDetailDeptResultResponse> list = orderDetailResultService.getOrderDeptSupResult(orderDetailResultRequest);
+
+        return list;
+    }
+
 
     @GetMapping("/udiwms/inout/resultDetail/exportExcel")
     public void exportTemplate(FilterOrderDetailResultRequest orderDetailResultRequest, HttpServletResponse response) throws IOException {

src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java

@@ -48,4 +48,6 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
     List<IoExOrderDetailResultResponse> exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest);
 
     List<IoOrderDetailDeptResultResponse> filterOrderDeptList(FilterOrderDetailDeptResultRequest orderDetailResultRequest);
+
+    List<IoOrderDetailDeptResultResponse> filterOrderDeptSupList(FilterOrderDetailDeptResultRequest orderDetailResultRequest);
 }

src/main/java/com/glxp/api/req/inout/FilterOrderDetailDeptResultRequest.java

@@ -40,4 +40,6 @@ public class FilterOrderDetailDeptResultRequest extends ListPageRequest {
 
 
     private Boolean groupBuy;          //是否集采产品
+
+    private Integer hcType;
 }

src/main/java/com/glxp/api/res/inout/IoOrderDetailDeptResultResponse.java

@@ -24,6 +24,7 @@ public class IoOrderDetailDeptResultResponse {
      * 部门编码外键
      */
     private String fromInvName;
+    private String fromCorpName;
 
     private Integer count;
     private BigDecimal amount;

src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java

@@ -35,4 +35,6 @@ public interface IoOrderDetailResultService {
     List<IoExOrderDetailResultResponse> exFilterOrderDetail(FilterOrderDetailResultRequest orderDetailResultRequest);
 
     List<IoOrderDetailDeptResultResponse> getOrderDeptResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest);
+
+    List<IoOrderDetailDeptResultResponse> getOrderDeptSupResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest);
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -106,4 +106,15 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         }
         return orderDetailResultDao.filterOrderDeptList(orderDetailResultRequest);
     }
+
+    @Override
+    public List<IoOrderDetailDeptResultResponse> getOrderDeptSupResult(FilterOrderDetailDeptResultRequest orderDetailResultRequest) {
+        if (null == orderDetailResultRequest) {
+            return Collections.emptyList();
+        }
+        if (null != orderDetailResultRequest.getPage() && null != orderDetailResultRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
+        }
+        return orderDetailResultDao.filterOrderDeptSupList(orderDetailResultRequest);
+    }
 }

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -134,11 +134,15 @@
         FROM auth_warehouse aw
         LEFT JOIN io_order a1 ON  a1.fromInvCode =  aw.CODE
         LEFT JOIN io_order_detail_result a2 ON a1.billNo = a2.orderIdFk
+        LEFT JOIN basic_udirel bu on bu.id = a2.bindRlFk
         <where>
             a1.status = 7
             <if test="invCode != null and invCode != ''">
                 AND a1.invCode = #{invCode}
             </if>
+            <if test="hcType != null and hcType != ''">
+                AND bu.hcType = #{hcType}
+            </if>
             <if test="mainAction != null and mainAction != ''">
                 AND a1.mainAction = #{mainAction}
             </if>
@@ -168,6 +172,63 @@
         group by a1.fromInvCode
     </select>
 
+    <select id="filterOrderDeptSupList" resultType="com.glxp.api.res.inout.IoOrderDetailDeptResultResponse">
+        SELECT
+        aw.code as fromInvCode,
+        aw.name as fromInvName,
+        bc.name as fromCorpName,
+        SUM(CASE WHEN a1.mainAction = 'WareHouseOut' THEN -COALESCE(a2.price,0) * COALESCE(a2.count,0)
+        WHEN a1.mainAction = 'WareHouseIn' THEN (COALESCE(a2.price,0) * COALESCE(a2.count,0))
+        ELSE 0
+        END) AS amount,
+
+        SUM(CASE WHEN a1.mainAction = 'WareHouseOut' THEN -COALESCE(a2.count,0)
+        WHEN a1.mainAction = 'WareHouseIn' THEN (COALESCE(a2.count,0))
+        ELSE 0
+        END) AS `count`
+
+        FROM auth_warehouse aw
+        LEFT JOIN io_order a1 ON  a1.invCode =  aw.CODE
+        LEFT JOIN io_order_detail_result a2 ON a1.billNo = a2.orderIdFk
+        LEFT JOIN basic_udirel bu on bu.id = a2.bindRlFk
+        LEFT JOIN basic_corp bc on bc.erpId = a1.fromCorp
+        <where>
+            a1.status = 7 and a1.fromCorp is not null
+            <if test="invCode != null and invCode != ''">
+                AND a1.invCode = #{invCode}
+            </if>
+            <if test="hcType != null and hcType != ''">
+                AND bu.hcType = #{hcType}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND a1.mainAction = #{mainAction}
+            </if>
+            <if test="action != null and action != ''">
+                AND a1.action = #{action}
+            </if>
+            <if test="mainAction != null and mainAction != ''">
+                AND a1.mainAction = #{mainAction}
+            </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND a1.fromCorp = #{fromCorp}
+            </if>
+            <if test="fromInvCode != null and fromInvCode != ''">
+                AND a1.fromInvCode = #{fromInvCode}
+            </if>
+            <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
+                AND date_format(a1.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
+                date_format(#{endAduditTime}, '%Y-%m-%d')
+            </if>
+            <if test="actions != null and actions.size() != 0">
+                AND a1.`action` in
+                <foreach collection="actions" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by a1.fromInvCode,a1.fromCorp
+    </select>
+
     <select id="selectStatDataByTime" resultType="com.glxp.api.res.inv.IoOrderDetailStatRsponse">
         select orderIdFk,
                bindRlFk,