#

野心家

2023-07-28 bf168eeba97e91ee1fe459090e2e8b8f4b9e0e59

#

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

@@ -91,7 +91,7 @@

    @ApiModelProperty(value= "库位号")
    @TableField("loc_no")
    private Date locNo;
    private String locNo;

    @ApiModelProperty(value= "状态")
    private String status;
@@ -134,6 +134,9 @@
    @TableField("appe_user")
    private Long appeUser;

    @ApiModelProperty(value= "批号")
    private String batch;

    public String getModiTime$(){
        if (Cools.isEmpty(this.modiTime)){
            return "";

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

@@ -154,12 +154,11 @@
//                        Thread.sleep(300);
//                    }catch (Exception e){}

                    String barcode = barcodeThread.getBarcode();
                    //String barcode = barcodeThread.getBarcode();
                    String barcode = "20000005";
                    if(!Cools.isEmpty(barcode)) {
                        News.info(""+mark+" - 1"+" - {}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        if(staProtocol.getStamp()<2){
                            continue;
                        }

                        if("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode)) {
                            staProtocol.setWorkNo((short) 9999);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -175,9 +174,6 @@
                            continue;
                        }
                    } else {
                        if(staProtocol.getStamp()<2){
                            continue;
                        }
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -454,9 +450,16 @@
                        Integer staNo = staDesc.getCrnStn();
                        // 更新工作档数据状态
                        wrkMast.setIoTime(now);
                        wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        //盘点入库时，有组托数据，盘点转并板入库
                        List<WaitPakin> waitPakins=waitPakinMapper.selectList(new EntityWrapper<WaitPakin>()
                                .eq("barcode",barcode));
                        if(!Cools.isEmpty(waitPakins)){
                            wrkMast.setIoType(54);
                        }else{
                            wrkMast.setIoType(wrkMast.getIoType() - 50); // 入出库类型: 103->53,104->54,107->57
                        }
                        wrkMast.setWrkSts(2L); // 工作状态: 2.设备上走
                        wrkMast.setSourceStaNo(wrkMast.getStaNo()); // 源站
                        wrkMast.setSourceStaNo(100); // 源站
                        wrkMast.setStaNo(staNo); // 目标站
                        wrkMast.setLocNo(wrkMast.getSourceLocNo()); // 目标库位 = 出库时的源库位
                        wrkMast.setSourceLocNo(""); // 源库位清空
@@ -464,6 +467,9 @@
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            throw new CoolException("更新工作档数据状态失败");
                        }



                        // 更新明细档io_time (历史档关联使用）
                        wrkDetlService.updateIoTime(wrkMast.getWrkNo(), now);
                        // 修改库位状态 Q.拣料/盘点/并板再入库

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

@@ -473,4 +473,13 @@

    }

    @Override
    public void setCmdFlag(boolean flag) {

    }

    @Override
    public boolean isCmdFlag() {
        return false;
    }
}

 src/main/webapp/static/js/console.map.js

@@ -78,42 +78,39 @@
            "height": 23
        }
    ],
    "crns": [
        {
            "type": "crane",
            "id": "crn-2",
            "text": "2",
            "top": 336,
            "left": 606,
            "width": 93,
            "height": 22
        },
        {
            "type": "track",
            "id": "lb_track2",
            "text": "",
            "top": 347,
            "left": 386,
            "width": 943,
            "height": 2
        },
        {
            "type": "crane",
            "id": "crn-1",
            "text": "1",
            "top": 199,
            "left": 606,
            "width": 93,
            "height": 22
        },
        {
            "type": "track",
            "id": "lb_track1",
            "text": "",
            "top": 210,
            "left": 386,
            "width": 943,
            "height": 2
    "crns": [{
        "type": "crane",
        "id": "crn-1",
        "text": "1",
        "top": 199,
        "left": 606,
        "width": 93,
        "height": 22
    },
    {
        "type": "crane",
        "id": "crn-2",
        "text": "2",
        "top": 336,
        "left": 606,
        "width": 93,
        "height": 22
    },{
        "type": "track",
        "id": "lb_track1",
        "text": "",
        "top": 210,
        "left": 386,
        "width": 943,
        "height": 2
    }, {
        "type": "track",
        "id": "lb_track2",
        "text": "",
        "top": 347,
        "left": 386,
        "width": 943,
        "height": 2
        }
    ],
    "areas": [