#

Administrator

15 小时以前 c8d0aaf6a77a28d8d934d6ccbcae3560296b3c09

#

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

@@ -84,6 +84,8 @@
            String zpallet = null;
            String batch = null;
            String model = null;
            String unit = null;
            String brand = null;
            Double anfme = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
@@ -111,11 +113,15 @@
                    matnr = val;
                }else if (entry.getKey().equals("model")) {
                    model = val;
                }else if (entry.getKey().equals("unit")) {
                    unit = val;
                }else if (entry.getKey().equals("brand")) {
                    brand = val;
                }
            }
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd, curr, limit);
            Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd));
            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd));
            return R.ok(page1);
        } catch (Exception e) {
            return R.error("异常" + e);

 src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java

@@ -24,7 +24,9 @@
                                       @Param("zpallet") String zpallet,
                                       @Param("batch") String batch,
                                       @Param("model") String model,
                                       @Param("unit") String unit,
                                       @Param("anfme") Double anfme,
                                       @Param("brand") String brand,
                                       @Param("modiTimeStart") Date modiTimeStart,
                                       @Param("modiTimeEnd") Date modiTimeEnd,
                                       @Param("pageNumber") Integer curr,
@@ -37,7 +39,9 @@
                                @Param("zpallet") String zpallet,
                                @Param("batch") String batch,
                                @Param("model") String model,
                                @Param("unit") String unit,
                                @Param("anfme") Double anfme,
                                @Param("brand") String brand,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);


 src/main/java/com/zy/asrs/service/WrkDetlLogService.java

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

    boolean save(Integer workNo);

    List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);

    Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd);
    Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd);

}

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

@@ -1599,8 +1599,8 @@
                matList.setStockType(wrkMast.getStaNo() == 2041 ? "返修出库" : "成品出库");
                matList.setBoxType(wrkDetl.getColor());
                matList.setRollType(wrkDetl.getManu());
                matList.setWideInWidth(wrkDetl.getSku());
                matList.setThickness(wrkDetl.getItemNum());
                matList.setWideInWidth(wrkDetl.getItemNum());
                matList.setThickness(wrkDetl.getSku());
                List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
                GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
                        wrkDetl.getUnit(), wrkDetl.getMaktx(), wrkDetl.getLength(),

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

@@ -17,13 +17,14 @@
        return this.baseMapper.save(workNo) > 0;
    }


    @Override
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd, curr, limit);
    public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd, curr, limit);
    }

    @Override
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,anfme, modiTimeStart, modiTimeEnd);
    public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,String model,String unit,Double anfme,String brand, Date modiTimeStart, Date modiTimeEnd) {
        return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,model,unit,anfme,brand, modiTimeStart, modiTimeEnd);
    }
}

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

@@ -531,8 +531,8 @@
                matList.setStockType(wrkMast.getWhsType() == 1 ? "返修入库" : "成品入库");
                matList.setBoxType(wrkDetl.getColor());
                matList.setRollType(wrkDetl.getManu());
                matList.setWideInWidth(wrkDetl.getSku());
                matList.setThickness(wrkDetl.getItemNum());
                matList.setWideInWidth(wrkDetl.getItemNum());
                matList.setThickness(wrkDetl.getSku());
                List<GwmsGenerateInventoryDto.Rolls> rollsList = new ArrayList<>();
                GwmsGenerateInventoryDto.Rolls roll = new GwmsGenerateInventoryDto.Rolls(wrkDetl.getModel(),
                        wrkDetl.getUnit(), wrkDetl.getMaktx(), wrkDetl.getLength(),

 src/main/java/com/zy/common/properties/SystemProperties.java

@@ -63,7 +63,7 @@

    // 生成激活码
    public static void main(String[] args) {
        String timeStr = "2099-09-26 08:00:00";
        String timeStr = "2099-10-26 08:00:00";
        Date exprTime = DateUtils.convert(timeStr);
        String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
        System.out.println("激活码："+code);

 src/main/resources/license.lic

Binary files differ

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -79,6 +79,12 @@
        <if test="specs != null and specs != ''">
            and a.specs like concat('%',#{specs},'%')
        </if>
        <if test="unit != null and unit != ''">
            and a.unit like concat('%',#{unit},'%')
        </if>
        <if test="brand != null and brand != ''">
            and a.brand like concat('%',#{brand},'%')
        </if>
    </sql>

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

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -60,7 +60,7 @@
            // ,{field: 'refIotime$', align: 'center',title: '拣料时间'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true, width: 160}
            // ,{field: 'memo', align: 'center',title: '备注'}
             ,{field: 'logErrMemo', align: 'center',title: '异常信息'}
            //
            // ,{field: 'fullPlt', align: 'center',title: '满板', templet:function(row){
            //         var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";

 src/main/webapp/views/wrkDetl/wrkDetl.html

@@ -31,7 +31,7 @@
    </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="unit" placeholder="箱号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/wrkDetlLog/wrkDetlLog.html

@@ -30,16 +30,16 @@
            <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="brand" placeholder="包装号" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
<!--    <div class="layui-inline">-->
<!--        <div class="layui-input-inline">-->
<!--            <input class="layui-input" type="text" name="unit" placeholder="箱号" autocomplete="off">-->
<!--        </div>-->
<!--    </div>-->
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="brand" placeholder="包装号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="unit" placeholder="箱号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="model" placeholder="卷号" autocomplete="off">

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -124,7 +124,7 @@
    <a class="layui-btn layui-btn-danger layui-btn-xs btn-cancel" lay-event="complete">完成</a>

    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>
<!--    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">维护状态</a>-->
    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">维护状态</a>

    {{#if (d.ioType === 103) { }}
        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</a>
@@ -138,7 +138,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMast/wrkMast.js?v=3" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>