#

LSH

2023-05-18 bd1a2aef7fbe13e920c473b4f5e7ff5ba942c9a8

#

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

@@ -194,6 +194,9 @@
    @ApiModelProperty(value= "通道")
    private Integer channel;

    @ApiModelProperty(value= "冻结")
    private Integer freeze;


    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -282,6 +285,18 @@
        }
    }

    public String getFreeze$() {
        if (null == this.freeze){ return null; }
        switch (this.freeze){
            case 0:
                return "正常";
            case 1:
                return "冻结";
            default:
                return String.valueOf(this.locType3);
        }
    }

    public String getModiUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.modiUser);

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

@@ -23,6 +23,8 @@

    //PACK状态
    private Integer packSts;
    //步骤
    private Integer stepSts;

    // 单据编号
    private String orderNo;

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

@@ -670,6 +670,14 @@
        if (!locMastService.update(locMast,new EntityWrapper<LocMast>().eq("loc_no", testMast.getLocNo()))){
            log.error("申请测试失败");
        }
        //3.开始测试上报
        CombParam combParam = new CombParam();
        combParam.setPackNo(locMast.getBarcode());
        combParam.setLocNo(locMast.getLocNo());
        combParam.setPackSts(0);
        combParam.setStepSts(3);
        combParam.setRequestTime(DateUtils.convert(now));
        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);

    }
    @Override

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

@@ -82,6 +82,14 @@
                            }
                            if (targetLocNo != null){
                                workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
                                //4.测试完成上报
                                CombParam combParam = new CombParam();
                                combParam.setPackNo(locMast.getBarcode());
                                combParam.setLocNo(locMast.getLocNo());
                                combParam.setPackSts(2);
                                combParam.setStepSts(4);
                                combParam.setRequestTime(DateUtils.convert(new Date()));
                                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                                return SUCCESS;
                            }else {
                                log.error("测试完成自动移库--->没有空库位!");
@@ -126,6 +134,14 @@
                            if (targetLocNo != null){
                                //生成出库任务
                                if (outLoc(locMast)){
                                    //4.测试完成上报
                                    CombParam combParam = new CombParam();
                                    combParam.setPackNo(locMast.getBarcode());
                                    combParam.setLocNo(locMast.getLocNo());
                                    combParam.setPackSts(1);
                                    combParam.setStepSts(4);
                                    combParam.setRequestTime(DateUtils.convert(new Date()));
                                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                                    return SUCCESS;
                                }
                            }else {
@@ -136,6 +152,14 @@
                                }
                                if (targetLocNo != null){
                                    workService.locMove(locMast.getLocNo(),targetLocNo.getLocNo(),(long)Integer.parseInt(testMast.getUserId()));
                                    //4.测试完成上报
                                    CombParam combParam = new CombParam();
                                    combParam.setPackNo(locMast.getBarcode());
                                    combParam.setLocNo(locMast.getLocNo());
                                    combParam.setPackSts(1);
                                    combParam.setStepSts(4);
                                    combParam.setRequestTime(DateUtils.convert(new Date()));
                                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                                    return SUCCESS;
                                }else {
                                    log.error("测试完成自动移库--->没有空库位!");

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

@@ -64,7 +64,8 @@
                    .eq("fire_status", 0)
                    .eq("loc_sts", "F")
                    .eq("loc_type1",(short)2)
                    .eq("pack_status", 5));
                    .eq("pack_status", 5)
                    .eq("freeze",0));
            Integer ioType = 101;   //入出库类型
            //静置完成出库站104
            for(LocMast locMast : locMasts){
@@ -130,6 +131,7 @@
                        combParam.setPackNo(locMast.getBarcode());
                        combParam.setLocNo(locMast.getLocNo());
                        combParam.setPackSts(6);
                        combParam.setStepSts(1);
                        combParam.setRequestTime(DateUtils.convert(new Date()));
                        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);


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

@@ -172,6 +172,20 @@
                                throw new CoolException("更改测试状态失败");
                            }
                        }
                        //2.入库完成上报
                        CombParam combParam = new CombParam();
                        combParam.setPackNo(wrkMast.getBarcode());
                        combParam.setLocNo(wrkMast.getLocNo());
                        if (locMast.getCrnNo()==1){
                            combParam.setPackSts(0);
                            combParam.setStepSts(2);
                        }else{
                            combParam.setPackSts(1);
                            combParam.setStepSts(5);
                        }

                        combParam.setRequestTime(DateUtils.convert(now));
                        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                        if (!locMastService.updateById(locMast)) {
//                            exceptionHandle("全板入库 ===>> 修改库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -333,6 +347,7 @@
                    locMast.setModiTime(now);
                    locMast.setFireStatus(0);

                    boolean sign =false;
                    if (locMast.getLocType1().equals(sourceLoc.getLocType1())){
                        locMast.setPackStatus(packStatus);
                    }else if (locMast.getLocType1().equals((short)1) && sourceLoc.getLocType1().equals((short)3)){
@@ -343,6 +358,7 @@
                        }else {
                            locMast.setPackStatus(5); //5:静置中
                        }
                        sign=true;
                        if (locMast.getLocType1()==1 && sourceLoc.getLocType1()==2){
                            TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no",sourceLoc.getLocNo())
@@ -361,6 +377,22 @@
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("库位移转 ===>> 修改目标库位状态失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    if (locMast.getCrnNo()==1 && sign){
                        //5.静置库位入库完成上报
                        CombParam combParam = new CombParam();
                        combParam.setPackNo(wrkMast.getBarcode());
                        combParam.setLocNo(wrkMast.getLocNo());
                        if (locMast.getPackStatus()==4){
                            combParam.setPackSts(2);
                        }else if (locMast.getPackStatus()==5){
                            combParam.setPackSts(1);
                        }else {
                            combParam.setPackSts(0);
                        }
                        combParam.setStepSts(5);
                        combParam.setRequestTime(DateUtils.convert(now));
                        new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                    }
                    break;
                default:
                    break;

 src/main/java/com/zy/common/web/WcsController.java

@@ -189,13 +189,16 @@
            if (!locMastService.updateById(locMast)){
                throw new CoolException("改变库位状态失败");
            }else{
                //1.扫码上报
                CombParam combParam = new CombParam();
                combParam.setPackNo(locMast.getBarcode());
                combParam.setLocNo(locMast.getLocNo());
                combParam.setPackSts(1);
                combParam.setRequestTime(DateUtils.convert(new Date()));
                new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                if (locMast.getRow1()<3){
                    //1.扫码上报
                    CombParam combParam = new CombParam();
                    combParam.setPackNo(wrkMast.getBarcode());
                    combParam.setLocNo(wrkMast.getLocNo());
                    combParam.setPackSts(0);
                    combParam.setStepSts(1);
                    combParam.setRequestTime(DateUtils.convert(now));
                    new PostMesDataUtils().postMesData("MES系统",mesUrl,inpath,combParam);
                }
            }
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");

 src/main/resources/mapper/LocMastMapper.xml

@@ -38,6 +38,7 @@
        <result column="fire_status" property="fireStatus" />
        <result column="pack_status" property="packStatus" />
        <result column="channel" property="channel" />
        <result column="freeze" property="freeze" />

    </resultMap>


 src/main/webapp/static/js/locMast/locMast.js

@@ -27,6 +27,7 @@
            ,{field: 'packStatus$', align: 'center',title: '产品状态', hide:false}
            ,{field: 'locType1$', align: 'center',title: '库位类型'}
            ,{field: 'locType2$', align: 'center',title: '测试设备号'}
            ,{field: 'freeze$', align: 'center',title: '冻结状态'}
            // ,{field: 'whsType$', align: 'center',title: '库位类型'}
            // ,{field: 'pltType', align: 'center',title: ''}
            // ,{field: 'ctnType', align: 'center',title: ''}
@@ -518,6 +519,7 @@
            fireNo: $('#fireNo').val(),
            fireStatus: $('#fireStatus').val(),
            packStatus: $('#packStatus').val(),
            freeze: $('#freeze').val(),
        };
        $.ajax({
            url: baseUrl+"/locMast/"+name+"/auth",

 src/main/webapp/static/js/stoMan/stoQue.js

@@ -32,6 +32,7 @@
            ,{field: 'packStatus$', align: 'center',title: '产品状态', width: 90, style: 'color: #8E2323'}
            ,{field: 'locType1$', align: 'center',title: '库位类型'}
            ,{field: 'locType2$', align: 'center',title: '测试设备号'}
            ,{field: 'freeze$', align: 'center',title: '冻结状态',width: 90}
            // ,{field: 'whsType$', align: 'center',title: '库位类型'}
            // ,{field: 'crnNo', align: 'center',title: '堆垛机号'}
            ,{field: 'row1', align: 'center',title: '排'}

 src/main/webapp/views/locMast/locMast_detail.html

@@ -98,6 +98,16 @@
                </select>
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label"><span class="not-null">*</span>冻结状态：</label>
            <div class="layui-input-inline">
                <select id="freeze" class="layui-input" type="text">
                    <!--                    <option style="display: none"></option>-->
                    <option value="0">正常</option>
                    <option value="1">冻结</option>
                </select>
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">