From 1c38849eebe0179b7ebad1db30b3335a41cc47e9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 12:30:22 +0800
Subject: [PATCH] art: WebService服务端相关代码修改
---
src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java | 218 +++++++++++++++++++++---------------------------------
1 files changed, 85 insertions(+), 133 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
index 63d55ef..87e8b9d 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
@@ -1,161 +1,113 @@
package org.jeecg.modules.mes.controller;
+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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.mes.entity.MesProductionOrder;
+import org.jeecg.modules.mes.enums.ProductionOrderStatus;
import org.jeecg.modules.mes.service.IMesProductionOrderService;
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.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
-* @Description: SAP鐢熶骇璁㈠崟
-* @Author: jeecg-boot
-* @Date: 2025-07-04
-* @Version: V1.0
-*/
-@Api(tags="SAP鐢熶骇璁㈠崟")
+ * @Description: SAP鐢熶骇璁㈠崟
+ * @Author: jeecg-boot
+ * @Date: 2025-07-04
+ * @Version: V1.0
+ */
+@Api(tags = "SAP鐢熶骇璁㈠崟")
@RestController
-@RequestMapping("/mesproductionwork/mesProductionOrder")
+@RequestMapping("/mes/productionOrder")
@Slf4j
public class MesProductionOrderController extends JeecgController<MesProductionOrder, IMesProductionOrderService> {
- @Autowired
- private IMesProductionOrderService mesProductionOrderService;
+ @Autowired
+ private IMesProductionOrderService mesProductionOrderService;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param mesProductionOrder
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ", notes="SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<MesProductionOrder>> queryPageList(MesProductionOrder mesProductionOrder,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<MesProductionOrder> queryWrapper = QueryGenerator.initQueryWrapper(mesProductionOrder, req.getParameterMap());
- Page<MesProductionOrder> page = new Page<MesProductionOrder>(pageNo, pageSize);
- IPage<MesProductionOrder> pageList = mesProductionOrderService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mesProductionOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<MesProductionOrder>> queryPageList(MesProductionOrder mesProductionOrder,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MesProductionOrder> queryWrapper = QueryGenerator.initQueryWrapper(mesProductionOrder, req.getParameterMap());
+ Page<MesProductionOrder> page = new Page<MesProductionOrder>(pageNo, pageSize);
+ IPage<MesProductionOrder> pageList = mesProductionOrderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 娣诲姞
- *
- * @param mesProductionOrder
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-娣诲姞")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-娣诲姞", notes="SAP鐢熶骇璁㈠崟-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody MesProductionOrder mesProductionOrder) {
- mesProductionOrderService.save(mesProductionOrder);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
+ /**
+ * 缂栬緫
+ *
+ * @param mesProductionOrder
+ * @return
+ */
+ @AutoLog(value = "SAP鐢熶骇璁㈠崟-缂栬緫")
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-缂栬緫", notes = "SAP鐢熶骇璁㈠崟-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody MesProductionOrder mesProductionOrder) {
+ mesProductionOrderService.updateById(mesProductionOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
- /**
- * 缂栬緫
- *
- * @param mesProductionOrder
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-缂栬緫")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-缂栬緫", notes="SAP鐢熶骇璁㈠崟-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody MesProductionOrder mesProductionOrder) {
- mesProductionOrderService.updateById(mesProductionOrder);
- return Result.OK("缂栬緫鎴愬姛!");
- }
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ", notes = "SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<MesProductionOrder> queryById(@RequestParam(name = "id", required = true) String id) {
+ MesProductionOrder mesProductionOrder = mesProductionOrderService.getById(id);
+ if (mesProductionOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(mesProductionOrder);
+ }
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-閫氳繃id鍒犻櫎")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-閫氳繃id鍒犻櫎", notes="SAP鐢熶骇璁㈠崟-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- mesProductionOrderService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-鎵归噺鍒犻櫎")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-鎵归噺鍒犻櫎", notes="SAP鐢熶骇璁㈠崟-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.mesProductionOrderService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ", notes="SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<MesProductionOrder> queryById(@RequestParam(name="id",required=true) String id) {
- MesProductionOrder mesProductionOrder = mesProductionOrderService.getById(id);
- if(mesProductionOrder==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(mesProductionOrder);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param mesProductionOrder
- */
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MesProductionOrder mesProductionOrder) {
- return super.exportXls(request, mesProductionOrder, MesProductionOrder.class, "SAP鐢熶骇璁㈠崟");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mes_production_order:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, MesProductionOrder.class);
- }
-
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-鏌ヨ鍙姤宸ョ殑鐢熶骇璁㈠崟", notes = "SAP鐢熶骇璁㈠崟-鏌ヨ鍙姤宸ョ殑鐢熶骇璁㈠崟")
+ @GetMapping(value = "/selectReportWorkOrderList")
+ public Result<?> selectReportWorkOrderList(MesProductionOrder mesProductionOrder) {
+ if (StringUtils.isBlank(mesProductionOrder.getMaterialNumber())) {
+ return Result.error("璇蜂紶鍏ュ繀瑕佺殑鏌ヨ鍙傛暟锛�");
+ }
+ List<MesProductionOrder> orderList = mesProductionOrderService.list(new LambdaQueryWrapper<MesProductionOrder>()
+ .eq(MesProductionOrder::getMaterialNumber, mesProductionOrder.getMaterialNumber())
+ .eq(MesProductionOrder::getOrderStatus, ProductionOrderStatus.REL.name())
+ .eq(MesProductionOrder::getDelFlag, CommonConstant.DEL_FLAG_0)
+ .orderByAsc(MesProductionOrder::getPlanStart));
+ List<Map<String, Object>> res = orderList.stream().map(order -> {
+ Map<String, Object> map = new HashMap<>();
+ map.put("title", order.getOrderCode());
+ map.put("label", order.getOrderCode());
+ map.put("value", order.getId());
+ return map;
+ }).collect(Collectors.toList());
+ return Result.OK(res);
+ }
}
--
Gitblit v1.9.3