|
@@ -238,10 +238,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
}
|
|
|
map.put("materialId",materialId);
|
|
|
|
|
|
- int netWeightCount = tmstruckWeightResultMapper.getHaveNetWeightByMaterial(map);
|
|
|
- if(netWeightCount != 0){
|
|
|
- throw new Exception("该物资已有净重,不能再次录入");
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
tmstruckWeightResult.setMaterialId(materialId);
|
|
|
tmstruckWeightResult.setMaterialNum(DataChange.dataToBigDecimal(map.get("goodNum")));
|
|
|
BigDecimal materialNum = DataChange.dataToBigDecimal(map.get("goodNum"));
|
|
@@ -251,7 +251,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
throw new Exception("该订单没有该物资分录");
|
|
|
}
|
|
|
BigDecimal saleMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("saleMaterialId"));
|
|
|
+ BigDecimal orderMaterialId = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialId"));
|
|
|
BigDecimal materialWeight = DataChange.dataToBigDecimal(saleMaterialMes.get("materialWeight"));
|
|
|
+ map.put("orderMaterialId",orderMaterialId);
|
|
|
+ map.put("saleMaterialId",saleMaterialId);
|
|
|
BigDecimal newWeight = null;
|
|
|
if (materialWeight.intValue() != 0) {
|
|
|
BigDecimal orderMaterialNumber = DataChange.dataToBigDecimal(saleMaterialMes.get("orderMaterialNumber"));
|
|
@@ -758,10 +761,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
|
tmstruckWeightResultMapper.updateOrderLineSqeBySqe(orderId,orderLineSqe);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}else{
|
|
|
tmstruckWeightResultMapper.linkageDeleteTransportOrder(orderNumber);
|
|
|
}
|