*

lsh

13 小时以前 712dcbef9f4ae3f81e751bf8651d2e241f3f792c

*

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

@@ -499,6 +499,7 @@
                               @RequestBody WMSAndAGVInterfaceParam param,//中航下发  1：出库，2：移库 3：入库    1：取消  2 完成
                               HttpServletRequest request) {
        auth(appkey, param, request);
        param.updateIoTyoe(param.getIoType());//中航下发  1：出库，2：移库 3：入库   ====转换为====>  1：入库，2：出库，3：移库
//        param.updateTaskStatus(param.getTaskStatus());
        if (Cools.isEmpty(param)){
            return R.error("参数为空！");
@@ -506,14 +507,11 @@
            return R.error("工作号为空！");
        } else if (Cools.isEmpty(param.getIoType())){
            return R.error("操作类型为空！");
        } else if (Cools.isEmpty(param.getBarcode())){
            return R.error("托盘码不能为空！");
        }

        TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
                .eq("task_no", param.getTaskNo())
                .eq("io_type",param.getIoType())
                .eq("barcode",param.getBarcode()));
                .eq("io_type",param.getIoType()));
        if (Cools.isEmpty(taskWrk)){
            return R.error("未查到当前任务---"+param);
        }

 src/main/java/com/zy/asrs/entity/param/WMSAndAGVInterfaceParam.java

@@ -65,4 +65,19 @@
//        }
//    }

    public void updateIoTyoe(Integer ioTypeOld){
        switch (ioTypeOld){
            case 1:
                this.ioType = 2;
                break;
            case 2:
                this.ioType = 3;
                break;
            case 3:
                this.ioType = 1;
                break;
            default:
                this.ioType = 3;
        }
    }
}

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

@@ -32,7 +32,7 @@
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    // 间隔
                    Thread.sleep(500);
                    Thread.sleep(1000);
                    // 系统运行状态判断
                    if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -105,7 +105,7 @@
                    default:
                        break;
                }
                Thread.sleep(200);
                Thread.sleep(500);
            } catch (Exception e) {
//                e.printStackTrace();
            }
@@ -313,7 +313,7 @@

        log.info("堆垛机任务写100.18：值：0 crnWrite-313行");
        OperateResult result18 = siemensNet.Write("DB100.18", (short)0);

        Thread.sleep(50L);
        if (command.getAckFinish() == 0) {
            log.info("堆垛机任务写100.0：值：0 crnWrite-317行");
            OperateResult result100 = siemensNet.Write("DB100.0", (short)0);