|
@@ -2,8 +2,10 @@ package com.steerinfo.dil.service.impl;
|
|
|
|
|
|
import com.steerinfo.dil.mapper.AmsSaleMaterialMapper;
|
|
|
import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
|
|
|
+import com.steerinfo.dil.mapper.RmsConsigneeMapper;
|
|
|
import com.steerinfo.dil.model.AmsSaleMaterial;
|
|
|
import com.steerinfo.dil.model.AmsSaleOrder;
|
|
|
+import com.steerinfo.dil.model.RmsConsignee;
|
|
|
import com.steerinfo.dil.service.IAmsSaleOrderService;
|
|
|
import com.steerinfo.dil.util.DataChange;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -36,6 +38,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
private AmsSaleOrderMapper amsSaleOrderMapper;
|
|
|
@Autowired
|
|
|
AmsSaleMaterialMapper amsSaleMaterialMapper;
|
|
|
+ @Autowired
|
|
|
+ RmsConsigneeMapper rmsConsigneeMapper;
|
|
|
|
|
|
/**
|
|
|
* 查询销售订单
|
|
@@ -100,7 +104,22 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
String isSelfMention = (String) mapVal.get("isSelfMention");
|
|
|
// 得到收货单位
|
|
|
String receiveUnit = (String) mapVal.get("receiveUnit");
|
|
|
+ // 得到收货单位名称
|
|
|
+ String receiveUnitName = (String) mapVal.get("receiveUnitName");
|
|
|
BigDecimal receiveId = amsSaleOrderMapper.getReceiveId(receiveUnit);
|
|
|
+ // 如果不存则自己增收获单位
|
|
|
+ if (receiveId == null) {
|
|
|
+ RmsConsignee rmsConsignee = new RmsConsignee();
|
|
|
+ BigDecimal consigneeId = rmsConsigneeMapper.getConsigneeId();
|
|
|
+ rmsConsignee.setConsigneeId(consigneeId);
|
|
|
+ rmsConsignee.setConsigneeCode(receiveUnit);
|
|
|
+ rmsConsignee.setConsigneeCompanyName(receiveUnitName);
|
|
|
+ rmsConsignee.setDeleted(new BigDecimal(0));
|
|
|
+ rmsConsignee.setInsertTime(new Date());
|
|
|
+ rmsConsignee.setInsertUsername("销售订单");
|
|
|
+ rmsConsignee.setInsertUpdateRemark("通过销售订单自增");
|
|
|
+ rmsConsigneeMapper.insertSelective(rmsConsignee);
|
|
|
+ }
|
|
|
// 得到发货单位
|
|
|
String shipperUnit = (String) mapVal.get("shipperUnit");
|
|
|
BigDecimal shipperId = amsSaleOrderMapper.getShipperId(shipperUnit);
|