修改

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -585,74 +585,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             } 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();
-                    }
-                    try {
-                        //根据摘要和收货客户ID查询
-                        if(isSelfMention != null && isSelfMention.equals("CARRY")) {
-                            //如果是自提,那么将该客户的结算方式改为自提
-                            rmsConsigneeMapper.updateConsigneeSettled(receiveId,"自提");
-                        }else if(isSelfMention != null && !isSelfMention.equals("CARRY")){
-                            //查询该客户对应的结算方式是什么
-                            Map<String,Object> settleMethodWlMap = rmsConsigneeMapper.selectSettleMethod(receiveId);
-                            String settleMethodWl = null;
-                            if(settleMethodWlMap.get("settleMethodWl") != null) {
-                                settleMethodWl = settleMethodWlMap.get("settleMethodWl").toString();
-                            }
-                            String settleMethodEas = " ";
-                            if(saleRemark != null && saleRemark.contains("钢材工程组")){
-                                settleMethodEas = "一票制";
-                                if(!settleMethodEas.equals(settleMethodWl)) {
-                                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"一票制");
-                                    if(settleMethodWlMap.get("userId") != null) {
-                                        String userId = settleMethodWlMap.get("userId").toString();
-                                        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
-                                        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
-                                        String token = (String) data.get("accessToken");
-                                        Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
-                                        Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
-                                        String userRoleId = userRoleMap.get("userRoleId").toString();
-                                        ssoFeign.sysuserrole("Bearer " + token, userRoleId);
-                                        ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1054405653877100544");
-                                    }
-                                }
-                            }else{
-                                if(!settleMethodEas.equals(settleMethodWl)) {
-                                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"两票制");
-                                    if(settleMethodWlMap.get("userId") != null) {
-                                        String userId = settleMethodWlMap.get("userId").toString();
-                                        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
-                                        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
-                                        String token = (String) data.get("accessToken");
-                                        Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
-                                        Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
-                                        String userRoleId = userRoleMap.get("userRoleId").toString();
-                                        ssoFeign.sysuserrole("Bearer " + token, userRoleId);
-                                        ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1042116550569627648");
-                                    }
-                                }
-                            }
-
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
                 amsSaleOrder.setSaleNumber(saleNumber);
                 amsSaleOrder.setSaleAccountBalance(new BigDecimal(saleAccountBalance));
                 amsSaleOrder.setSaleCurrentOrderAmount(new BigDecimal(saleCurrentOrderAmount));
@@ -812,6 +744,74 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     System.out.println(chaEasIds);
                     System.out.println("---删除多余分录" + new Date());
                 }
+                if(amsSaleOrder != null && amsSaleOrder.getSaleType() != null && amsSaleOrder.getSaleType().intValue() == 1) {
+                    try {
+                        //根据摘要和收货客户ID查询
+                        if(isSelfMention != null && isSelfMention.equals("CARRY")) {
+                            //如果是自提,那么将该客户的结算方式改为自提
+                            rmsConsigneeMapper.updateConsigneeSettled(receiveId,"自提");
+                        }else if(isSelfMention != null && !isSelfMention.equals("CARRY")){
+                            //查询该客户对应的结算方式是什么
+                            Map<String,Object> settleMethodWlMap = rmsConsigneeMapper.selectSettleMethod(receiveId);
+                            String settleMethodWl = null;
+                            if(settleMethodWlMap.get("settleMethodWl") != null) {
+                                settleMethodWl = settleMethodWlMap.get("settleMethodWl").toString();
+                            }
+                            String settleMethodEas = " ";
+                            if(saleRemark != null && saleRemark.contains("钢材工程组")){
+                                settleMethodEas = "一票制";
+                                if(!settleMethodEas.equals(settleMethodWl)) {
+                                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"一票制");
+                                    if(settleMethodWlMap.get("userId") != null) {
+                                        String userId = settleMethodWlMap.get("userId").toString();
+                                        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+                                        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+                                        String token = (String) data.get("accessToken");
+                                        Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
+                                        Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
+                                        String userRoleId = userRoleMap.get("userRoleId").toString();
+                                        ssoFeign.sysuserrole("Bearer " + token, userRoleId);
+                                        ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1054405653877100544");
+                                    }
+                                }
+                            }else{
+                                if(!settleMethodEas.equals(settleMethodWl)) {
+                                    rmsConsigneeMapper.updateConsigneeSettled(receiveId,"两票制");
+                                    if(settleMethodWlMap.get("userId") != null) {
+                                        String userId = settleMethodWlMap.get("userId").toString();
+                                        Map<String, Object> tokenMap = ssoFeign.login("adminMannage", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+                                        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+                                        String token = (String) data.get("accessToken");
+                                        Map<String,Object> userRoleResponseMap = ssoFeign.getSysuserrole("Bearer " + token,userId,1,100);
+                                        Map<String,Object> userRoleMap = ((List<Map<String, Object>>)((Map<String, Object>)userRoleResponseMap.get("data")).get("list")).get(0);
+                                        String userRoleId = userRoleMap.get("userRoleId").toString();
+                                        ssoFeign.sysuserrole("Bearer " + token, userRoleId);
+                                        ssoFeign.addUserroles("Bearer " + token,userId, receiveUnitName, "1042116550569627648");
+                                    }
+                                }
+                            }
+
+                        }
+                    } 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();
+                    }
+                }
                 result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             }
         }