变更优化

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

@@ -145,6 +145,13 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
         change.setUserUU(SystemSession.getUser().getUserUU());
         change.setSendStatus((short) Status.NOT_UPLOAD.value());
         change.setStatus((short)Status.NOT_REPLY.value());
+        //判断付款方式，币种等是否改变
+        if (change.getNewCurrency() == change.getOldCurrency()) {
+            change.setNewCurrency(null);
+        }
+        if (change.getNewPayments() == change.getOldPayments()) {
+            change.setNewPayments(null);
+        }
         if (!CollectionUtils.isEmpty(change.getOrderChangeItems())) {
             StringBuffer stringBuffer = new StringBuffer();
             Set<PurchaseOrderChangeItem> itemList = change.getOrderChangeItems();
@@ -152,22 +159,38 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
             while (itemIterator.hasNext()) {
                 PurchaseOrderChangeItem item = itemIterator.next();
                 item.setOrderChange(change);
-                if (!StringUtils.isEmpty(item.getNewQty()) || !StringUtils.isEmpty(item.getNewPrice())
-                        || !StringUtils.isEmpty(item.getNewTaxrate()) || !StringUtils.isEmpty(item.getNewDelivery())) {
+                if (item.getNewPrice() != item.getOldPrice() || item.getNewQty() != item.getOldQty()
+                        || item.getNewDelivery() != item.getOldDelivery() || item.getNewTaxrate() != item.getOldTaxrate()) {
                     stringBuffer.append("行"+item.getOrderItemNumber()+":");
-                    if (!StringUtils.isEmpty(item.getNewPrice())) {
+                    if (item.getNewPrice() != item.getOldPrice()) {
                         stringBuffer.append("单价"+".");
                     }
-                    if (!StringUtils.isEmpty(item.getNewQty())) {
+                    if (item.getNewQty() != item.getOldQty()) {
                         stringBuffer.append("数量"+".");
                     }
-                    if (!StringUtils.isEmpty(item.getNewDelivery())) {
+                    if (item.getNewDelivery() != item.getOldDelivery()) {
                         stringBuffer.append("交货日期"+".");
                     }
-                    if (!StringUtils.isEmpty(item.getNewTaxrate())) {
+                    if (item.getNewTaxrate() != 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()) {
+                        item.setNewPrice(null);
+                    }
+                    if (item.getNewQty() == item.getOldQty()) {
+                        item.setNewQty(null);
+                    }
+                    if (item.getNewDelivery() == item.getOldDelivery()) {
+                        item.setNewDelivery(null);
+                    }
+                    if (item.getNewTaxrate() == item.getOldTaxrate()) {
+                        item.setNewTaxrate(null);
+                    }
+                }
             }
             if (!StringUtils.isEmpty(stringBuffer)) {
                 change.setDescription(stringBuffer.toString());

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

@@ -24046,6 +24046,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.change.vendUU = data.vendUU;
                 $scope.change.apVendorName = data.receiveName;
                 $scope.change.vendUserUU = data.vendUserUU;
+                $scope.change.newCurrency = data.currency;
+                $scope.change.newPayments = data.payments;
                 angular.forEach($scope.orderItems, function (item) {
                     $scope.change.orderChangeItems.push({
                         oldProductId: item.productId,
@@ -24055,6 +24057,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         oldPrice: item.price,
                         oldTaxrate: item.taxrate,
                         oldDelivery: item.delivery,
+                        newQty: item.qty,
+                        newPrice: item.price,
+                        newTaxrate: item.taxrate,
+                        newDelivery: item.delivery,
                         oldProduct: item.product
                     });
                 });

src/main/webapp/resources/tpl/index/purc/change_new.html

@@ -254,25 +254,14 @@
                             </div>
                             <div class="fr">
                                 <em>新付款币种：</em>
-                                <input ng-model="change.newCurrency" list="newCurrency" class="select"  placeholder="选择付款币种" />
+                                <input ng-model="change.newCurrency" list="newCurrency" class="select"  placeholder="选择付款币种"/>
                                 <datalist id="newCurrency">
                                     <option value="RMB">RMB</option>
                                     <option value="USD">USD</option>
                                     <option value="HKD">HKD</option>
                                 </datalist>
-                                <!--<span><input type="text" class="input01" ng-model="change.newCurrency"></span>-->
                             </div>
                         </li>
-                        <!--<li>-->
-                            <!--<div class="fr">-->
-                                <!--<em>原付款汇率：</em>-->
-                                <!--<span ng-bind="change.oldRate || '无'"></span>-->
-                            <!--</div>-->
-                            <!--<div class="fr">-->
-                                <!--<em>新付款汇率：</em>-->
-                                <!--<span><input type="text" class="input01" ng-model="change.newRate"></span>-->
-                            <!--</div>-->
-                        <!--</li>-->
                         <li>
                             <div class="fr">
                                 <em>备注：</em>
@@ -280,7 +269,7 @@
                             </div>
                             <div class="fr">
                                 <em>是否需要供应商确认：</em>
-                                <select name="" class="select" ng-model="change.unNeedReply">
+                                <select name="" class="select" ng-model="change.unNeedReply" required="true">
                                     <option value="0">是</option>
                                     <option value="1">否</option>
                                 </select>
@@ -316,7 +305,7 @@
                             <td ng-bind="item.oldProduct.brand || '-'" title="{{item.oldProduct.brand}}"></td>
                             <td ng-bind="item.oldQty || '-'" title="{{item.oldQty}}"></td>
                             <td><input type="text" class="text-center" ng-model="item.newQty" placeholder="新数量"
-                                       ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[0-9][0-9]*\.[0-9]{1,3})|([0-9]*[0-9][0-9]*))$/" ></td>
+                                       ng-pattern="/^(([0-9]+\.[0-9]{1,3})|([0-9]*[0-9][0-9]*\.[0-9]{1,3})|([0-9]*[0-9][0-9]*))$/" value="111"></td>
                             <td ng-bind="item.oldPrice || '-'" title="{{item.oldPrice}}"></td>
                             <td><input type="text" class="text-center" ng-model="item.newPrice" placeholder="新单价"
                                        ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[0-9][0-9]*\.[0-9]{1,6})|([0-9]*[0-9][0-9]*))$/" ></td>