From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 15 八月 2025 18:34:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 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 7003c7f..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,21 +1,29 @@
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 javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description: SAP鐢熶骇璁㈠崟
@@ -81,4 +89,25 @@
}
return Result.OK(mesProductionOrder);
}
+
+ @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