From c4e489878e01a41debab8a1d954199d7b831177d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 11 八月 2025 16:58:09 +0800
Subject: [PATCH] art: SAP 报工接口调试修改、投料接口修改、订单关闭接口修改
---
src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java b/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java
index ba9a438..f7bc3ce 100644
--- a/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/ShiftGroupController.java
@@ -9,8 +9,16 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.ShiftGroup;
import org.jeecg.modules.base.entity.UserGroup;
@@ -54,6 +62,11 @@
@Autowired
private IUserGroupService userGroupService;
+
+ @Autowired
+ private ObjectMapper objectMapper;
+ @Autowired
+ private TranslateDictTextUtils translateDictTextUtils;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
@@ -157,6 +170,28 @@
return Result.OK(shiftGroup);
}
+ @AutoLog(value = "鐝粍浜哄憳淇℃伅-閫氳繃浜х嚎id鏌ヨ鍏朵笅鎵�鏈夌彮缁�")
+ @ApiOperation(value="鐝粍浜哄憳淇℃伅-閫氳繃浜х嚎id鏌ヨ鍏朵笅鎵�鏈夌彮缁�", notes = "鐝粍浜哄憳淇℃伅-閫氳繃浜х嚎id鏌ヨ鍏朵笅鎵�鏈夌彮缁�")
+ @GetMapping(value = "/queryShiftGroupByFactoryId")
+ public Result<?> queryShiftGroupByFactoryId(@RequestParam(name="factoryId") String factoryId) {
+ List<ShiftGroup> shiftGroupList = shiftGroupService.list(new LambdaQueryWrapper<ShiftGroup>()
+ .eq(ShiftGroup::getFactoryId, factoryId)
+ .eq(ShiftGroup::getDelFlag, CommonConstant.DEL_FLAG_0));
+ JSONArray array = new JSONArray();
+ for (ShiftGroup shiftGroup : shiftGroupList) {
+ try {
+ String json = objectMapper.writeValueAsString(shiftGroup);
+ JSONObject item = JSONObject.parseObject(json);
+ translateDictTextUtils.translateField("shiftId", shiftGroup.getShiftId(), item, "base_shift,shift_name,id");
+ translateDictTextUtils.translateField("shiftCode", shiftGroup.getShiftId(), item, "base_shift,shift_code,id");
+ array.add(item);
+ } catch (JsonProcessingException e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
+ }
+ return Result.OK(array);
+ }
+
/**
* 瀵煎嚭excel
*
--
Gitblit v1.9.3