#

vincentlu

7 天以前 4c4844e2bb640d8c17260f0119b04dfcd7f39d63

#

 zy-acs-flow/src/page/sta/StaEdit.jsx

@@ -152,14 +152,14 @@
                            <NumberInput
                                label="table.field.sta.rsvInCnt"
                                source="rsvInCnt"
                                InputProps={{ readOnly: true }}
                                disabled
                                // InputProps={{ readOnly: true }}
                                // disabled
                            />
                            <NumberInput
                                label="table.field.sta.rsvOutCnt"
                                source="rsvOutCnt"
                                InputProps={{ readOnly: true }}
                                disabled
                                // InputProps={{ readOnly: true }}
                                // disabled
                            />
                        </Stack>
                    </Grid>

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java

@@ -289,13 +289,13 @@
                if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(task, agv.getId());

                // task
                task.setOriLoc(oriLoc.getId());
                task.setOriCode(oriLoc.getCode());
                task.setDestSta(destSta.getId());
                task.setDestCode(destSta.getCode());

                staReserveService.allocateCallBack(task, agv.getId());
                break;
            case STA_TO_LOC:
                // oriSta
@@ -311,7 +311,6 @@
                if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(task, agv.getId());

                // destLoc
                if (!Cools.isEmpty(param.getEndLocNo())) {
@@ -337,6 +336,8 @@
                task.setOriCode(oriSta.getCode());
                task.setDestLoc(destLoc.getId());
                task.setDestCode(destLoc.getCode());

                staReserveService.allocateCallBack(task, agv.getId());
                break;
            case STA_TO_STA:
                // oriSta
@@ -352,7 +353,7 @@
                if (null == staReserveService.reserveStaOut(oriSta, task, 1)) {
                    throw new BusinessException("oriSta：" + oriSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(task, agv.getId());


                // destSta
                if (!Cools.isEmpty(param.getEndStaNo())) {
@@ -367,13 +368,14 @@
                if (null == staReserveService.reserveStaIn(destSta, task, 1)) {
                    throw new BusinessException("destSta：" + destSta.getStaNo() + " 预约失败");
                }
                staReserveService.allocateCallBack(task, agv.getId());

                // task
                task.setOriSta(oriSta.getId());
                task.setOriCode(oriSta.getCode());
                task.setDestSta(destSta.getId());
                task.setDestCode(destSta.getCode());

                staReserveService.allocateCallBack(task, agv.getId());
                break;
            default:
                break;