fixed

Junjie

2023-05-22 6e65e575aedd776432cda5a88f7434320f42e3f4

fixed

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

@@ -1,6 +1,5 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -8,7 +7,6 @@
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.WmsWrkStatusType;
import com.zy.asrs.entity.WmsWrk;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WmsWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;

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

@@ -11,6 +11,7 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.CommandInfoService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,8 @@

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private CommandInfoService commandInfoService;

    @RequestMapping(value = "/wrkMast/{id}/auth")
    @ManagerAuth

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

@@ -28,11 +28,18 @@
    private Integer id;

    /**
     * 任务号
     * 任务号wcs_command_info
     */
    @ApiModelProperty(value= "任务号")
    @TableField("wrk_no")
    private Integer wrkNo;

    /**
     * WMS任务号
     */
    @ApiModelProperty(value= "WMS任务号")
    @TableField("wms_wrk_no")
    private Integer wmsWrkNo;

    /**
     * 指令类型{1:创建,2:执行,3:完成}
@@ -93,8 +100,9 @@

    public CommandInfo() {}

    public CommandInfo(Integer wrkNo,Integer commandStatus,Date startTime,Date endTime,Integer commandType,String device,String deviceLog,String commandDesc) {
    public CommandInfo(Integer wrkNo, Integer wmsWrkNo, Integer commandStatus, Date startTime, Date endTime, Integer commandType, String device, String deviceLog, String commandDesc) {
        this.wrkNo = wrkNo;
        this.wmsWrkNo = wmsWrkNo;
        this.commandStatus = commandStatus;
        this.startTime = startTime;
        this.endTime = endTime;

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

@@ -19,6 +19,7 @@
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
import java.util.List;

@Data
@TableName("wcs_wms_wrk")

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

@@ -18,6 +18,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Data
@TableName("asr_wrk_mast")
@@ -324,6 +325,10 @@
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date endTime;

    //命令list
    @TableField(exist = false)
    private List<CommandInfo> children;

    public String getWrkSts$(){
        BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
        BasWrkStatus entity = mapper.selectById(this.wrkSts);

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

@@ -271,8 +271,8 @@
    private String manuType;

    @ApiModelProperty(value= "")
    @TableField("memo_m")
    private String memoM;
    @TableField("memo")
    private String memo;

    @ApiModelProperty(value= "")
    @TableField("sc_weight")

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

@@ -5,8 +5,11 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

import java.util.List;

@Mapper
@Repository
public interface CommandInfoMapper extends BaseMapper<CommandInfo> {

    List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo);
}

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

@@ -3,6 +3,10 @@
import com.zy.asrs.entity.CommandInfo;
import com.baomidou.mybatisplus.service.IService;

import java.util.List;

public interface CommandInfoService extends IService<CommandInfo> {

    List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo);

}

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

@@ -6,7 +6,13 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("commandInfoService")
public class CommandInfoServiceImpl extends ServiceImpl<CommandInfoMapper, CommandInfo> implements CommandInfoService {

    @Override
    public List<CommandInfo> selectByWmsWrkNoAndWrkNo(Integer wmsWrkNo, Integer wrkNo) {
        return this.baseMapper.selectByWmsWrkNoAndWrkNo(wmsWrkNo, wrkNo);
    }
}

 src/main/resources/mapper/CommandInfoMapper.xml

@@ -6,6 +6,7 @@
    <resultMap id="BaseResultMap" type="com.zy.asrs.entity.CommandInfo">
        <id column="id" property="id" />
        <result column="wrk_no" property="wrkNo" />
        <result column="wms_wrk_no" property="wmsWrkNo" />
        <result column="command_status" property="commandStatus" />
        <result column="start_time" property="startTime" />
        <result column="end_time" property="endTime" />
@@ -16,4 +17,10 @@

    </resultMap>

    <select id="selectByWmsWrkNoAndWrkNo" resultMap="BaseResultMap">
        select * from wcs_command_info
        where wrk_no = #{wrkNo}
        and wms_wrk_no = #{wmsWrkNo}
    </select>

</mapper>

 src/main/webapp/static/wms/js/commandManage/commandManage.js

@@ -1,5 +1,6 @@
var pageCurr;
var wrkNo;
var wmsWrkNo;
layui.use(['table', 'form'], function(){
    var table = layui.table;
    var $ = layui.jquery;
@@ -7,12 +8,13 @@
    var form = layui.form;

    $("#wrkNo").val(parent.wrkNo)
    $("#wmsWrkNo").val(parent.wmsWrkNo)
    // 数据渲染
    tableIns = table.render({
        elem: '#commandManage',
        headers: {token: localStorage.getItem('token')},
        url: baseUrl+'/commandInfo/list/auth',
        where: {wrk_no: parent.wrkNo},
        where: {wrk_no: parent.wrkNo, wms_wrk_no: wmsWrkNo},
        page: true,
        limit: 16,
        limits: [16, 30, 50, 100, 200, 500],
@@ -22,6 +24,7 @@
        cols: [[
            {field: 'id', align: 'center',title: '指令编号',event: 'wrkNo', sort: true}
            ,{field: 'wrkNo', align: 'center',title: '任务号',event: 'wrkNo', sort: true}
            ,{field: 'wmsWrkNo', align: 'center',title: 'WMS任务号'}
            ,{field: 'commandStatus$', align: 'center',title: '指令状态'}
            ,{field: 'durationTime', align: 'center',title: '持续时长', width: 160}
            ,{field: 'commandType', align: 'center',title: '指令类型'}
@@ -111,6 +114,7 @@
            // 任务信息展示
            case 'wrkMastShow':
                wrkNo = data.wrkNo;
                wmsWrkNo = data.wmsWrkNo;
                layer.open({
                    type: 2,
                    title: 'WMS任务',

 src/main/webapp/static/wms/js/wmsWrkLog/wmsWrkLog.js

@@ -41,7 +41,7 @@
            ,{field: 'barcode', align: 'center',title: '条码'}
            ,{field: 'endTime$', align: 'center',title: '结束时间'}

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

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

@@ -14,7 +14,6 @@

    $('#wrkNo').val(parent.wrkNo);
    $('#wmsWrkNo').val(parent.wmsWrkNo);

    // 数据渲染
    tableIns = table.render({
        elem: '#wrkMast',
@@ -29,8 +28,8 @@
        cellMinWidth: 50,
        cols: [[
            {type: 'checkbox'}
            , {field: 'wmsWrkNo', align: 'center', title: 'WMS任务号', sort: true, width: 85}
            , {field: 'wrkNo', align: 'center', title: '任务号', sort: true, width: 85}
            , {field: 'wmsWrkNo', align: 'center', title: 'WMS任务号', sort: true, width: 120}
            , {field: 'wrkNo', align: 'center', title: '任务号', sort: true, width: 120}
            , {field: 'ioTime$', align: 'center', title: '任务时间', sort: true, width: 160}
            , {field: 'durationTime', align: 'center', title: '持续时长', width: 160}
            , {field: 'wrkSts$', align: 'center', title: '任务状态'}
@@ -98,7 +97,7 @@
            if (res.code === 403) {
                top.location.href = baseUrl + "/";
            }
            $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow','visible');//解决layui数据表格中嵌套下拉框显示问题
            $(".layui-table-body, .layui-table-box, .layui-table-cell").css('overflow', 'visible');//解决layui数据表格中嵌套下拉框显示问题
            pageCurr = curr;
            limit();
            form.on('checkbox(tableCheckbox)', function (data) {
@@ -404,6 +403,7 @@
                break;
            case 'commandShow'://查看指令
                wrkNo = data.wrkNo;
                wmsWrkNo = data.wmsWrkNo;
                layer.open({
                    type: 2,
                    title: 'WMS任务指令',
@@ -411,7 +411,7 @@
                    area: [top.detailWidth, top.detailHeight],
                    shadeClose: true,
                    content: '../commandManage/commandManage.html',
                    success: function(layero, index){
                    success: function (layero, index) {
                    }
                });
                break;

 src/main/webapp/views/commandManage/commandManage.html

@@ -23,6 +23,11 @@
            <input class="layui-input" type="text" name="wrk_no" id="wrkNo" placeholder="任务号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="wms_wrk_no" id="wmsWrkNo" placeholder="WMS任务号" autocomplete="off">
        </div>
    </div>

    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item">

 src/main/webapp/views/wmsWrkLog/wmsWrkLog.html

@@ -49,7 +49,7 @@

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>
<!--        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">删除</button>-->
        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">导出</button>
    </div>
</script>
@@ -65,172 +65,5 @@
<script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/wms/js/wmsWrkLog/wmsWrkLog.js" charset="utf-8"></script>
</body>
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">wms任务号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="wmsWrkNo" placeholder="请输入wms任务号" lay-vertype="tips" lay-verify="required">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">wms任务状态: </label>
                    <div class="layui-input-block">
                        <select name="wmsStatus">
                            <option value="">请选择wms任务状态</option>
                            <option value="1">接收</option>
                            <option value="2">派发</option>
                            <option value="3">执行</option>
                            <option value="4">完结</option>
                            <option value="5">取消</option>
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">任务号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="wrkNo" placeholder="请输入任务号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">任务时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入任务时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">任务类型: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="ioType" placeholder="请输入任务类型" style="display: none">
                        <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入任务类型" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">优先级: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="ioPri" placeholder="请输入优先级">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">目标库位: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="locNo" placeholder="请输入目标库位" style="display: none">
                        <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入目标库位" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">目标站: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="staNo" placeholder="请输入目标站" style="display: none">
                        <input id="staNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入目标站" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">源站: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="sourceStaNo" placeholder="请输入源站" style="display: none">
                        <input id="sourceStaNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入源站" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">源库位: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="sourceLocNo" placeholder="请输入源库位" style="display: none">
                        <input id="sourceLocNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入源库位" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改人员: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="modiUser" placeholder="请输入修改人员" style="display: none">
                        <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入修改人员" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">修改时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="modiTime" id="modiTime$" placeholder="请输入修改时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">创建者: </label>
                    <div class="layui-input-block cool-auto-complete">
                        <input class="layui-input" name="appeUser" placeholder="请输入创建者" style="display: none">
                        <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入创建者" onfocus=this.blur()>
                        <div class="cool-auto-complete-window">
                            <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
                            <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
                            </select>
                        </div>
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">添加时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="appeTime" id="appeTime$" placeholder="请输入添加时间">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">条码: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="barcode" placeholder="请输入条码">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">结束时间: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="endTime" id="endTime$" placeholder="请输入结束时间">
                    </div>
                </div>

             </div>
        </div>
        <hr class="layui-bg-gray">
        <div class="layui-form-item text-right">
            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">保存</button>
            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">取消</button>
        </div>
    </form>
</script>
</html>