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

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

@@ -420,8 +420,6 @@ public class SaleOrderController {
 	@ResponseBody
 	public SPage<PurchaseOrderAll> getSaleOrders(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);

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

@@ -94,14 +94,14 @@ public class ErpProdIODetailServiceImpl implements ErpProdIODetailService {
 			String s = "";
 			for (int i = 0; i < filter.size(); i++) {
 				if (i != filter.size() - 1) {
-					str[i] = "?,";
+					str[i] = filter.get(i).toString() + ",";
 				} else {
-					str[i] = "?";
+					str[i] = filter.get(i).toString();
 				}
 				lon[i + 1] = filter.get(i);
 				s = s + str[i];
 			}
-            con.append(AND).append(ApcheckField._enuu).append(" in (").append(s).append(")");
+            con.append(AND).append(ApcheckField._enuu).append(" in (").append(s).append(") ");
 			lon[0] = enUu;
 		}
         StoredProcedureQuery storedProcedureQuery = this.entityManager.createNamedStoredProcedureQuery("findAllApChecks");

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

@@ -331,7 +331,7 @@ public class PurchaseApCheckServiceImpl implements PurchaseApCheckService {
 			SearchFilter searchFilter) {
 		if (searchFilter != null) {
 			if (!CollectionUtils.isEmpty(searchFilter.getDistribute())) {
-				pageInfo.expression(PredicateUtils.in("vendUU", searchFilter.getDistribute(), false));
+				pageInfo.expression(PredicateUtils.in("custUu", searchFilter.getDistribute(), false));
 			}
 			if (searchFilter.getFromDate() != null) {
                 pageInfo.expression(PredicateUtils.gte("recordDate", new Date(searchFilter.getFromDate()), false));

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

@@ -3123,7 +3123,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             page: 1,
             count: 20,
             sorting: {
-                display: 'desc',
                 date: 'desc',
                 id: 'desc'
             }