更新

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

@@ -159,7 +159,7 @@ public class BiInfoController {
         }
         List<BiViewInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_BI_INFO+compId+seachMoth+userFlag, BiViewInfo.class);
         if (listRedis != null && listRedis.size() > 0) {
-//            return listRedis;
+            return listRedis;
         }
         companyId = compId;
         List<BiViewInfo> biViewInfos = new ArrayList<>();

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

@@ -1177,6 +1177,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         }
         //查采购合同编号(不包含自运）,以及移库任务编号,销售合同
         else if (flag == 7) {
+            calendar = Calendar.getInstance();
+            calendar.add(Calendar.MONTH, -1);
 /*****************************************************---------------------------******************************/
             List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
                     .eq("comp_id", compId)

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

@@ -376,6 +376,20 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                     paymentManagement1.setPayeeAddressUrl(identityAuthenticationInfo.getPayeeAddressUrl());
                     paymentManagement1.setIdentityId(identityAuthenticationInfo.getId());
                 }
+                else{
+                    identityAuthenticationInfo = identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+//                            .eq("comp_id", weighingManagement1.getCompId())
+                            .eq("customer_name",weighingManagement1.getCustomer())
+                            .eq("customer_phone",weighingManagement1.getCustomerPhone())
+                            .eq("delete_flag","0"));
+                    if(identityAuthenticationInfo != null){
+                        paymentManagement1.setBankCard(identityAuthenticationInfo.getBankCard());
+                        paymentManagement1.setBankDeposit(identityAuthenticationInfo.getBankDeposit());
+                        paymentManagement1.setBankDepositBranch(identityAuthenticationInfo.getBankDepositBranch());
+                        paymentManagement1.setPayeeAddressUrl(identityAuthenticationInfo.getPayeeAddressUrl());
+                        paymentManagement1.setIdentityId(identityAuthenticationInfo.getId());
+                    }
+                }
 
                 //质检信息
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()