修改

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderController.java

@@ -1610,9 +1610,9 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
                 saleOrderNo = map.get("saleOrderNo").toString();
                 count++;
                 int saleOrderId= amsSaleOrderService.addSteelSaleOrder(map);
-                if (map.get("isUploadEas") != null && saleOrderId != 0) {
-                    amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
-                }
+                //if (map.get("isUploadEas") != null && saleOrderId != 0) {
+                //    amsSaleOrderService.uploadSaleOrder(new BigDecimal(saleOrderId));
+                //}
             }
         } catch (Exception e) {
             return failed("销售订单编号为:" + saleOrderNo + e.getMessage());

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

@@ -674,7 +674,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                         amsSaleOrderMaterial.setSaleShippingAddressId((BigDecimal) placeIdList.get(0).get("placeId"));
                     }
                 }
-                if (amsSaleOrderMaterial.getSaleShippingAddressId() != null && isSelfMention.equals("否")) {
+                if (amsSaleOrderMaterial.getSaleShippingAddressId() != null && isSelfMention.equals("否") && DataChange.dataToBigDecimal(map.get("carrierId")).intValue() == 0) {
                     // 自动匹配承运商
                     List<Map<String, Object>> carrierList = getCarrierByAddress(amsSaleOrderMaterial.getSaleShippingAddressId());
                     BigDecimal carrierCount = null;
@@ -708,6 +708,15 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                         dispatchToCarrier(list);
                     }
                 }
+                if (isSelfMention.equals("否") && DataChange.dataToBigDecimal(map.get("carrierId")).intValue() != 0) {
+                    //说明有承运商
+                    List<Map<String, Object>> list = new ArrayList<>();
+                    Map<String, Object> carrierMap = new HashMap<>();
+                    carrierMap.put("carrierId",map.get("carrierId"));
+                    carrierMap.put("saleOrderMaterialId",saleOrderMaterialId);
+                    list.add(carrierMap);
+                    dispatchToCarrier(list);
+                }
                 // 收货方姓名
                 String consigneeName = String.valueOf(map.get("saleOrderConsignee"));
                 // 收货方电话
@@ -1211,6 +1220,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             BigDecimal carrierId =DataChange.dataToBigDecimal(map.get("carrierId"));
             // 得到车序号表主键
             BigDecimal saleOrderMaterialId =DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
+            //判断该车序号有没有被授权
             AmsDispatchSaleOrder amsDispatchSaleOrder = new AmsDispatchSaleOrder();
             BigDecimal dispatchId = amsDispatchSaleOrderMapper.selectOtherId();
             amsDispatchSaleOrder.setDispatchId(dispatchId);

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J\u914D\u7F6E
-log4j.rootCategory=INFO,file,RUNNING,errorfile,stdout
+log4j.rootCategory=INFO,file,RUNNING,errorfile
 ## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout