Merge remote-tracking branch 'origin/master'

src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -26,6 +26,6 @@ public interface AmsFeign {
 
     //根据物资查询运输物资单价
     @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getInwardPriceBy")
-    Map<String,Object> getInwardPriceBy(Map<String, Object> priceMap);
+    Map<String,Object> getInwardPriceBy(@RequestBody(required = false) Map<String, Object> priceMap);
 
 }

src/main/java/com/steerinfo/dil/feign/BmsTruckFeign.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Map;
 
@@ -16,5 +17,5 @@ import java.util.Map;
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addInwardDetailsOrder")
-    int addDetailsOrder(Map<String,Object> map);
+    RESTfulResult addDetailsOrder(@RequestBody(required = false) Map<String,Object> map);
 }

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);

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

@@ -13,6 +13,7 @@ import com.steerinfo.dil.service.IOmstrainOrderService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import com.steerinfo.dil.util.getRequestUtils;
+import javassist.expr.Instanceof;
 import org.apache.commons.lang3.AnnotationUtils;
 import org.apache.http.HttpEntity;
 import org.springframework.boot.test.web.client.TestRestTemplate;
@@ -88,6 +89,7 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
             if(trainOrderIds.size() > 0){
                 trainOrderId = trainOrderIds.get(0);
             }else{
+                //根据发出时间和
                 trainOrderId = omstrainOrderMapper.getTrainOrder();
             }
         }

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

@@ -10,6 +10,7 @@ import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.dil.service.IOmstruckOrderSeparateService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -665,7 +666,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId, sqe);
         Map<String, Object> map = omstruckOrderMapper.selectInwardTimeByOrderId(new BigDecimal(orderId));
         //根据运输订单id查找需求日期是否超过一个月
-        if (map != null) {
+        if (map != null && i != 0) {
             if (DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 11) {
                 Date dueDate = (Date) map.get("dueTime");
                 //当前时间小于截至日期
@@ -690,11 +691,13 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         try {
             Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
             Map<String,Object> priceValueMap = null;
-            priceValueMap = amsFeign.getInwardPriceBy(priceMap);
+            if(priceMap != null){
+                priceValueMap = amsFeign.getInwardPriceBy(priceMap);
+            }
             if(priceValueMap != null){
                 priceValueMap.put("netWeight", resultNetWeight);
                 priceValueMap.put("orderId",orderId);
-                i += bmsTruckFeign.addDetailsOrder(priceValueMap);
+                RESTfulResult resTfulResult =  bmsTruckFeign.addDetailsOrder(priceValueMap);
             }
         } catch (Exception e) {
             e.printStackTrace();

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) {

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

@@ -561,6 +561,7 @@
                                    ASM.METER_WEIGHT                               "theoryWeight",
                                    ASM.EAS_PRIMARY_ID                             "closeEntryId",
                                    RC.CONSIGNEE_COMPANY_NAME                      "consigneeName",
+                                   RC.CONSIGNEE_ID                                "consigneeId",
                                    RS.SHIPPER_NAME                                "shipperName",
                                    RM.MATERIAL_ID                                 "materialId",
                                    RM.MATERIAL_NAME                               "materialName",
@@ -568,7 +569,7 @@
                                    OTO.ORDER_NO                                   "orderNum",
                                    TWR.RESULT_NET_WEIGHT                          "materialWeight",
                                    to_char(OTO.OUTSTATION_TIME,'yyyy-mm-dd')      "OutStation",
-                                   to_char(OTO.ENSTATION_TIME,'yyyy-mm-dd')       "EnStation",
+                                   to_char(TUR.RESULT_END_TIME,'yyyy-mm-dd')       "EnStation",
                                    OTO.ORDER_WAGON_NO                             "wagonNo",
                                    OTO.ORDER_WAGON_WEIGHT                         "wagonWeight",
                                    OTO.BILLING_WEIGHT                             "wagonBillWeight",
@@ -582,7 +583,8 @@
                                    RW.WAREHOUSE_NAME                                "unloadPoint",
                                    RAR1.RAILWAY_BUREAU                              "railwayBureau",
                                    OTO.STRAWMATS                                    "strawMats",
-                                   TWR.RESULT_POUND_NO                              "number"
+                                   OO.ORDER_NUMBER                                  "number",
+                                   OTO.WAREHOUSE_ID                                 "unloadPointId"
                    FROM AMS_SALE_ORDER ASO
                           LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
                           LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
@@ -601,6 +603,7 @@
                           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+                          LEFT JOIN TMSTRUCK_UNLOAD_RESULT  TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                           LEFT JOIN TMSTT_ORDER TTO ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                           LEFT JOIN OMSTRAIN_ORDER OTO ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
                           LEFT JOIN RMS_PWAREHOUSE_GRID RPG ON RPG.STACKING_ID = OO.ORDER_ID
@@ -608,6 +611,7 @@
                                     and wgm.MATERIAL_ID = rm.MATERIAL_ID
                           LEFT JOIN RMS_WAREHOUSE   RW ON RW.WAREHOUSE_ID = OTO.WAREHOUSE_ID
                           WHERE ASO.SALE_TYPE = 4
+                          AND OO.ORDER_STATUS IN (2,5)
                           <if test="oneDate != null">
                             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
                           </if>

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"
@@ -537,7 +537,9 @@
         <if test="sqe != null">
             , OO.ORDER_LINE_SEQUENCE = #{sqe}
         </if>
-        where oo.ORDER_ID = #{orderId}
+        where
+        OO.ORDER_STATUS = 5
+        AND oo.ORDER_ID = #{orderId}
     </update>
     <update id="updateSporadicStatus">
         update AMSTRUCK_SPORADIC_ORDER ASO