tijaio

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

@@ -116,4 +116,6 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //查询已计重的物资
     Integer getAlreadyWeightMaterialNum(BigDecimal orderId);
 
+    Integer getNoNetWeight(BigDecimal orderId);
+
 }

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

@@ -326,16 +326,18 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
             }
             //查询已经计量物资
-            Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
-            if(materialNum >= 1){
+            //Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
+            //查询没有净重的数据条数，如果没有净重的条数大于1，则是否拼装标志带true,否则为false
+            Integer materialNum = tmstruckMeasureCommissionMapper.getNoNetWeight(DataChange.dataToBigDecimal(map.get("orderId")));
+            if(materialNum > 1){
                 measureCommission.put("IsAssembly", true);
             }else {
                 measureCommission.put("IsAssembly", false);
             }
         }
-//        System.out.println(measureCommission);
-//        return 1;
-        return sendMesToMeasure(measureCommission);
+        System.out.println(measureCommission);
+        return 1;
+//        return sendMesToMeasure(measureCommission);
     }
 
     /**

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

@@ -1359,5 +1359,15 @@
                            and OOM.MATERIAL_ID = TWR.MATERIAL_ID
             )
     </select>
+    <select id="getNoNetWeight" resultType="java.lang.Integer" parameterType="decimal">
+        SELECT count(*)
+        FROM OMSTRUCK_ORDER OO
+        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
+        WHERE TWR.RESULT_NET_WEIGHT IS NULL
+        AND OO.ORDER_ID = #{orderId}
+    </select>
 
 </mapper>