|
@@ -2274,7 +2274,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
for (Map<String, Object> stringObjectMap : materialMesNew) {
|
|
for (Map<String, Object> stringObjectMap : materialMesNew) {
|
|
for (Map<String, Object> objectMap : materialId) {
|
|
for (Map<String, Object> objectMap : materialId) {
|
|
BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("saleMaterialId"));
|
|
BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("saleMaterialId"));
|
|
- BigDecimal materialId1 = (BigDecimal) objectMap.get("saleMaterialId")
|
|
|
|
|
|
+ BigDecimal materialId1 = (BigDecimal) objectMap.get("saleMaterialId");
|
|
if (materialId2.compareTo(materialId1)==0){
|
|
if (materialId2.compareTo(materialId1)==0){
|
|
//钢材长度
|
|
//钢材长度
|
|
BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
|
|
BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
|