销售计划查询明细接口区分场站

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

@@ -180,7 +180,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 			salesPlanDetail.setPurchaseSandUnit(purchaseSandUnit.getUuid(BaseConstants.ID));
 			salesPlanDetail.setContractName(contract.getString(ContractConstant.CONTRACT_NAME));
 			salesPlanDetail.setProjectName(project.getString(ProjectFiledConstant.PROJECT_NAME));
-			salesPlanDetail.setProjectTypeName(project.get(ProjectFiledConstant.PROJECT_TYPE).getString("name"));
+			salesPlanDetail.setProjectTypeName(project.get(ProjectFiledConstant.PROJECT_TYPE).getString("title"));
 			salesPlanDetail.setDinasTypeName(dinasType.getString(DinasTypeConstant.DINASTYPE_NAME));
 			salesPlanDetail.setPurchaseSandUnitName(purchaseSandUnit.getString(PurchaseSandCompanyConstant.NAME));
 			

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

@@ -119,11 +119,16 @@ public class SalesPlanController {
 	 * @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)));
-    }
+	@PostMapping("/warehouse/api/salesplan/querySalesPlanDetails")
+	public Object querySalesPlanDetailsByWareHouse(@RequestBody SaleaPlanDetailQuery saleaPlanDetailQuery) {
+		Object object = salesPlanService.querySalesPlanDetails(saleaPlanDetailQuery);
+		return ResponseObj.success("success", object);
+	}
+//	@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)));
+//    }
 	
 	public static void main(String[] args) {
 		System.out.println(UUID.randomUUID().toString());