野心家
2025-05-24 62b68627fc86bbc0705f3c14d19e18b7eacc0059
初始化
11个文件已修改
124 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/ToWmsDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 33 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/TaskLogScheduler.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/utils/HttpHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/core/MainProcess.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/wcs/js/console.map.js 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -527,6 +527,10 @@
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }
            if (crnProtocol.getMode()!=3){
                basCrnpWmsParam.setCrnErr(999L);
                basCrnpWmsParam.setCrnErrM("非自动!!!");
            }
            basCrnpWmsParamList.add(basCrnpWmsParam);
//            list.add(basCrnpWmsParam);
@@ -549,6 +553,10 @@
                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            if (rgvStatus.getMode()!=1){
                basRgvWmsParam.setSteErr(999L);
                basRgvWmsParam.setSteErrM("非自动!!!");
            }
//            list.add(basRgvWmsParam);
            wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
@@ -607,6 +615,10 @@
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }
            if (crnProtocol.getMode()!=3){
                basCrnpWmsParam.setCrnErr(999L);
                basCrnpWmsParam.setCrnErrM("非自动!!!");
            }
            basCrnpWmsParamList.add(basCrnpWmsParam);
//            list.add(basCrnpWmsParam);
@@ -631,6 +643,10 @@
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            if (rgvStatus.getMode()!=1){
                basRgvWmsParam.setSteErr(999L);
                basRgvWmsParam.setSteErrM("非自动!!!");
            }
//            list.add(basRgvWmsParam);
            wcsStatusResponseModel.getRgvList().add(basRgvWmsParam);
src/main/java/com/zy/asrs/entity/ToWmsDTO.java
@@ -16,6 +16,7 @@
    private List<Integer> canInboundTunnels;
    // 容器编码
    private String barCode;
    private String barcode;
    //容器类型
    private String ioType;
@@ -25,6 +26,7 @@
    private Integer locType;
    private Integer status;//空满版
    private Double grossWt;
    private Double weight;
//    public ToWmsDTO(String barcode, Integer stationCode, Integer locType){
//        this.barcode = barcode;
@@ -34,14 +36,17 @@
    public ToWmsDTO(String barcode, Integer stationCode, Integer status){
        this.barcode = barcode;
        this.barCode = barcode;
        this.stationCode = stationCode;
        this.status = status;
    }
    public ToWmsDTO(Integer stationCode, Double grossWt, String barcode, Integer status) {
        this.stationCode = stationCode;
        this.weight = grossWt;
        this.grossWt = grossWt;
        this.barcode = barcode;
        this.barCode = barcode;
        this.status = status;
    }
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -121,7 +121,7 @@
                        staProtocol = staProtocol.clone();
                    }
                    Integer workNo = staProtocol.getWorkNo();
                    if (workNo!=9998){
                    if (workNo!=9998 && workNo!=9997){
                        continue;
                    }
                    Integer stano = staProtocol.getStaNo();
@@ -189,7 +189,7 @@
                    // 判断是否满足入库条件
                    if (staProtocol.isAutoing() && staProtocol.isLoading()
                            && staProtocol.isInEnable()
                            && workNo == 9998
                            && (workNo == 9998 || workNo == 9997)
                            && staProtocol.isPakMk()
                            && staProtocol.isPakMkWalk()
                    ) {
@@ -199,9 +199,10 @@
                            continue;
                        }
                        String barcode = barcodeThread.getBarcode();
                        if (!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
                        if (!Cools.isEmpty(barcode) && !barcode.equals("99999999") && !barcode.equals("000000")) {
                            // 请求wms接口,获取工作号和目标库位
                            ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, 0);
                            ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, workNo == 9998? 0 : 1);
                            TaskWrk taskWrk1 = taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode", barcode));
                            if (!Cools.isEmpty(taskWrk1)) {
                                log.info("托盘码:" + barcode + "任务档存在");
@@ -215,6 +216,7 @@
                                    } else {
                                        staProtocol.setWorkNo(taskWrk1.getWrkNo());
                                        staProtocol.setStaNo(staProtocol.getSiteId());
                                        devpThread.setPakMkWalk(staProtocol.getSiteId(), false);
                                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                    }
                                }
@@ -249,6 +251,7 @@
                                staProtocol.setWorkNo(9999);
                                staProtocol.setStaNo(inSta.getBackSta());
                                devpThread.setPakMk(staProtocol.getSiteId(), false);
                                devpThread.setPakMkWalk(staProtocol.getSiteId(), false);
                                MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                continue;
                            }
@@ -264,7 +267,7 @@
                            );
                            log.info("入库请求参数{}" + JSON.toJSONString(toWmsDTO));
                            log.info("入库请求返回参数{}" + JSON.toJSONString(response));
                            if (jsonObject.getInteger("code").equals(200)) {
                            if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
                                try {
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                                } catch (Exception e) {
@@ -384,9 +387,21 @@
                            && staProtocol.isPakMk()
                            && staProtocol.isPakMkWalk()
                    ) {
                        // 获取条码扫描仪信息
                        BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
                        if (barcodeThread == null) {
                            continue;
                        }
                        String barcode = barcodeThread.getBarcode();
                        if (Cools.isEmpty(barcode) || barcode.equals("0")  || barcode.equals("000000")) {
                            staProtocol.setWorkNo(9999);
                            staProtocol.setStaNo(inSta.getBackSta());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            continue;
                        }
                        // 请求wms接口,获取工作号和目标库位
                        ToWmsDTO toWmsDTO = new ToWmsDTO("", staProtocol.getSiteId(), 1);
                        ToWmsDTO toWmsDTO = new ToWmsDTO(staProtocol.getSiteId(),staProtocol.getGrossWt(),barcode, 1);
                        HashMap<String, Object> headParam = new HashMap<>();
                        headParam.put("Content-Type", "application/json");
                        String response;
@@ -431,7 +446,7 @@
                        );
                        log.info("入库请求参数{}" + JSON.toJSONString(toWmsDTO));
                        log.info("入库请求返回参数{}" + JSON.toJSONString(response));
                        if (jsonObject.getInteger("code").equals(200)) {
                        if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
                            try {
                                devpThread.setPakMk(staProtocol.getSiteId(), false);
                            } catch (Exception e) {
@@ -792,7 +807,7 @@
//                    //开始运行
//                    String response = CrnStartRunning(taskWrk);
//                    JSONObject jsonObject = JSON.parseObject(response);
//                    if (jsonObject.getInteger("code").equals(200)) {
//                    if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
//
//                    }else {
//                        log.error("入库开始运行通讯失败,"+jsonObject.get("msg"));
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -187,7 +187,7 @@
                ,true
        );
        if (jsonObject.getInteger("code").equals(200)) {
        if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
            //解析
            List<WMSAndAGVInterfaceParam> params = new ArrayList<>();
            params.add(param);
src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
@@ -76,7 +77,7 @@
                        .doPost();
                jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
                if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
                    if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
                        log.error("任务档转任务历史档失败" + taskWrk);
                        return ;
src/main/java/com/zy/asrs/utils/PostMesDataUtils.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.task.AbstractHandler;
@@ -40,7 +41,7 @@
                System.out.println("response:"+response);
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getInteger("code").equals(200)) {
                if (!Cools.isEmpty(jsonObject.getInteger("code")) && jsonObject.getInteger("code").equals(200)) {
                    success = true;
                } else {
                    log.error("请求接口失败!!!url:{};request:{};response:{}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
src/main/java/com/zy/common/utils/HttpHandler.java
@@ -15,7 +15,7 @@
 */
public class HttpHandler {
    private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
    private static final Integer DEFAULT_TIMEOUT_SECONDS = 10;
    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json");
    private String uri;
src/main/java/com/zy/core/MainProcess.java
@@ -41,7 +41,7 @@
                    // 入库  ===>> 入库站到堆垛机站,根据条码扫描生成入库工作档
                    mainService.generateStoreWrkFile(); // 组托
                    mainService.generateStoreWrkFileIsEmptyMk(); // 组托  空托
//                    mainService.generateStoreWrkFileIsEmptyMk(); // 组托  空托
                    mainService.generateStoreWrkFileWalk(); // 任务下发
src/main/resources/application-prod.yml
@@ -58,6 +58,18 @@
      barcode: ${wcs-slave.barcode[1].id}
      backSta: 1012
      barcodeSign: false
    # 入库下发口1
    inWalkSta[3]:
      staNo: 1020
      barcode: ${wcs-slave.barcode[2].id}
      backSta: 1021
      barcodeSign: false
    # 入库下发口1
    inWalkSta[4]:
      staNo: 1004
      barcode: ${wcs-slave.barcode[0].id}
      backSta: 1005
      barcodeSign: false
    # 出库口1
    outSta[0]:
src/main/resources/application.yml
@@ -12,11 +12,11 @@
#    username: sa
#    password: sa@123
    driver-class-name: dm.jdbc.driver.DmDriver
#    url: jdbc:dm://27.172.2.102:5236/SOURCE
    url: jdbc:dm://27.172.1.129:5236/SOURCE
    url: jdbc:dm://27.172.2.102:5236/SOURCE
#    url: jdbc:dm://27.172.1.129:5236/SOURCE
#    url: jdbc:dm://127.0.0.1:5236/SOURCE
#    username: SYSDBA
#    password: Zy@12345
    username: SYSDBA
    password: Zy@12345
#    username: ZOS_ZEMIC
#    password: k3Mq6xRv9frOxb7n
#    username: ENC(++MryJD2j+X3rpmocG4vPH5vxXbpJNrF)
@@ -71,15 +71,19 @@
  #url: 10.32.53.195:8080
  # WMS系统ip
  #  url: 10.210.157.109:8090
  url: 27.172.1.135:9027
  url: 27.172.1.135:20006
#  url: 27.172.2.104:9027
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: api/external/wcs/inboundTaskApply
  inboundTaskApplyPath: xf-management/api/external/wcs/inboundTaskApply
#  inboundTaskApplyPath: api/external/wcs/inboundTaskApply
  #  inboundTaskApplyPath: open/asrs/inboundTaskApply
  # 任务状态反馈接口
  taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback
  taskStatusFeedbackPath: xf-management/api/external/wcs/taskStatusFeedback
#  taskStatusFeedbackPath: api/external/wcs/taskStatusFeedback
  # 货位状态更新接口
#  locationUpdatePath: api/InterFace/get_InterFace_TestStorage
  # 移库申请接口
#  movePath: api/InterFace/get_InterFace_TestStorage
  wmsHeartBeat: api/external/wcs/wmsHeartBeat
  wmsHeartBeat: xf-management/api/external/wcs/wmsHeartBeat
#  wmsHeartBeat: api/external/wcs/wmsHeartBeat
src/main/webapp/static/wcs/js/console.map.js
@@ -294,19 +294,11 @@
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1010",
                "text": "1010",
                "top": 231,
                "left": 240,
                "width": 45,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1011",
                "text": "1011",
                "top": 231,
                "left": 193,
                "width": 45,
                "left": 220,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
@@ -326,26 +318,18 @@
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1015",
                "text": "1015",
                "top": 172,
                "left": 240,
                "width": 45,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1016",
                "text": "1016",
                "top": 172,
                "left": 193,
                "width": 45,
                "left": 220,
                "width": 65,
                "height": 23
            }, {
                "type": "stn",
                "id": "site-1012",
                "text": "1012",
                "top": 196,
                "left": 193,
                "left": 220,
                "width": 45,
                "height": 34
            }, {