#

whycq

2022-11-08 71e2c4b6e73131b6415c8c239e70c95be94ec73e

#

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

@@ -182,6 +182,13 @@
    @ApiModelProperty(value= "是否冻结")
    private Integer frozen;

    /**
     * å†»ç»“备注
     */
    @ApiModelProperty(value= "冻结备注")
    @TableField("frozen_memo")
    private String frozenMemo;

    public String getWhsType$(){
        BasWhsService service = SpringUtils.getBean(BasWhsService.class);
        BasWhs basWhs = service.selectById(this.whsType);

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

@@ -130,6 +130,7 @@
                        locMast.setFrozen(wrkMast.getFrozen());
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        locMast.setFrozenMemo(wrkMast.getMemo());
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("全板入库 ===>> ä¿®æ”¹åº“位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                        }
@@ -351,6 +352,7 @@
                        locMast.setFrozen(0);
                        locMast.setModiTime(now);
                        locMast.setIoTime(now);
                        locMast.setFrozenMemo("");
                        if (!locMastService.updateById(locMast)) {
                            exceptionHandle("全板出库 ===>> ä¿®æ”¹æºåº“位状态失败；[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
                        }

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

@@ -142,6 +142,7 @@
        if(waitPakins.size()>0) {
            WaitPakin one = waitPakins.get(0);
            wrkMast.setFrozen(one.getFrozen());
            wrkMast.setMemo(one.getMemo());
        }
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {

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

@@ -28,6 +28,7 @@
            // ,{field: 'locSts', align: 'center',title: ''}
            // ,{field: 'sheetNo', align: 'center',title: ''}
            ,{field: 'frozen$', align: 'center',title: '冻结状态'}
            ,{field: 'frozenMemo', align: 'center',title: '冻结原因'}
            ,{field: 'crnNo', align: 'center',title: '堆垛机号'}
            ,{field: 'row1', align: 'center',title: '排', sort:true}
            ,{field: 'bay1', align: 'center',title: '列', sort:true}
@@ -65,7 +66,6 @@
            pageSize: 'limit'
        },
        parseData: function (res) {
            console.log(res)
            return {
                'code': res.code,
                'msg': res.msg,
@@ -460,7 +460,8 @@
            barcode: $('#barcode').val(),
            PdcType: $('#PdcType').val(),
            ctnNo: $('#ctnNo').val(),
            frozen: $('#frozen').val()
            frozen: $('#frozen').val(),
            frozenMemo: $('#frozenMemo').val()
        };
        $.ajax({
            url: baseUrl+"/locMast/"+name+"/auth",

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

@@ -36,6 +36,11 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="frozen" placeholder="冻结状态" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="row1" placeholder="排" autocomplete="off">
        </div>
    </div>

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

@@ -89,6 +89,12 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">冻结原因：</label>
            <div class="layui-input-inline">
                <input id="frozenMemo" class="layui-input" type="text" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline"  style="width:80%;">
            <label class="layui-form-label">堆垛机号：</label>
            <div class="layui-input-inline">
                <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled">

 version/±ß·æÊý¾Ý¿â¸Ä¶¯20221028/±ß·æÊý¾Ý¿â¸Ä¶¯.md

@@ -37,5 +37,7 @@
cust_wait_pakin
cust_wait_pakin_log
asr_wrk_detl

asr_loc_mast + frozen_memo (varchar(255)
```