From a8a11aeeb8b55a312fc03bd3c60a93be014a2fdd Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 15 一月 2026 12:41:03 +0800
Subject: [PATCH] no message
---
src/main/webapp/static/js/orderPakout/out.js | 5 +++--
src/main/resources/application-dev.yml | 6 +++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4e75421..d08c9ed 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8080
+ port: 8081
servlet:
context-path: /@pom.build.finalName@
@@ -12,7 +12,7 @@
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
username: sa
password: sa@123
- url: jdbc:sqlserver://192.168.4.15:1433;databasename=jsxsasrs
+ url: jdbc:sqlserver://47.97.1.152:1433;databasename=jsxsasrs
mvc:
static-path-pattern: /**
redis:
@@ -30,7 +30,7 @@
# global-config:
# field-strategy: 0
configuration:
- # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 3f61514..ba5061e 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -34,7 +34,8 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
+ ,{field: 'batch', align: 'center',title: '鎵规', hide: true}
+ ,{field: 'standby1', title: '渚涘簲鍟�', align: 'center'},
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
@@ -159,7 +160,7 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '搴忓垪鐮�', align: 'center'},
+ {field: 'standby1', title: '渚涘簲鍟�', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
{field: 'locNo', title: '璐т綅', align: 'center', width: 100, templet: '#locNoTpl'},
{field: 'frozen$', title: '鏄庣粏', align: 'center', width: 90, templet: '#locFrozen'},
--
Gitblit v1.9.1