From 5b6c56096af8a8262bff43371ecca9b500269586 Mon Sep 17 00:00:00 2001
From: LSH <1>
Date: 星期五, 17 五月 2024 10:44:52 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/rowLastno/rowLastno.js | 5 +++--
src/main/webapp/views/rowLastno/rowLastno.html | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 3 ++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index f42d168..8bcec59 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -487,7 +487,8 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
+// StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),batchs.get(0),null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0),null,null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
diff --git a/src/main/webapp/static/js/rowLastno/rowLastno.js b/src/main/webapp/static/js/rowLastno/rowLastno.js
index 9f91bf6..d88db9e 100644
--- a/src/main/webapp/static/js/rowLastno/rowLastno.js
+++ b/src/main/webapp/static/js/rowLastno/rowLastno.js
@@ -18,9 +18,10 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left'}
+ // {type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'whsType', align: 'center',title: '绫诲埆', width:80}
+// ,
+ {field: 'whsType', align: 'center',title: '绫诲埆', width:80}
,{field: 'wrkMk', align: 'center',title: '褰撳墠宸ヤ綔鍙�'}
,{field: 'sRow', align: 'center',title: '璧峰鎺掑彿'}
,{field: 'currentRow', align: 'center',title: '褰撳墠鎺掑彿', style: 'color: #AA3130;font-weight: bold'}
diff --git a/src/main/webapp/views/rowLastno/rowLastno.html b/src/main/webapp/views/rowLastno/rowLastno.html
index 964e8de..62c2a92 100644
--- a/src/main/webapp/views/rowLastno/rowLastno.html
+++ b/src/main/webapp/views/rowLastno/rowLastno.html
@@ -23,7 +23,7 @@
<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-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>
</div>
</script>
--
Gitblit v1.9.1