From 316dcc081a7f7c9187fa5278ca90e2057f9af1a0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 02 十一月 2023 13:10:58 +0800
Subject: [PATCH] #checkbox设置宽度
---
src/main/java/com/zy/asrs/controller/OrderController.java | 28 ++++++++++++++
src/main/webapp/views/pakStore/turnOverQuery.html | 2
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/webapp/static/js/stoMan/stoQue.js | 2
src/main/webapp/views/saas/matQuery.html | 2
src/main/webapp/views/pakStore/matQuery.html | 2
src/main/webapp/views/tag/tag.html | 2
src/main/webapp/views/ioWorks/matQuery.html | 2
src/main/webapp/views/resource/resource.html | 2
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2
src/main/webapp/views/ioWorks/locDetlQuery.html | 2
src/main/webapp/views/pakStore/turnOverOwner.html | 4 +-
src/main/webapp/views/ioWorks/orderQuery.html | 2
src/main/webapp/views/pda/stockOut.html | 2
src/main/resources/application.yml | 4 +-
16 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index d11c842..8dc4cbe 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -468,6 +468,34 @@
return R.ok(orderService.selectAllorderNo());
}
+ @RequestMapping(value = "/order/list/AllCu")
+ @ManagerAuth
+ public R orderCuList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.le("settle", 2).eq("status", 1);
+ wrapper.orderBy("create_time", false);
+ List<Order> orders = orderService.selectList(wrapper);
+ // 淇濈暀鍑哄簱鍗�
+ if (!Cools.isEmpty(orders)) {
+ Iterator<Order> iterator = orders.iterator();
+ while (iterator.hasNext()) {
+ Order order = iterator.next();
+ if (order.getDocType() != null) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType != null) {
+ if (docType.getPakout() == 1) {
+ iterator.remove();
+ }
+ }
+ }
+ }
+ }
+ return R.ok().add(orders);
+ }
+
//璁㈠崟缁勬墭2
@RequestMapping(value = "/order/list/orderNo")
public R orderListorderNo(@RequestParam String orderNo) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index dfe5749..d4025ec 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,8 +14,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
- #url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs
+ #url: jdbc:sqlserver://10.10.10.100:1433;databasename=stasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=stasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 718549c..c78235a 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -25,7 +25,7 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..d1e0277 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -19,7 +19,7 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',sort: true, width: 85}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿',sort: true, width: 160}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
diff --git a/src/main/webapp/views/ioWorks/locDetlQuery.html b/src/main/webapp/views/ioWorks/locDetlQuery.html
index dd61a33..feacc3a 100644
--- a/src/main/webapp/views/ioWorks/locDetlQuery.html
+++ b/src/main/webapp/views/ioWorks/locDetlQuery.html
@@ -96,7 +96,7 @@
var pageCurr;
function getCol() {
var cols = [
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{field: 'locNo', align: 'center',title: '璐т綅'}
];
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/ioWorks/matQuery.html b/src/main/webapp/views/ioWorks/matQuery.html
index 351d3d1..e22310f 100644
--- a/src/main/webapp/views/ioWorks/matQuery.html
+++ b/src/main/webapp/views/ioWorks/matQuery.html
@@ -70,7 +70,7 @@
<script>
function getCol() {
var cols = [
- {type: 'checkbox', fixed: 'left'}
+ {type: 'checkbox',width: 50, fixed: 'left'}
];
cols.push.apply(cols, matCols);
cols.push(
diff --git a/src/main/webapp/views/ioWorks/orderQuery.html b/src/main/webapp/views/ioWorks/orderQuery.html
index aee329b..36a455d 100644
--- a/src/main/webapp/views/ioWorks/orderQuery.html
+++ b/src/main/webapp/views/ioWorks/orderQuery.html
@@ -70,7 +70,7 @@
<script>
function getCol() {
var cols = [
- {type: 'checkbox', fixed: 'left'}
+ {type: 'checkbox',width: 50, fixed: 'left'}
];
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index c17c59a..1a6dbd2 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -116,7 +116,7 @@
function getCol() {
let cols = [
- {type: 'checkbox', merge: ['locNo']}
+ {type: 'checkbox',width: 50, merge: ['locNo']}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
];
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 35b9f09..fbdd3f7 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -106,7 +106,7 @@
function getCol() {
var cols = [
- {type: 'checkbox', merge: ['locNo']}
+ {type: 'checkbox',width: 50, merge: ['locNo']}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
// ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 54c50b4..96be64f 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -77,7 +77,7 @@
<script>
function getCol() {
let cols = [
- {type: 'checkbox', fixed: 'left'}
+ {type: 'checkbox',width: 50, fixed: 'left'}
];
cols.push.apply(cols, matCols);
cols.push(
diff --git a/src/main/webapp/views/pakStore/turnOverOwner.html b/src/main/webapp/views/pakStore/turnOverOwner.html
index 68b8caf..bf915a0 100644
--- a/src/main/webapp/views/pakStore/turnOverOwner.html
+++ b/src/main/webapp/views/pakStore/turnOverOwner.html
@@ -89,7 +89,7 @@
function getCol() {
var cols = [
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
@@ -122,7 +122,7 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
diff --git a/src/main/webapp/views/pakStore/turnOverQuery.html b/src/main/webapp/views/pakStore/turnOverQuery.html
index 1d80462..502b8b1 100644
--- a/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -95,7 +95,7 @@
function getCol() {
var cols = [
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 54cd9c7..a50644d 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -128,7 +128,7 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left', width:30},
+ {type: 'checkbox', fixed: 'left', width:50},
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
diff --git a/src/main/webapp/views/resource/resource.html b/src/main/webapp/views/resource/resource.html
index 099bceb..cd76dac 100644
--- a/src/main/webapp/views/resource/resource.html
+++ b/src/main/webapp/views/resource/resource.html
@@ -153,7 +153,7 @@
pidName: 'resourceId' // pid瀛楁鍚嶇О
},
cols: [[
- {type: 'checkbox', fixed: 'left'}
+ {type: 'checkbox',width: 50, fixed: 'left'}
,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80, hide: true}
,{field: 'name', align: 'left',title: '鑿滃崟鍚嶇О'}
,{field: 'code', align: 'center',title: '鑿滃崟缂栫爜'}
diff --git a/src/main/webapp/views/saas/matQuery.html b/src/main/webapp/views/saas/matQuery.html
index 351d3d1..e22310f 100644
--- a/src/main/webapp/views/saas/matQuery.html
+++ b/src/main/webapp/views/saas/matQuery.html
@@ -70,7 +70,7 @@
<script>
function getCol() {
var cols = [
- {type: 'checkbox', fixed: 'left'}
+ {type: 'checkbox',width: 50, fixed: 'left'}
];
cols.push.apply(cols, matCols);
cols.push(
diff --git a/src/main/webapp/views/tag/tag.html b/src/main/webapp/views/tag/tag.html
index b82b9f8..26dba13 100644
--- a/src/main/webapp/views/tag/tag.html
+++ b/src/main/webapp/views/tag/tag.html
@@ -146,7 +146,7 @@
pidName: 'parentId' // pid瀛楁鍚嶇О
},
cols: [[
- {type: 'checkbox'}
+ {type: 'checkbox',width: 50}
,{type: 'numbers'}
,{field: 'name', align: 'left',title: '鍚嶇О', minWidth: 150}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
--
Gitblit v1.9.1