From bf30552ba8237818b2d71b8dadfd0f1538457131 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 四月 2025 14:54:56 +0800
Subject: [PATCH] 点检工单

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java |   92 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 83 insertions(+), 9 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
index 8c1431c..428905e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -10,8 +10,13 @@
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
 import org.jeecg.modules.eam.entity.EamInspectionOrder;
+import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
 import org.jeecg.modules.eam.service.IEamInspectionOrderService;
+import org.jeecg.modules.eam.service.IEamMaintenanceStandardService;
+import org.jeecg.modules.system.service.ISysBusinessCodeRuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -31,9 +36,12 @@
 @RequestMapping("/eam/eamInspectionOrder")
 @Slf4j
 public class EamInspectionOrderController extends JeecgController<EamInspectionOrder, IEamInspectionOrderService> {
-	@Autowired
-	private IEamInspectionOrderService eamInspectionOrderService;
-
+	 @Autowired
+	 private IEamInspectionOrderService eamInspectionOrderService;
+	 @Autowired
+	 private ISysBusinessCodeRuleService businessCodeRuleService;
+	 @Autowired
+	 private IEamMaintenanceStandardService eamMaintenanceStandardService;
 	/**
 	 * 鍒嗛〉鍒楄〃鏌ヨ
 	 *
@@ -56,36 +64,102 @@
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅
+	  * @param id
+	  * @return
+	  */
+	 @ApiOperation(value = "鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅", notes = "鏌ヨ鐐规宸ュ崟鍩烘湰淇℃伅")
+	 @GetMapping(value = "/selectVoById")
+	 public Result<?> selectVoById(@RequestParam(name="id") String id){
+		 return eamInspectionOrderService.selectVoById(id);
+	 }
+
+
 	/**
 	 *   娣诲姞
 	 *
-	 * @param eamInspectionOrder
+	 * @param eamInspectionOrderRequest
 	 * @return
 	 */
 	@AutoLog(value = "鐐规宸ュ崟-娣诲姞")
 	@ApiOperation(value="鐐规宸ュ崟-娣诲姞", notes="鐐规宸ュ崟-娣诲姞")
 	//@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody EamInspectionOrder eamInspectionOrder) {
-		eamInspectionOrderService.save(eamInspectionOrder);
+	public Result<String> add(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
+		String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE);
+		eamInspectionOrderRequest.setOrderNum(codeSeq);
+		eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.AUTO));
+		eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest);
 		return Result.OK("娣诲姞鎴愬姛锛�");
 	}
 
 	/**
 	 *  缂栬緫
 	 *
-	 * @param eamInspectionOrder
+	 * @param eamInspectionOrderRequest
 	 * @return
 	 */
 	@AutoLog(value = "鐐规宸ュ崟-缂栬緫")
 	@ApiOperation(value="鐐规宸ュ崟-缂栬緫", notes="鐐规宸ュ崟-缂栬緫")
 	//@RequiresPermissions("org.jeecg.modules:鐐规宸ュ崟:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody EamInspectionOrder eamInspectionOrder) {
-		eamInspectionOrderService.updateById(eamInspectionOrder);
+	public Result<String> edit(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
+		eamInspectionOrderService.editInspectionOrder(eamInspectionOrderRequest);
 		return Result.OK("缂栬緫鎴愬姛!");
 	}
 
+	 /**
+	  * 棰嗗彇鐐规宸ュ崟
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟")
+	 @ApiOperation(value="鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟", notes="鐐规宸ュ崟-棰嗗彇鐐规宸ュ崟")
+	 @GetMapping(value = "/receiveInspectionOrder")
+	 public Result<String> receiveInspectionOrder(@RequestParam(name="id") String id) {
+		 eamInspectionOrderService.takeInspectionOrder(id);
+		 return Result.OK("棰嗗彇鎴愬姛");
+	 }
+
+	 /**
+	  * 浣滃簾鐐规宸ュ崟
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "鐐规宸ュ崟-浣滃簾鐐规宸ュ崟")
+	 @ApiOperation(value="鐐规宸ュ崟-浣滃簾鐐规宸ュ崟", notes="鐐规宸ュ崟-浣滃簾鐐规宸ュ崟")
+	 @GetMapping(value = "/cancelInspectionOrder")
+	 public Result<String> cancelInspectionOrder(@RequestParam(name="id") String id) {
+		 eamInspectionOrderService.cancelInspectionOrder(id);
+		 return Result.OK("浣滃簾鎴愬姛");
+	 }
+
+	 /**
+	  * 鎵归噺浣滃簾涓庨鍙�
+	  * @param ids
+	  * @param type
+	  * @return
+	  */
+	 @AutoLog(value = "鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�")
+	 @ApiOperation(value="鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�", notes="鐐规宸ュ崟-鎵归噺浣滃簾涓庨鍙�")
+	 @GetMapping(value = "/cancelOrReceive")
+	 public Result<?> cancelOrReceive(@RequestParam(name="ids") String ids, @RequestParam(name="type") String type) {
+		 return eamInspectionOrderService.batchCancelOrTakeInspectionOrder(ids, type);
+	 }
+
+	 /**
+	  * 鐐规娴佺▼
+	  * @param eamInspectionOrderRequest
+	  * @return
+	  */
+	 @AutoLog(value = "鐐规娴佺▼")
+	 @ApiOperation(value="鐐规宸ュ崟-鐐规娴佺▼", notes="鐐规宸ュ崟-鐐规娴佺▼")
+	 @PostMapping("/approval")
+	 public Result<?> approval(@RequestBody EamInspectionOrderRequest eamInspectionOrderRequest) {
+		 return eamInspectionOrderService.inspectionProcess(eamInspectionOrderRequest);
+	 }
+
 	/**
 	 *   閫氳繃id鍒犻櫎
 	 *

--
Gitblit v1.9.3