膝盖

src/main/java/com/steerinfo/dil/controller/AmsSaleOrderMaterialController.java

@@ -239,7 +239,7 @@ public class AmsSaleOrderMaterialController extends BaseRESTfulController {
     public RESTfulResult dispatchTruckOrderBySale(@RequestBody Map<String,Object> mapValue){
         int result = amsSaleOrderMaterialService.dispatchTruckOrderBySale(mapValue);
         if (result == -1) {
-            return failed("该销售订单的净重已达到97%");
+            return failed("该销售订单的净重已达到99%");
         }
         else {
             return success(result);

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

@@ -347,7 +347,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             saleMaterialNetWeight = saleMaterialNetWeight.add(dispatchedOrderWeight);
             // 计算净重所占销售订单中的比例
             Double percent = saleMaterialNetWeight.doubleValue()/saleMaterialWeight.doubleValue();
-            if (percent >= 0.97) {
+            if (percent > 1) {
                 return -1;
             }
         }

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

@@ -1006,7 +1006,7 @@
     WHERE TTR.ORDER_ID = #{previousOrderId}
   </select>
   <select id="getDispatchedOrderWeight" resultType="java.math.BigDecimal">
-    select NVL(sum(OOM.ORDER_MATERIAL_NUMBER),0)
+    select NVL(sum(OOM.ORDER_MATERIAL_WEIGHT),0)
     from OMSTRUCK_ORDER_MATERIAL OOM
            left join OMSTRUCK_ORDER OO
                      on OO.ORDER_ID = OOM.ORDER_ID