Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

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

@@ -81,13 +81,15 @@ public class MakeServiceImpl implements MakeService {
 					makeOrder.setProduct(product);
 					makeOrder.setProductId(product.getId());
 					List<Vendor> vendors = vendorDao.findByMyEnUUAndVendUU(enUU, make.getVe_uu());
-					Vendor vend = vendors.get(0);
+					Vendor vend = new Vendor();
 					if (CollectionUtils.isEmpty(vendors)) {
 						vend = addVendor(make);
 						if (null != vend) {
 							// 添加合作伙伴
 							vendorService.addPartnerShipRecord(vend, appId);
 						}
+					} else {
+						vend = vendors.get(0);
 					}
 					makeOrder.setUserUU(vend.getMyUserUU());
 					makeOrder.setVendUserUU(vend.getVendUserUU());

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

@@ -411,7 +411,7 @@ public class PurchaseProdInOutServiceImpl implements PurchaseProdInOutService {
 		if (!CollectionUtils.isEmpty(prodInOuts)) {
 			for (ProdInOutRefreshPrice prod : prodInOuts) {
 				PurchaseAcceptItem acceptItem = purchaseAcceptItemDao.findByEnUUAndCodeAndNumber(
-						SystemSession.getUser().getEnterprise().getUu(), prod.getPbu_inoutno(), prod.getPbu_pdno());
+						SystemSession.getUser().getEnterprise().getUu(), prod.getPbu_inoutno(), prod.getPd_orderdetno());
 				if (null != acceptItem) {
                     PurcAcceptItem item = new PurcAcceptItem();
                     BeanUtils.copyProperties(acceptItem, item, PurcAcceptItem.class);

src/main/java/com/uas/platform/b2b/model/PurchaseOrderChangeItem.java

@@ -234,7 +234,7 @@ public class PurchaseOrderChangeItem {
 			this.newProductTitle = newProduct.getTitle();
 			this.newProductSpec = newProduct.getSpec();
 			this.newProductUnit = newProduct.getUnit();
-			this.newProductSourceId = oldProduct.getSourceId();
+			this.newProductSourceId = newProduct.getSourceId();
 		}
 		this.newProduct = newProduct;
 	}

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

@@ -395,7 +395,7 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
                 "aa_orderdetno orderdetno, aa_detno detno, aa_prid prid, aa_prodcode prodcode, aa_prodspec prodspec, aa_prodtitle prodtitle, aa_produnit as produnit, " +
                 "aa_qty qty, aa_orderprice orderprice, aa_currency currency, aa_taxrate taxrate, aa_whname whname, aa_ycheckqty ycheckqty, " +
                 "(aa_qty - coalesce(aa_ycheckqty, 0)) as thischeckqty, aa_custuu custuu, aa_enuu enuu, aa_id sourceid, aa_sendcode sendcode, " +
-                "aa_factory factory, aa_custname custname from purc$apbilladjustment where aa_enuu = ").append(enUU).append(" ");
+                "aa_factory factory, aa_custname custname from purc$apbilladjustment where coalesce(aa_thischeckqty, 0) <> 0 and aa_enuu = ").append(enUU).append(" ");
         if (!StringUtils.isEmpty(keyword.getReceiveName())) {
             sql.append("and aa_receivename = '").append(keyword.getReceiveName()).append("' ");
         }

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

@@ -10406,7 +10406,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
 
         $scope.exportApcheckList = function() {
-            var url = 'sale/apCheck/xls?fromDate=' + $scope.fromDate + '&endDate' + $scope.endDate;
+            var url = 'sale/apCheck/xls?fromDate=' + $scope.fromDate + '&endDate=' + $scope.endDate;
             if (angular.isDefined($scope.receiveName)) {
                 url = url + '&receiveName=' + $scope.receiveName;
             }