#

Junjie

2026-01-12 074851753d1187d4e547966d643f4323c6b002bd

#

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

@@ -103,6 +103,13 @@
    @TableField("device_no")
    private Integer deviceNo;

    /**
     * 站点别名
     */
    @ApiModelProperty(value= "站点别名")
    @TableField("station_alias")
    private String stationAlias;

    public BasStation() {}

    public BasStation(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer stationLev) {

 src/main/java/com/zy/core/utils/WmsOperateUtils.java

@@ -7,10 +7,12 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDualCrnp;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.HttpRequestLog;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDualCrnpService;
import com.zy.asrs.service.BasStationService;
import com.zy.asrs.service.HttpRequestLogService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
@@ -45,6 +47,8 @@
    private BasCrnpService basCrnpService;
    @Autowired
    private BasDualCrnpService basDualCrnpService;
    @Autowired
    private BasStationService basStationService;

    //申请入库任务
    public synchronized String applyInTask(String barcode, Integer sourceStaNo, Integer locType1) {
@@ -74,8 +78,19 @@
        String response = null;
        int result = 0;
        try {
            BasStation basStation = basStationService.selectOne(new EntityWrapper<BasStation>().eq("station_id", sourceStaNo));
            if(basStation == null){
                News.error("站点{}不存在", sourceStaNo);
                return null;
            }

            String stationNo = String.valueOf(sourceStaNo);
            if(!Cools.isEmpty(basStation.getStationAlias())){
                stationNo = basStation.getStationAlias();
            }

            requestParam.put("barcode", barcode);
            requestParam.put("sourceStaNo", String.valueOf(sourceStaNo));
            requestParam.put("sourceStaNo", stationNo);
            requestParam.put("locType1", locType1);
            requestParam.put("row", Utils.getInTaskEnableRow(sourceStaNo));


 src/main/resources/mapper/BasStationMapper.xml

@@ -16,6 +16,7 @@
        <result column="memo" property="memo" />
        <result column="station_lev" property="stationLev" />
        <result column="device_no" property="deviceNo" />
        <result column="station_alias" property="stationAlias" />

    </resultMap>


 src/main/webapp/static/js/basStation/basStation.js

@@ -24,7 +24,7 @@
            {type: 'checkbox'}
            ,{field: 'stationId', align: 'center',title: '编号'}
            ,{field: 'status$', align: 'center',title: '状态'}
            ,{field: 'wrkNo', align: 'center',title: '工作号'}
            // ,{field: 'wrkNo', align: 'center',title: '工作号'}
            ,{field: 'inEnable', align: 'center',title: '可入(checkBox)'}
            ,{field: 'outEnable', align: 'center',title: '可出(checkBox)'}
            // ,{field: 'createBy', align: 'center',title: '创建人员'}
@@ -34,6 +34,7 @@
            ,{field: 'memo', align: 'center',title: '备注'}
            ,{field: 'stationLev', align: 'center',title: '站点楼层'}
            ,{field: 'deviceNo', align: 'center',title: '设备编号'}
            ,{field: 'stationAlias', align: 'center',title: '站点别名'}

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

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

@@ -93,6 +93,13 @@

}

function clearFormVal(el) {
    $(':input', el)
        .val('')
        .removeAttr('checked')
        .removeAttr('selected');
}



// http请求

 src/main/webapp/views/basStation/basStation.html

@@ -19,12 +19,7 @@
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <div class="layui-input-inline">
                            <input class="layui-input" type="text" name="id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                     <div class="layui-inline" style="width: 300px">
                        <div class="layui-input-inline">
                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="起始时间 - 终止时间" autocomplete="off" style="width: 300px">
                            <input class="layui-input" type="text" name="station_id" placeholder="编号" autocomplete="off">
                        </div>
                    </div>
                    <div class="layui-inline">
@@ -69,7 +64,7 @@
<!-- 表单弹窗 -->
<script type="text/html" id="editDialog">
    <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
        <input name="id" type="hidden">
        <input name="stationId" type="hidden">
        <div class="layui-row">
            <div class="layui-col-md12">
                <div class="layui-form-item">
@@ -82,12 +77,12 @@
                        </select>
                    </div>
                </div>
                <div class="layui-form-item">
                <!-- <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> -->
                <div class="layui-form-item">
                    <label class="layui-form-label">可入(checkBox): </label>
                    <div class="layui-input-block">
@@ -142,6 +137,12 @@
                        <input class="layui-input" name="deviceNo" placeholder="请输入设备编号">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">站点别名: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="stationAlias" placeholder="请输入站点别名">
                    </div>
                </div>

             </div>
        </div>