feat: 科室产品出库功能

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

@@ -120,6 +120,16 @@ public class IoOrderDetailResultController extends BaseController {
         return ResultVOUtils.page(pageInfo);
     }
 
+    /**
+     * 查询科室产品领用出库
+     * @param orderDetailResultRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/resultDetail/filterProductOutList")
+    public BaseResponse filterProductOutList(FilterOrderDetailResultRequest orderDetailResultRequest) {
+        PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(getOrderResultProductOut(orderDetailResultRequest));
+        return ResultVOUtils.page(pageInfo);
+    }
 
     public List<IoOrderDetailResultResponse> getOrderResult(FilterOrderDetailResultRequest orderDetailResultRequest) {
         if (CollUtil.isNotEmpty(orderDetailResultRequest.getList())) {
@@ -160,6 +170,15 @@ public class IoOrderDetailResultController extends BaseController {
     }
 
 
+
+    public List<IoOrderDetailResultResponse> getOrderResultProductOut(FilterOrderDetailResultRequest orderDetailResultRequest) {
+
+        List<IoOrderDetailResultResponse> list = orderDetailResultService.filterOrderProductOutList(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

@@ -30,6 +30,8 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
      */
     List<IoOrderDetailResultResponse> filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest);
 
+    List<IoOrderDetailResultResponse> filterOrderProductOutList(FilterOrderDetailResultRequest orderDetailResultRequest);
+
     /**
      * 根据起止时间查询单据信息
      *

src/main/java/com/glxp/api/service/collect/IoCollectSetService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.collect;
 
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.entity.collect.IoCollectSet;
@@ -10,7 +11,13 @@ import com.glxp.api.dao.collect.IoCollectSetMapper;
 public class IoCollectSetService extends ServiceImpl<IoCollectSetMapper, IoCollectSet> {
 
     public IoCollectSet getSet() {
-        List<IoCollectSet> collectSets = this.list();
+        List<IoCollectSet> collectSets = new ArrayList<>();
+        try {
+            collectSets = this.list();
+        }catch (Exception e){
+            return new IoCollectSet();
+        }
+
         return collectSets.get(0);
     }
 }

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

@@ -27,6 +27,8 @@ public interface IoOrderDetailResultService {
 
     List<IoOrderDetailResultResponse> filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest);
 
+    List<IoOrderDetailResultResponse> filterOrderProductOutList(FilterOrderDetailResultRequest orderDetailResultRequest);
+
 
     List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
 

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

@@ -75,6 +75,17 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         return orderDetailResultDao.filterOrderList(orderDetailResultRequest);
     }
 
+    @Override
+    public List<IoOrderDetailResultResponse> filterOrderProductOutList(FilterOrderDetailResultRequest 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.filterOrderProductOutList(orderDetailResultRequest);
+    }
+
     @Override
     public List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest) {
         if (StrUtil.isNotEmpty(cptTraceRequest.getSerialNo())) {

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://192.168.0.166:3306/udi_wms_cl?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://192.168.0.43:3306/nj_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

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

@@ -141,6 +141,57 @@
         group by a2.id
     </select>
 
+    <select id="filterOrderProductOutList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">
+        SELECT a2.coName,
+               a2.spec,
+               a2.measname,
+               a2.bindRlFk,
+               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.fromInvCode = aw.CODE
+                     LEFT JOIN io_order_detail_result a2 ON a1.billNo = a2.orderIdFk
+        <where>
+            a1.status = 7
+            and a2.bindRlFk is not null
+            <if test="invCode != null and invCode != ''">
+                AND a1.invCode = #{invCode}
+            </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="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  a2.bindRlFk
+    </select>
+
     <select id="selectStatDataByTime" resultType="com.glxp.api.res.inv.IoOrderDetailStatRsponse">
         select orderIdFk,
                bindRlFk,

src/main/resources/schemas/schema_v2.4.sql

@@ -5223,9 +5223,7 @@ VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取
 CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount',
                          'int NULL DEFAULT NULL COMMENT ''扫码数量''',
                          1);
-CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount',
-                         'int NULL DEFAULT NULL COMMENT ''扫码数量''',
-                         1);
+
 CALL Pro_Temp_ColumnWork('io_collect_set', 'pdaMaxCount',
                          'int NULL DEFAULT NULL COMMENT ''PDA扫码数量''',
                          1);