|
@@ -1,6 +1,7 @@
|
|
package com.yh.saas.plugin.yiliangyiyun.service.impl;
|
|
package com.yh.saas.plugin.yiliangyiyun.service.impl;
|
|
|
|
|
|
|
|
|
|
|
|
+import com.baomidou.mybatisplus.mapper.Wrapper;
|
|
import com.winsea.svc.base.workflow.entity.Workflow;
|
|
import com.winsea.svc.base.workflow.entity.Workflow;
|
|
import com.yh.saas.common.support.util.IdGenerator;
|
|
import com.yh.saas.common.support.util.IdGenerator;
|
|
import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
|
|
import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
|
|
@@ -57,6 +58,8 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
|
|
private IPurchaseClosingReportService purchaseClosingReportService;
|
|
private IPurchaseClosingReportService purchaseClosingReportService;
|
|
@Autowired
|
|
@Autowired
|
|
private IProcurementPlanInfoService procurementPlanInfoService;
|
|
private IProcurementPlanInfoService procurementPlanInfoService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ICustomerInfoService customerInfoService;
|
|
/**
|
|
/**
|
|
* 成交
|
|
* 成交
|
|
*/
|
|
*/
|
|
@@ -259,6 +262,15 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
|
|
.eq("order_id",purchaseOrdera.getId())
|
|
.eq("order_id",purchaseOrdera.getId())
|
|
.eq("record_flag","1")
|
|
.eq("record_flag","1")
|
|
.eq("delete_flag","0"));
|
|
.eq("delete_flag","0"));
|
|
|
|
+ //查询客户信息
|
|
|
|
+ Wrapper<CustomerInfo> customerInfoWrapper = new EntityWrapper<>();
|
|
|
|
+ customerInfoWrapper.andNew().eq("comp_name",purchaseOrdera.getCustomer()).or()
|
|
|
|
+ .eq("customer_name",purchaseOrdera.getCustomer());
|
|
|
|
+ customerInfoWrapper.eq("delete_flag","0");
|
|
|
|
+ CustomerInfo customerInfo=customerInfoService.selectOne(customerInfoWrapper);
|
|
|
|
+ if (customerInfo!=null){
|
|
|
|
+ purchaseOrdera.setCustomerInfo(customerInfo);
|
|
|
|
+ }
|
|
purchaseOrdera.setStockInQuantityList(warehouseInOutInfoList);
|
|
purchaseOrdera.setStockInQuantityList(warehouseInOutInfoList);
|
|
purchaseOrdera.setTransactionRecordList(transactionRecordList);
|
|
purchaseOrdera.setTransactionRecordList(transactionRecordList);
|
|
purchaseOrdera.setClosePositionList(closePositionList);
|
|
purchaseOrdera.setClosePositionList(closePositionList);
|