asd

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

@@ -34,6 +34,6 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //通过汽车衡编号查询汽车衡ID
     Integer selectTruckCalculateId(String truckCalculateNumber);
 
-    //
+    //通过运输订单号查询计量实绩Id 条件 路段顺序号 和 净重
     Map<String, Object> selectWeightIdByOrderId(Map<String, Object> map);
 }

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

@@ -94,7 +94,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //通过运输订单号查询计量实绩Id
         Map<String, Object> stringObjectMap = tmstruckWeightResultMapper.selectWeightIdByOrderId(map);
         if(stringObjectMap == null){
-            //如果都有净重了 通过传来的运输订单号 与 物资ID查询计重实绩ID
+            //通过传来的运输订单号 与 物资ID查询计重实绩ID
             stringObjectMap = tmstruckWeightResultMapper.selectTotalIdByOrderNo(map);
             if(stringObjectMap == null){
                 return map.get("orderNumber") + "没有此订单信息或物资信息(" + map.get("materialId") + ")错误";
@@ -129,7 +129,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         String resultCrossWeightTime = (String) map.get("resultCrossWeightTime");
         tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         //如果是采购订单 先计毛再计皮
-        if("5678".contains(orderType.toString()) || orderType.intValue() == 12 || orderType.intValue() == 14){
+        if("56789".contains(orderType.toString())
+                || orderType.intValue() == 12
+                || orderType.intValue() == 14
+                || orderType.intValue() == 10){
             //如果毛重数据为空 则是第一次计量为毛重  此时第一次计量时间放皮重时间里面
             if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
                 //设置毛重时间

src/main/resources/bootstrap.yml

@@ -54,4 +54,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8066
+  port: 8006

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

@@ -706,7 +706,7 @@
         where TRUCK_CALCULATE_NUMBER = #{truckCalculateNumber}
     </select>
 
-<!--    -->
+<!--  通过运输订单号查询计量实绩Id 条件 路段顺序号 和 净重  -->
     <select id="selectWeightIdByOrderId" parameterType="map" resultType="java.util.Map">
         select *
         from (
@@ -726,7 +726,7 @@
                           left join RMS_CAPACITY RC
                                     on RC.CAPACITY_ID = OO.CAPACITY_ID
                  where OO.ORDER_NUMBER = #{orderNumber}
-                   and TWR.RESULT_NET_WEIGHT is null
+                   and TWR.RESULT_NET_WEIGHT is null or TWR.RESULT_NET_WEIGHT = 0
                  order by "tareSegmentSqe"
              )
             where rownum = 1