|
@@ -326,16 +326,18 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
|
|
+
|
|
- if(materialNum >= 1){
|
|
+
|
|
|
|
+ Integer materialNum = tmstruckMeasureCommissionMapper.getNoNetWeight(DataChange.dataToBigDecimal(map.get("orderId")));
|
|
|
|
+ if(materialNum > 1){
|
|
measureCommission.put("IsAssembly", true);
|
|
measureCommission.put("IsAssembly", true);
|
|
}else {
|
|
}else {
|
|
measureCommission.put("IsAssembly", false);
|
|
measureCommission.put("IsAssembly", false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
+ System.out.println(measureCommission);
|
|
-
|
|
+ return 1;
|
|
- return sendMesToMeasure(measureCommission);
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|