Merge remote-tracking branch 'origin/dev'

src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseNotifyServiceImpl.java

@@ -113,8 +113,8 @@ public class PurchaseNotifyServiceImpl implements PurchaseNotifyService {
 					if (!existDeliveryStr.equals(deliveryStr)) {
 						existNotice.setRemark(remark + dateString + "修改交期，" + existDeliveryStr + " -> " + deliveryStr);
                         Double ltinStock = 0.00;
-                        if (notice.getOrderItem() != null && notice.getOrderItem().getLtinstock() != null) {
-                            ltinStock = notice.getOrderItem().getLtinstock();
+                        if (existNotice.getOrderItem() != null && existNotice.getOrderItem().getLtinstock() != null) {
+                            ltinStock = existNotice.getOrderItem().getLtinstock();
                         }
                         existNotice.setWaiting(getNoticeWaiting(DateFormatUtils.DATE_FORMAT.format(notice.getDelivery()), ltinStock));
 					}