123

ZY

3 天以前 364b9ccc44bc6863280c5cc00aa8512cfff548d4

123

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

@@ -21,7 +21,6 @@
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.asrs.utils.VersionUtils;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -38,7 +37,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;
@@ -53,7 +51,6 @@
@Slf4j
@RestController
public class CrnController {



    @Autowired

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

@@ -258,6 +258,7 @@

    /**
     * x轴单位转换
     *
     * @param dot y轴数值保留小数位
     */
    private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot) {

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

@@ -8,9 +8,11 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.param.CrnStatusParam;
import com.zy.asrs.entity.param.TaskCreateParam;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -168,125 +170,6 @@
    }


    //取放货申请
    @PostMapping("/pick/and/place/v1")
    @AppAuth(memo = "agv取放货申请")
    public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
                                  @RequestBody TaskOverParam param,
                                  HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStartPoint())) {
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())) {
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV1(param);
    }

    //取放货完成反馈
    @PostMapping("/pick/and/place/v2")
    @AppAuth(memo = "agv取放货完成反馈")
    public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
                                  @RequestBody TaskOverParam param,
                                  HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStartPoint())) {
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())) {
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV2(param);
    }


    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
    }


    //任务下发接口
    @PostMapping("/outboundTaskSend")
    @Transactional
    public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
        HashMap<String, Object> map = new HashMap<>();
        for (CarryParam param : params) {
            if (Cools.isEmpty(param)) {
                map.put("Code", "0");
                map.put("Msg", "参数为空！");
                return map;
            } else if (Cools.isEmpty(param.getTaskNo())) {
                map.put("Code", "0");
                map.put("Msg", "任务号为空！");
                return map;
            } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
                map.put("Code", "0");
                map.put("Msg", "任务类型为空！");
                return map;
            }
            String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
            param.setStartPoint(fusion);
            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
            if (Cools.isEmpty(locMast)) {
                map.put("Code", "0");
                map.put("Msg", "初始库位无法找到！");
                return map;
            }

            HashMap<String, Object> r = new HashMap<>();

            if (param.getStereoscopicTaskType() == 2) {
                //出库任务创建
                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                        .eq("type_no", 2)
                        .eq("crn_no", locMast.getCrnNo())
                        .eq("stn_no", param.getTerminalNo()));
                if (Cools.isEmpty(staDesc)) {
                    map.put("Code", "0");
                    map.put("Msg", "出库路径不存在！");
                    return map;
                }
                r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
                if (r.get("Code").equals("0")) {
                    return r;
                }
            } else if (param.getStereoscopicTaskType() == 3) {
                String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
                param.setTerminalNo(fusion1);
                //移库任务创建
                r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
                if (r.get("Code").equals("0")) {
                    return r;
                }
            }
            apiLogService.save("Wms任务下发接口"
                    , request.getRemoteAddr() + request.getRequestURI()
                    , ""
                    , request.getRemoteAddr()
                    , JSON.toJSONString(param)
                    , r.toString()
                    , true
            );
        }
        map.put("Code", "1");
        map.put("Msg", "ok");
        return map;
    }

    //任务取消接口
    @PostMapping("/taskCancel")
    public R taskCancel(@RequestHeader String appkey,
@@ -364,6 +247,55 @@
        return R.ok(crnStatusParams);
    }

    //取放货申请
    @PostMapping("/pick/and/place/v1")
    @AppAuth(memo = "agv取放货申请")
    public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
                                  @RequestBody TaskOverParam param,
                                  HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStartPoint())) {
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())) {
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV1(param);
    }

    //取放货完成反馈
    @PostMapping("/pick/and/place/v2")
    @AppAuth(memo = "agv取放货完成反馈")
    public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
                                  @RequestBody TaskOverParam param,
                                  HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getStartPoint())) {
            return R.error("码头[staNo]不能为空");
        }
        if (Cools.isEmpty(param.getType())) {
            return R.error("类型[type]不能为空");
        }
        return openService.getAgvPickAndPlaceV2(param);
    }


    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败，请确认appkey无误！");
        }
    }

    //查询任务详情
    @GetMapping("/queryTask")
@@ -394,6 +326,74 @@
    }


    //任务下发接口
//    @PostMapping("/outboundTaskSend")
//    @Transactional
//    public HashMap<String, Object> outboundTaskSend(@RequestBody List<CarryParam> params) {
//        HashMap<String, Object> map = new HashMap<>();
//        for (CarryParam param : params) {
//            if (Cools.isEmpty(param)) {
//                map.put("Code", "0");
//                map.put("Msg", "参数为空！");
//                return map;
//            } else if (Cools.isEmpty(param.getTaskNo())) {
//                map.put("Code", "0");
//                map.put("Msg", "任务号为空！");
//                return map;
//            } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
//                map.put("Code", "0");
//                map.put("Msg", "任务类型为空！");
//                return map;
//            }
//            String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
//            param.setStartPoint(fusion);
//            LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
//            if (Cools.isEmpty(locMast)) {
//                map.put("Code", "0");
//                map.put("Msg", "初始库位无法找到！");
//                return map;
//            }
//
//            HashMap<String, Object> r = new HashMap<>();
//
//            if (param.getStereoscopicTaskType() == 2) {
//                //出库任务创建
//                StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
//                        .eq("type_no", 2)
//                        .eq("crn_no", locMast.getCrnNo())
//                        .eq("stn_no", param.getTerminalNo()));
//                if (Cools.isEmpty(staDesc)) {
//                    map.put("Code", "0");
//                    map.put("Msg", "出库路径不存在！");
//                    return map;
//                }
//                r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
//                if (r.get("Code").equals("0")) {
//                    return r;
//                }
//            } else if (param.getStereoscopicTaskType() == 3) {
//                String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
//                param.setTerminalNo(fusion1);
//                //移库任务创建
//                r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
//                if (r.get("Code").equals("0")) {
//                    return r;
//                }
//            }
//            apiLogService.save("Wms任务下发接口"
//                    , request.getRemoteAddr() + request.getRequestURI()
//                    , ""
//                    , request.getRemoteAddr()
//                    , JSON.toJSONString(param)
//                    , r.toString()
//                    , true
//            );
//        }
//        map.put("Code", "1");
//        map.put("Msg", "ok");
//        return map;
//    }

    //AGV请求入库码头接口
//    @PostMapping("/targetWharfApply")
//    @AppAuth(memo = "AGV请求入库码头接口")

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

@@ -22,6 +22,7 @@

/**
 * 日志统计控制器层
 *
 * @author admin
 * @date 2018年11月23日
 */
@@ -158,6 +159,7 @@

    /**
     * 日入库汇总查询
     *
     * @return
     */
    @RequestMapping("/viewWorkCountInList.action")

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

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,17 +9,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
import com.zy.asrs.service.TaskWrkReportService;
import com.zy.asrs.service.ToWmsService;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
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.*;

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

@@ -20,7 +20,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;

@RestController
@Slf4j
@@ -37,7 +39,6 @@

    @Autowired
    private ToWmsService toWmsService;

   

    @RequestMapping(value = "/transferTask/{wrkNo}/auth")
@@ -129,7 +130,6 @@
        List<TaskWrk> list = taskWrkService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }



    @RequestMapping(value = "/transferTask/check/column/auth")

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

@@ -41,7 +41,6 @@
    private ToWmsService toWmsService;

   

    @RequestMapping(value = "/transferTaskLog/{wrkNo}/auth")
    @ManagerAuth
    public R get(@PathVariable("wrkNo") Integer wrkNo) {
@@ -131,7 +130,6 @@
        List<TaskWrk> list = taskWrkService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }



    @RequestMapping(value = "/transferTaskLog/check/column/auth")

 src/main/java/com/zy/asrs/domain/dto/AxisBean.java

@@ -2,8 +2,8 @@

/**
 * 曲线图表json键
 * @author admin
 *
 * @author admin
 */
public class AxisBean {
    private String name;

 src/main/java/com/zy/asrs/domain/dto/WorkChartAxis.java

@@ -2,6 +2,7 @@

/**
 * 入出库统计曲线图
 *
 * @author admin
 * @date 2018年12月12日
 */

 src/main/java/com/zy/asrs/domain/vo/LocChartPie.java

@@ -2,6 +2,7 @@

/**
 * 库位占用百分比
 *
 * @author admin
 * @date 2018年12月12日
 */

 src/main/java/com/zy/asrs/entity/ApiConfig.java

 src/main/java/com/zy/asrs/entity/ApiLog.java

 src/main/java/com/zy/asrs/entity/BasCrnOpt.java

 src/main/java/com/zy/asrs/entity/BasErrLog.java

 src/main/java/com/zy/asrs/entity/BasPlcerrorLog.java

 src/main/java/com/zy/asrs/entity/CommandInfoLog.java

 src/main/java/com/zy/asrs/entity/TaskWrkLog.java

 src/main/java/com/zy/asrs/entity/TransferTask.java

@@ -122,6 +122,4 @@
    private Date cancelTime;




}

 src/main/java/com/zy/asrs/entity/ViewInOutBean.java

@@ -2,6 +2,7 @@

/**
 * 日出入库次数统计
 *
 * @author admin
 * @date 2018年11月24日
 */

 src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java

@@ -13,6 +13,7 @@

/**
 * 库存滞留时间实体类
 *
 * @author admin
 * @date 2018年11月23日
 */

 src/main/java/com/zy/asrs/entity/ViewStockUseBean.java

@@ -2,6 +2,7 @@

/**
 * 库位使用率视图实体类
 *
 * @author admin
 * @date 2018年11月23日
 */

 src/main/java/com/zy/asrs/entity/ViewWorkInBean.java

@@ -13,6 +13,7 @@

/**
 * 入库明细统计
 *
 * @author admin
 * @date 2018年11月26日
 */

 src/main/java/com/zy/asrs/mapper/DevpTaskMapper.java

@@ -2,17 +2,12 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.DevpTask;
import com.zy.asrs.entity.TaskWrk;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Mapper
@Repository
public interface DevpTaskMapper extends BaseMapper<DevpTask> {



}

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -40,5 +40,4 @@
    List<LocMast> selectLocByLev(@Param("lev") Integer lev);



}

 src/main/java/com/zy/asrs/mapper/TransferTaskLogMapper.java

@@ -1,7 +1,6 @@
package com.zy.asrs.mapper;

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.TransferTask;
import com.zy.asrs.entity.TransferTaskLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -9,7 +8,6 @@
@Mapper
@Repository
public interface TransferTaskLogMapper extends BaseMapper<TransferTaskLog> {



}

 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java

@@ -81,6 +81,7 @@

    /**
     * 堆垛机是否存在出库任务
     *
     * @param crnNo
     * @return
     */
@@ -88,6 +89,7 @@

    /**
     * 输送线是否存在入库任务
     *
     * @param crnNo
     * @return
     */
@@ -98,6 +100,7 @@

    /**
     * 查找堆垛机号对应所有待出库工作档
     *
     * @param crnNO
     * @param sourceStaNo
     * @return

 src/main/java/com/zy/asrs/service/ApiConfigService.java

@@ -1,7 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.ApiConfig;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.ApiConfig;

public interface ApiConfigService extends IService<ApiConfig> {


 src/main/java/com/zy/asrs/service/BasCrnOptService.java

@@ -1,7 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.BasCrnOpt;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasCrnOpt;

public interface BasCrnOptService extends IService<BasCrnOpt> {


 src/main/java/com/zy/asrs/service/BasDevpService.java

@@ -9,36 +9,42 @@

    /**
     * 入库站
     *
     * @return
     */
    List<Integer> getAvailableInSite();

    /**
     * 空板入库站
     *
     * @return
     */
    List<Integer> getAvailableEmptyInSite();

    /**
     * 出库站
     *
     * @return
     */
    List<Integer> getAvailableOutSite(Integer typeNo);

    /**
     * 空板出库站
     *
     * @return
     */
    List<Integer> getAvailableEmptyOutSite();

    /**
     * 目标站点状态检测
     *
     * @param devpNo
     */
    BasDevp checkSiteStatus(Integer devpNo);

    /**
     * 目标站点状态检测
     *
     * @param devpNo
     * @param put 是否入库操作 true 是 ； false 不是
     */

 src/main/java/com/zy/asrs/service/BasErrLogService.java

@@ -1,7 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.BasErrLog;

public interface BasErrLogService extends IService<BasErrLog> {


 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -19,6 +19,7 @@

    /**
     * 获取当天相同规格货物的深库位号
     *
     * @param matnr 物料号
     * @return locNo 库位号
     */

 src/main/java/com/zy/asrs/service/LocMastService.java

@@ -20,6 +20,7 @@

    /**
     * 获取同组货架的空库位
     *
     * @param sourceLocNo 源库位
     * @return 同组空库位集合
     */
@@ -27,6 +28,7 @@

    /**
     * 堆垛机演示获取源库位
     *
     * @param crn
     * @return
     */
@@ -34,6 +36,7 @@

    /**
     * 堆垛机演示获取目标库位
     *
     * @param crn
     * @return
     */
@@ -41,6 +44,7 @@

    /**
     * 检查当前库位所属巷道的空库位数量
     *
     * @param locMast
     * @return
     */

 src/main/java/com/zy/asrs/service/TaskWrkLogService.java

@@ -1,7 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.TaskWrkLog;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.TaskWrkLog;

public interface TaskWrkLogService extends IService<TaskWrkLog> {


 src/main/java/com/zy/asrs/service/TaskWrkService.java

@@ -1,7 +1,7 @@
package com.zy.asrs.service;

import com.zy.asrs.entity.TaskWrk;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.TaskWrk;

import java.util.List;


 src/main/java/com/zy/asrs/service/ToWmsService.java

@@ -4,7 +4,6 @@
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.wms.StorageEscalationParam;
import com.zy.asrs.entity.wms.WmsResult;

public interface ToWmsService {


 src/main/java/com/zy/asrs/service/TransferTaskLogService.java

@@ -1,8 +1,6 @@
package com.zy.asrs.service;

import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.TaskWrkLog;
import com.zy.asrs.entity.TransferTask;
import com.zy.asrs.entity.TransferTaskLog;

public interface TransferTaskLogService extends IService<TransferTaskLog> {

 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java

@@ -1,7 +1,5 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
@@ -9,13 +7,9 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WmsLocStatus;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;

import java.util.HashMap;

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -16,7 +16,6 @@
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.core.CrnThread;
@@ -1057,10 +1056,7 @@
                }
                Random random = new Random();
                LocMast locMastEnd = locMasts.get(random.nextInt(locMasts.size()));
                ReturnT<String> result = locMove(locMastStart, locMastEnd, basCrnp.getCrnNo());
                if (!result.isSuccess()) {
                    log.error("处理失败");
                }
                locMove(locMastStart, locMastEnd, Long.parseLong(basCrnp.getCrnNo().toString()));
            }
        }
    }

 src/main/java/com/zy/asrs/service/impl/TaskWrkReportServiceImpl.java

@@ -1,42 +1,11 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.domain.enums.WorkNoType;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.entity.TaskWrk;
import com.zy.asrs.entity.TaskWrkReport;
import com.zy.asrs.mapper.TaskWrkMapper;
import com.zy.asrs.mapper.TaskWrkReportMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.StaDescService;
import com.zy.asrs.service.TaskWrkReportService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.utils.Utils;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.DevpThread;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.CrnTaskModeType;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.Task;
import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.protocol.StaProtocol;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.HashMap;
import java.util.List;

@Slf4j
@Service

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -1,16 +1,13 @@
package com.zy.asrs.service.impl;

import com.alibaba.fastjson.JSON;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -33,10 +30,6 @@

    @Autowired
    private ToWmsService    toWmsService;






    @Override

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

@@ -17,7 +17,6 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.io.IOException;

 src/main/java/com/zy/asrs/utils/VersionUtils.java

 src/main/java/com/zy/core/MainProcess.java

@@ -39,11 +39,11 @@
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;
                    }
                    // 跑库程序
                    // 跑库程序.未调试测试
                    //mainService.debug("F");

                    mainService.transferTaskStart();
                    mainService.transferTaskEnd();
                    //独立输送线任务.未调试测试
                    //mainService.transferTaskStart();
                    //mainService.transferTaskEnd();


                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档