From 1b30538f3573bbc7ac5db3340f41b279e9e29e36 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 28 二月 2024 18:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
new file mode 100644
index 0000000..1e9a012
--- /dev/null
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ProductionSchedulingController.java
@@ -0,0 +1,55 @@
+package com.example.erp.controller.pp;
+
+import com.example.erp.common.Constants;
+import com.example.erp.common.Result;
+import com.example.erp.entity.pp.ProductionScheduling;
+import com.example.erp.exception.ServiceException;
+import com.example.erp.service.pp.ProductionSchedulingService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.sql.Date;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/productionScheduling")
+public class ProductionSchedulingController {
+ @Autowired
+ ProductionSchedulingService productionSchedulingService;
+
+ //鏌ヨ绗竴娆℃帓鐗堟暟鎹�
+ @PostMapping ("/selectLastScheduling/{selectTime1}/{selectTime2}")
+ public Result selectLastScheduling(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @RequestBody ProductionScheduling productionScheduling){
+ return Result.seccess(productionSchedulingService.selectLastScheduling(selectTime1,selectTime2,productionScheduling));
+
+ }
+ //鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
+ @PostMapping ("/selectScheduling/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ public Result SelectScheduling(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String processes,
+ @PathVariable Integer state,
+ @RequestBody ProductionScheduling productionScheduling){
+ return Result.seccess(productionSchedulingService.SelectSchedulingSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
+
+ }
+
+ //鐐瑰嚮鏌ヨ鎺掔増鏁版嵁
+ @PostMapping ("/selectSchedulingNot/{selectTime1}/{selectTime2}/{orderId}/{processes}/{state}")
+ public Result SelectSchedulingNot(
+ @PathVariable String selectTime1,
+ @PathVariable String selectTime2,
+ @PathVariable String orderId,
+ @PathVariable String processes,
+ @PathVariable Integer state,
+ @RequestBody ProductionScheduling productionScheduling){
+ return Result.seccess(productionSchedulingService.SelectSchedulingNotSv(selectTime1,selectTime2,orderId,processes,state,productionScheduling));
+
+ }
+
+}
--
Gitblit v1.8.0