From eeebc22772cbf7dc03ed4bc6f734e6de9f5c3e75 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 06 八月 2025 10:55:56 +0800
Subject: [PATCH] art: 订单BOM、物料工序 后端代码修改、优化
---
src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java | 189 +++++++----------------------------------------
1 files changed, 29 insertions(+), 160 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java b/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
index 2d51ada..b66c2e4 100644
--- a/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
+++ b/src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java
@@ -1,181 +1,50 @@
package org.jeecg.modules.pms.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
-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.pms.entity.PmsMaterialProcess;
-import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.service.IPmsMaterialProcessService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.Map;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
/**
-* @Description: 鐗╂枡宸ュ簭
-* @Author: jeecg-boot
-* @Date: 2025-07-01
-* @Version: V1.0
-*/
-@Api(tags="鐗╂枡宸ュ簭")
+ * @Description: 鐗╂枡宸ュ簭
+ * @Author: jeecg-boot
+ * @Date: 2025-07-01
+ * @Version: V1.0
+ */
+@Api(tags = "鐗╂枡宸ュ簭")
@RestController
-@RequestMapping("/pms/pmsMaterialProcess")
+@RequestMapping("/pms/materialProcess")
@Slf4j
public class PmsMaterialProcessController extends JeecgController<PmsMaterialProcess, IPmsMaterialProcessService> {
- @Autowired
- private IPmsMaterialProcessService pmsMaterialProcessService;
+ @Autowired
+ private IPmsMaterialProcessService pmsMaterialProcessService;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param pmsMaterialProcess
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鐗╂枡宸ュ簭-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鐗╂枡宸ュ簭-鍒嗛〉鍒楄〃鏌ヨ", notes="鐗╂枡宸ュ簭-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<PmsMaterialProcess>> queryPageList(PmsMaterialProcess pmsMaterialProcess,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<PmsMaterialProcess> queryWrapper = QueryGenerator.initQueryWrapper(pmsMaterialProcess, req.getParameterMap());
- Page<PmsMaterialProcess> page = new Page<PmsMaterialProcess>(pageNo, pageSize);
- IPage<PmsMaterialProcess> pageList = pmsMaterialProcessService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param pmsMaterialProcess
- * @return
- */
- @AutoLog(value = "鐗╂枡宸ュ簭-娣诲姞")
- @ApiOperation(value="鐗╂枡宸ュ簭-娣诲姞", notes="鐗╂枡宸ュ簭-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:pms_material_process:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody PmsMaterialProcess pmsMaterialProcess) {
- pmsMaterialProcessService.save(pmsMaterialProcess);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param pmsMaterialProcess
- * @return
- */
- /**
- * 缂栬緫
- * 鏍规嵁ID鏇存柊鐗╂枡宸ュ簭淇℃伅
- *
- * @param pmsMaterialProcess 鐗╂枡宸ュ簭瀹炰綋瀵硅薄锛堝寘鍚渶瑕佹洿鏂扮殑ID鍜屼慨鏀瑰悗鐨勫瓧娈靛�硷級
- * - 蹇呴』鍖呭惈鏈夋晥鐨勭墿鏂欏伐搴廔D
- * - 浠呮洿鏂板疄浣撲腑闈炵┖鐨勫瓧娈�
- * @return 杩斿洖缁熶竴鏍煎紡鐨勫搷搴旂粨鏋滐紝鍖呭惈鎿嶄綔鐘舵�佸拰鎻愮ず淇℃伅
- * @apiNote 璇ユ搷浣滈渶瑕佸疄浣撲腑鍖呭惈鏈夋晥ID锛屾墽琛屽熀浜庝富閿殑瀛楁绾ф洿鏂�
- */
- @AutoLog(value = "鐗╂枡宸ュ簭-缂栬緫")
- @ApiOperation(value="鐗╂枡宸ュ簭-缂栬緫", notes="鐗╂枡宸ュ簭-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:pms_material_process:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody PmsMaterialProcess pmsMaterialProcess) {
- pmsMaterialProcessService.updateById(pmsMaterialProcess);
- return Result.OK("缂栬緫鎴愬姛!");
- }
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鐗╂枡宸ュ簭-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鐗╂枡宸ュ簭-閫氳繃id鍒犻櫎", notes="鐗╂枡宸ュ簭-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:pms_material_process:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- pmsMaterialProcessService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鐗╂枡宸ュ簭-鎵归噺鍒犻櫎")
- @ApiOperation(value="鐗╂枡宸ュ簭-鎵归噺鍒犻櫎", notes="鐗╂枡宸ュ簭-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:pms_material_process:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.pmsMaterialProcessService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "鐗╂枡宸ュ簭-閫氳繃id鏌ヨ")
- @ApiOperation(value="鐗╂枡宸ュ簭-閫氳繃id鏌ヨ", notes="鐗╂枡宸ュ簭-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<PmsMaterialProcess> queryById(@RequestParam(name="id",required=true) String id) {
- PmsMaterialProcess pmsMaterialProcess = pmsMaterialProcessService.getById(id);
- if(pmsMaterialProcess==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(pmsMaterialProcess);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param pmsMaterialProcess
- */
- //@RequiresPermissions("org.jeecg.modules:pms_material_process:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, PmsMaterialProcess pmsMaterialProcess) {
- return super.exportXls(request, pmsMaterialProcess, PmsMaterialProcess.class, "鐗╂枡宸ュ簭");
- }
-
- /**1路3
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("pms_material_process:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, PmsMaterialProcess.class);
- }
- @GetMapping(value = "/searchlikeQuery")
- public Result<?> searchlikeQuery(PmsMaterialProcess pmsMaterialProcess,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req){
- IPage<Map<String, Object>> pageList = pmsMaterialProcessService.getpmsMaterialProcessListData(pageNo,pageSize,req);
-
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ //@AutoLog(value = "鐗╂枡宸ュ簭-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鐗╂枡宸ュ簭-鍒嗛〉鍒楄〃鏌ヨ", notes = "鐗╂枡宸ュ簭-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<PmsMaterialProcess>> queryPageList(PmsMaterialProcess query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ Page<PmsMaterialProcess> page = new Page<PmsMaterialProcess>(pageNo, pageSize);
+ IPage<PmsMaterialProcess> pageList = pmsMaterialProcessService.queryPageList(page, query);
return Result.OK(pageList);
}
-
}
--
Gitblit v1.9.3