修改理重磅重方式

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

@@ -177,12 +177,15 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             if(isPoundSale != null){
                 if(DataChange.dataToBigDecimal(isPoundSale).intValue() == 0){
                     measureCommission.put("deliveryMethod", "磅重交货");
-                    measureCommission.remove("meterWeight");
                 }else {
                     measureCommission.put("deliveryMethod", "理重交货");
-                    BigDecimal meterWeight = DataChange.dataToBigDecimal(measureCommission.get("meterWeight")).divide(new BigDecimal(1000));
-                    measureCommission.remove("meterWeight");
-                    measureCommission.put("theoryWeight", meterWeight.setScale(4, BigDecimal.ROUND_HALF_UP));//理重除1000保留四位小数
+                }
+            }else {
+                String materiaName = (String) measureCommission.get("materiaName");
+                if(materiaName.contains("盘螺")){ //如果名字中包含盘螺则为磅重交货
+                    measureCommission.put("deliveryMethod", "磅重交货");
+                }else {
+                    measureCommission.put("deliveryMethod", "理重交货");
                 }
             }
             //查询已经计量物资

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

@@ -1314,7 +1314,7 @@
                         OO.INSERT_UPDATE_REMARK                              "demo",
                         ASM.EAS_PRIMARY_ID                                   "FLID",
                         MAORTC.TRUCK_CALCULATE_NUMBER                        "steelyardNum",
-                        ASM.METER_WEIGHT                                     "meterWeight",
+                        ASM.MATERIAL_WEIGHT                                  "theoryWeight",
                         ASM.IS_POUND_SALE                                    "isPoundSale"
                  from OMSTRUCK_ORDER OO
                           left join OMSTRUCK_ORDER_MATERIAL OOM on OO.ORDER_ID = OOM.ORDER_ID