From 18eb8ad4c66fd8515706e2a910ad50ac8f06ba22 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 05 六月 2025 16:58:07 +0800
Subject: [PATCH] 工具管理-增加刃磨出库
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
index a23ff9c..9d82e25 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/OutboundOrderController.java
@@ -1,5 +1,9 @@
package org.jeecg.modules.tms.controller;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,8 +11,13 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.TranslateDictTextUtils;
+import org.jeecg.modules.tms.entity.dto.OutBoundAddDto;
+import org.jeecg.modules.tms.entity.dto.OutBoundOrderFlowDto;
+import org.jeecg.modules.tms.entity.dto.OutBoundRequestDto;
import org.jeecg.modules.tms.entity.dto.OutboundOrderAndDetailDto;
import org.jeecg.modules.tms.entity.vo.OutboundDetailVo;
+import org.jeecg.modules.tms.entity.vo.SelectOutboundToolVo;
import org.jeecg.modules.tms.enums.OutBillStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -56,6 +65,13 @@
@Autowired
private IOutboundDetailService outboundDetailService;
+ @Autowired
+ private ObjectMapper objectMapper;
+
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
+
+
/*---------------------------------涓昏〃澶勭悊-begin-------------------------------------*/
@@ -79,6 +95,50 @@
Page<OutboundOrder> page = new Page<OutboundOrder>(pageNo, pageSize);
IPage<OutboundOrder> pageList = outboundOrderService.queryPageList(page, parameterMap);
return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鍑哄簱鐢宠-鏌ヨ鍊熺敤鍑哄簱宸ュ叿鍒楄〃", notes="鍑哄簱鐢宠-鏌ヨ鍊熺敤鍑哄簱宸ュ叿鍒楄〃")
+ @GetMapping(value = "/selectBorrowOutboundToolPageList")
+ public Result<IPage<SelectOutboundToolVo>> queryBorrowOutboundToolPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ Page<SelectOutboundToolVo> page = new Page<>(pageNo, pageSize);
+ IPage<SelectOutboundToolVo> pageList = outboundOrderService.queryBorrowOutboundToolPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="鍑哄簱鐢宠-鏌ヨ鍒冪（鍑哄簱宸ュ叿鍒楄〃", notes="鍑哄簱鐢宠-鏌ヨ鍒冪（鍑哄簱宸ュ叿鍒楄〃")
+ @GetMapping(value = "/selectSharpenOutboundToolPageList")
+ public Result<IPage<SelectOutboundToolVo>> querySharpenOutboundToolPageList(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ Page<SelectOutboundToolVo> page = new Page<>(pageNo, pageSize);
+ IPage<SelectOutboundToolVo> pageList = outboundOrderService.querySharpenOutboundToolPageList(page, parameterMap);
+ return Result.OK(pageList);
+ }
+
+ @ApiOperation(value="tms_outbound_order-閫氳繃id鏌ヨ", notes="tms_outbound_order-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam("id") String id) {
+ OutboundOrder outboundOrder = outboundOrderService.getById(id);
+ if (outboundOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ try {
+ String jsonStr = objectMapper.writeValueAsString(outboundOrder);
+ JSONObject item = JSONObject.parseObject(jsonStr, Feature.OrderedField);
+ translateDictTextUtils.translateField("outStorehouseType", outboundOrder.getOutStorehouseType(), item, "out_storehouse_type");
+ translateDictTextUtils.translateField("handler", outboundOrder.getHandler(), item, "sys_user,realname,id");
+ translateDictTextUtils.translateField("orderStatus", outboundOrder.getOrderStatus(), item, "out_bill_status");
+ translateDictTextUtils.translateField("outStatus", outboundOrder.getOutStatus(), item, "out_storehouse_status");
+ translateDictTextUtils.translateField("createBy", outboundOrder.getCreateBy(), item, "sys_user,realname,username");
+ translateDictTextUtils.translateField("updateBy", outboundOrder.getUpdateBy(), item, "sys_user,realname,username");
+ return Result.OK(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
/**
@@ -130,14 +190,34 @@
@ApiOperation(value="tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�", notes="tms_outbound_order-鎻愪氦鍑哄簱鐢宠鍗�")
@GetMapping(value = "/submit")
public Result<String> submit(@RequestParam(name="id") String id) {
- OutboundOrder order = new OutboundOrder();
- order.setId(id);
- order.setOrderStatus(OutBillStatus.SUBMITTED.getValue());
- outboundOrderService.updateById(order);
- //寮�鍚祦绋�
+ outboundOrderService.submit(id);
return Result.OK("鎻愪氦鎴愬姛!");
}
+ @AutoLog(value = "瀹℃壒娴佺▼")
+ @ApiOperation(value = "鍑哄簱鐢宠鍗�-瀹℃壒娴佺▼", notes = "鍑哄簱鐢宠鍗�-瀹℃壒娴佺▼")
+ @PostMapping("/approval")
+ public Result<?> approval(@RequestBody OutBoundOrderFlowDto outBoundOrderFlowDto) {
+ outboundOrderService.approvalProcess(outBoundOrderFlowDto);
+ return Result.OK("鎿嶄綔鎴愬姛");
+ }
+
+ @AutoLog(value = "鐢宠鍗曟柟寮忓嚭搴�")
+ @ApiOperation(value = "鐢宠鍗曟柟寮忓嚭搴�", notes = "鐢宠鍗曟柟寮忓嚭搴�")
+ @PostMapping(value = "/outBoundByApply")
+ public Result<?> outBoundByApply(@RequestBody List<OutBoundRequestDto> outBoundRequestList) {
+ outboundOrderService.outBoundByApply(outBoundRequestList);
+ return Result.OK("鍑哄簱鎴愬姛");
+ }
+
+ @AutoLog(value = "鏂板鏂瑰紡鍑哄簱")
+ @ApiOperation(value = "鏂板鏂瑰紡鍑哄簱", notes = "鏂板鏂瑰紡鍑哄簱")
+ @PostMapping(value = "/outBoundByAdd")
+ public Result<?> outBoundByAdd(@RequestBody List<OutBoundAddDto> boundAddList) {
+ outboundOrderService.outBoundByAdd(boundAddList);
+ return Result.OK("鍑哄簱鎴愬姛");
+ }
+
/**
* 閫氳繃id鍒犻櫎
* @param id
--
Gitblit v1.9.3