#

Junjie

1 天以前 9d5c54be580f637daa60ce231b67b6236742e570

#

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

@@ -16,7 +16,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.CrnOperaUtils;
@@ -35,7 +34,6 @@
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
@@ -51,18 +49,12 @@
@RestController
public class CrnController {

    @Value("${wms.url}")
    private String wmsUrl;
    @Value("${wms.movePath}")
    private String movePath;
    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private CrnOperaUtils crnOperaUtils;
    @Autowired

 src/main/java/com/zy/asrs/task/TaskLogScheduler.java

@@ -35,14 +35,10 @@

    @Value("${wms.url}")
    private String wmsUrl;
    @Value("${wms.movePath}")
    private String movePath;
    @Value("${wms.inboundTaskApplyPath}")
    private String inboundTaskApplyPath;
    @Value("${wms.TaskExecCallback}")
    private String TaskExecCallback;
    @Value("${wms.taskStatusFeedbackPath}")
    private String taskStatusFeedbackPath;
    @Autowired
    private NotifyUtils notifyUtils;
    @Autowired

 src/main/resources/application.yml

@@ -51,10 +51,10 @@
  # WMS系统ip
  url: 192.168.10.12:8001
  # 入库任务申请接口
  inboundTaskApplyPath: /wes/api/AcceptTaskStatus
  inboundTaskApplyPath: /wes/api/drivers/zy/asrs/inboundTaskApply
  # 任务开始时，WCS回调WMSz
  taskStatusFeedbackPath: /wes/api/TaskExecCallback
  taskStatusFeedbackPath: /wes/api/drivers/zy/asrs/callBack
  # 任务完成结束时，WCS回调WMS
  TaskExecCallback: /wes/api/TaskExecFinishedCallback
  TaskExecCallback: /wes/api/drivers/zy/asrs/callBack
  # 移库申请接口
  movePath: /wes/api/get_InterFace_TestStorage