From 074851753d1187d4e547966d643f4323c6b002bd Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 12 一月 2026 09:56:31 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/BasStationMapper.xml | 1 +
src/main/webapp/static/js/basStation/basStation.js | 3 ++-
src/main/java/com/zy/asrs/entity/BasStation.java | 7 +++++++
src/main/java/com/zy/core/utils/WmsOperateUtils.java | 17 ++++++++++++++++-
src/main/webapp/static/js/common.js | 7 +++++++
src/main/webapp/views/basStation/basStation.html | 19 ++++++++++---------
6 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index dc709c2..4394099 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/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) {
diff --git a/src/main/java/com/zy/core/utils/WmsOperateUtils.java b/src/main/java/com/zy/core/utils/WmsOperateUtils.java
index 5cd16b3..39f0363 100644
--- a/src/main/java/com/zy/core/utils/WmsOperateUtils.java
+++ b/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));
diff --git a/src/main/resources/mapper/BasStationMapper.xml b/src/main/resources/mapper/BasStationMapper.xml
index 9ed4534..df720ea 100644
--- a/src/main/resources/mapper/BasStationMapper.xml
+++ b/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>
diff --git a/src/main/webapp/static/js/basStation/basStation.js b/src/main/webapp/static/js/basStation/basStation.js
index 4f5e481..7404826 100644
--- a/src/main/webapp/static/js/basStation/basStation.js
+++ b/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}
]],
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index f2f0be2..1b9840b 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -93,6 +93,13 @@
}
+function clearFormVal(el) {
+ $(':input', el)
+ .val('')
+ .removeAttr('checked')
+ .removeAttr('selected');
+}
+
// http璇锋眰
diff --git a/src/main/webapp/views/basStation/basStation.html b/src/main/webapp/views/basStation/basStation.html
index 5c4bb9f..b8e6215 100644
--- a/src/main/webapp/views/basStation/basStation.html
+++ b/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>
--
Gitblit v1.9.1