Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -1899,4 +1899,20 @@ public class AmsSaleOrderController<RedisTemplate> extends BaseRESTfulController
         }
         return  null;
     }
+
+    @ApiOperation("同步金蝶车号")
+    @PostMapping("/pushCarNumberToEas")
+    public Map<String,Object> pushCarNumberToEas(@RequestBody(required = false) Map<String, Object> map) {
+        Map<String,Object> resultMap = new HashMap<>();
+        try {
+            int result = amsSaleOrderService.pushCarNumberToEas(map);
+            if(result != 1){
+                throw new RuntimeException();
+            }
+            resultMap.put("result", "succeed");
+        } catch (Exception e) {
+            resultMap.put("result", "fail");
+        }
+        return resultMap;
+    }
 }

src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -83,4 +83,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     int updateTotalOrderStatus(BigDecimal resultTotalId);
 
+    String getAddressPlace(BigDecimal orderId);
+
 }

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

@@ -1026,7 +1026,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
             //校验结束，上传金蝶
             if(!map.containsKey("oYeFlag")) {
-                pushCarNumberToEas(map);
+                //不是欧冶库的可直接同步车号
+                if(placeAddress == null || !placeAddress.contains("欧冶")){
+                    pushCarNumberToEas(map);
+                }
             }
 
             // 得到承运商
@@ -2254,6 +2257,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         if (mapValue.get("orderId") == null) {
             throw new Exception("还未派车,不允许修改车牌号");
         }
+        //收货客户
+        String addressPlace = omstruckOrderMapper.getAddressPlace(DataChange.dataToBigDecimal(mapValue.get("orderId")));
         //判断该车序号对应的分录是否全部关闭
         if(mapValue.get("saleOrderMaterialId") != null && DataChange.dataToBigDecimal(mapValue.get("capacityId")).compareTo(new BigDecimal(35128)) != 0) {
             Integer flCount = amsSaleMaterialMapper.getAbleFlcount(DataChange.dataToBigDecimal(mapValue.get("saleOrderMaterialId")));
@@ -2268,7 +2273,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         mapValue.put("oldCapacityNumber",oldCapacityNumber);
         if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0) {
             mapValue.put("result",1);
-            pushCarNumberToEas(mapValue);
+            //已接单或者不是欧冶库的可直接同步车号
+            if(addressPlace == null || !addressPlace.contains("欧冶") || "5".equals(carStatus.toString())) {
+                pushCarNumberToEas(mapValue);
+            }
             return mapValue;
         }
         //校验该车是否存在手机号
@@ -2320,7 +2328,10 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             }
         }
         if(!mapValue.containsKey("oYeFlag")) {
-            pushCarNumberToEas(mapValue);
+            //不是欧冶库的可直接同步车号
+            if(addressPlace == null || !addressPlace.contains("欧冶")) {
+                pushCarNumberToEas(mapValue);
+            }
         }
         //try{
         //    //不为空且为新手机号，则修改电话号码

src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -1206,4 +1206,13 @@
             SMS_STATUS = NULL
         WHERE RESULT_TOTAL_ID = #{resultTotalId}
     </update>
+    <select id="getAddressPlace" resultType="java.lang.String" parameterType="java.math.BigDecimal">
+        SELECT RRP.ADDRESS_DELIVERY_ADDRESS FROM OMSTRUCK_ORDER OO
+         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                   ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+         LEFT JOIN RMS_RECEIVE_PLACE RRP
+                   ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        WHERE OO.ORDER_ID = #{orderId}
+          AND OO.ORDER_TYPE = 1
+    </select>
 </mapper>