From 35d9446131124e12616c7b6b9dfd79e23d20e1c9 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期五, 06 六月 2025 17:23:11 +0800
Subject: [PATCH] 工具台账功能
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsLossBoundController.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsLossBoundController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsLossBoundController.java
index 68f23ea..8641d9c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsLossBoundController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/ToolsLossBoundController.java
@@ -13,10 +13,9 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.tms.entity.OutboundDetail;
-import org.jeecg.modules.tms.entity.OutboundOrder;
-import org.jeecg.modules.tms.entity.ToolsLossBound;
-import org.jeecg.modules.tms.entity.ToolsLossBoundDetail;
+import org.jeecg.modules.tms.entity.*;
+import org.jeecg.modules.tms.entity.dto.LossBoundFlowDto;
+import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.jeecg.modules.tms.service.IToolsLossBoundDetailService;
@@ -157,13 +156,22 @@
return Result.OK("鎻愪氦鎴愬姛");
}
+
+
+ @AutoLog(value = "瀹℃壒娴佺▼")
+ @ApiOperation(value = "鎶ユ崯鍗�-瀹℃壒娴佺▼", notes = "鎶ユ崯鍗�-瀹℃壒娴佺▼")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody LossBoundFlowDto lossBoundFlowDto) {
+ toolsLossBoundService.approvalProcess(lossBoundFlowDto);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
/**
* 鎵归噺鍒犻櫎
* @param ids
* @return
*/
- @AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎", notes="鍑哄簱鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎")
+ @AutoLog(value = "鎶ユ崯鍗曟槑缁�-鎵归噺鍒犻櫎")
+ @ApiOperation(value="鎶ユ崯鍗曟槑缁�-鎵归噺鍒犻櫎", notes="鎶ユ崯鍗曟槑缁�-鎵归噺鍒犻櫎")
@DeleteMapping(value = "/deleteBatchLossboundDetail")
public Result<String> deleteBatchLossboundDetail(@RequestParam(name="ids",required=true) String ids) {
this.toolsLossBoundDetailService.removeByIds(Arrays.asList(ids.split(",")));
@@ -295,13 +303,13 @@
}
- /*--------------------------------瀛愯〃澶勭悊-鍑哄簱鐢宠鍗曟槑缁�-begin----------------------------------------------*/
+
/**
* 閫氳繃涓昏〃ID鏌ヨ
* @return
*/
- //@AutoLog(value = "鍑哄簱鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
- @ApiOperation(value="鍑烘姤鎹熺敵璇峰崟鏄庣粏-閫氳繃涓昏〃ID鏌ヨ", notes="鍑烘姤鎹熺敵璇峰崟鏄庣粏-閫氳繃涓昏〃ID鏌ヨ")
+
+ @ApiOperation(value="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ", notes="鎶ユ崯鐢宠鍗曟槑缁�-閫氳繃涓昏〃ID鏌ヨ")
@GetMapping(value = "/listlossboundDetailByMainId")
public Result<IPage<ToolsLossBoundDetail>> listlossboundDetailByMainId(ToolsLossBoundDetail toolsLossBoundDetail,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@@ -313,4 +321,23 @@
IPage<ToolsLossBoundDetail> pageList = toolsLossBoundDetailService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
+
+ /**
+ * 宸ュ叿鍙拌处-鎶ユ崯瀛愰〉闈㈠垪琛ㄦ煡璇�
+ *
+ * @param toolsLossBoundDetail
+ * @param pageNo
+ * @param pageSize
+ * @param query
+ * @return
+ */
+ @ApiOperation(value="宸ュ叿鍙拌处-鎶ユ崯瀛愰〉闈㈠垪琛ㄦ煡璇�", notes="宸ュ叿鍙拌处-鎶ユ崯瀛愰〉闈㈠垪琛ㄦ煡璇�")
+ @GetMapping(value = "/toolLossDetailList")
+ public Result<?> toolLossDetailList(ToolsLossBoundDetail toolsLossBoundDetail,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ @RequestParam Map<String, String> query) {
+ IPage<Map<String, Object>> pageList = toolsLossBoundDetailService.toolLossDetailList(pageNo,pageSize, query);
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3