From b90d0e82bce66fce8e243de13a85fd4f7e1c2e47 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期日, 21 十二月 2025 08:49:13 +0800
Subject: [PATCH] 修复人工空托出库没有条码信息
---
src/main/java/com/zy/common/properties/SystemProperties.java | 2 +-
src/main/webapp/static/js/order/out.js | 2 +-
src/main/java/com/zy/common/model/enums/SysOsType.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/model/enums/SysOsType.java b/src/main/java/com/zy/common/model/enums/SysOsType.java
index c5e014d..b8d5fd0 100644
--- a/src/main/java/com/zy/common/model/enums/SysOsType.java
+++ b/src/main/java/com/zy/common/model/enums/SysOsType.java
@@ -6,7 +6,7 @@
Linux("Linux", null),
Mac_OS("Mac OS", null),
Mac_OS_X("Mac OS X", null),
- Windows("Windows", "D:\\licensed.txt"),
+ Windows("Windows", "D:\\license.txt"),
OS2("OS/2", null),
Solaris("Solaris", null),
SunOS("SunOS", null),
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 9581f8a..047cbc6 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -63,7 +63,7 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String timeStr = "2099-10-26 08:00:00";
+ String timeStr = "2025-12-30 08:00:00";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 4ca3a98..2b7fec5 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -34,7 +34,7 @@
,{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: 'unit', align: 'center',title: '绠卞彿'}
// ,{field: 'specs', align: 'center',title: '鎺ュご'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'brand', align: 'center',title: '鍖呰缁勫彿'}
--
Gitblit v1.9.1