班组增加跨位

工序转码接口

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;//所属车间

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.*;
-import java.util.List;
 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);
+        }
+
+
 }