|
@@ -313,16 +313,16 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
measureCommission.remove("isPoundSale");
|
|
|
if(isPoundSale != null){
|
|
|
if(DataChange.dataToBigDecimal(isPoundSale).intValue() == 0){
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
}else {
|
|
|
- measureCommission.put("deliveryMethod", "理重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "理重");
|
|
|
}
|
|
|
}else {
|
|
|
String materiaName = (String) measureCommission.get("materiaName");
|
|
|
if(materiaName.contains("盘螺")){ //如果名字中包含盘螺则为磅重交货
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
}else {
|
|
|
- measureCommission.put("deliveryMethod", "理重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "理重");
|
|
|
}
|
|
|
}
|
|
|
//查询已经计量物资
|
|
@@ -446,7 +446,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
measureCommission.put("isDel", false);
|
|
|
measureCommission.put("isInsert", true);
|
|
|
measureCommission.put("IsAssembly", false);
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
measureCommission.put("packagesNum", 0);
|
|
|
if(map.get("isDG") != null){
|
|
|
measureCommission.put("factory", "dg");
|
|
@@ -465,7 +465,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
measureCommission.put("isDel", false);
|
|
|
measureCommission.put("isInsert", true);
|
|
|
measureCommission.put("IsAssembly", false);
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
measureCommission.put("packagesNum", 0);
|
|
|
break;
|
|
|
case 11:
|
|
@@ -484,7 +484,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
measureCommission.put("isRelationEAS", false);
|
|
|
measureCommission.put("flowTo", "中转");
|
|
|
measureCommission.put("IsAssembly", false);
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
measureCommission.put("packagesNum", 0);
|
|
|
System.out.println(measureCommission);
|
|
|
break;
|
|
@@ -518,7 +518,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
}
|
|
|
measureCommission.put("isDel", false);
|
|
|
measureCommission.put("isInsert", true);
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
measureCommission.put("packagesNum", 0);
|
|
|
break;
|
|
|
case 20://采购内转委托总厂区
|
|
@@ -536,7 +536,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
measureCommission.put("flowTo","进厂");
|
|
|
measureCommission.put("isDel",false);
|
|
|
measureCommission.put("isInsert",true);
|
|
|
- measureCommission.put("deliveryMethod", "磅重交货");
|
|
|
+ measureCommission.put("deliveryMethod", "磅重");
|
|
|
measureCommission.put("packagesNum", 0);
|
|
|
}
|
|
|
if(measureCommission != null){
|