修改

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -604,6 +604,11 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      */
     @TableField(exist = false)
     private String creater;
+    /**
+     * 创建人
+     */
+    @TableField(exist = false)
+    private String creator;
     /**
      * 图表合同利润
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehousingOrder.java

@@ -370,6 +370,26 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
      */
     @TableField(exist = false)
     private String buyer;
+    /**
+     *客户姓名
+     */
+    @TableField(exist = false)
+    private String customerName;
+    /**
+     * 银行卡账号
+     */
+    @TableField(exist = false)
+    private String bankCard;
+    /**
+     * 开户行
+     */
+    @TableField(exist = false)
+    private String bankDeposit;
+    /**
+     * 开户支行
+     */
+    @TableField(exist = false)
+    private String bankDepositBranch;
 
     @Override
     protected Serializable pkVal() {

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

@@ -96,6 +96,10 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     private IPaymentManagementService paymentManagementService;
     @Autowired
     private IContractInventoryDistributionService contractInventoryDistributionService;
+    @Autowired
+    private ICustomerInfoService customerInfoService;
+    @Autowired
+    private IIdentityAuthenticationInfoService identityAuthenticationInfoService;
     @Value("${file-root-path}")
     private String localPath;
     @Autowired
@@ -235,6 +239,35 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                                 .eq("comp_id", warehousingOrder2.getCompId()));
                         if (contractManagementInfo != null) {
                             warehousingOrder2.setBuyer(contractManagementInfo.getBuyer());
+                            //采购入库客户信息
+                            if ("采购入库".equals(warehousingOrder2.getInType())){
+                                CustomerInfo customerInfo = customerInfoService.selectOne(new EntityWrapper<CustomerInfo>().eq("comp_id",warehousingOrder2.getCompId())
+                                        .andNew().eq("comp_name", contractManagementInfo.getSeller()).or()
+                                        .eq("customer_name", contractManagementInfo.getSeller()));
+                                if (customerInfo != null) {
+                                    if (customerInfo.getCompName() != null){
+                                        warehousingOrder2.setCustomerName(customerInfo.getCompName());
+                                    }else {
+                                        warehousingOrder2.setCustomerName(customerInfo.getCustomerName());
+                                    }
+                                    warehousingOrder2.setBankCard(customerInfo.getBankCard());
+                                    warehousingOrder2.setBankDeposit(customerInfo.getBankDeposit());
+                                    warehousingOrder2.setBankDepositBranch(customerInfo.getBankDepositBranch());
+                                }
+                            }
+                            //采购入库客户信息
+                            else if ("收购入库".equals(warehousingOrder2.getInType())){
+                                IdentityAuthenticationInfo identityAuthenticationInfo = identityAuthenticationInfoService.selectOne(new EntityWrapper<IdentityAuthenticationInfo>()
+                                        .eq("customer_name",warehousingOrder2.getCustomer())
+                                        .eq("authentication_status_key","7")
+                                        .eq("comp_id",warehousingOrder2.getCompId()));
+                                if (identityAuthenticationInfo != null){
+                                    warehousingOrder2.setCustomerName(identityAuthenticationInfo.getCustomerName());
+                                    warehousingOrder2.setBankCard(identityAuthenticationInfo.getBankCard());
+                                    warehousingOrder2.setBankDeposit(identityAuthenticationInfo.getBankDeposit());
+                                    warehousingOrder2.setBankDepositBranch(identityAuthenticationInfo.getBankDepositBranch());
+                                }
+                            }
                         }
                     }
                     List<ExpenseAllocationInfo> expenseAllocationInfos=expenseAllocationInfoService.selectList(new EntityWrapper<ExpenseAllocationInfo>()

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -142,10 +142,12 @@
         WHERE t.delete_flag = '0'
         AND t.contract_no=m.contract_no
         AND t.comp_id = m.comp_id)
-        else '他运' end as amountEdPayable
+        else '他运' end as amountEdPayable,
+        c.staff_name as creator
         FROM contract_management_info m
         left join contract_goods_info g on m.id=g.contract_id
         left join contract_process_info p on m.id=p.contract_id
+        left join common_staff c on m.create_user_id=c.staff_id
         WHERE
         m.comp_id = #{compId}
         and m.goods_type= #{goodsType}