dev
parent
846a9af165
commit
cc6db32ede
|
|
@ -979,7 +979,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
||||||
if (total_weight.compareTo(surplus_weight) >= 0) {
|
if (total_weight.compareTo(surplus_weight) >= 0) {
|
||||||
oldobj.setTotalWeight(over_weight); // 将总量设置成和已完成量一样,就是将余量设置为 0 了
|
oldobj.setTotalWeight(over_weight); // 将总量设置成和已完成量一样,就是将余量设置为 0 了
|
||||||
} else {
|
} else {
|
||||||
oldobj.setTotalWeight(surplus_weight.subtract(total_weight)); // 结转不完的,要留下
|
oldobj.setTotalWeight(over_weight.add(surplus_weight.subtract(total_weight))); // 结转不完的,要留下
|
||||||
}
|
}
|
||||||
|
|
||||||
List<OrderclusterTruck> octs = OrderclusterTruck.dao.find("select * from ordercluster_truck t where t.ordercluster_id = ?", ordercluster_id);
|
List<OrderclusterTruck> octs = OrderclusterTruck.dao.find("select * from ordercluster_truck t where t.ordercluster_id = ?", ordercluster_id);
|
||||||
|
|
@ -1149,7 +1149,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
||||||
if (total_weight.compareTo(surplus_weight) >= 0) {
|
if (total_weight.compareTo(surplus_weight) >= 0) {
|
||||||
oldobj.setTotalWeight(over_weight); // 将总量设置成和已完成量一样,就是将余量设置为 0 了
|
oldobj.setTotalWeight(over_weight); // 将总量设置成和已完成量一样,就是将余量设置为 0 了
|
||||||
} else {
|
} else {
|
||||||
oldobj.setTotalWeight(surplus_weight.subtract(total_weight)); // 结转不完的,要留下
|
oldobj.setTotalWeight(over_weight.add(surplus_weight.subtract(total_weight))); // 结转不完的,要留下
|
||||||
}
|
}
|
||||||
|
|
||||||
String[] truckarr = trucks.split(",");
|
String[] truckarr = trucks.split(",");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue