From e4fe69941b2dd4582ec0bd82c32b8dfbc30d85b5 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 22 二月 2024 08:06:43 +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/WorkOrderController.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
index 543c156..33e4c4e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/WorkOrderController.java
@@ -1,12 +1,16 @@
package com.example.erp.controller.pp;
+import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.WorkOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
+import java.util.Map;
@RestController
@RequestMapping("/workOrder")
@@ -14,6 +18,7 @@
@Autowired
WorkOrderService workOrderService;
+ //鏌ヨ宸ュ崟
@PostMapping ("/orderGlassDetail/{selectTime1}/{selectTime2}/{state}")
public Result DateWork(
@PathVariable Date selectTime1,
@@ -22,4 +27,40 @@
@RequestBody OrderGlassDetail orderGlassDetail){
return Result.seccess(workOrderService.defaultDateWork(selectTime1,selectTime2,state,orderGlassDetail));
}
+
+ //杞敓浜ц鍗曟煡璇�
+ @PostMapping ("/addWork/{orderId}")
+
+ public Result AddWork(
+ @PathVariable String orderId,
+ @RequestBody OrderDetail orderDetail){
+ return Result.seccess(workOrderService.AddDateWork(orderId,orderDetail));
+
+ }
+
+
+
+ @PostMapping("/addOrderWork")
+ public Result AddOrderWork( @RequestBody Map<String,Object> object){
+ System.out.println("obj:"+object);
+ if(workOrderService.AddOrderWorkSv(object)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
+
+ }
+ }
+
+ @PostMapping("/deleteOrderWork/{orderId}/{productName}")
+ public Result deleteOrderWork(
+ @PathVariable String orderId,
+ @PathVariable String productName
+ ){
+ if(workOrderService.DeleteOrderWorkSv(orderId,productName)){
+ return Result.seccess();
+ }else {
+ throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触");
+
+ }
+ }
}
--
Gitblit v1.8.0