Merge branch 'master' of ssh://10.10.101.21/source/platform-b2b into dev

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -196,7 +196,7 @@ public class SaleOrderController {
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("pu_id", false, Type.INT, 1L));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<String, Object>(1);
 		map.put("pu_status", (short) Status.UNAUDIT.value());
 		pageParams.setNotEqualFilters(map);
 		return searchService.searchPurchaseOrderIds(keyword, pageParams);
@@ -232,6 +232,8 @@ public class SaleOrderController {
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
+        pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
+        pageParams.getFilters().put("pu_end", Constant.NO);
 		return searchService.searchPurchaseTodoOrderIds(keyword, pageParams);
 	}
 
@@ -265,11 +267,8 @@ public class SaleOrderController {
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
-		ModelMap map = new ModelMap();
-		// 过滤掉已结案状态的
-		map.put("pu_end", Constant.YES);
-		pageParams.setNotEqualFilters(map);
-		return searchService.searchPurchaseDoneOrderIds(keyword, pageParams);
+        pageParams.getFilters().put("pu_end", Constant.NO);
+        return searchService.searchPurchaseDoneOrderIds(keyword, pageParams);
 	}
 
 	/**
@@ -403,7 +402,8 @@ public class SaleOrderController {
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		List<Object> list = new ArrayList<>();
 		list.add(Constant.YES);
-		list.add((short) 2); // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2
+        // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2
+		list.add((short) 2);
 		ModelMap map = new ModelMap();
 		map.put("pu_end", new MultiValue(list, true));
 		map.put("pu_status", (short) Status.UNAUDIT.value());
@@ -444,9 +444,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderTodo> getTodoSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购单列表（待回复）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
-//		purchaseOrderTodoDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -470,9 +467,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderDone> getDoneSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购单列表（已回复）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
-//		purchaseOrderDoneDao.updateStatusForSaleDone(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -499,8 +493,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getToAgreeSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购单列表（已结案）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.WAITSELLERCOMFIRM.value());
@@ -526,8 +518,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderEnd> getEndSaleOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购单列表（已结案）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -550,9 +540,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderReceived> getReceivedOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
-//		purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -575,9 +562,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderWaiting> getWaitingOrders(PageParams params, String searchFilter) {
 		logger.log("客户采购单", "查看收到的客户采购订单列表（包括采购明细）（待交货）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.sale.name());
-//		purchaseOrderWaitingDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
 		SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
@@ -938,9 +922,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderTodo> getTodoPurcOrders(PageParams params, String searchFilter) {
 		logger.log("采购单", "查看采购订单列表（包括采购明细）（待回复）");
-//		purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
-//				SystemSession.getUser().getEnterprise().getUu(), OrderType.purc.getPhrase());
-//		purchaseOrderTodoDao.updateStatusForPurc(SystemSession.getUser().getEnterprise().getUu());
 		PageInfo pageInfo = new PageInfo(params);
 		pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
 		pageInfo.filter("status", Status.NOT_REPLY.value());
@@ -1053,7 +1034,8 @@ public class SaleOrderController {
 		sortList.add(new Sort("pu_id", false, Type.INT, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
-		pageParams.getFilters().put("pu_status", Status.NOT_REPLY);
+		pageParams.getFilters().put("pu_status", Status.NOT_REPLY.value());
+        pageParams.getFilters().put("pu_end", Constant.NO);
 		return searchService.searchPurchaseTodoOrderIds(keyword, pageParams);
 	}
 
@@ -1075,7 +1057,8 @@ public class SaleOrderController {
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
 		pageParams.getFilters().put("pu_enuu", SystemSession.getUser().getEnterprise().getUu());
 		pageParams.getFilters().put("pu_reply", Constant.YES);
-		return searchService.searchPurchaseDoneOrderIds(keyword, pageParams);
+        pageParams.getFilters().put("pu_end", Constant.NO);
+        return searchService.searchPurchaseDoneOrderIds(keyword, pageParams);
 	}
 
 	/**

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

@@ -14,7 +14,13 @@ import java.util.Set;
  * @author yingp
  * 
  */
-@Table(name = "purc$orders", indexes = { @Index(name = "purc$orders_date", columnList = "pu_date"), @Index(name = "unique_enuu_code", columnList = "pu_enuu,pu_code", unique = true) })
+@Table(name = "purc$orders", indexes = {
+        @Index(name = "purc$orders_date", columnList = "pu_date"),
+        @Index(name = "unique_enuu_code", columnList = "pu_enuu,pu_code", unique = true),
+        @Index(name = "purc$orders_status_IDX", columnList = "pu_status"),
+        @Index(name = "purc$orders_end_IDX", columnList = "pu_end"),
+        @Index(name = "purc$orders_reply_IDX", columnList = "pu_reply"),
+        @Index(name = "purc$orders_venduu_IDX", columnList = "pu_venduu")})
 @Entity
 public class PurchaseOrderAll {
 

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

@@ -16816,6 +16816,15 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
+        // 设置付款企业信息
+        $scope.setPayComName = function() {
+            // 针对信扬客户，如果是RMB赋值默认值
+            if ($scope.deOrder.currency == 'RMB' && $scope.deOrder.deputyuu == 10044118) {
+                $scope.deOrder.paycomname = '深圳信扬国际经贸股份有限公司';
+                $scope.deOrder.paycomaddress= '深圳市前海深港合作区前湾一路1号A栋201室（入驻深圳市前海商务秘书有限公司）';
+            }
+        }
+
         // 查找付款企业
         $scope.dbfindPayCompany = function (deputyuu) {
             var modalInstance = $modal.open({
@@ -17300,6 +17309,15 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
+        // 设置付款企业信息
+        $scope.setPayComName = function() {
+            // 针对信扬客户，如果是RMB赋值默认值
+            if ($scope.deOrder.currency == 'RMB' && $scope.deOrder.deputyuu == 10044118) {
+                $scope.deOrder.paycomname = '深圳信扬国际经贸股份有限公司';
+                $scope.deOrder.paycomaddress= '深圳市前海深港合作区前湾一路1号A栋201室（入驻深圳市前海商务秘书有限公司）';
+            }
+        }
+
         // 查找付款企业
         $scope.dbfindPayCompany = function (deputyuu) {
             var modalInstance = $modal.open({

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

@@ -284,7 +284,8 @@
                             <div class="fr">
                                 <em><b>*</b>交易币别：</em>
                                <span> 
-	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'" ng-disabled="!deOrder.$editing">
+	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'"
+                                            ng-disabled="!deOrder.$editing" ng-change="setPayComName()">
 	                                    <option value="USD">USD</option>
 	                                    <option value="RMB">RMB</option>
 	                                    <option value="HKD">HKD</option>
@@ -495,7 +496,8 @@
                          <li>
                             <div class="fl">
                                 <em><b>*</b>付款公司： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.paycomname" ng-readonly="!deOrder.$editing" ng-click="dbfindPayCompany(deOrder.deputyuu)" ng-required="true"></span>
+                                <span ng-if="deOrder.currency !='RMB'"><input type="text" class="input01" ng-model="deOrder.paycomname" ng-click="dbfindPayCompany(deOrder.deputyuu)" ng-required="true" ng-readonly="!deOrder.$editing" ></span>
+                                <span ng-if="deOrder.currency =='RMB' && deOrder.deputyuu == 10044118"><input type="text" class="input01" ng-model="deOrder.paycomname" readonly></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>付款公司地址：</em>

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

@@ -282,7 +282,7 @@
                             <div class="fr">
                                 <em><b>*</b>交易币别：</em>
                                <span> 
-	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'">
+	                               	<select name="" class="select" ng-model="deOrder.currency" ng-init="deOrder.currency = 'USD'" ng-change="setPayComName()">
 	                                    <option value="USD">USD</option>
 	                                    <option value="RMB">RMB</option>
 	                                    <option value="HKD">HKD</option>
@@ -490,7 +490,8 @@
                          <li>
                             <div class="fl">
                                 <em><b>*</b>付款公司： </em>
-                                <span><input type="text" class="input01" ng-model="deOrder.paycomname" ng-click="dbfindPayCompany(deOrder.deputyuu)"></span>
+                                <span ng-if="deOrder.currency !='RMB'"><input type="text" class="input01" ng-model="deOrder.paycomname" ng-click="dbfindPayCompany(deOrder.deputyuu)"></span>
+                                <span ng-if="deOrder.currency =='RMB' && deOrder.deputyuu == 10044118"><input type="text" class="input01" ng-model="deOrder.paycomname" readonly></span>
                             </div>
                             <div class="fr">
                                 <em><b>*</b>付款公司地址：</em>