From f5490126548dda0fd7918c423ed64a8b425f6c9a Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Wed, 26 Jun 2024 09:14:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BB=84=E5=A2=9E=E5=8A=A0=E8=B7=A8?=
 =?UTF-8?q?=E4=BD=8D=20=E5=B7=A5=E5=BA=8F=E8=BD=AC=E7=A0=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dsic/gj_erp/bean/jcsj/DmBzzz.java     |  1 +
 .../jhgk/三月滚动排产控制器.java     | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java
index fd354a2..c334874 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBzzz.java
@@ -31,6 +31,7 @@ public class DmBzzz implements Serializable {
     private String factoryId;
     private String factoryCode;
     private String factoryName;//所属工厂
+    private String kw;//所属跨位
     private String workshopId;
     private String workshopCode;
     private String workshopName;//所属车间
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java
index 31dfc1e..db73a13 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java
@@ -2,6 +2,7 @@ package com.dsic.gj_erp.controller.jhgk;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.dsic.gj_erp.bean.ResultBean;
 import com.dsic.gj_erp.pc.*;
 import com.dsic.gj_erp.pc.service.三月滚动接口;
@@ -11,9 +12,9 @@ import com.dsic.gj_erp.pc.service.设备产能接口;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.Semaphore;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("sygdpc")
@@ -137,4 +138,28 @@ public class 三月滚动排产控制器 {
         }
         return new ResultBean<>();
     }
+
+//    工序list
+        @GetMapping("getGxDict")
+        public ResultBean<?> getGxDict(){
+            Constant.工序[] l= Constant.工序.values();
+//            List<Map> list=new ArrayList<>();
+//            for (Constant.工序 工序 : l) {
+//                String code=工序.getCode();
+//                String name=工序.name();
+//                Map<String,String> map=new HashMap<>();
+//                map.put(name,code);
+//                list.add(map);
+//            }
+
+            List<JSONObject> list = Arrays.stream(l).filter(o->StrUtil.isNotEmpty(o.name())&&!o.name().equals("NULL"))
+                    .map(item -> new JSONObject(new LinkedHashMap<>())
+                            .fluentPut("name", item.name())
+                            .fluentPut("code", item.getCode())
+                    )
+                    .collect(Collectors.toList());
+            return new ResultBean<>(list);
+        }
+
+
 }