1.作业计划增加工序查看开关,管理生产作业报工时,下道序是否需要上道序完工后才可查看

2.调整各工序查看逻辑,默认下道序需要上道序报工后才能看到

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -294,6 +294,15 @@ public class ZyjhController {
         return new ResultBean<>();
     }
 
+    /**
+     * 报工数据查看控制器
+     * 可根据配置情况控制是否根据上道序报工后下道序才可查看到作业计划数据
+     */
+    @PostMapping("bgControl")
+    public ResultBean<?> bgControl(String gx){
+        return new ResultBean<>(zyjhService.cacheable(gx));
+    }
+
     @PostMapping("test")
     public ResultBean<?> test(@RequestBody Message msg){
         wsHandler.tip(msg.toJson());

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -13,8 +13,11 @@ import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper;
 import com.dsic.gj_erp.service.jcsj.DmCbxxpService;
 import com.google.common.collect.ImmutableMap;
 import lombok.AllArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -24,6 +27,7 @@ import java.util.stream.Collectors;
 public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     private final DmCbxxpService dmCbxxpService;
+    private final RedisTemplate<String,Object> redisTemplate;
 
 
     public List<Map<String, Object>> gcjd(){
@@ -85,4 +89,15 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
         this.update(wrapper);
     }
+
+    private static final String KEY="gxControl";
+
+    public Object cacheable(String gx){
+        if (gx!=null){
+            redisTemplate.opsForValue().set(KEY,gx);
+            return gx;
+        }else{
+            return redisTemplate.opsForValue().get(KEY);
+        }
+    }
 }