From 068b53bcfd44dcab4f6688f6c32707208d525f12 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 22 十一月 2024 23:38:31 +0800
Subject: [PATCH] 装箱单打印功能
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
index 6581d97..d926a49 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/GlassOptimizeController.java
@@ -1,18 +1,17 @@
package com.example.erp.controller.pp;
import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.example.erp.common.Constants;
import com.example.erp.common.Result;
-import com.example.erp.entity.sd.OrderDetail;
-import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.pp.OptimizeProjectMange;
+import com.example.erp.exception.ServiceException;
import com.example.erp.service.pp.GlassOptimizeService;
-import com.example.erp.service.pp.WorkOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.sql.Date;
-import java.util.Map;
@RestController
@Api(value="浼樺寲绠＄悊controller",tags={"浼樺寲绠＄悊鎿嶄綔鎺ュ彛"})
@@ -30,4 +29,36 @@
return Result.seccess(glassOptimizeService.getFlowCardList(optionVal,radio));
}
+ //宸ョ▼鏌ヨ娴佺▼鍗�
+ @ApiOperation("宸ョ▼鏌ヨ娴佺▼鍗�")
+ @PostMapping ("/getProjectList")
+ public Result getProjectList(){
+ return Result.seccess(glassOptimizeService.getProjectListSv());
+ }
+
+ //宸ョ▼绠＄悊鏌ヨ
+ @ApiOperation("宸ョ▼绠＄悊鏌ヨ鎺ュ彛")
+ @PostMapping("/optimizeProjectMange/{startSelectTime}/{endSelectTime}")
+ public Result optimizeProjectMange(
+ @PathVariable Date startSelectTime,
+ @PathVariable Date endSelectTime,
+ @RequestBody OptimizeProjectMange optimizeProjectMange) {
+ return Result.seccess(glassOptimizeService.OptimizeProjectMange(startSelectTime,endSelectTime,optimizeProjectMange));
+ }
+
+ //淇敼宸ョ▼鐘舵��
+ @ApiOperation("淇敼宸ョ▼鐘舵�佹帴鍙�")
+ @PostMapping("/updateProjectState/{projectNumber}/{state}")
+ public Result updateProjectState(
+ @PathVariable String projectNumber,
+ @PathVariable Integer state
+ ) {
+ if (glassOptimizeService.updateProjectState(projectNumber, state)) {
+ return Result.seccess();
+ } else {
+ throw new ServiceException(Constants.Code_500, "淇敼澶辫触");
+
+ }
+ }
+
}
--
Gitblit v1.8.0