1

Administrator

2 天以前 f133b83ef4af600e4c92d289cc01c015f298d029

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/integrate/conveyor/ConveyorController.java

@@ -3,12 +3,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.annotation.IntegrationAuth;
import com.zy.acs.manager.core.domain.type.NamespaceType;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryParam;
import com.zy.acs.manager.core.integrate.dto.ConveyorQueryResult;
import com.zy.acs.manager.manager.entity.Sta;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.service.SegmentService;
import com.zy.acs.manager.manager.service.StaService;
import com.zy.acs.manager.system.controller.BaseController;
import com.zy.acs.manager.manager.service.TaskService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -22,12 +26,19 @@
@Api(tags = "Open Api")
@RestController
@RequestMapping("/api/open")
public class ConveyorController extends BaseController {
public class ConveyorController {

    @Autowired
    private StaService staService;

    @Autowired
    private TaskService taskService;

    @Autowired
    private SegmentService segmentService;

    @PostMapping("/station/convey")
    @IntegrationAuth(name = NamespaceType.RCS_STA_QUERY)
    public R save(@RequestBody ConveyorQueryParam param) {
        List<ConveyorQueryResult> resultList = new ArrayList<>();

@@ -38,8 +49,16 @@
                    .orderByAsc(Sta::getStaNo)
            );
            for (Sta sta : list) {
                resultList.add(new ConveyorQueryResult(sta.getStaNo()
                        , staService.hasWorkingAgv(sta.getId())));
                Long staId = sta.getId();
                boolean conveyable = !staService.hasWorkingAgv(staId);
                String taskNo = null;
                if (conveyable) {
                    Task task = staService.checkoutTask(staId);
                    if (null != task) {
                        taskNo = task.getSeqNum();
                    }
                }
                resultList.add(new ConveyorQueryResult(sta.getStaNo(), conveyable, taskNo));
            }
        } else {
            for (String staNo : staNos) {
@@ -48,8 +67,16 @@
                    resultList.add(new ConveyorQueryResult(staNo, Boolean.FALSE));
                    continue;
                }
                resultList.add(new ConveyorQueryResult(staNo
                        , staService.hasWorkingAgv(sta.getId())));
                Long staId = sta.getId();
                boolean conveyable = !staService.hasWorkingAgv(staId);
                String taskNo = null;
                if (conveyable) {
                    Task task = staService.checkoutTask(staId);
                    if (null != task) {
                        taskNo = task.getSeqNum();
                    }
                }
                resultList.add(new ConveyorQueryResult(staNo, conveyable, taskNo));
            }
        }

@@ -57,5 +84,14 @@
    }


    @PostMapping("/station/checkTakeComplete")
    @IntegrationAuth(name = NamespaceType.RCS_STA_QUERY)
    public R checkTakeComplete(@RequestBody ConveyorQueryParam param) {

        String staNo = param.getStaNo();
        String seqNum = param.getSeqNum();
        taskService.()

        return R.ok().add(resultList);
    }
}