#

Junjie

2024-05-14 997175b461ab192d8e249e216e1364d8a4d6c524

#

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

@@ -71,6 +71,10 @@
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            bean.setLoc_no(locNo);
        }
        String matnr = String.valueOf(param.get("matnr"));
        if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
            bean.setMatnr(matnr);
        }
        List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
        int count = reportQueryMapper.getViewStayTimeCount(bean);
        Page<ViewStayTimeBean> page = new Page<>();

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

@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@@ -221,6 +224,15 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getAppeUser$(){
        UserService service = SpringUtils.getBean(UserService.class);
        User user = service.selectById(this.appeUser);
        if (!Cools.isEmpty(user)){
            return String.valueOf(user.getUsername());
        }
        return null;
    }

    public void sync(Object source) {
        Synchro.Copy(source, this);
    }

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

@@ -2,8 +2,10 @@

import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.WrkMastLogService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -358,5 +360,20 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
    }

    public String getIoType$(){
        if (Cools.isEmpty(this.wrkNo) || Cools.isEmpty(this.ioTime)){
            return "";
        }
        WrkMastLogService wrkMastLogService = SpringUtils.getBean(WrkMastLogService.class);
        EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
        wrapper.eq("wrk_no", wrkNo);
        wrapper.eq("io_time", ioTime);
        WrkMastLog wrkMastLog = wrkMastLogService.selectOne(wrapper);
        if (Cools.isEmpty(wrkMastLog)){
            return "";
        }
        return wrkMastLog.getIoType$();
    }


}

 src/main/resources/mapper/LocDetlMapper.xml

@@ -106,6 +106,9 @@
        <if test="crnNo!=null and crnNo!='' ">
            and b.crn_no=#{crnNo}
        </if>
        <if test="zpallet!=null and zpallet!='' ">
            and a.zpallet like '%' + #{zpallet} + '%'
        </if>
    </sql>

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

 src/main/webapp/static/js/locDetl/locDetl.js

@@ -8,7 +8,7 @@
        ,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
        ,{field: 'anfme', align: 'center',title: '数量'}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}
        ,{field: 'specs', align: 'center',title: '配置'}
        ,{field: 'specs', align: 'center',title: '规格'}
        ,{field: 'model', align: 'center',title: '代码', hide: true}
        ,{field: 'color', align: 'center',title: '颜色', hide: true}
        ,{field: 'brand', align: 'center',title: '类型', hide: false}

 src/main/webapp/static/js/waitPakin/waitPakin.js

@@ -17,7 +17,9 @@
                return html;
            }}
        ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true})
        ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}
        ,{field: 'appeUser$', align: 'center',title: '添加人员'}
        ,{field: 'appeTime$', align: 'center',title: '添加时间'})
    return cols;
}


 src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js

@@ -3,6 +3,7 @@
    var cols = [
        {field: 'wrkNo', align: 'center',title: '工作号'}
        ,{field: 'ioTime$', align: 'center',title: '工作时间'}
        ,{field: 'ioType$', align: 'center',title: '入出库类型'}
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'modiUser$', align: 'center',title: '修改人员',hide: true}

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -76,14 +76,19 @@
                <input class="layui-input" type="text" name="matnr" placeholder="商品编号"  autocomplete="off">
            </div>
        </div>
<!--        <div class="layui-inline">-->
<!--            <div class="layui-input-inline">-->
<!--                <input class="layui-input" type="text" name="maktx" placeholder="物料描述" autocomplete="off">-->
<!--            </div>-->
<!--        </div>-->
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="maktx" placeholder="物料描述" autocomplete="off">
                <input class="layui-input" type="text" name="batch" placeholder="批号" autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="batch" placeholder="批号" autocomplete="off">
                <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off">
            </div>
        </div>
        <!-- 日期范围 -->

 src/main/webapp/views/report/viewStayTime.html

@@ -24,6 +24,11 @@
            <input class="layui-input" type="text" name="loc_no" placeholder="库位号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
        </div>
    </div>

    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">

 src/main/webapp/views/waitPakinLog/waitPakinLog.html

@@ -16,6 +16,11 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="商品编号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="pakin_id" placeholder="入库通知号" autocomplete="off">
        </div>
    </div>