#

mrzhssss

2022-10-28 103c9cfb51142885dd2b5e7332e6de3bf63d631a

#

 src/main/java/com/zy/asrs/controller/OutController.java

@@ -206,7 +206,8 @@
                if (issued > 0) {
                    LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), JSON.toJSONString(vo.getOrderDtos()),
                            issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                    int ioType = (issued >= locDetl.getAnfme() && locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo())) == 1) ? 101 : 103;
                    int count = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("loc_no", locDto.getLocNo()));
                    int ioType = (issued >= locDetl.getAnfme() && count == 1 ? 101 : 103);
                    List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
                    locDto.setStaNos(staNos);
                    locDtos.add(locDto);

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

@@ -315,6 +315,12 @@
    @TableField("store_max_date")
    private Integer storeMaxDate;

    /**
     * 是否为频繁入出库物料
     */
    @TableField("inout_everyday")
    private Boolean inoutEveryday;


    public Mat() {}

@@ -526,4 +532,15 @@
        }
    }

    public String getInoutEveryday$(){
        if (this.inoutEveryday == null){
            return "否";
        }
        if (this.inoutEveryday){
            return "是";
        }else {
            return "否";
        }
    }

}

 src/main/resources/mapper/MatMapper.xml

@@ -46,6 +46,7 @@
        <result column="store_max" property="storeMax" />
        <result column="store_min" property="storeMin" />
        <result column="store_max_date" property="storeMaxDate" />
        <result column="inout_everyday" property="inoutEveryday" />
    </resultMap>

    <select id="listByPage" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -222,6 +222,8 @@
    ,{field: 'storeMax$', align: 'center',title: '库存上限'}
    ,{field: 'storeMin$', align: 'center',title: '库存下限'}
    ,{field: 'storeMaxDate$', align: 'center',title: '最大滞留时间'}
    ,{field: 'inoutEveryday$', align: 'center',title: '频繁入出库物料'}

]

var detlCols = [

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

@@ -258,6 +258,8 @@
            }
            ,yes: function(index, layero){
                //按钮【立即出库】的回调
                console.log('261行')
                console.log(tableCache);
                pakout(tableCache, index);
            }
            ,btn2: function(index, layero){
@@ -533,7 +535,6 @@
                                    mergeTabCache[i]['staNo'] = batchSta;
                                    arr.push(i);
                                }
                                console.log(mergeTabCache)
                                stoPreTabMergeIdx.reload({data: mergeTabCache});
                                arr.forEach(item => {
                                    $('div[lay-id=stoPreTabMerge] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
@@ -555,6 +556,8 @@
            }
            ,yes: function(index, layero){
                //按钮【立即出库】的回调
                console.log('560')
                console.log(mergeTabCache);
                pakout(mergeTabCache, index);
            }
            ,btn2: function(index, layero){

 src/main/webapp/views/mat/mat.html

@@ -209,6 +209,15 @@
                        <input name="storeMaxDate" placeholder="最大滞留时间(天)" type="number" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">频繁入出库物料</label>
                    <div class="layui-input-block">
                        <select name="inoutEveryday" lay-vertype="tips" lay-verify="required" required="">
                            <option value="0">否</option>
                            <option value="1">是</option>
                        </select>
                    </div>
                </div>


            </div>