WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/master' into master_lz

Browse Source 
# Conflicts:
#	wms-module-system/src/main/java/top/wms/admin/material/service/MaterialInfoService.java
#	wms-module-system/src/main/java/top/wms/admin/material/service/impl/MaterialInfoServiceImpl.java
This commit is contained in:
liuzhu
2026-03-05 14:27:48 +08:00
parent d95f527938 381c1638e3
commit 656267e6b7
13 changed files with 267 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wms-webapi/src/main/java/top/wms/admin/controller/meterial/MaterialInfoController.java
View File

@@ -44,10 +44,9 @@ import java.io.IOException;
Api.EXPORT})
public class MaterialInfoController extends BaseController<MaterialInfoService, MaterialInfoResp, MaterialInfoResp, MaterialInfoQuery, MaterialInfoReq> {
@GetMapping("/code/{code}")
public MaterialInfoDO getMaterialInfoByCode(@PathVariable String code) {
return baseService.getMaterialInfoByCode(code);
public MaterialInfoDO getMaterialInfoByCode(@PathVariable String code) {
return baseService.getMaterialInfoByCode(code);
}
@Operation(summary = "下载导入模板", description = "下载导入模板")

14
wms-webapi/src/main/java/top/wms/admin/controller/weighManage/WorkOrderController.java
View File

@@ -1,5 +1,6 @@
package top.wms.admin.controller.weighManage;
import cn.dev33.satoken.annotation.SaCheckPermission;
import top.continew.starter.extension.crud.enums.Api;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -8,12 +9,16 @@ import org.springframework.web.bind.annotation.*;
import lombok.RequiredArgsConstructor;
import top.continew.starter.extension.crud.annotation.CrudRequestMapping;
import top.continew.starter.log.annotation.Log;
import top.wms.admin.common.controller.BaseController;
import top.wms.admin.weighManage.model.query.WorkOrderQuery;
import top.wms.admin.weighManage.model.req.WorkOrderReq;
import top.wms.admin.weighManage.model.resp.WorkOrderInfoResp;
import top.wms.admin.weighManage.model.resp.WorkOrderResp;
import top.wms.admin.weighManage.service.WorkOrderService;
import java.util.List;
/**
* 任务工单信息管理 API
*
@@ -23,7 +28,14 @@ import top.wms.admin.weighManage.service.WorkOrderService;
@Tag(name = "任务工单信息管理 API")
@RestController
@RequiredArgsConstructor
@CrudRequestMapping(value = "/weighManage/workOrder", api = {Api.PAGE, Api.DETAIL, Api.ADD, Api.DELETE, Api.EXPORT})
@CrudRequestMapping(value = "/weighManage/workOrder", api = {Api.PAGE, Api.ADD, Api.DELETE, Api.EXPORT})
public class WorkOrderController extends BaseController<WorkOrderService, WorkOrderResp, WorkOrderResp, WorkOrderQuery, WorkOrderReq> {
@Log(ignore = true)
@SaCheckPermission("workOrder:record:detail")
@GetMapping(value = "/{id}")
public List<WorkOrderInfoResp> getDetail(@PathVariable("id") Long id) {
return baseService.getDetail(id);
}
}