#

LSH

2024-01-05 5ee977f1dadab25a87661ff48b4a0844c669bc28

#

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

@@ -103,7 +103,7 @@
    /**
     * 工作类型
     */
    @ApiModelProperty(value= "工作类型")
    @ApiModelProperty(value= "工作类型  1:取（叠盘）  2：放 3：取放 4：拆盘")
    @TableField("wrk_type")
    private Integer wrkType;


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

@@ -46,8 +46,11 @@
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                    continue;
                }
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,1);
                    if (result.getCode()==200){
                        continue;
                    }else {
@@ -61,8 +64,15 @@
            BasDevp basDevp = basDevpService.selectById(staNo);
            if (basDevp.getWrkNo()!=0){
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                if (wrkMast.getWrkSts()!=2){
                    continue;
                }
                boolean wrkTypeSign = fillKM(wrkMast);
                if (wrkTypeSign){

                }
                if (!Cools.isEmpty(wrkMast)){
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
                    if (result.getCode()==200){
                        continue;
                    }else {
@@ -73,4 +83,11 @@
        }
    }

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

}

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
@@ -29,13 +30,27 @@
    @Autowired
    private WrkMastStaService wrkMastStaService;

    public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp) {
    public ReturnT<String> start(WrkMast wrkMast,BasDevp basDevp,Integer type) {
        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);
            switch (type){
                case 11://满出
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(3);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                    break;
                case 2://入
                    if (Cools.isEmpty(wrkMastSta)){
                        WrkMastSta wrkMastSta1 = new WrkMastSta(wrkMast,new Date(),basDevp);
                        wrkMastSta1.setType(fillKM(wrkMast)? 0:1);
                        wrkMastSta1.setWrkType(3);
                        wrkMastStaService.insert(wrkMastSta1);
                    }
                default:
                    return FAIL;
            }

        }catch (Exception e){
@@ -47,8 +62,8 @@

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