变更优化

src/main/java/com/uas/platform/b2b/service/impl/PurcOrderChangeServiceImpl.java

@@ -146,10 +146,10 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
         change.setSendStatus((short) Status.NOT_UPLOAD.value());
         change.setStatus((short)Status.NOT_REPLY.value());
         //判断付款方式，币种等是否改变
-        if (change.getNewCurrency() == change.getOldCurrency()) {
+        if (StringUtils.isEmpty(change.getNewCurrency()) || change.getNewCurrency().equals(change.getOldCurrency())) {
             change.setNewCurrency(null);
         }
-        if (change.getNewPayments() == change.getOldPayments()) {
+        if (StringUtils.isEmpty(change.getNewPayments()) || change.getNewPayments().equals(change.getOldPayments())) {
             change.setNewPayments(null);
         }
         if (!CollectionUtils.isEmpty(change.getOrderChangeItems())) {
@@ -159,35 +159,35 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
             while (itemIterator.hasNext()) {
                 PurchaseOrderChangeItem item = itemIterator.next();
                 item.setOrderChange(change);
-                if (item.getNewPrice() != item.getOldPrice() || item.getNewQty() != item.getOldQty()
-                        || item.getNewDelivery() != item.getOldDelivery() || item.getNewTaxrate() != item.getOldTaxrate()) {
+                if ((!item.getNewPrice().equals(item.getOldPrice())) || (!item.getNewQty().equals(item.getOldQty()))
+                        || (!item.getNewDelivery().equals(item.getOldDelivery())) || (!item.getNewTaxrate().equals(item.getOldTaxrate()))) {
                     stringBuffer.append("行"+item.getOrderItemNumber()+":");
-                    if (item.getNewPrice() != item.getOldPrice()) {
+                    if (!item.getNewPrice().equals(item.getOldPrice())) {
                         stringBuffer.append("单价"+".");
                     }
-                    if (item.getNewQty() != item.getOldQty()) {
+                    if (!item.getNewQty().equals(item.getOldQty())) {
                         stringBuffer.append("数量"+".");
                     }
-                    if (item.getNewDelivery() != item.getOldDelivery()) {
+                    if (!item.getNewDelivery().equals(item.getOldDelivery())) {
                         stringBuffer.append("交货日期"+".");
                     }
-                    if (item.getNewTaxrate() != item.getOldTaxrate()) {
+                    if (!item.getNewTaxrate().equals(item.getOldTaxrate())) {
                         stringBuffer.append("税率"+".");
                     }
                 }
                 //判断单价、数量等是否变更，如不变更，将新单价等设为空
-                if (item.getNewPrice() == item.getOldPrice() || item.getNewQty() == item.getOldQty()
-                        || item.getNewDelivery() == item.getOldDelivery() || item.getNewTaxrate() == item.getOldTaxrate()) {
-                    if (item.getNewPrice() == item.getOldPrice()) {
+                if ((item.getNewPrice().equals(item.getOldPrice())) || (item.getNewQty().equals(item.getOldQty()))
+                        || (item.getNewDelivery().equals(item.getOldDelivery())) || (item.getNewTaxrate().equals(item.getOldTaxrate()))) {
+                    if (item.getNewPrice().equals(item.getOldPrice())) {
                         item.setNewPrice(null);
                     }
-                    if (item.getNewQty() == item.getOldQty()) {
+                    if (item.getNewQty().equals(item.getOldQty())) {
                         item.setNewQty(null);
                     }
-                    if (item.getNewDelivery() == item.getOldDelivery()) {
+                    if (item.getNewDelivery().equals(item.getOldDelivery())) {
                         item.setNewDelivery(null);
                     }
-                    if (item.getNewTaxrate() == item.getOldTaxrate()) {
+                    if (item.getNewTaxrate().equals(item.getOldTaxrate())) {
                         item.setNewTaxrate(null);
                     }
                 }

src/main/webapp/resources/js/index/app.js

@@ -24048,7 +24048,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.change.vendUserUU = data.vendUserUU;
                 $scope.change.newCurrency = data.currency != null ? data.currency :null;
                 $scope.change.newPayments = data.payments != null ? data.payments :null;
-                angular.forEach($scope.orderItems, function (item) {
+                angular.forEach($scope.orderItems, function (item, index) {
                     $scope.change.orderChangeItems.push({
                         oldProductId: item.productId,
                         orderItemId: item.id,
@@ -24061,7 +24061,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         newPrice: item.price != null ? item.price :null,
                         newTaxrate: item.taxrate != null ? item.taxrate :null,
                         newDelivery: item.delivery != null ? item.delivery :null,
-                        oldProduct: item.product
+                        oldProduct: item.product,
+                        number: index + 1
                     });
                 });
             });