|
|
@@ -292,22 +292,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
- try{
|
|
|
- new Thread( new Runnable() {
|
|
|
- public void run(){
|
|
|
- //查询销售订单车序号表是否存在上一个运输订单号，如果存在，调用钢材继续装派单接口
|
|
|
- List<Map<String,Object>> saleOrders=amsSaleOrderMapper.selectPreviousOrderNumber(amsSaleOrder.getSaleOrderId());
|
|
|
- for (Map<String,Object> temp:saleOrders){
|
|
|
- temp.putAll(amsSaleOrderMapper.selectOrderDetails(temp));
|
|
|
- }
|
|
|
- if(saleOrders != null && saleOrders.size() > 0){
|
|
|
- amsFeign.continueSteelOrder(saleOrders);
|
|
|
- }
|
|
|
- }
|
|
|
- }).start();
|
|
|
- }catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
}
|
|
|
if (orderStatus.equals("2") && closeStatus.equals("1")){
|
|
|
// 得到账户余额
|
|
|
@@ -462,6 +446,24 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
result += amsSaleOrderMapper.insertSelective(amsSaleOrder);
|
|
|
} else {
|
|
|
AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
|
|
|
+ if(amsSaleOrder != null && amsSaleOrder.getSaleType() != null && amsSaleOrder.getSaleType().intValue() == 1) {
|
|
|
+ try{
|
|
|
+ new Thread( new Runnable() {
|
|
|
+ public void run(){
|
|
|
+ //查询销售订单车序号表是否存在上一个运输订单号，如果存在，调用钢材继续装派单接口
|
|
|
+ List<Map<String,Object>> saleOrders = amsSaleOrderMapper.selectPreviousOrderNumber(amsSaleOrder.getSaleOrderId());
|
|
|
+ for (Map<String,Object> temp:saleOrders){
|
|
|
+ temp.putAll(amsSaleOrderMapper.selectOrderDetails(temp));
|
|
|
+ }
|
|
|
+ if(saleOrders != null && saleOrders.size() > 0){
|
|
|
+ amsFeign.continueSteelOrder(saleOrders);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }).start();
|
|
|
+ }catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
amsSaleOrder.setSaleNumber(saleNumber);
|
|
|
amsSaleOrder.setSaleAccountBalance(new BigDecimal(saleAccountBalance));
|
|
|
amsSaleOrder.setSaleCurrentOrderAmount(new BigDecimal(saleCurrentOrderAmount));
|
luobang