Merge remote-tracking branch 'origin/master'

bonus-common-biz/src/main/java/com/bonus/common/biz/constant/GlobalConstants.java

@@ -580,4 +580,15 @@ public class GlobalConstants {
      */
     public static final List<String> roleList = Arrays.asList("cly", "库管员", "wxy");
 
+    /**
+     * Long 101L 机具（物流）分公司部门id
+     */
+    public static final Long LONG_JJ = 101L;
+
+
+    /**
+     * Long 309L 安徽宏源电力建设有限公司部门id
+     */
+    public static final Long LONG_HY = 309L;
+
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java

@@ -880,7 +880,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
                                             // 会签成功，对配置的流程进行处理
                                             configSignOrgSet.remove(loginUserDeptId);
                                             // 如果loginUserDeptId包含库管一班、库管二班、库管三班或修试二班的任意一个组织id，那么库管班就算审核通过
-                                            if (loginUserDeptId == 106L || loginUserDeptId == 334L || loginUserDeptId == 335L || loginUserDeptId == 336L) {
+                                            if (loginUserDeptId == 106L ||loginUserDeptId == 312L || loginUserDeptId == 334L || loginUserDeptId == 335L || loginUserDeptId == 336L) {
                                                 // 库管班审核通过，放行进行验收流程
                                                 System.out.println("ONE会签成功,放行进行验收流程!");
                                             } else {

bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml

@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             pcd.check_time as passTime,
             pcd.input_time as inputTime,
             a.creator as inputUser,
-            IFNULL(pcd.check_num, 0) - IFNULL(pcd.input_num, 0) as pendingInputNum,
+            case when pcd.status in (12,13,14) then 0 else IFNULL(pcd.check_num, 0) - IFNULL(pcd.input_num, 0) end as pendingInputNum,
             tt.`code` as inputCode,
             mt1.manage_type as manageType
         FROM

bonus-modules/bonus-material/src/main/resources/mapper/material/settlement/SltAgreementInfoMapper.xml

@@ -2366,10 +2366,8 @@
             ( sad.slt_type = 1, sad.money, 0 ) AS leaseCost,
             IF
             ( sad.slt_type = 2, sad.money, 0 ) AS loseCost,
-            IF
-            ( sad.slt_type = 3, sad.money, 0 ) AS repairCost,
-            IF
-            ( sad.slt_type = 4, sad.money, 0 ) AS scrapCost,
+            IF(sad.slt_type = 3 AND (sad.is_charge = 1 ), sad.money, 0) AS repairCost,
+            IF(sad.slt_type = 4 AND (sad.is_charge = 1 ), sad.money, 0) AS scrapCost,
             0 AS aqLeaseCost,
             0 AS aqLoseCost,
             0 AS aqRepairCost,
@@ -2381,7 +2379,7 @@
             saa.agreement_id = #{agreementId}
             AND saa.settlement_type = 1
             GROUP BY
-            sad.id UNION
+            sad.id UNION ALL
             SELECT
             saa.agreement_id AS agreementId,
             saa.create_time AS createTime,
@@ -2393,10 +2391,8 @@
             ( sad.slt_type = 1, sad.money, 0 ) AS aqLeaseCost,
             IF
             ( sad.slt_type = 2, sad.money, 0 ) AS aqLoseCost,
-            IF
-            ( sad.slt_type = 3, sad.money, 0 ) AS aqRepairCost,
-            IF
-            ( sad.slt_type = 4, sad.money, 0 ) AS aqScrapCost
+            IF(sad.slt_type = 3 AND (sad.is_charge = 1 ), sad.money, 0) AS aqRepairCost,
+            IF(sad.slt_type = 4 AND (sad.is_charge = 1 ), sad.money, 0) AS aqScrapCost
             FROM
             slt_agreement_apply saa
             LEFT JOIN slt_agreement_details sad ON saa.id = sad.apply_id