销售计划根据id查询详情接口区分场站用户

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java

@@ -104,4 +104,16 @@ public class SalesPlanDao {
 		
 		});
 	}
+
+	public List<KObject> querySalesPlanDetailsByMasterIdWarehouse(UUID salesPlanId, UUID stationId) {
+		return template.execute(session ->{
+			String hql = "from " + SalesPlanConstant.ENTITY_DETAIL + " where master.id =:salesPlanId and station.id =:stationId GROUP BY purchaseSandUnit.id, project.id, contract.id, id ";
+			Query<KObject> query = session.createQuery(hql, KObject.class);
+			query.setParameter("salesPlanId", salesPlanId);
+			query.setParameter("stationId", stationId);
+			List<KObject> resultList = query.getResultList();
+			return resultList;
+		
+		});
+	}
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java

@@ -119,6 +119,14 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 		kObject.set("SalesPlanDetails", details);
 		return kObject;
 	}
+
+	@Override
+	public Object querySalesPlanDetailsByMasterIdWarehouse(UUID salesPlanId, UUID stationId) {
+		KObject kObject = salesPlanDao.load(salesPlanId);
+		List<KObject> details = salesPlanDao.querySalesPlanDetailsByMasterIdWarehouse(salesPlanId, stationId);
+		kObject.set("SalesPlanDetails", details);
+		return kObject;
+	}
 	
 	
 	

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java

@@ -40,5 +40,7 @@ public interface SalesPlanService {
 	public void approveSalesPlanForTemp(UUID id,int approveState,String approveMemo);
 
 	public Object querySalesPlanDetailsByMasterId(UUID fromString);
+
+	public Object querySalesPlanDetailsByMasterIdWarehouse(UUID fromString, UUID fromString2);
 	
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesPlanController.java

@@ -74,8 +74,19 @@ public class SalesPlanController {
 	 */
 	@ResponseBody
     @RequestMapping(value = "/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
-    public Object verifyName(@RequestParam("saleaPlanId") String saleaPlanId) {
+    public Object querySalesPlanDetailsByMasterId(@RequestParam("saleaPlanId") String saleaPlanId) {
 		return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterId(UUID.fromString(saleaPlanId)));
     }
 
+	/**
+	 * 根据销售计划id查询计划明细(分组)场站用户
+	 * @param saleaPlanId
+	 * @return
+	 */
+	@ResponseBody
+    @RequestMapping(value = "/warehouse/api/salesplan/querySalesPlanDetailsByMasterId", method = RequestMethod.GET)
+    public Object querySalesPlanDetailsByMasterIdWarehouse(@RequestParam("saleaPlanId") String saleaPlanId, @RequestParam("stationId") String stationId) {
+		return ResponseObj.success("success", salesPlanService.querySalesPlanDetailsByMasterIdWarehouse(UUID.fromString(saleaPlanId), UUID.fromString(stationId)));
+    }
+
 }