#

lsh

2024-03-06 9c86cce3943842ed28f3acd48c33c76cb93b57e5

#

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

@@ -168,6 +168,9 @@
    @ManagerAuth(memo = "手动完成任务")
    public R complete(@RequestParam String taskNo) {
        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
        if (Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3){
            return R.error("已完结或已取消") ;
        }
        LocMast locMast=new LocMast();
            if(taskWrk.getIoType()==1){//入库任务完成库位为F
                locMast=locMastService.selectByLocNo(taskWrk.getTargetPoint());

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

@@ -211,6 +211,9 @@
        this.wrkNo = taskWrk.getWrkNo();
        this.createTime = taskWrk.getCreateTime();
        this.ioType = taskWrk.getIoType();
        if (Cools.isEmpty(taskWrk.getIoPri())){
            taskWrk.setIoPri(1);
        }
        this.ioPri = (double)taskWrk.getIoPri();
        this.startPoint = taskWrk.getStartPoint();
        this.targetPoint = taskWrk.getTargetPoint();

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

@@ -190,7 +190,7 @@
                            continue;
                        }
                        String barcode = barcodeThread.getBarcode();
                        if(!Cools.isEmpty(barcode)) {
                        if(!Cools.isEmpty(barcode) && !barcode.equals("99999999")) {
                            // 请求wms接口，获取工作号和目标库位
                            ToWmsDTO toWmsDTO = new ToWmsDTO(barcode,staProtocol.getSiteId(),staProtocol.isHigh() ? 2 : 1);
                            TaskWrk taskWrk1=taskWrkService.selectOne(new EntityWrapper<TaskWrk>().eq("barcode",barcode));

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

@@ -233,10 +233,10 @@
        if (slave.getId() == 1) {
            //条码
            //Thread.sleep(200);
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 60);
            OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.840.0", (short) 32);
            if (result2.IsSuccess) {
                for (int i = 0; i < 4; i++) {
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 10, 8, "UTF-8");
                    String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
                    BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
                    if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
                        barcodeThread.setBarcode(barcode);

 src/main/resources/application.yml

@@ -49,10 +49,12 @@
  # WMS系统ip
  #url: 10.32.53.195:8080
  # WMS系统ip
  url: 10.210.157.109:8090
#  url: 10.210.157.109:8090
  url: 10.210.157.11:8080/wms
  # 入库任务申请接口
  #inboundTaskApplyPath: api/InterFace/inboundTaskApply
  inboundTaskApplyPath: apis/inboundTaskApply
#  inboundTaskApplyPath: apis/inboundTaskApply
  inboundTaskApplyPath: open/asrs/inboundTaskApply
  # 任务状态反馈接口
  taskStatusFeedbackPath: apis/taskStatusFeedback
  # 货位状态更新接口