变更单异常处理

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

@@ -2,6 +2,7 @@ package com.uas.platform.b2b.service.impl;
 
 import com.uas.platform.b2b.core.util.ContextUtils;
 import com.uas.platform.b2b.dao.*;
+import com.uas.platform.b2b.erp.model.PurchaseChange;
 import com.uas.platform.b2b.event.PurchaseOrderChangeSaveReleaseEvent;
 import com.uas.platform.b2b.model.*;
 import com.uas.platform.b2b.service.PurcOrderChangeService;
@@ -152,6 +153,7 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
         if (StringUtils.isEmpty(change.getNewPayments()) || change.getNewPayments().equals(change.getOldPayments())) {
             change.setNewPayments(null);
         }
+        List<PurchaseOrderChangeItem> changeItemList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(change.getOrderChangeItems())) {
             StringBuffer stringBuffer = new StringBuffer();
             Set<PurchaseOrderChangeItem> itemList = change.getOrderChangeItems();
@@ -161,18 +163,18 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
                 item.setOrderChange(change);
                 if ((!item.getNewPrice().equals(item.getOldPrice())) || (!item.getNewQty().equals(item.getOldQty()))
                         || (StringUtils.isEmpty(item.getNewDelivery()) || !item.getNewDelivery().equals(item.getOldDelivery())) || (!item.getNewTaxrate().equals(item.getOldTaxrate()))) {
-                    stringBuffer.append("行"+item.getOrderItemNumber()+":");
+                    stringBuffer.append("行" + item.getOrderItemNumber() + ":");
                     if (!item.getNewPrice().equals(item.getOldPrice())) {
-                        stringBuffer.append("单价"+".");
+                        stringBuffer.append("单价.");
                     }
                     if (!item.getNewQty().equals(item.getOldQty())) {
-                        stringBuffer.append("数量"+".");
+                        stringBuffer.append("数量.");
                     }
                     if (StringUtils.isEmpty(item.getNewDelivery()) || !item.getNewDelivery().equals(item.getOldDelivery())) {
-                        stringBuffer.append("交货日期"+".");
+                        stringBuffer.append("交货日期.");
                     }
                     if (!item.getNewTaxrate().equals(item.getOldTaxrate())) {
-                        stringBuffer.append("税率"+".");
+                        stringBuffer.append("税率.");
                     }
                 }
                 //判断单价、数量等是否变更，如不变更，将新单价等设为空
@@ -191,12 +193,14 @@ public class PurcOrderChangeServiceImpl implements PurcOrderChangeService {
                         item.setNewTaxrate(null);
                     }
                 }
+                //changeItemList.add(item);
             }
             if (!StringUtils.isEmpty(stringBuffer)) {
                 change.setDescription(stringBuffer.toString());
             }
+            changeItemList.addAll(itemList);
         }
-       List<PurchaseOrderChangeItem> items = changeItemDao.save(change.getOrderChangeItems());
+       List<PurchaseOrderChangeItem> items = changeItemDao.save(changeItemList);
        if (change.getUnNeedReply() == 1) {
            PurchaseOrderInfo orderInfo = orderInfoDao.findOne(change.getOrderId());
            if (!StringUtils.isEmpty(change.getNewPayments())) {