#

lsh

2024-01-04 3073dbfd47dfdc153545fe9dbdc78100bc251201

#

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

@@ -117,6 +117,18 @@

    public WrkMastSta() {}

    public WrkMastSta(WrkMast wrkMast,Date now,BasDevp basDevp) {
        this.wrkNo = wrkMast.getWrkNo().longValue();
        this.wrkStart = wrkMast.getSourceStaNo();
        this.wrkEnd = wrkMast.getStaNo();
        this.staStart = basDevp.getDevNo();
        this.staEnd = wrkMast.getStaNo();
        this.createTime = now;
        this.updateTime = now;
        this.wrkSts = 0;
        this.bignTime = now;
    }

    public WrkMastSta(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime) {
        this.wrkNo = wrkNo;
        this.wrkStart = wrkStart;

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

@@ -1,10 +1,20 @@
package com.zy.asrs.task;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.WrkMastStaInItHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.util.ArrayList;
import java.util.List;

/**
 * Created by Monkey D. Luffy on 2023.07.25
@@ -15,14 +25,50 @@

    @Autowired
    private WrkMastStaInItHandler wrkMastStaInItHandler;
    @Autowired
    private BasDevpService basDevpService;
    @Autowired
    private WrkMastService wrkMastService;


    public static final List<Integer> STA_WORK_CU = new ArrayList<Integer>() {{
        add(101);add(102);add(104);add(105);add(107);add(108);add(110);add(111);add(113);add(114);add(116);add(117);
    }};

    public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
        add(118);add(119);add(120);add(121);add(122);add(123);
    }};


    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute(){//条码上传中控
        int[] staNos =new int[]{216,220};
        for (int staNo : staNos){
            ReturnT<String> result = wrkMastStaInItHandler.start(null);
            if (result.getCode()==200){
                break;
    private void execute(){
        for(Integer staNo : STA_WORK_CU){
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
                    if (result.getCode()==200){
                        continue;
                    }else {
                        System.out.println(staNo+"失败！");
                    }
                }
            }
        }

        for(Integer staNo : STA_WORK_RU){
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
                    if (result.getCode()==200){
                        continue;
                    }else {
                        System.out.println(staNo+"失败！");
                    }
                }
            }
        }
    }

 src/main/java/com/zy/asrs/task/handler/WrkMastStaInItHandler.java

@@ -1,6 +1,11 @@
package com.zy.asrs.task.handler;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastStaService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -8,6 +13,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
 * Created by Monkey D. Luffy on 2023.11.21
@@ -20,9 +29,14 @@
    @Autowired
    private WrkMastStaService wrkMastStaService;

    public ReturnT<String> start(WrkMast wrkMast) {
    public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp) {
        try {

            WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMast.getWrkNo().longValue()));
            if (Cools.isEmpty(wrkMastSta)){
                WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
                wrkMastStaService.insert(wrkMastSta1);
            }

        }catch (Exception e){
            log.error("异常！！！"+e);
@@ -30,4 +44,11 @@
        }
        return FAIL;
    }

    public boolean fillKM(WrkMast wrkMast){
        if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
            return false;
        }
        return true;
    }
}

 src/main/webapp/static/js/order/order.js

@@ -110,7 +110,7 @@
                    ,'<td><div class="layui-progress" lay-filter="progress-demo-'+ index +'"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
                    ,'<td>'
                    ,'<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
                    ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                    // ,'<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                    ,'</td>'
                    ,'</tr>'].join(''));

@@ -200,7 +200,7 @@
                                + '<td><div class="layui-progress" lay-filter="progress-demo-' + index + '"><div class="layui-progress-bar" lay-percent=""></div></div></td>'
                                + '<td>'
                                + '<button class="layui-btn layui-btn-xs demo-reload layui-hide">重传</button>'
                                + '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                                // + '<button class="layui-btn layui-btn-xs layui-btn-danger demo-delete">删除</button>'
                                + '</td>';

                            // 将tr元素添加到目标table中