Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

ZY

2025-08-05 5e61001f8678d26ffdf230e640b32c3632220d58

Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

# Conflicts:
#	src/main/java/com/zy/core/thread/SiemensCrnThread.java

 src/main/java/com/zy/asrs/controller/CrnController.java

@@ -99,7 +99,7 @@
    }

    @PostMapping("/table/crn/state")
    @ManagerAuth(memo = "堆垛机信息表")
    //@ManagerAuth(memo = "堆垛机信息表")
    public R crnStateTable(){
        List<CrnStateTableVo> list = new ArrayList<>();
        List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -137,7 +137,6 @@
    }

    @PostMapping("/table/crn/msg")
    @ManagerAuth(memo = "堆垛机数据表")
    public R crnMsgTable(){
        List<CrnMsgTableVo> list = new ArrayList<>();
        List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));