2 Commits e9a8306944 ... 6e147149ff

Autor SHA1 Mensagem Data
  zx 6e147149ff Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS 2 anos atrás
  zx 57576ddf8f 修改退货 2 anos atrás

+ 4 - 0
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -50,6 +50,10 @@ public interface TmsTruckFeign {
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
     Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
+    //发送零星退货委托,运输订单号,车牌号
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/addSporadicOddMeasureCommission")
+    Map<String, Object> addSporadicOddMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+
     //新增计时作业实绩
     @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")
     RESTfulResult addTimeTaskResult(@RequestBody(required = false) Map<String, Object> map);

+ 13 - 0
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -904,6 +904,19 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             }else if(orderType!=21&&orderType!=25){
                 //添加各个实绩
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
+                if (orderType==19){
+                    Map<String,Object> sporadicMap=new HashMap<>();
+                    sporadicMap.put("orderNumber",orderMessage.get("orderNumber"));
+                    String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
+                    sporadicMap.put("capacityNumber",capacityNumber);
+                    //是否发送空委托标志
+                    sporadicMap.put("firstMC",1);
+                    Map<String, Object> stringObjectMap = tmsTruckFeign.addSporadicOddMeasureCommission(sporadicMap);
+                    System.out.println(stringObjectMap);
+                    if (DataChange.dataToBigDecimal(stringObjectMap.get("data")).intValue()==0){
+                        throw new RuntimeException("委托发送失败!");
+                    }
+                }
             }
             //判断订单是否是一车多单
             if (orderType ==12 || orderType ==13 || orderType ==14 || orderType ==19) {

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderSeparateMapper.xml

@@ -12,7 +12,7 @@
 
     <!--通过订单Id 查询关联的线路子表顺序-->
     <select id="getLineMesByOrderId" parameterType="int" resultType="java.util.LinkedHashMap">
-        select RLS.SEGMENT_SQE           "segmentSqe",
+        select  RLS.SEGMENT_SQE           "segmentSqe",
                RLS.SEGMENT_START_NODE_ID "type",
                RL.LINK_NAME              "linkName",
                RLI.LINE_TYPE             "lineType"