|
@@ -85,9 +85,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
|
|
public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
|
|
List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
|
|
List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
|
|
Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
|
|
Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
|
|
- String saleRemark = head.get("remark").toString();
|
|
|
|
String saleGroupCode = null;
|
|
String saleGroupCode = null;
|
|
try {
|
|
try {
|
|
|
|
+ String saleRemark = head.get("remark").toString();
|
|
String saleGroup = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
|
|
String saleGroup = "钢" + StringUtils.substringBetween(saleRemark,"钢","组") + "组";
|
|
saleGroupCode = amsSaleOrderMapper.selectSaleGroupCode(saleGroup);
|
|
saleGroupCode = amsSaleOrderMapper.selectSaleGroupCode(saleGroup);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|