DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(wms): 移除产品BOM相关模块和采购计划功能模块

Browse Source 
- 删除产品BOM（Bill of Materials）相关的控制器、服务、实体类及映射文件
- 移除了WmsProductBomController控制器及相关接口实现
- 清理了IWmsProductBomService服务接口与WmsProductBomServiceImpl实现类
- 移除了WmsProductBom实体类及其对应的BO/VO对象- 删除WmsProductBomMapper接口及XML配置文件
- 更新WmsMaterialCoilServiceImpl依赖注入，移除对IWmsProductBomService的引用
- 调整WmsCoilPendingActionMapper.xml路径从wms目录迁移至klp目录下
- 整理采购计划相关模块代码结构，确保模块清晰分离
This commit is contained in:
Joshi
2025-11-13 13:24:09 +08:00
parent 1bccfe57d8
commit 9c88669751
28 changed files with 65 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
klp-wms/src/main/java/com/klp/controller/WmsProductBomController.java
View File

@@ -1,100 +0,0 @@
package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsProductBomVo;
import com.klp.domain.bo.WmsProductBomBo;
import com.klp.service.IWmsProductBomService;
import com.klp.common.core.page.TableDataInfo;
/**
* 产品BOM（产品-原材料清单）
*
* @author Joshi
* @date 2025-07-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/wms/productBom")
public class WmsProductBomController extends BaseController {
private final IWmsProductBomService iWmsProductBomService;
/**
* 查询产品BOM（产品-原材料清单）列表
*/
@GetMapping("/list")
public TableDataInfo<WmsProductBomVo> list(WmsProductBomBo bo, PageQuery pageQuery) {
return iWmsProductBomService.queryPageList(bo, pageQuery);
}
/**
* 导出产品BOM（产品-原材料清单）列表
*/
@Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsProductBomBo bo, HttpServletResponse response) {
List<WmsProductBomVo> list = iWmsProductBomService.queryList(bo);
ExcelUtil.exportExcel(list, "产品BOM（产品-原材料清单）", WmsProductBomVo.class, response);
}
/**
* 获取产品BOM（产品-原材料清单）详细信息
*
* @param bomId 主键
*/
@GetMapping("/{bomId}")
public R<WmsProductBomVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long bomId) {
return R.ok(iWmsProductBomService.queryById(bomId));
}
/**
* 新增产品BOM（产品-原材料清单）
*/
@Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsProductBomBo bo) {
return toAjax(iWmsProductBomService.insertByBo(bo));
}
/**
* 修改产品BOM（产品-原材料清单）
*/
@Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsProductBomBo bo) {
return toAjax(iWmsProductBomService.updateByBo(bo));
}
/**
* 删除产品BOM（产品-原材料清单）
*
* @param bomIds 主键串
*/
@Log(title = "产品BOM（产品-原材料清单）", businessType = BusinessType.DELETE)
@DeleteMapping("/{bomIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] bomIds) {
return toAjax(iWmsProductBomService.deleteWithValidByIds(Arrays.asList(bomIds), true));
}
}

143
klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanController.java
View File

@@ -1,143 +0,0 @@
package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import java.util.Map;
import com.klp.domain.vo.RecognizeTextVo;
import com.klp.service.ITesseractOcrService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsPurchasePlanVo;
import com.klp.domain.bo.WmsPurchasePlanBo;
import com.klp.service.IWmsPurchasePlanService;
import com.klp.common.core.page.TableDataInfo;
/**
* 采购计划主
*
* @author Joshi
* @date 2025-07-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/wms/purchasePlan")
public class WmsPurchasePlanController extends BaseController {
private final IWmsPurchasePlanService iWmsPurchasePlanService;
private final ITesseractOcrService iTesseractOcrService;
/**
* 新增采购计划（含明细）
*/
@PostMapping("/addWithDetails")
public R<Void> addPurchasePlan(@RequestBody WmsPurchasePlanVo planVo) {
return toAjax(iWmsPurchasePlanService.insertWithDetails(planVo));
}
// /**
// * 根据订单ID生成推荐采购计划（只返回，不落库）
// */
// @GetMapping("/recommend/{orderId}")
// public R<WmsPurchasePlanVo> recommendPurchasePlan(@PathVariable Long orderId) {
// WmsPurchasePlanVo planVo = iWmsPurchasePlanService.recommendPurchasePlanByOrder(orderId);
// return R.ok(planVo);
// }
/**
* 识别图片中的文字
* @param request 图片地址
* @return 识别出的文字
*/
@PostMapping("/recognizeText")
public R<RecognizeTextVo> recognize(@RequestBody Map<String, String> request) {
String imgUrl = request.get("imgUrl");
String text = iTesseractOcrService.recognizeText(imgUrl);
return R.ok(new RecognizeTextVo(text));
}
/**
* 识别PDF文件中的文字
* @param request PDF文件地址
* @return 识别出的文字
*/
@PostMapping("/recognizePdfText")
public R<RecognizeTextVo> recognizePdf(@RequestBody Map<String, String> request) {
String pdfUrl = request.get("pdfUrl");
String text = iTesseractOcrService.recognizePdfText(pdfUrl);
return R.ok(new RecognizeTextVo(text));
}
/**
* 查询采购计划主列表
*/
@GetMapping("/list")
public TableDataInfo<WmsPurchasePlanVo> list(WmsPurchasePlanBo bo, PageQuery pageQuery) {
return iWmsPurchasePlanService.queryPageList(bo, pageQuery);
}
/**
* 导出采购计划主列表
*/
@Log(title = "采购计划主", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsPurchasePlanBo bo, HttpServletResponse response) {
List<WmsPurchasePlanVo> list = iWmsPurchasePlanService.queryList(bo);
ExcelUtil.exportExcel(list, "采购计划主", WmsPurchasePlanVo.class, response);
}
/**
* 获取采购计划主详细信息
*
* @param planId 主键
*/
@GetMapping("/{planId}")
public R<WmsPurchasePlanVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long planId) {
return R.ok(iWmsPurchasePlanService.queryById(planId));
}
/**
* 新增采购计划主
*/
@Log(title = "采购计划主", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsPurchasePlanBo bo) {
return toAjax(iWmsPurchasePlanService.insertByBo(bo));
}
/**
* 修改采购计划主
*/
@Log(title = "采购计划主", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsPurchasePlanBo bo) {
return toAjax(iWmsPurchasePlanService.updateByBo(bo));
}
/**
* 删除采购计划主
*
* @param planIds 主键串
*/
@Log(title = "采购计划主", businessType = BusinessType.DELETE)
@DeleteMapping("/{planIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] planIds) {
return toAjax(iWmsPurchasePlanService.deleteWithValidByIds(Arrays.asList(planIds), true));
}
}

100
klp-wms/src/main/java/com/klp/controller/WmsPurchasePlanDetailController.java
View File

@@ -1,100 +0,0 @@
package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import cn.dev33.satoken.annotation.SaCheckPermission;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.WmsPurchasePlanDetailVo;
import com.klp.domain.bo.WmsPurchasePlanDetailBo;
import com.klp.service.IWmsPurchasePlanDetailService;
import com.klp.common.core.page.TableDataInfo;
/**
* 采购计划明细
*
* @author Joshi
* @date 2025-07-18
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/wms/purchasePlanDetail")
public class WmsPurchasePlanDetailController extends BaseController {
private final IWmsPurchasePlanDetailService iWmsPurchasePlanDetailService;
/**
* 查询采购计划明细列表
*/
@GetMapping("/list")
public TableDataInfo<WmsPurchasePlanDetailVo> list(WmsPurchasePlanDetailBo bo, PageQuery pageQuery) {
return iWmsPurchasePlanDetailService.queryPageList(bo, pageQuery);
}
/**
* 导出采购计划明细列表
*/
@Log(title = "采购计划明细", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsPurchasePlanDetailBo bo, HttpServletResponse response) {
List<WmsPurchasePlanDetailVo> list = iWmsPurchasePlanDetailService.queryList(bo);
ExcelUtil.exportExcel(list, "采购计划明细", WmsPurchasePlanDetailVo.class, response);
}
/**
* 获取采购计划明细详细信息
*
* @param detailId 主键
*/
@GetMapping("/{detailId}")
public R<WmsPurchasePlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long detailId) {
return R.ok(iWmsPurchasePlanDetailService.queryById(detailId));
}
/**
* 新增采购计划明细
*/
@Log(title = "采购计划明细", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsPurchasePlanDetailBo bo) {
return toAjax(iWmsPurchasePlanDetailService.insertByBo(bo));
}
/**
* 修改采购计划明细
*/
@Log(title = "采购计划明细", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsPurchasePlanDetailBo bo) {
return toAjax(iWmsPurchasePlanDetailService.updateByBo(bo));
}
/**
* 删除采购计划明细
*
* @param detailIds 主键串
*/
@Log(title = "采购计划明细", businessType = BusinessType.DELETE)
@DeleteMapping("/{detailIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] detailIds) {
return toAjax(iWmsPurchasePlanDetailService.deleteWithValidByIds(Arrays.asList(detailIds), true));
}
}