自动化立体仓库 - WMS系统
zc
2025-07-10 6ec3505f6acceca7eae90693d9e4b109942f4185
接口对接调试
7个文件已修改
23 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OrderController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/AgvHandler.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/TaskDto.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/StaDescMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OrderController.java
@@ -67,7 +67,7 @@
    }
    @RequestMapping(value = "/order/head/page/auth")
    @ManagerAuth
    //@ManagerAuth
    public R head(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -202,16 +202,16 @@
        // 出库站点
        Integer outSite = null;
        List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123));
        List<BasDevp> devps = basDevpService.selectList(new EntityWrapper<BasDevp>().in("dev_no", 223, 123).orderBy("dev_no",false));
        for (BasDevp basDevp : devps) {
            // 无工作号,无物
            if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("N")) {
            if (basDevp.getWrkNo() == 0 && basDevp.getLoading().equals("Y")) {
                outSite = basDevp.getDevNo();
                break;
            }
        }
        if (outSite == null) {
            outSite = 123;
            outSite = 223;
        }
        Date now = new Date();
src/main/java/com/zy/asrs/task/handler/AgvHandler.java
@@ -65,6 +65,10 @@
            log.error("出库呼叫agv接货,{}工作号没有找到工作档", wrkNo);
            return;
        }
        if (wrkMast.getInvWh() == null) {
            log.error("出库站点为空,{}", wrkNo);
            return;
        }
        // 已经呼叫过agv接货则跳过 WrkMast表中ref_wrkno变量用做标识 0未呼叫,1呼叫成功
        if (wrkMast.getIoType() != 101 && wrkMast.getIoType() != 103 || wrkMast.getRefWrkno() == 1) {
src/main/java/com/zy/common/model/TaskDto.java
@@ -6,6 +6,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.utils.MatCompareUtils;
import lombok.Data;
import java.util.*;
@@ -106,6 +107,9 @@
                        continue;
                    }
                }
                if (!MatCompareUtils.compare(dto,locDetl)){
                    continue;
                }
                if (dto.getAnfme() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                }
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -72,7 +72,7 @@
        }
    }
    @Transactional(rollbackFor = Throwable.class)
    public void OutHedTBScheduler(String orderNo) {
        //log.info("OutHedTBScheduler开始了");
        if (!erpEnabled) return;
src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
  port: 8085
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@
@@ -10,7 +10,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:50948;databasename=xgmFlasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=xgmFlasrs
    username: sa
    password: sa@123
  mvc:
src/main/resources/mapper/StaDescMapper.xml
@@ -29,6 +29,7 @@
        <if test="typeNo != null and typeNo !=''">
            and asd.type_no = #{typeNo}
        </if>
        order  by asd.stn_no desc
    </select>
    <select id="queryCrnStn" resultMap="BaseResultMap">