dadsa

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

@@ -784,7 +784,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                 if (s == null || s.size() == 0) {
                     throw new Exception("登录金蝶失败");
                 }
-                System.out.println(s);
+            System.out.println(s);
             return success(result);
         }
     }
@@ -805,7 +805,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
 
     @ApiModelProperty(value = "将车序号下发给承运商")
     @PostMapping("/dispatchToCarrier")
-    public RESTfulResult dispatchToCarrier(@RequestBody List<Map<String,Object>> mapList) {
+    public RESTfulResult dispatchToCarrier(@RequestBody(required = false) List<Map<String,Object>> mapList) {
         int result = amsSaleOrderService.dispatchToCarrier(mapList);
         return success(result);
     }

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

@@ -1412,6 +1412,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public int updateCarAddress(Map<String, Object> mapValue) {
         // 判断是否需要删除金蝶分录
         Integer isCloseEas = (Integer) mapValue.get("isCloseEas");
+        String operateName = (String) mapValue.get("operateName");
         int result = 0;
         // 运输订单id
         BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
@@ -1422,6 +1423,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderStatus(new BigDecimal(7));
+            if(operateName != null){
+                omstruckOrder.setOptionerCode(operateName);
+            }
             omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
             // 得到销售订单物资表主键
             List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
@@ -1727,11 +1731,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             //这是修改车牌号
             //将排队信息删掉
             Map<String, Object> isSpellingMap = omstruckOrderMapper.getSteelIsSpelling(DataChange.dataToBigDecimal(mapValue.get("orderId")));
-            int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
-            if(isSpelling == 1){
-                result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
-            }else{
-                result += omstruckOrderMapper.deleteQueueList(isSpellingMap.get("listId"));
+            if(isSpellingMap != null){
+                int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
+                if(isSpelling == 1){
+                    result += omstruckOrderMapper.deleteSpellingList(isSpellingMap.get("listId"));
+                }else{
+                    result += omstruckOrderMapper.deleteQueueList(isSpellingMap.get("listId"));
+                }
             }
             result += amsSaleOrderMapper.updateCapacityNumberInFactory(mapValue);
             //若是接单之后还需要删除实绩且将状态变为4
@@ -1756,11 +1762,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public int updateConsigneeTel(Map<String, Object> mapValue) {
         String saleOrderNo= (String) mapValue.get("saleOrderNo");
-        Integer saleMaterialId= (Integer) mapValue.get("saleMaterialId");
+        Integer saleOrderMaterialId= (Integer) mapValue.get("saleOrderMaterialId");
         String consigneeTel= (String) mapValue.get("consigneeTel");
         int result = 0;
-        if (saleOrderNo!=null&&!("".equals(saleOrderNo))&&saleMaterialId!=null&&!("".equals(saleMaterialId))){
-            BigDecimal id = amsSaleOrderMapper.getId(saleOrderNo, saleMaterialId);
+        if (saleOrderNo!=null&&!("".equals(saleOrderNo)) && saleOrderMaterialId!=null && !("".equals(saleOrderMaterialId))){
+            BigDecimal id = DataChange.dataToBigDecimal(saleOrderMaterialId);
             if (id!=null&&!("".equals(id))){
                 result += amsSaleOrderMapper.updateForTel(id,consigneeTel);
             }

src/main/resources/application-prod.yml

@@ -19,7 +19,7 @@ openfeign:
    ImFeign:
       url: ${IMFEIGN_URL:172.16.33.166:8055}
    JoinFeign:
-     url: ${JOINFEIGN_URL:localhost:8066}
+     url: ${JOINFEIGN_URL:172.16.33.166:8066}
 
  #正式环境端口