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/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java | 31 -
src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java | 5
src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java | 179 +-----------
src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java | 49 +-
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java | 51 +-
src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java | 10
src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java | 11
src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java | 195 +++----------
src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java | 5
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml | 14
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java | 12
src/main/java/org/jeecg/modules/pms/controller/PmsMaterialProcessController.java | 189 ++-----------
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java | 14
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml | 13
src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java | 6
15 files changed, 208 insertions(+), 576 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);
}
-
}
diff --git a/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java b/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java
index 1606554..67aa1ca 100644
--- a/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java
+++ b/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsController.java
@@ -1,172 +1,67 @@
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.lsw.entity.LswMaterialInbound;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsService;
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: 璁㈠崟BOM
-* @Author: jeecg-boot
-* @Date: 2025-07-01
-* @Version: V1.0
-*/
-@Api(tags="璁㈠崟BOM")
+ * @Description: 璁㈠崟BOM
+ * @Author: jeecg-boot
+ * @Date: 2025-07-01
+ * @Version: V1.0
+ */
+@Api(tags = "璁㈠崟BOM")
@RestController
-@RequestMapping("/pmsprocessbillmaterials/pmsProcessBillMaterials")
+@RequestMapping("/pms/processBillMaterials")
@Slf4j
public class PmsProcessBillMaterialsController extends JeecgController<PmsProcessBillMaterials, IPmsProcessBillMaterialsService> {
- @Autowired
- private IPmsProcessBillMaterialsService pmsProcessBillMaterialsService;
+ @Autowired
+ private IPmsProcessBillMaterialsService pmsProcessBillMaterialsService;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param pmsProcessBillMaterials
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "璁㈠崟BOM-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="璁㈠崟BOM-鍒嗛〉鍒楄〃鏌ヨ", notes="璁㈠崟BOM-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<PmsProcessBillMaterials>> queryPageList(PmsProcessBillMaterials pmsProcessBillMaterials,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<PmsProcessBillMaterials> queryWrapper = QueryGenerator.initQueryWrapper(pmsProcessBillMaterials, req.getParameterMap());
- Page<PmsProcessBillMaterials> page = new Page<PmsProcessBillMaterials>(pageNo, pageSize);
- IPage<PmsProcessBillMaterials> pageList = pmsProcessBillMaterialsService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param pmsProcessBillMaterials
- * @return
- */
- @AutoLog(value = "璁㈠崟BOM-娣诲姞")
- @ApiOperation(value="璁㈠崟BOM-娣诲姞", notes="璁㈠崟BOM-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody PmsProcessBillMaterials pmsProcessBillMaterials) {
- pmsProcessBillMaterialsService.save(pmsProcessBillMaterials);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param pmsProcessBillMaterials
- * @return
- */
- @AutoLog(value = "璁㈠崟BOM-缂栬緫")
- @ApiOperation(value="璁㈠崟BOM-缂栬緫", notes="璁㈠崟BOM-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody PmsProcessBillMaterials pmsProcessBillMaterials) {
- pmsProcessBillMaterialsService.updateById(pmsProcessBillMaterials);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "璁㈠崟BOM-閫氳繃id鍒犻櫎")
- @ApiOperation(value="璁㈠崟BOM-閫氳繃id鍒犻櫎", notes="璁㈠崟BOM-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- pmsProcessBillMaterialsService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "璁㈠崟BOM-鎵归噺鍒犻櫎")
- @ApiOperation(value="璁㈠崟BOM-鎵归噺鍒犻櫎", notes="璁㈠崟BOM-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.pmsProcessBillMaterialsService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "璁㈠崟BOM-閫氳繃id鏌ヨ")
- @ApiOperation(value="璁㈠崟BOM-閫氳繃id鏌ヨ", notes="璁㈠崟BOM-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<PmsProcessBillMaterials> queryById(@RequestParam(name="id",required=true) String id) {
- PmsProcessBillMaterials pmsProcessBillMaterials = pmsProcessBillMaterialsService.getById(id);
- if(pmsProcessBillMaterials==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(pmsProcessBillMaterials);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param pmsProcessBillMaterials
- */
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, PmsProcessBillMaterials pmsProcessBillMaterials) {
- return super.exportXls(request, pmsProcessBillMaterials, PmsProcessBillMaterials.class, "璁㈠崟BOM");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("pms_process_bill_materials:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, PmsProcessBillMaterials.class);
- }
- @GetMapping(value = "/searchlikeQuery")
- public Result<?> searchlikeQuery(PmsProcessBillMaterials pmsProcessBillMaterials,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req){
- IPage<Map<String, Object>> pageList = pmsProcessBillMaterialsService.getpmsProcessBillMaterialsListData(pageNo,pageSize,req);
-
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param query
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "璁㈠崟BOM-鍒嗛〉鍒楄〃鏌ヨ", notes = "璁㈠崟BOM-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<PmsProcessBillMaterials>> queryPageList(PmsProcessBillMaterials query,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+// QueryWrapper<PmsProcessBillMaterials> queryWrapper = QueryGenerator.initQueryWrapper(pmsProcessBillMaterials, req.getParameterMap());
+ Page<PmsProcessBillMaterials> page = new Page<PmsProcessBillMaterials>(pageNo, pageSize);
+ IPage<PmsProcessBillMaterials> pageList = pmsProcessBillMaterialsService.queryPageList(page, query);
return Result.OK(pageList);
}
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "璁㈠崟BOM-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "璁㈠崟BOM-閫氳繃id鏌ヨ", notes = "璁㈠崟BOM-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<PmsProcessBillMaterials> queryById(@RequestParam(name = "id", required = true) String id) {
+ PmsProcessBillMaterials pmsProcessBillMaterials = pmsProcessBillMaterialsService.getById(id);
+ if (pmsProcessBillMaterials == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(pmsProcessBillMaterials);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java b/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java
index 8f93da4..583065a 100644
--- a/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java
+++ b/src/main/java/org/jeecg/modules/pms/controller/PmsProcessBillMaterialsDetailController.java
@@ -1,182 +1,39 @@
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.PmsProcessBillMaterials;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
+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;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.Map;
+import java.util.List;
/**
-* @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/pmsProcessBillMaterialsDetail")
+@RequestMapping("/pms/processBillMaterialsDetail")
@Slf4j
public class PmsProcessBillMaterialsDetailController extends JeecgController<PmsProcessBillMaterialsDetail, IPmsProcessBillMaterialsDetailService> {
- @Autowired
- private IPmsProcessBillMaterialsDetailService pmsProcessBillMaterialsDetailService;
+ @Autowired
+ private IPmsProcessBillMaterialsDetailService pmsProcessBillMaterialsDetailService;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param pmsProcessBillMaterialsDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鐗╂枡娓呭崟-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鐗╂枡娓呭崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鐗╂枡娓呭崟-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<PmsProcessBillMaterialsDetail>> queryPageList(PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<PmsProcessBillMaterialsDetail> queryWrapper = QueryGenerator.initQueryWrapper(pmsProcessBillMaterialsDetail, req.getParameterMap());
- Page<PmsProcessBillMaterialsDetail> page = new Page<PmsProcessBillMaterialsDetail>(pageNo, pageSize);
- IPage<PmsProcessBillMaterialsDetail> pageList = pmsProcessBillMaterialsDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param pmsProcessBillMaterialsDetail
- * @return
- */
- @AutoLog(value = "鐗╂枡娓呭崟-娣诲姞")
- @ApiOperation(value="鐗╂枡娓呭崟-娣诲姞", notes="鐗╂枡娓呭崟-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail) {
- pmsProcessBillMaterialsDetailService.save(pmsProcessBillMaterialsDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param pmsProcessBillMaterialsDetail
- * @return
- */
- @AutoLog(value = "鐗╂枡娓呭崟-缂栬緫")
- @ApiOperation(value="鐗╂枡娓呭崟-缂栬緫", notes="鐗╂枡娓呭崟-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail) {
- pmsProcessBillMaterialsDetailService.updateById(pmsProcessBillMaterialsDetail);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鐗╂枡娓呭崟-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鐗╂枡娓呭崟-閫氳繃id鍒犻櫎", notes="鐗╂枡娓呭崟-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- pmsProcessBillMaterialsDetailService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鐗╂枡娓呭崟-鎵归噺鍒犻櫎")
- @ApiOperation(value="鐗╂枡娓呭崟-鎵归噺鍒犻櫎", notes="鐗╂枡娓呭崟-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.pmsProcessBillMaterialsDetailService.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<PmsProcessBillMaterialsDetail> queryById(@RequestParam(name="id",required=true) String id) {
- PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail = pmsProcessBillMaterialsDetailService.getById(id);
- if(pmsProcessBillMaterialsDetail==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(pmsProcessBillMaterialsDetail);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param pmsProcessBillMaterialsDetail
- */
- //@RequiresPermissions("org.jeecg.modules:pms_process_bill_materials_detail:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail) {
- return super.exportXls(request, pmsProcessBillMaterialsDetail, PmsProcessBillMaterialsDetail.class, "鐗╂枡娓呭崟");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("pms_process_bill_materials_detail:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, PmsProcessBillMaterialsDetail.class);
- }
- @ApiOperation(value="鐗╂枡娓呭崟-閫氳繃鐢熶骇鐗╂枡ID鏌ヨ", notes="鐗╂枡娓呭崟-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "鐗╂枡娓呭崟-閫氳繃鐢熶骇鐗╂枡ID鏌ヨ", notes = "鐗╂枡娓呭崟-閫氳繃id鏌ヨ")
@GetMapping(value = "/queryByMaterialId")
- public Result<PmsProcessBillMaterialsDetail> queryByMaterialId(@RequestParam(name="materialId",required=true) String materialId) {
- PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail = pmsProcessBillMaterialsDetailService.queryByMaterialId(materialId);
- if(pmsProcessBillMaterialsDetail==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(pmsProcessBillMaterialsDetail);
- }
-
- @GetMapping(value = "/searchlikeQuery")
- public Result<?> searchlikeQuery(PmsProcessBillMaterialsDetail pmsProcessBillMaterialsDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req){
- IPage<Map<String, Object>> pageList = pmsProcessBillMaterialsDetailService.getpmsProcessBillMaterialsDetailListData(pageNo,pageSize,req);
-
- return Result.OK(pageList);
+ public Result<?> queryByMaterialId(@RequestParam(name = "materialId", required = true) String materialId) {
+ List<PmsProcessBillMaterialsDetail> list = pmsProcessBillMaterialsDetailService.queryByMaterialId(materialId);
+ return Result.OK(list);
}
}
diff --git a/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java b/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java
index 0a341d6..aa2a315 100644
--- a/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java
+++ b/src/main/java/org/jeecg/modules/pms/entity/PmsMaterialProcess.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.pms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -67,6 +68,10 @@
/**鎺у埗鐮�*/
@ApiModelProperty(value = "鎺у埗鐮�")
private String controlCode;
+ /** 璁㈠崟鍙� */
+ @ApiModelProperty(value = "璁㈠崟鍙�")
+ @TableField(exist = false)
+ private String orderCode;
public PmsMaterialProcess(){}
diff --git a/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java b/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java
index f4ce7d6..dc82660 100644
--- a/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java
+++ b/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterials.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.pms.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -64,4 +65,8 @@
/**璁㈠崟鏁伴噺*/
@ApiModelProperty(value = "璁㈠崟鏁伴噺")
private BigDecimal productionQuantity;
+ /** 璁㈠崟鍙� */
+ @ApiModelProperty(value = "璁㈠崟鍙�")
+ @TableField(exist = false)
+ private String orderCode;
}
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java b/src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java
index ce58f1c..77c3d8f 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java
+++ b/src/main/java/org/jeecg/modules/pms/mapper/PmsMaterialProcessMapper.java
@@ -1,7 +1,9 @@
package org.jeecg.modules.pms.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
@@ -14,5 +16,11 @@
* @Version: V1.0
*/
public interface PmsMaterialProcessMapper extends BaseMapper<PmsMaterialProcess> {
- IPage<Map<String, Object>> getpmsMaterialProcessListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<PmsMaterialProcess> queryPageList(Page<PmsMaterialProcess> page, @Param("ew") QueryWrapper<PmsMaterialProcess> queryWrapper);
}
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java b/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java
index 93f2716..bebddbe 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java
+++ b/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsMapper.java
@@ -1,18 +1,24 @@
package org.jeecg.modules.pms.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
-
-import java.util.Map;
/**
* @Description: 璁㈠崟BOM
* @Author: jeecg-boot
- * @Date: 2025-07-01
+ * @Date: 2025-07-01
* @Version: V1.0
*/
public interface PmsProcessBillMaterialsMapper extends BaseMapper<PmsProcessBillMaterials> {
- IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(IPage<Map> pageData, @Param("params")Map<String, String> paramMap);
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param queryWrapper
+ * @return
+ */
+ IPage<PmsProcessBillMaterials> queryPageList(Page<PmsProcessBillMaterials> page, @Param("ew") QueryWrapper<PmsProcessBillMaterials> queryWrapper);
}
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml
index 925e4b8..c422823 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml
+++ b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsMaterialProcessMapper.xml
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.pms.mapper.PmsMaterialProcessMapper">
- <select id="getpmsMaterialProcessListData" parameterType="Map" resultType="Map">
- select * from pms_material_process WHERE 1=1
- <if test="params.materialNumber != null and params.materialNumber != ''">
- AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
- </if>
- <if test="params.materialName != null and params.materialName != ''">
- AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
- </if>
+
+ <select id="queryPageList" resultType="org.jeecg.modules.pms.entity.PmsMaterialProcess">
+ select pbm.*, po.order_code
+ from pms_material_process pbm
+ left join mes_production_order po on pbm.order_id = po.id
+ ${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml
index fcfcf13..95eec7f 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml
+++ b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsMapper.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsMapper">
- <select id="getpmsProcessBillMaterialsListData" parameterType="Map" resultType="Map">
- select * from pms_process_bill_materials WHERE 1=1
- <if test="params.materialNumber != null and params.materialNumber != ''">
- AND material_number LIKE CONCAT('%', #{params.materialNumber}, '%')
- </if>
- <if test="params.materialName != null and params.materialName != ''">
- AND material_name LIKE CONCAT('%', #{params.materialName}, '%')
- </if>
+ <select id="queryPageList" resultType="org.jeecg.modules.pms.entity.PmsProcessBillMaterials">
+ select pbm.*, po.order_code
+ from pms_process_bill_materials pbm
+ left join mes_production_order po on pbm.order_id = po.id
+ ${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java b/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
index a3d097b..df9d5b7 100644
--- a/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
+++ b/src/main/java/org/jeecg/modules/pms/service/IPmsMaterialProcessService.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.pms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
@@ -17,8 +18,6 @@
* @Version: V1.0
*/
public interface IPmsMaterialProcessService extends IService<PmsMaterialProcess> {
- IPage<Map<String, Object>> getpmsMaterialProcessListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
-
/**
*
* @param orderMap
@@ -31,4 +30,12 @@
* @param orderId
*/
void removeByOrderId(String orderId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<PmsMaterialProcess> queryPageList(Page<PmsMaterialProcess> page, PmsMaterialProcess query);
}
diff --git a/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java b/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java
index b49558b..4a5e867 100644
--- a/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java
+++ b/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsDetailService.java
@@ -1,13 +1,10 @@
package org.jeecg.modules.pms.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.sap.dto.OrderBomDTO;
-import javax.servlet.http.HttpServletRequest;
import java.util.List;
-import java.util.Map;
/**
* @Description: 鐗╂枡娓呭崟
@@ -16,8 +13,7 @@
* @Version: V1.0
*/
public interface IPmsProcessBillMaterialsDetailService extends IService<PmsProcessBillMaterialsDetail> {
- PmsProcessBillMaterialsDetail queryByMaterialId(String materialId);
- IPage<Map<String, Object>> getpmsProcessBillMaterialsDetailListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
+ List<PmsProcessBillMaterialsDetail> queryByMaterialId(String materialId);
/**
* 鍒犻櫎鍘熸湁鐨勬暟鎹�
diff --git a/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java b/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
index 4ddfc1f..8f4cfb3 100644
--- a/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
+++ b/src/main/java/org/jeecg/modules/pms/service/IPmsProcessBillMaterialsService.java
@@ -1,12 +1,12 @@
package org.jeecg.modules.pms.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.sap.dto.OrderBomDTO;
-import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
@@ -17,8 +17,6 @@
* @Version: V1.0
*/
public interface IPmsProcessBillMaterialsService extends IService<PmsProcessBillMaterials> {
- IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(Integer pageNo, Integer pageSize, HttpServletRequest req);
-
/**
* 鎵归噺淇濆瓨鎴栨洿鏂拌鍗旴OM鏁版嵁
* @param orderMap
@@ -33,4 +31,12 @@
* @return
*/
PmsProcessBillMaterials getByOrderId(String orderId);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ * @param page
+ * @param query
+ * @return
+ */
+ IPage<PmsProcessBillMaterials> queryPageList(Page<PmsProcessBillMaterials> page, PmsProcessBillMaterials query);
}
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
index 972ce6e..dfc6bee 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsMaterialProcessServiceImpl.java
@@ -2,10 +2,11 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsMaterialProcess;
import org.jeecg.modules.pms.mapper.PmsMaterialProcessMapper;
@@ -14,8 +15,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -28,25 +27,6 @@
*/
@Service
public class PmsMaterialProcessServiceImpl extends ServiceImpl<PmsMaterialProcessMapper, PmsMaterialProcess> implements IPmsMaterialProcessService {
-
- @Override
- public IPage<Map<String, Object>> getpmsMaterialProcessListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
- IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- Map<String, String> paramMap = new HashMap<String, String>();
- Map<String, String[]> parameterMap = req.getParameterMap();
- if (null != parameterMap) {
- if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
- paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
- }
- if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
- paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
- }
- if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
- paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
- }
- }
- return super.getBaseMapper().getpmsMaterialProcessListData(pageData, paramMap);
- }
@Override
@Transactional(rollbackFor = Exception.class)
@@ -72,4 +52,29 @@
queryWrapper.eq(PmsMaterialProcess::getOrderId, orderId);
super.remove(queryWrapper);
}
+
+ @Override
+ public IPage<PmsMaterialProcess> queryPageList(Page<PmsMaterialProcess> page, PmsMaterialProcess query) {
+ QueryWrapper<PmsMaterialProcess> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByDesc("pbm.create_time");
+ if (query != null) {
+ //鐗╂枡缂栫爜 妯＄硦鏌ヨ
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getMaterialNumber())) {
+ queryWrapper.like("pbm.material_number", query.getMaterialNumber());
+ }
+ //鐗╂枡鍚嶇О 妯＄硦鏌ヨ
+ if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getMaterialName())) {
+ queryWrapper.like("pbm.material_name", query.getMaterialName());
+ }
+ //宸ュ簭鍙� 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getProcessCode())) {
+ queryWrapper.like("pbm.process_code", query.getProcessCode());
+ }
+ //璁㈠崟鍙� 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getOrderCode())) {
+ queryWrapper.like("po.order_code", query.getOrderCode());
+ }
+ }
+ return this.getBaseMapper().queryPageList(page, queryWrapper);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
index 8273062..d8480a8 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
@@ -2,10 +2,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang.StringUtils;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsDetailMapper;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
@@ -13,10 +10,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -29,27 +23,10 @@
public class PmsProcessBillMaterialsDetailServiceImpl extends ServiceImpl<PmsProcessBillMaterialsDetailMapper, PmsProcessBillMaterialsDetail> implements IPmsProcessBillMaterialsDetailService {
@Override
- public PmsProcessBillMaterialsDetail queryByMaterialId(String materialId) {
- return baseMapper.queryByMaterialId(materialId);
- }
-
- @Override
- public IPage<Map<String, Object>> getpmsProcessBillMaterialsDetailListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
- IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- Map<String, String> paramMap = new HashMap<String, String>();
- Map<String, String[]> parameterMap = req.getParameterMap();
- if (null != parameterMap) {
- if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
- paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
- }
- if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
- paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
- }
- if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
- paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
- }
- }
- return super.getBaseMapper().getpmsProcessBillMaterialsDetailListData(pageData, paramMap);
+ public List<PmsProcessBillMaterialsDetail> queryByMaterialId(String materialId) {
+ LambdaQueryWrapper<PmsProcessBillMaterialsDetail> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(PmsProcessBillMaterialsDetail::getMaterialId, materialId);
+ return baseMapper.selectList(queryWrapper);
}
@Override
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
index 75cda98..ec90412 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsServiceImpl.java
@@ -2,10 +2,11 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.mapper.PmsProcessBillMaterialsMapper;
@@ -16,8 +17,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -34,31 +33,12 @@
private IPmsProcessBillMaterialsDetailService processBillMaterialsDetailService;
@Override
- public IPage<Map<String, Object>> getpmsProcessBillMaterialsListData(Integer pageNo, Integer pageSize, HttpServletRequest req) {
- IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
- Map<String, String> paramMap = new HashMap<String, String>();
- Map<String, String[]> parameterMap = req.getParameterMap();
- if (null != parameterMap) {
- if (parameterMap.containsKey("materialNumber") && StringUtils.isNotBlank(parameterMap.get("materialNumber")[0])) {
- paramMap.put("materialNumber", parameterMap.get("materialNumber")[0]);
- }
- if (parameterMap.containsKey("materialName") && StringUtils.isNotBlank(parameterMap.get("materialName")[0])) {
- paramMap.put("materialName", parameterMap.get("materialName")[0].trim());
- }
- if (parameterMap.containsKey("batchNumber") && StringUtils.isNotBlank(parameterMap.get("batchNumber")[0])) {
- paramMap.put("batchNumber", parameterMap.get("batchNumber")[0].trim());
- }
- }
- return super.getBaseMapper().getpmsProcessBillMaterialsListData(pageData, paramMap);
- }
-
- @Override
@Transactional(rollbackFor = Exception.class)
public boolean saveOrUpdateOrderBom(Map<String, MesProductionOrder> orderMap, List<OrderBomDTO> orderBomDTOList) {
- for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
+ for (Map.Entry<String, MesProductionOrder> entry : orderMap.entrySet()) {
MesProductionOrder order = entry.getValue();
PmsProcessBillMaterials materials = getByOrderId(order.getId());
- if(materials != null) {
+ if (materials != null) {
//鏇存柊鐗╂枡鏁版嵁
materials.setOrderId(order.getId());
materials.setMaterialNumber(order.getMaterialNumber());
@@ -71,7 +51,7 @@
//杩囨护鍑烘璁㈠崟鐨勭墿鏂欎俊鎭�
List<OrderBomDTO> collect = orderBomDTOList.stream().filter(orderBomDTO -> entry.getKey().equals(orderBomDTO.getAUFNR())).collect(Collectors.toList());
processBillMaterialsDetailService.saveBatchDetail(materials.getId(), collect);
- }else {
+ } else {
materials = new PmsProcessBillMaterials();
materials.setOrderId(order.getId());
materials.setMaterialNumber(order.getMaterialNumber());
@@ -97,4 +77,25 @@
}
return null;
}
+
+ @Override
+ public IPage<PmsProcessBillMaterials> queryPageList(Page<PmsProcessBillMaterials> page, PmsProcessBillMaterials query) {
+ QueryWrapper<PmsProcessBillMaterials> queryWrapper = new QueryWrapper<>();
+ queryWrapper.orderByDesc("pbm.create_time");
+ if (query != null) {
+ //鐗╂枡缂栫爜 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getMaterialNumber())) {
+ queryWrapper.like("pbm.material_number", query.getMaterialNumber());
+ }
+ //鐗╂枡鍚嶇О 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getMaterialName())) {
+ queryWrapper.like("pbm.material_name", query.getMaterialName());
+ }
+ //璁㈠崟鍙� 妯＄硦鏌ヨ
+ if (StringUtils.isNotBlank(query.getOrderCode())) {
+ queryWrapper.like("po.order_code", query.getOrderCode());
+ }
+ }
+ return this.getBaseMapper().queryPageList(page, queryWrapper);
+ }
}
--
Gitblit v1.9.3