Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy...

luxiaotao1123

2020-07-15 05ebcccc2c8099c0252501fea0e1797e5a1361d2

Merge branches 'master' and 'xtyasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs

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

@@ -38,7 +38,7 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库号")
    @ApiModelProperty(value= "规格")
    private String lgnum;

    /**
@@ -56,7 +56,7 @@
    /**
     * 物料标签ID
     */
    @ApiModelProperty(value= "物料标签ID")
    @ApiModelProperty(value= "颜色")
    private String zmatid;

    /**

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

@@ -52,10 +52,10 @@
    @ApiModelProperty(value= "物料规格")
    private String str2;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "颜色")
    private String str3;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "客户")
    private String str4;

    @ApiModelProperty(value= "")
@@ -115,7 +115,7 @@
    @ApiModelProperty(value= "")
    private String str23;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "重量")
    private Double num1;

    @ApiModelProperty(value= "")

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

@@ -40,7 +40,7 @@
    /**
     * 仓库号
     */
    @ApiModelProperty(value= "仓库号")
    @ApiModelProperty(value= "规格")
    private String lgnum;

    /**
@@ -58,7 +58,7 @@
    /**
     * 物料标签ID
     */
    @ApiModelProperty(value= "物料标签ID")
    @ApiModelProperty(value= "颜色")
    private String zmatid;

    /**

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

@@ -11,6 +11,7 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
@@ -52,8 +53,6 @@
    private AdjDetlService adjDetlService;
    @Autowired
    private WrkMastLogService wrkMastLogService;
    @Autowired
    private WrkDetlLogService wrkDetlLogService;

    @Override
    @Transactional
@@ -215,16 +214,9 @@
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.setWrkNo(workNo);
                wrkDetl.setIoTime(new Date());
                wrkDetl.setMatnr(detlDto.getLocDetl().getMatnr());
                Double anfme = ioType==101?detlDto.getCount():detlDto.getLocDetl().getAnfme();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setZmatid(detlDto.getLocDetl().getZmatid());
                wrkDetl.setTbpos(detlDto.getLocDetl().getTbpos());
                wrkDetl.setTbnum(detlDto.getLocDetl().getTbnum());
                wrkDetl.setLgnum(detlDto.getLocDetl().getLgnum());
                wrkDetl.setAltme(detlDto.getLocDetl().getAltme());
                wrkDetl.setBname(detlDto.getLocDetl().getBname());
                wrkDetl.setMaktx(detlDto.getLocDetl().getMaktx());
                VersionUtils.setWrkDetl(wrkDetl, detlDto.getLocDetl()); // 版本控制
                wrkDetl.setAppeTime(new Date());
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(new Date());
@@ -420,6 +412,7 @@
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk(sourceLoc.getLocType().equals("D")?"Y":"N"); // 空板
        wrkMast.setBarcode(sourceLoc.getBarcode()); // 托盘码
        wrkMast.setLinkMis("N");
        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(new Date());
@@ -435,15 +428,8 @@
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(new Date());
            wrkDetl.setMatnr(locDetl.getMatnr());
            wrkDetl.setAnfme(locDetl.getAnfme());
            wrkDetl.setZmatid(locDetl.getZmatid());
            wrkDetl.setTbpos(locDetl.getTbpos());
            wrkDetl.setTbnum(locDetl.getTbnum());
            wrkDetl.setLgnum(locDetl.getLgnum());
            wrkDetl.setAltme(locDetl.getAltme());
            wrkDetl.setBname(locDetl.getBname());
            wrkDetl.setMaktx(locDetl.getMaktx());
            VersionUtils.setWrkDetl(wrkDetl, locDetl); // 版本控制
            wrkDetl.setAppeTime(new Date());
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(new Date());
@@ -523,17 +509,8 @@
                MatCode matCode = matCodeService.selectById(adjust.getMatnr());
                LocDetl locDetl = new LocDetl();
                locDetl.setLocNo(locMast.getLocNo());
                locDetl.setMatnr(matCode.getMatNo());
                locDetl.setMaktx(matCode.getMatName()); // 物料描述
                locDetl.setAnfme(adjust.getCount()); // 数量
                locDetl.setAltme(matCode.getStr1()); // 单位
                // todo:luxiaoao
                locDetl.setLgnum("待定"); // 仓库号
                locDetl.setTbnum(0); // 转储请求编号
                locDetl.setTbpos(0); // 行项目
                locDetl.setZmatid("待定"); // 物料标签ID
                locDetl.setZpallet("待定"); // 托盘条码

                VersionUtils.setLocDetl(locDetl, matCode); // 版本控制
                locDetl.setModiUser(userId); // 操作人员信息
                locDetl.setModiTime(new Date());
                locDetl.setAppeUser(userId);

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

@@ -9,6 +9,7 @@
import com.zy.asrs.mapper.WrkDetlMapper;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,13 +38,9 @@
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(new Date());
            wrkDetl.setMatnr(matCode.getMatNo()); // 物料编号
            wrkDetl.setAnfme(dto.getCount()); // 数量
            VersionUtils.setWrkDetl(wrkDetl, matCode); // 版本控制
            wrkDetl.setZpallet(barcode); // 托盘条码
            wrkDetl.setLgnum("待定"); // todo
            wrkDetl.setTbnum(0); // todo
            wrkDetl.setTbpos(0); // todo
            wrkDetl.setZmatid("待定"); // todo
            wrkDetl.setAppeUser(userId);
            wrkDetl.setAppeTime(new Date());
            wrkDetl.setModiUser(userId);

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

@@ -5,6 +5,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -83,25 +84,11 @@
                                exceptionHandle("全板入库 ===>> 更新库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
                        } else {
                            locDetl = new LocDetl(
                                    wrkMast.getLocNo(), // 库位号
                                    wrkDetl.getMatnr(), // 物料号
                                    null,    // 仓库号
                                    null,    // 转储请求编号
                                    null,    // 行项目
                                    null,    // 物料标签ID
                                    wrkDetl.getMaktx(),    // 物料描述
                                    null,    // 工厂
                                    wrkDetl.getAnfme(),    // 数量
                                    wrkDetl.getAltme(),    // 单位
                                    wrkDetl.getZpallet(),    // 托盘条码
                                    null,    // 用户ID
                                    null,    // 备注
                                    null,    // 修改人员
                                    now,    // 修改时间
                                    null,    // 创建者
                                    now    // 添加时间
                            );
                            locDetl = new LocDetl();
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 版本控制
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("全板入库 ===>> 添加库存明细失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            }
@@ -171,25 +158,11 @@
                                exceptionHandle("并板入库 ===>> 修改库存明细数量失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                            }
                        } else {
                            locDetl = new LocDetl(
                                    wrkMast.getLocNo(), // 库位号
                                    wrkDetl.getMatnr(), // 物料号
                                    null,    // 仓库号
                                    null,    // 转储请求编号
                                    null,    // 行项目
                                    null,    // 物料标签ID
                                    wrkDetl.getMaktx(),    // 物料描述
                                    null,    // 工厂
                                    wrkDetl.getAnfme(),    // 数量
                                    wrkDetl.getAltme(),    // 单位
                                    wrkDetl.getZpallet(),    // 托盘条码
                                    null,    // 用户ID
                                    null,    // 备注
                                    null,    // 修改人员
                                    now,    // 修改时间
                                    null,    // 创建者
                                    now    // 添加时间
                            );
                            locDetl = new LocDetl();
                            locDetl.setLocNo(wrkMast.getLocNo()); // 库位号
                            VersionUtils.setLocDetl(locDetl, wrkDetl); // 版本控制
                            locDetl.setModiTime(now);
                            locDetl.setAppeTime(now);
                            if (!locDetlService.insert(locDetl)) {
                                exceptionHandle("并板入库 ===>> 新增库存明细失败；[workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
                            }

 src/main/java/com/zy/asrs/utils/VersionUtils.java

New file
@@ -0,0 +1,51 @@
package com.zy.asrs.utils;

import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;

/**
 * Created by vincent on 2020/7/14
 */
public class VersionUtils {

    public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
        wrkDetl.setMatnr(matCode.getMatNo()); // 物料编号
        wrkDetl.setMaktx(matCode.getMatName()); // 物料描述
        wrkDetl.setLgnum(matCode.getStr2()); // 规格
        wrkDetl.setZmatid(matCode.getStr3()); // 颜色
        wrkDetl.setAltme(matCode.getStr1()); // 单位
        wrkDetl.setBname(matCode.getStr4()); // 用户ID
    }

    public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
        wrkDetl.setMatnr(locDetl.getMatnr()); // 物料编号
        wrkDetl.setMaktx(locDetl.getMaktx()); // 物料描述
        wrkDetl.setLgnum(locDetl.getLgnum()); // 规格
        wrkDetl.setZmatid(locDetl.getZmatid()); // 颜色
        wrkDetl.setAltme(locDetl.getAltme()); // 单位
        wrkDetl.setBname(locDetl.getBname()); // 用户ID
        wrkDetl.setZpallet(locDetl.getZpallet()); // 托盘条码
    }

    public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
        locDetl.setMatnr(matCode.getMatNo()); // 物料编号
        locDetl.setMaktx(matCode.getMatName()); // 物料描述
        locDetl.setLgnum(matCode.getStr2()); // 规格
        locDetl.setZmatid(matCode.getStr3()); // 颜色
        locDetl.setAltme(matCode.getStr1()); // 单位
        locDetl.setBname(matCode.getStr4()); // 用户ID
    }

    public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
        locDetl.setMatnr(wrkDetl.getMatnr()); // 物料编号
        locDetl.setMaktx(wrkDetl.getMaktx()); // 物料描述
        locDetl.setLgnum(wrkDetl.getLgnum()); // 规格
        locDetl.setZmatid(wrkDetl.getZmatid()); // 颜色
        locDetl.setAnfme(wrkDetl.getAnfme()); // 数量
        locDetl.setAltme(wrkDetl.getAltme()); // 单位
        locDetl.setBname(wrkDetl.getBname()); // 用户ID
        locDetl.setZpallet(wrkDetl.getZpallet()); // 托盘条码
    }

}

 src/main/resources/application.yml

@@ -13,7 +13,7 @@
#    password: xltys1995
    # sql-server
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=xtyasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=dlasrs
    username: sa
    password: sa@123
  mvc:

 src/main/webapp/static/css/common.css

@@ -1,9 +1,9 @@
*, *::before, *::after {
    -webkit-box-sizing: border-box;
    box-sizing: border-box;
    margin: 0;
    padding: 0;
}
/**, *::before, *::after {*/
/*    -webkit-box-sizing: border-box;*/
/*    box-sizing: border-box;*/
/*    margin: 0;*/
/*    padding: 0;*/
/*}*/

body {
    background-color: #fff;

 src/main/webapp/static/js/errorWrkMast/errorWrkMast.js

@@ -20,8 +20,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'wrkNo', align: 'center',title: '工作号',sort: true}
            // {type: 'checkbox'}
            {field: 'wrkNo', align: 'center',title: '工作号',sort: true}
            ,{field: 'ioTime$', align: 'center',title: '工作时间',sort: true, hide:true}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态'}
            ,{field: 'ioType$', align: 'center',title: '入出库类型'}

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

@@ -18,9 +18,9 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            // {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'locNo$', align: 'center',title: '库位号'}
            {field: 'locNo$', align: 'center',title: '库位号'}
            ,{field: 'matnr', align: 'center',title: '物料'}
            // ,{field: 'lgnum', align: 'center',title: '仓库号', width:80}
            // ,{field: 'tbnum', align: 'center',title: '转储请求编号'}

 src/main/webapp/static/js/matCode/matCode.js

@@ -60,8 +60,7 @@
            ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            // ,{field: 'status', align: 'center',title: ''}

            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:150}
            ,{fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        ]],
        request: {
            pageName: 'curr',

 src/main/webapp/static/js/report/inOut.js

@@ -17,8 +17,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'ymd', align: 'center', title: '日期'}
            // {type: 'checkbox'}
            {field: 'ymd', align: 'center', title: '日期'}
            ,{field: 'source_sta_no', align: 'center',title: '站点'}
            ,{field: 'sto_qty', align: 'center',title: '入库次数'}
            ,{field: 'ret_qty', align: 'center',title: '出库次数'}

 src/main/webapp/static/js/report/reportStockUse.js

@@ -18,8 +18,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox', fixed: 'left'}
            ,{field: 'row1', title: '钢架号', sort: true, align: 'center'}
            // {type: 'checkbox', fixed: 'left'}
            {field: 'row1', title: '钢架号', sort: true, align: 'center'}
            ,{field: 'total_qty', align: 'center',title: '库位总数'}
            ,{field: 'full_qty', align: 'center',title: '在库数量'}
            ,{field: 'null_qty', align: 'center',title: '空库位数量'}

 src/main/webapp/static/js/report/stayTime.js

@@ -18,8 +18,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'appe_time', title: '入库时间', align: 'center'}
            // {type: 'checkbox'}
            {field: 'appe_time', title: '入库时间', align: 'center'}
            ,{field: 'stay_time', align: 'center',title: '滞留天数'}
            ,{field: 'loc_no', align: 'center',title: '库位号'}
            ,{field: 'matnr', align: 'center',title: '物料'}

 src/main/webapp/static/js/report/workIn.js

@@ -17,8 +17,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'io_time', align: 'center', title: '入库日期'}
            // {type: 'checkbox'}
            {field: 'io_time', align: 'center', title: '入库日期'}
            ,{field: 'loc_no', align: 'center',title: '库位号'}
            // ,{field: 'crn_str_time', align: 'center',title: '堆垛机启动时间'}
            // ,{field: 'crn_end_time', align: 'center',title: '堆垛机停止时间'}

 src/main/webapp/static/js/report/workOut.js

@@ -17,8 +17,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'io_time', align: 'center', title: '出库日期'}
            // {type: 'checkbox'}
            {field: 'io_time', align: 'center', title: '出库日期'}
            ,{field: 'loc_no', align: 'center',title: '库位号'}
            ,{field: 'crn_str_time', align: 'center',title: '堆垛机启动时间'}
            ,{field: 'crn_end_time', align: 'center',title: '堆垛机停止时间'}

 src/main/webapp/static/js/stkPlcm/stkPlcm.js

@@ -17,8 +17,8 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            ,{field: 'ioTime$', align: 'center',title: '日期'}
            // {type: 'checkbox'}
            {field: 'ioTime$', align: 'center',title: '日期'}
            ,{field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'locNo$', align: 'center',title: '库位号',event: 'locNo', style: 'cursor:pointer'}
            ,{field: 'crnError$', align: 'center',title: '异常码'}

 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js

@@ -18,10 +18,10 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            // {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
//             ,{field: 'id', align: 'center',title: '编号'}
            ,{field: 'pakinId', align: 'center',title: '入库通知号'}
            {field: 'pakinId', align: 'center',title: '入库通知号'}
            ,{field: 'barcode', align: 'center',title: '托盘码'}
            ,{field: 'matnr', align: 'center',title: '物料编码'}
            ,{field: 'maktx', align: 'center',title: '物料描述'}

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

@@ -18,9 +18,9 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            // {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
            ,{field: 'wrkNo', align: 'center',title: '工作号'}
            {field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'ioTime$', align: 'center',title: '工作时间'}
            ,{field: 'matnr', align: 'center',title: '物料编号'}
            // ,{field: 'lgnum', align: 'center',title: '仓库号'}

 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -18,10 +18,10 @@
        toolbar: '#toolbar',
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            // {type: 'checkbox'}
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
//             ,{field: 'id', align: 'center',title: '编号'}
            ,{field: 'wrkNo', align: 'center',title: '工作号',event: 'wrkNo', sort: true}
            {field: 'wrkNo', align: 'center',title: '工作号',event: 'wrkNo', sort: true}
            ,{field: 'ioTime$', align: 'center',title: '工作时间', width:160, sort: true}
            ,{field: 'wrkSts$', align: 'center',title: '工作状态', width:160}
            ,{field: 'ioType$', align: 'center',title: '入出库类型', width:160}

 src/main/webapp/views/locDetl/locDetl.html

@@ -37,15 +37,12 @@
</div>
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button>
        <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">导出</button>
    </div>
</script>

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">详情</a>
    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a>
</script>

<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

 src/main/webapp/views/matCode/matCode_detail.html

@@ -15,14 +15,14 @@
<!-- 详情 -->
<div id="data-detail" class="layer_self_wrap">
    <form id="detail" class="layui-form">
    <!--
        <div class="layui-inline"  style="display: none">
            <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
            <div class="layui-input-inline">
                <input id="id" class="layui-input" type="text" placeholder="编号">
        <!--
            <div class="layui-inline"  style="display: none">
                <label class="layui-form-label"><span class="not-null">*</span>编　　号：</label>
                <div class="layui-input-inline">
                    <input id="id" class="layui-input" type="text" placeholder="编号">
                </div>
            </div>
        </div>
    -->
        -->
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label"><span class="not-null">*</span>物料编码：</label>
            <div class="layui-input-inline">