Browse Source

通过单据交易添加的供应商关系,默认打开开关;对账单筛选会错误筛选出结束日期之后一天的单据问题处理。

dongbw 8 years ago
parent
commit
1a053d4834

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/ARCheckServiceImpl.java

@@ -103,6 +103,8 @@ public class ARCheckServiceImpl implements ARCheckService {
 		vendor.setVendEnUU(SystemSession.getUser().getEnterprise().getUu());
 		// 卖方联系人为卖方企业管理员
 		vendor.setVendUserUU(SystemSession.getUser().getEnterprise().getEnAdminuu());
+		vendor.setCustswitch(Constant.YES);
+		vendor.setVendswitch(Constant.YES);
 		return vendorDao.save(vendor);
 	}
 

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryMouldServiceImpl.java

@@ -165,6 +165,8 @@ public class InquiryMouldServiceImpl implements InquiryMouldService {
 		Vendor vendor = new Vendor();
 		vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
 		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
+		vendor.setCustswitch(Constant.YES);
+		vendor.setVendswitch(Constant.YES);
 		if (purchaseInquiryMould.getUseruu() != null && purchaseInquiryMould.getUseruu() != 0) {
 			vendor.setMyUserUU(purchaseInquiryMould.getUseruu());
 		} else {

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/InquiryServiceImpl.java

@@ -193,6 +193,8 @@ public class InquiryServiceImpl implements InquiryService {
 		}
 		vendor.setMyUserUU(SystemSession.getUser().getUserUU());
 		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
+		vendor.setCustswitch(Constant.YES);
+		vendor.setVendswitch(Constant.YES);
 		Enterprise vendEnterprise = enterpriseDao.findOne(inquiryItem.getVendUU());
 		if (vendEnterprise != null) {
 			vendor.setVendorEnterprise(vendEnterprise);

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseForecastServiceImpl.java

@@ -191,6 +191,8 @@ public class PurchaseForecastServiceImpl implements PurchaseForecastService {
 			Vendor vendor = new Vendor();
 			vendor.setMyEnUU(forecastItem.getOrder().getEnUU());
 			vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
+			vendor.setCustswitch(Constant.YES);
+			vendor.setVendswitch(Constant.YES);
 			if (forecastItem.getOrder().getUserUU() != null
 					&& userDao.findOne(forecastItem.getOrder().getUserUU()) != null)
 				vendor.setMyUserUU(forecastItem.getOrder().getUserUU());

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseSampleServiceImpl.java

@@ -130,6 +130,8 @@ public class PurchaseSampleServiceImpl implements PurchaseSampleService {
 			vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 			vendor.setVendorEnterprise(enterprise);
 			vendor.setVendEnUU(enterprise.getUu());
+			vendor.setCustswitch(Constant.YES);
+			vendor.setVendswitch(Constant.YES);
 			if (proofingItem.getVendUserUU() != null) {
 				List<User> users = userDao.findByEnUUAndUserUU(enterprise.getUu(), proofingItem.getVendUserUU());
 				if (users.size() > 0) {

+ 1 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/PurchaseServiceImpl.java

@@ -143,6 +143,7 @@ public class PurchaseServiceImpl implements PurchaseService {
 		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
 		// 默认开启供应商
 		vendor.setVendswitch(Constant.YES);
+		vendor.setCustswitch(Constant.YES);
 		// 买方用户(联系人)
 		// 1、单据存在买方用户UU号:买方企业存在对应uu号的用户,设为该用户;买方企业不存在对应uu号的用户,供应商和单据设为当前用户(管理员)
 		// 2、单据不存在买方用户UU号:供应商和单据设为当前用户(管理员)

+ 2 - 0
src/main/java/com/uas/platform/b2b/erp/service/impl/TenderServiceImpl.java

@@ -872,6 +872,8 @@ public class TenderServiceImpl implements TenderService {
             vendor.setMyUserUU(saleTender.getRecorderuu());
             vendor.setVendorEnterprise(enterprise);
             vendor.setVendEnUU(enterprise.getUu());
+            vendor.setCustswitch(Constant.YES);
+            vendor.setVendswitch(Constant.YES);
             if (saleTender.getUseruu() != null) {
                 List<User> users = userDao.findByEnUUAndUserUU(enterprise.getUu(), saleTender.getUseruu());
                 if (users.size() > 0) {

+ 1 - 1
src/main/java/com/uas/platform/b2b/listener/MessageListener.java

@@ -113,7 +113,7 @@ public class MessageListener implements ApplicationListener<SaveReleaseEvent<?,
 											}
 										}
 									} catch (RuntimeException e) {
-										e.getStackTrace();
+										e.printStackTrace();
 									}
 								}
 								enUUs.add(enter.getEnuu());

+ 2 - 0
src/main/java/com/uas/platform/b2b/service/impl/VendorsServiceImpl.java

@@ -62,6 +62,8 @@ public class VendorsServiceImpl implements VendorService {
 	public Vendor addVendor(Vendor vendor) {
 		vendor.setMyEnUU(SystemSession.getUser().getEnterprise().getUu());
 		vendor.setMyEnterprise(SystemSession.getUser().getEnterprise());
+		vendor.setCustswitch(Constant.YES);
+		vendor.setVendswitch(Constant.YES);
 		Vendor vendor1 = vendorDao.save(vendor);
 		addPartnerShipRecord(vendor1); // 添加合作伙伴关系
 		return vendor1;

+ 2 - 2
src/main/webapp/resources/js/index/app.js

@@ -8547,7 +8547,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.condition.dateFrom = ($scope.sdateFrom || 0);
             $scope.thisdatato = ($scope.sdateTo || 0);
             if($scope.thisdatato != 0) {
-                $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf() + 3600 * 12 * 1000) || 0);
+                $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf()) || 0);
             } else {
                 $scope.condition.dateTo = ($scope.sdateTo || 0);
             }
@@ -9460,7 +9460,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.condition.dateFrom = ($scope.sdateFrom || 0);
             $scope.thisdatato = ($scope.sdateTo || 0);
             if ($scope.thisdatato != 0) {
-                $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf() + 3600 * 12 * 1000 - 1) || 0);
+                $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf()) || 0);
             } else {
                 $scope.condition.dateTo = ($scope.sdateTo || 0);
             }