更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/BiInfoController.java

@@ -352,10 +352,20 @@ public class BiInfoController {
                     }
                 }
             }else {
-                // 查询自有库数量
-                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
-                        .eq("delete_flag", "0").like("bin_number", "合营").groupBy("base_id"));
-                count1 = warehousePositionInfos.size();
+                List<WarehouseBaseInfo> warehouseBaseInfoList = warehouseBaseInfoService.selectList(new EntityWrapper<WarehouseBaseInfo>()
+                        .eq("comp_id", companyId).eq("delete_flag", "0").eq("warehouse_type", "1")
+                        );
+                if (CollectionUtils.isNotEmpty(warehouseBaseInfoList)){
+                    for (int i = 0;i<warehouseBaseInfoList.size();i++){
+                        List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+                                .eq("base_id",warehouseBaseInfoList.get(i).getId()).eq("delete_flag", "0").like("bin_number", "合营").groupBy("base_id"));
+                        count1 = count1 + warehousePositionInfos.size();
+                    }
+                }
+//                // 查询自有库数量
+//                List<WarehousePositionInfo> warehousePositionInfos = warehousePositionInfoService.selectList(new EntityWrapper<WarehousePositionInfo>()
+//                        .eq("delete_flag", "0").like("bin_number", "合营").groupBy("base_id"));
+//                count1 = warehousePositionInfos.size();
             }
         }
         if(countWare == 0){

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -303,9 +303,20 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         if (identityAuthenticationInfo1 != null) {
             //通过
             if (identityAuthenticationInfo.getFlag() == 1) {
+                String compId = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
                 identityAuthenticationInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
                 identityAuthenticationInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
                 identityAuthenticationInfo1.setExaminer(identityAuthenticationInfo.getExaminer());
+                identityAuthenticationInfo1.setCompId(compId);
+                List<CommonCompanyIdentity> list = iCommonCompanyIdentityService.selectList(
+                        new EntityWrapper<CommonCompanyIdentity>().eq("identity_id",identityAuthenticationInfo1.getId())
+                .eq("comp_id",compId));
+                if(list.size() == 0){
+                    CommonCompanyIdentity commonCompanyIdentity = new CommonCompanyIdentity();
+                    commonCompanyIdentity.setIdentityId(identityAuthenticationInfo1.getId());
+                    commonCompanyIdentity.setComId(identityAuthenticationInfo1.getCompId()!=null?identityAuthenticationInfo1.getCompId():identityAuthenticationInfo.getCompId());
+                    iCommonCompanyIdentityService.insert(commonCompanyIdentity);
+                }
             }
             //驳回
             else {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/StockSaleReceiptReportServiceImpl.java

@@ -398,13 +398,14 @@ public class StockSaleReceiptReportServiceImpl extends ServiceImpl<StockSaleRece
         }
         String  amonutIn = baseMapper.getAmonutIn(pageView);
         String  amonutout = baseMapper.getAmonutOut(pageView);
-        Double  amonutMao = Double.valueOf(amonutIn) - Double.valueOf(amonutout);
         if(amonutIn == null){
             amonutIn = "0";
         }
         if(amonutout == null){
             amonutout = "0";
         }
+        Double  amonutMao = Double.valueOf(amonutIn) - Double.valueOf(amonutout);
+
         if(amonutMao < 0){
             amonutMao = 0d;
         }