|
@@ -25,6 +25,7 @@ import com.alibaba.dubbo.common.utils.CollectionUtils;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
|
|
import com.uas.platform.b2b.dao.PurchaseOrderAllDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
|
|
import com.uas.platform.b2b.dao.PurchaseOrderDoneDao;
|
|
|
|
|
+import com.uas.platform.b2b.dao.PurchaseOrderTodoDao;
|
|
|
import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
|
|
import com.uas.platform.b2b.dao.PurchaseOrderWaitingDao;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
import com.uas.platform.b2b.model.PurchaseOrder;
|
|
|
import com.uas.platform.b2b.model.PurchaseOrderAll;
|
|
import com.uas.platform.b2b.model.PurchaseOrderAll;
|
|
@@ -84,6 +85,9 @@ public class SaleOrderController {
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private PurchaseOrderAllDao purchaseOrderAllDao;
|
|
private PurchaseOrderAllDao purchaseOrderAllDao;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private PurchaseOrderTodoDao purchaseOrderTodoDao;
|
|
|
|
|
+
|
|
|
private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
|
|
private final static UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -417,6 +421,7 @@ public class SaleOrderController {
|
|
|
logger.log("客户采购单", "查看收到的客户采购单列表(待回复)");
|
|
logger.log("客户采购单", "查看收到的客户采购单列表(待回复)");
|
|
|
purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
|
|
purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
|
|
|
SystemSession.getUser().getEnterprise().getUu(), SALEKIND);
|
|
SystemSession.getUser().getEnterprise().getUu(), SALEKIND);
|
|
|
|
|
+ purchaseOrderTodoDao.updateStatusForSale(SystemSession.getUser().getEnterprise().getUu());
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
pageInfo.filter("vendUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
SearchFilter filter = JSONObject.parseObject(searchFilter, SearchFilter.class);
|
|
@@ -776,6 +781,7 @@ public class SaleOrderController {
|
|
|
logger.log("采购单", "查看采购订单列表(包括采购明细)(待回复)");
|
|
logger.log("采购单", "查看采购订单列表(包括采购明细)(待回复)");
|
|
|
purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
|
|
purchaseOrderAllDao.setDisplayStatus(SystemSession.getUser().getUserUU(),
|
|
|
SystemSession.getUser().getEnterprise().getUu(), PURCKIND);
|
|
SystemSession.getUser().getEnterprise().getUu(), PURCKIND);
|
|
|
|
|
+ purchaseOrderTodoDao.updateStatusForPurc(SystemSession.getUser().getEnterprise().getUu());
|
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
PageInfo pageInfo = new PageInfo(params);
|
|
|
pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
pageInfo.filter("enUU", SystemSession.getUser().getEnterprise().getUu());
|
|
|
pageInfo.filter("status", Status.NOT_REPLY.value());
|
|
pageInfo.filter("status", Status.NOT_REPLY.value());
|