|
|
@@ -584,10 +584,12 @@ public class saorder extends BaseSaorder {
|
|
|
PaoSetRemote titemset = saorderdetail.getPao(i).getPaoSet("titem");
|
|
|
if (!titemset.isEmpty()) {
|
|
|
titem titem = (titem) titemset.getPao(0);
|
|
|
-
|
|
|
- double fsaleprice = titem.getAgentSalePrice(getString("fagentnum"));
|
|
|
- if (order_fsaleprice != fsaleprice) {
|
|
|
- map.put(titem.getString("fitemno"), new Double[]{order_fsaleprice, fsaleprice});
|
|
|
+ if (!saorderdetail.getPao(i).getBoolean("fpricechanged")) {
|
|
|
+ //如果价格没有更改过,则进行价格判断
|
|
|
+ double fsaleprice = titem.getAgentSalePrice(getString("fagentnum"));
|
|
|
+ if (order_fsaleprice != fsaleprice) {
|
|
|
+ map.put(titem.getString("fitemno"), new Double[]{order_fsaleprice, fsaleprice});
|
|
|
+ }
|
|
|
}
|
|
|
if (!map.containsKey(titem.getString("fitemno"))) {
|
|
|
/**
|