|
@@ -41,10 +41,12 @@ import com.dk.mdm.model.vo.ivt.OutboundItemVO;
|
|
|
import com.dk.mdm.model.vo.ivt.OutboundVO;
|
|
import com.dk.mdm.model.vo.ivt.OutboundVO;
|
|
|
import com.dk.mdm.model.vo.mac.RecPayItemVO;
|
|
import com.dk.mdm.model.vo.mac.RecPayItemVO;
|
|
|
import com.dk.mdm.model.vo.mac.RecPayVO;
|
|
import com.dk.mdm.model.vo.mac.RecPayVO;
|
|
|
|
|
+import com.dk.mdm.model.vo.mst.CustomerVO;
|
|
|
import com.dk.mdm.service.common.CommonService;
|
|
import com.dk.mdm.service.common.CommonService;
|
|
|
import com.dk.mdm.service.ivt.inventory.InventoryService;
|
|
import com.dk.mdm.service.ivt.inventory.InventoryService;
|
|
|
import com.dk.mdm.service.mac.AccountService;
|
|
import com.dk.mdm.service.mac.AccountService;
|
|
|
import com.dk.mdm.service.mac.ReceiptService;
|
|
import com.dk.mdm.service.mac.ReceiptService;
|
|
|
|
|
+import com.dk.mdm.service.mst.CustomerService;
|
|
|
import com.dk.mdm.service.mst.MoneyAccountService;
|
|
import com.dk.mdm.service.mst.MoneyAccountService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -112,6 +114,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private InboundItemMapper inboundItemMapper;
|
|
private InboundItemMapper inboundItemMapper;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private CustomerService customerService;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* @desc : 修改原总单数据(订单,出库单)
|
|
* @desc : 修改原总单数据(订单,出库单)
|
|
|
* posNegFlag :正负标识 true:正数,false:负数
|
|
* posNegFlag :正负标识 true:正数,false:负数
|
|
@@ -434,6 +439,9 @@ public class OutboundSaleReturnService extends BaseService<Outbound> {
|
|
|
if (outboundVO.getCusId() == null) {
|
|
if (outboundVO.getCusId() == null) {
|
|
|
outboundVO = outCommon.insertCustomer(outboundVO);
|
|
outboundVO = outCommon.insertCustomer(outboundVO);
|
|
|
}
|
|
}
|
|
|
|
|
+ //更新总单客户状态为成交
|
|
|
|
|
+ customerService.update(new CustomerVO().setCusId(outboundVO.getCusId()).setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName()) );
|
|
|
|
|
+
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
|
//region 查询当前公司的系统参数 自动办理信息 并赋值
|
|
//region 查询当前公司的系统参数 自动办理信息 并赋值
|