修改

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

@@ -718,6 +718,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
             Map<String,Object> priceValueMap = null;
             if(priceMap != null){
+                if(priceMap.get("rangeId") == null) {
+                    priceMap.put("rangeId",1);
+                }
                 priceValueMap = amsFeign.getInwardPriceBy(priceMap);
             }
             if(priceValueMap != null){

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

@@ -598,7 +598,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             throw new Exception("已过磅，撤单失败！");
         }
         //如果是老区已进场或者内转，则删除计量委托
-        if(omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11){
+        if(omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 21 || orderType == 15 || orderType == 16){
             //获取运输订单号
             String orderNumber = (String) mesMap.get("orderNumber");
             //撤销订单的同时删除计量数据

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

@@ -818,7 +818,7 @@
         select
             TER.RESULT_ENTRY_GATE_TIME   "pointDate",
             RG.GATEPOST_NAME             "pointName",
-            TER.SEGMEN_SQE                "segmenSqe",
+            nvl(TER.SEGMEN_SQE,0)                "segmenSqe",
             '进厂'                          "linkName"
         from TMSTRUCK_ENFACTORY_RESULT TER
                  left join RMS_GATEPOST RG
@@ -838,7 +838,7 @@
     <select id="getFourDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
                TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
-               TWR.TARE_SEGMENT_SQE         "segmenSqe",
+               NVL(TWR.TARE_SEGMENT_SQE,0)         "segmenSqe",
                '计皮'                        "linkName",
                TWR.RESULT_TARE_WEIGHT       "weight",
                RM.MATERIAL_NAME             "materialName",
@@ -878,7 +878,7 @@
         select TUR.RESULT_END_TIME    "pointDate",
                RW.WAREHOUSE_NAME    "pointName",
                RM.MATERIAL_NAME ||  RM.MATERIAL_SPECIFICATION  || RM.MATERIAL_MODEL  "materialName",
-               TUR.SEGMENT_SQE             "segmenSqe",
+               NVL(TUR.SEGMENT_SQE,0)             "segmenSqe",
                '卸货'                          "linkName"
         from TMSTRUCK_UNLOAD_RESULT TUR
                  left join RMS_WAREHOUSE RW