|
@@ -655,10 +655,11 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
// 钢材米数
|
|
// 钢材米数
|
|
BigDecimal steelMeters = DataChange.dataToBigDecimal(map.get("steelMeters"));
|
|
BigDecimal steelMeters = DataChange.dataToBigDecimal(map.get("steelMeters"));
|
|
// 判断物资是否是盘螺或盘元/盘圆
|
|
// 判断物资是否是盘螺或盘元/盘圆
|
|
- if (materialName != null && (!materialName.toString().contains("盘螺") || !materialName.toString().contains("盘元") || !materialName.toString().contains("盘圆"))) {
|
|
|
|
- if (steelMeters != null && !steelMeters.toString().equals("0")) {
|
|
|
|
- amsSaleMaterial.setSteelMeter(steelMeters);
|
|
|
|
- }
|
|
|
|
|
|
+ if (materialName != null && (materialName.toString().contains("盘螺") || materialName.toString().contains("盘元") || materialName.toString().contains("盘圆"))) {
|
|
|
|
+ amsSaleMaterial.setSteelMeter(null);
|
|
|
|
+ }
|
|
|
|
+ else {
|
|
|
|
+ amsSaleMaterial.setSteelMeter(steelMeters);
|
|
}
|
|
}
|
|
// 是否磅重销售(0:磅重;1:理重)
|
|
// 是否磅重销售(0:磅重;1:理重)
|
|
BigDecimal isPoundSale = DataChange.dataToBigDecimal(map.get("isPoundSale"));
|
|
BigDecimal isPoundSale = DataChange.dataToBigDecimal(map.get("isPoundSale"));
|