修改

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

@@ -78,7 +78,10 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
                     if (commonCompanyIdentity != null) {
                         identityAuthenticationInfo1.setAuthenticationStatus("已接受");
                     }
-
+                    //筛除企业
+                    if("2".equals(identityAuthenticationInfo1.getCustomerTypeFlag())){
+                        identityAuthenticationInfoList.remove(identityAuthenticationInfo1);
+                    }
                 }
             }
         }

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

@@ -735,6 +735,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo=contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                         .eq("contract_id",contractManagementInfo.getId()));
+                //查合同下的车牌号
+                List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no",contractManagementInfo.getContractNo()));
+                if (!CollectionUtils.isEmpty(tranCarInfoList)){
+                    contractManagementInfo.setTranCarInfoList(tranCarInfoList);
+                }
                 contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 contractManagementInfo.setInOutType("销售出库");
@@ -751,6 +757,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
+                //查移库任务编号下的车牌号
+                List<TranCarInfo> tranCarInfoList=tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo()));
+                if (!CollectionUtils.isEmpty(tranCarInfoList)){
+                    contractManagementInfo.setTranCarInfoList(tranCarInfoList);
+                }
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
                 contractManagementInfo.setContractPrice(inOutWarehouseTask.getUnitPrice());
                 contractManagementInfo.setInOutType("移库出库");