From aef500a5cebed741c69e2bc3426bc8342db30bf1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 24 四月 2026 16:10:53 +0800
Subject: [PATCH] #堆垛机命令增加排映射关系V3.0.0.8
---
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 39 ++++++++++++-------
src/main/java/com/zy/asrs/entity/WrkMast.java | 16 +++++++-
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 17 +++++++-
src/main/java/com/zy/asrs/entity/BasCrnp.java | 21 ++++++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 4 +-
5 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index b6abfb8..ddb49c0 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -222,4 +222,25 @@
}
}
+ public String formatMappedLocNo(String locNo){
+ if (Cools.isEmpty(locNo)){
+ return locNo;
+ }
+ String[] locParts = locNo.split("-");
+ if (locParts.length < 3){
+ return locNo;
+ }
+ try {
+ Integer locationRow = Integer.valueOf(locParts[0]);
+ Integer commandRow = getCommandRow(locationRow);
+ if (commandRow == null || commandRow.equals(locationRow)){
+ return locNo;
+ }
+ String mappedLocNo = commandRow + "-" + locParts[1] + "-" + locParts[2];
+ return locNo + "(" + mappedLocNo + ")";
+ } catch (Exception exception) {
+ return locNo;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 2a5d271..bec8eda 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -225,7 +225,7 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
}
return null;
}
@@ -234,11 +234,23 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
}
return null;
}
+ private String formatMappedLocNo(String locNo){
+ if (Cools.isEmpty(this.crnNo)){
+ return locNo;
+ }
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = basCrnpService.getById(this.crnNo);
+ if (Cools.isEmpty(basCrnp)){
+ return locNo;
+ }
+ return basCrnp.formatMappedLocNo(locNo);
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 0c9efa7..9100d93 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.mapper.BasWrkIotypeMapper;
import com.zy.asrs.mapper.BasWrkStatusMapper;
+import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.utils.Synchro;
@@ -242,7 +243,7 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
}
return null;
}
@@ -251,11 +252,23 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
}
return null;
}
+ private String formatMappedLocNo(String locNo){
+ if (Cools.isEmpty(this.crnNo)){
+ return locNo;
+ }
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = basCrnpService.getById(this.crnNo);
+ if (Cools.isEmpty(basCrnp)){
+ return locNo;
+ }
+ return basCrnp.formatMappedLocNo(locNo);
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index a2811c7..eb0e240 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -9,8 +9,8 @@
{ key: "ioPri", prop: "ioPri", label: "浼樺厛绾�", width: 90, sortable: true, align: "center" },
{ key: "sourceStaNo", prop: "sourceStaNo", label: "婧愮珯", width: 90, sortable: true, align: "center" },
{ key: "staNo", prop: "staNo", label: "鐩爣绔�", width: 90, sortable: true, align: "center" },
- { key: "sourceLocNo", prop: "sourceLocNo", label: "婧愬簱浣�", minWidth: 140, sortable: true },
- { key: "locNo", prop: "locNo", label: "鐩爣搴撲綅", minWidth: 140, sortable: true },
+ { key: "sourceLocNo", prop: "sourceLocNo$", label: "婧愬簱浣�", minWidth: 170, sortable: true },
+ { key: "locNo", prop: "locNo$", label: "鐩爣搴撲綅", minWidth: 170, sortable: true },
{ key: "modiTime$", prop: "modiTime$", label: "淇敼鏃堕棿", minWidth: 168, sortable: true },
{ key: "barcode", prop: "barcode", label: "鎵樼洏鐮�", minWidth: 150, sortable: true },
{ key: "crnNo", prop: "crnNo", label: "鍫嗗灈鏈�", width: 90, sortable: true, align: "center" },
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index 34d2335..8d00a86 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -115,8 +115,8 @@
field: 'locNo',
columnName: 'loc_no',
label: '鐩爣搴撲綅',
- tableProp: 'locNo',
- exportField: 'locNo',
+ tableProp: 'locNo$',
+ exportField: 'locNo$',
kind: 'text',
valueType: 'string',
required: false,
@@ -169,8 +169,8 @@
field: 'sourceLocNo',
columnName: 'source_loc_no',
label: '婧愬簱浣�',
- tableProp: 'sourceLocNo',
- exportField: 'sourceLocNo',
+ tableProp: 'sourceLocNo$',
+ exportField: 'sourceLocNo$',
kind: 'text',
valueType: 'string',
required: false,
@@ -1305,10 +1305,10 @@
var wrkMastLogFieldOrder = [
'wrkNo',
'wmsWrkNo',
+ 'mk',
'wrkSts',
'ioType',
'ioTime',
- 'appeTime',
'ioPri',
'sourceStaNo',
'staNo',
@@ -1321,6 +1321,7 @@
'barcode',
'modiUser',
'modiTime',
+ 'appeTime',
'appeUser',
'systemMsg',
'errorTime',
@@ -1339,6 +1340,12 @@
},
wmsWrkNo: {
label: 'WMS浠诲姟鍙�',
+ searchable: true,
+ quickSearch: true,
+ minWidth: 140
+ },
+ mk: {
+ label: 'mk',
searchable: true,
quickSearch: true,
minWidth: 140
@@ -1373,13 +1380,6 @@
defaultVisible: false,
minWidth: 300
},
- appeTime: {
- label: '宸ヤ綔鏃堕棿',
- tableProp: 'appeTime$',
- exportField: 'appeTime$',
- sortable: true,
- minWidth: 168
- },
ioPri: {
label: '浼樺厛绾�',
minWidth: 90
@@ -1400,14 +1400,18 @@
},
sourceLocNo: {
label: '婧愬簱浣�',
+ tableProp: 'sourceLocNo$',
+ exportField: 'sourceLocNo$',
searchable: true,
- minWidth: 120
+ minWidth: 170
},
locNo: {
label: '鐩爣搴撲綅',
+ tableProp: 'locNo$',
+ exportField: 'locNo$',
searchable: true,
quickSearch: true,
- minWidth: 120
+ minWidth: 170
},
crnNo: {
label: '鍫嗗灈鏈�',
@@ -1443,7 +1447,12 @@
label: '淇敼鏃堕棿',
tableProp: 'modiTime$',
exportField: 'modiTime$',
- defaultVisible: false,
+ minWidth: 168
+ },
+ appeTime: {
+ label: '娣诲姞鏃堕棿',
+ tableProp: 'appeTime$',
+ exportField: 'appeTime$',
minWidth: 168
},
appeUser: {
--
Gitblit v1.9.1