tijia

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

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

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

@@ -1366,7 +1366,7 @@
         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
+        WHERE TWR.RESULT_NET_WEIGHT IS not NULL
         AND OO.ORDER_ID = #{orderId}
     </select>