|
@@ -11,6 +11,7 @@ import com.steerinfo.dil.model.*;
|
|
|
import com.steerinfo.dil.service.IAmsSaleOrderService;
|
|
|
import com.steerinfo.dil.util.DataChange;
|
|
|
import com.steerinfo.dil.util.MyException;
|
|
|
+import com.steerinfo.framework.utils.base.StringUtils;
|
|
|
import com.sun.org.apache.bcel.internal.generic.NEW;
|
|
|
import io.swagger.models.auth.In;
|
|
|
import org.apache.ibatis.executor.loader.ResultLoader;
|
|
@@ -84,7 +85,18 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
|
|
|
List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
|
|
|
Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
|
|
|
- // 单价
|
|
|
+ String saleRemark = head.get("remark").toString();
|
|
|
+ String saleGroupCode = null;
|
|
|
+ try {
|
|
|
+ String saleGroup = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
|
|
|
+ saleGroupCode = amsSaleOrderMapper.selectSaleGroupCode(saleGroup);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ if(saleGroupCode != null) {
|
|
|
+ head.put("saleGroup",saleGroupCode);
|
|
|
+ }
|
|
|
+ // 单价
|
|
|
BigDecimal taxPrice = (BigDecimal) head.get("unitPrice");
|
|
|
// 税率
|
|
|
String taxRate = (String) head.get("tax");
|