sad

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

@@ -33,4 +33,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //通过汽车衡编号查询汽车衡ID
     Integer selectTruckCalculateId(String truckCalculateNumber);
+
+    //
+    Map<String, Object> selectWeightIdByOrderId(Map<String, Object> map);
 }

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

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

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

@@ -705,4 +705,30 @@
         from RMS_TRUCK_CALCULATE
         where TRUCK_CALCULATE_NUMBER = #{truckCalculateNumber}
     </select>
+
+<!--    -->
+    <select id="selectWeightIdByOrderId" parameterType="map" resultType="java.util.Map">
+        select *
+        from (
+                 select OO.ORDER_ID               "orderId",
+                        OO.ORDER_TYPE             "orderTypee",
+                        TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
+                        TTR.RESULT_TOTAL_ID       "resultTotalId",
+                        RC.CAPACITY_NUMBER        "capacityNumber",
+                        TWR.TARE_SEGMENT_SQE      "tareSegmentSqe",
+                        TWR.GROSS_SEGMENT_SQE     "grossSegmentSqe"
+
+                 from TMSTRUCK_WEIGHT_RESULT TWR
+                          left join TMSTRUCK_TOTAL_RESULT TTR
+                                    on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                          left join OMSTRUCK_ORDER OO
+                                    on OO.ORDER_ID = TTR.ORDER_ID
+                          left join RMS_CAPACITY RC
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 where OO.ORDER_NUMBER = #{orderNumber}
+                   and TWR.RESULT_NET_WEIGHT is null
+                 order by "tareSegmentSqe"
+             )
+            where rownum = 1
+    </select>
 </mapper>