From 30080636fd8413443862157d5f050ac377d5b09e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 5 Dec 2024 12:01:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/basic/BasicProductsEntity.java |  2 +
 .../mapper/inout/IoOrderDetailResultDao.xml   |  8 +--
 src/main/resources/schemas/schema_v2.4.sql    | 50 +++++++++----------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
index ca12b73cc..7f3cb15c5 100644
--- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java
@@ -388,6 +388,8 @@ public class BasicProductsEntity {
     @ApiModelProperty(value="是否需要收费 1是；0否")
     private String requireCost;
 
+    private String requireScanCode;
+
 
 
     /**
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index ec0e1719a..a7d66e940 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -335,17 +335,19 @@ FROM
   <select id="filterOrderDeptProductOutList" resultType="com.glxp.api.res.inout.IoOrderDetailDeptProductResultResponse">
         SELECT
 	nameCode,cpmctymc as coName,batchNo,ggxh as spec,
-	SUM( outCount ) AS count
+	SUM( reCount ) AS count
 FROM
 	(
-	  select ipd.nameCode,bp.cpmctymc,ipd.batchNo,bp.ggxh,ipd.outCount
+	  select ipd.nameCode,bp.cpmctymc,ipd.batchNo,bp.ggxh,ipd.reCount
        from inv_product_detail ipd
                  inner join basic_udirel on ipd.relId = basic_udirel.id
                  inner join basic_products bp on basic_udirel.uuid = bp.uuid
                  inner join io_order io on io.billNo = ipd.orderId
                  left join basic_corp on ipd.supId = basic_corp.erpId
         <where>
-            ipd.outCount > 0
+            <if test="mainAction != null and mainAction != ''">
+                AND  io.mainAction = #{mainAction}
+            </if>
             <if test="nameCode != null and nameCode != ''">
                 AND ipd.nameCode like concat('%', #{nameCode}, '%')
             </if>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index e2c691451..69f6d5b85 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -3922,31 +3922,31 @@ CREATE TABLE IF NOT EXISTS `device_asset_contract`
   ROW_FORMAT = DYNAMIC;
 
 
-INSERT ignore INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `enable`, `remark`, `thirdSysFk`,
-                                             `genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`,
-                                             `checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`,
-                                             `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`,
-                                             `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`,
-                                             `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`,
-                                             `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`,
-                                             `ullageFill`, `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`,
-                                             `defaultSubInv`, `defaultInv`, `orderVisibleType`, `checkCopy`,
-                                             `secCheckCopy`, `originAction`, `advanceType`, `changeEnable`, `spUse`,
-                                             `preIn`, `preInBack`, `supplementAll`, `createUser`, `createTime`,
-                                             `updateUser`, `vailDispatch`, `vailGroupBuy`, `busType`, `inStock`,
-                                             `actionType`, `thrCheckEnable`, `thrCheckWebNew`, `thrCheckPdaUn`,
-                                             `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`,
-                                             `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`,
-                                             `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`,
-                                             `backPreinType`, `sortNum`, `advancePreIn`, `spaceOut`, `checkReview`,
-                                             `secCheckReview`, `thrCheckReview`, `editType`, `inPreInBack`,
-                                             `vailProductAttributes`, `vailHcType`, `checkWebNewType`, `deptNoInvType`,
-                                             `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`,
-                                             `devInType`, `requireScanCode`, `codeCheck`, `requireCost`)
-VALUES (1859776049824198656, 'WareHouseIn', 'SC72854426720051', '临床退库（普耗退费）', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0,
-        0, 0, 0, 0, 0, 0, 0, 0, 3, '', 0, 0, 0, 1, '2024-11-22 11:55:24', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0,
-        0, 0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
-        NULL, 1, 999, 0, 0, 0, 0, 0, 1, 1, NULL, 0, 0, 0, 0, 0, 2, 1, 0, b'0', 0, b'0');
+-- INSERT ignore INTO `basic_bussiness_type`(`id`, `mainAction`, `action`, `name`, `enable`, `remark`, `thirdSysFk`,
+--                                              `genUnit`, `innerOrder`, `secCheckEnable`, `checkEnable`, `checkUdims`,
+--                                              `checkPdaEd`, `checkPdaUn`, `checkPc`, `checkWebNew`, `checkSp`,
+--                                              `checkChange`, `secCheckUdims`, `secCheckPdaEd`, `secCheckPdaUn`,
+--                                              `secCheckPc`, `secCheckWebNew`, `secCheckChange`, `secCheckSp`, `corpType`,
+--                                              `supplementOrderType`, `checkBalance`, `secCheckBalance`, `useDyCount`,
+--                                              `expireTip`, `updateTime`, `defaultUnit`, `prefix`, `outToSpms`,
+--                                              `ullageFill`, `scanPreIn`, `vailInv`, `entrutSpms`, `codeFillCheck`,
+--                                              `defaultSubInv`, `defaultInv`, `orderVisibleType`, `checkCopy`,
+--                                              `secCheckCopy`, `originAction`, `advanceType`, `changeEnable`, `spUse`,
+--                                              `preIn`, `preInBack`, `supplementAll`, `createUser`, `createTime`,
+--                                              `updateUser`, `vailDispatch`, `vailGroupBuy`, `busType`, `inStock`,
+--                                              `actionType`, `thrCheckEnable`, `thrCheckWebNew`, `thrCheckPdaUn`,
+--                                              `thrCheckPdaEd`, `thrCheckUdims`, `thrCheckPc`, `thrCheckSp`,
+--                                              `thrCheckChange`, `thrCheckBalance`, `thrCheckCopy`, `fillCodeRel`,
+--                                              `checkVailDate`, `checkExpire`, `checkCertExpire`, `preInBackAction`,
+--                                              `backPreinType`, `sortNum`, `advancePreIn`, `spaceOut`, `checkReview`,
+--                                              `secCheckReview`, `thrCheckReview`, `editType`, `inPreInBack`,
+--                                              `vailProductAttributes`, `vailHcType`, `checkWebNewType`, `deptNoInvType`,
+--                                              `vailPrescribe`, `inputSick`, `groupBuySplit`, `vailInvBatchNo`,
+--                                              `devInType`, `requireScanCode`, `codeCheck`, `requireCost`)
+-- VALUES (1859776049824198656, 'WareHouseIn', 'SC72854426720051', '临床退库（普耗退费）', 1, '', '', 0, 0, 0, 1, 0, 0, 0, 0, 4, 0,
+--         0, 0, 0, 0, 0, 0, 0, 0, 3, '', 0, 0, 0, 1, '2024-11-22 11:55:24', NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, 0,
+--         0, 0, NULL, NULL, 0, 0, NULL, 0, 0, NULL, NULL, '1', 0, 0, NULL, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0,
+--         NULL, 1, 999, 0, 0, 0, 0, 0, 1, 1, NULL, 0, 0, 0, 0, 0, 2, 1, 0, b'0', 0, b'0');
 
 CALL Pro_Temp_ColumnWork('basic_products', 'requireCost',
                          'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要收费 1是；0否''',