From 1443d5a84a4df99d9a86ac04c904554e91ae8271 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期日, 12 四月 2026 15:35:06 +0800
Subject: [PATCH] 1.针对7.3接口文档，新增了几个字段需要加入到组托档中，不额外加字段 2.针对7.11接口文档，对outOrder方法进行重写，batchSeq在wrkMast表中新增一个字段放，entryWmsCode、outDoorNo这两个在wrkDetl中找两个字段存放 3.针对7.7接口文档，上报时加上orderId出库单号 4.针对7.9接口文档，wcs会先请求wms，只需要palletId托盘码，errorMsg错误信息；wms转发给加上orderId出库单号转发给ERP 5.针对7.10接口文档，ERP先按照这个文档发给wms，wms再发给wcs，发给wcs这块先不写
---
src/main/java/com/zy/common/properties/SystemProperties.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 37d8e1c..b693d42 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -1,8 +1,10 @@
package com.zy.common.properties;
import com.core.common.AesUtils;
+import com.core.common.DateUtils;
import java.io.*;
+import java.util.Date;
/**
* Created by vincent on 2020/8/1
@@ -13,7 +15,8 @@
public static final String SALT = "123456789qwertyu";
// 绯荤粺婵�娲荤姸鎬� (榛樿鏈縺娲�)
- public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
+// public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
+ public static boolean SYSTEM_ACTIVATION = Boolean.TRUE;
public static String getActivationCode(String fileName){
StringBuilder activationCode = new StringBuilder();
@@ -26,6 +29,8 @@
}
f.close();
buf.close();
+ } catch (FileNotFoundException ignore) {
+
} catch (IOException e) {
e.printStackTrace();
throw new RuntimeException("璇诲彇WMS绯荤粺婵�娲荤爜澶辫触锛侊紒锛乗n璇诲彇璺緞 " + fileName);
@@ -42,6 +47,8 @@
}
boolean newFile = file.createNewFile();// 鍒涘缓鏂版枃浠�
if (newFile) {
+ String sets = "attrib +H \"" + file.getAbsolutePath() + "\"";
+ Runtime.getRuntime().exec(sets);
BufferedWriter out = new BufferedWriter(new FileWriter(file, true));
out.write(code); // \r\n鍗充负鎹㈣
out.flush(); // 鎶婄紦瀛樺尯鍐呭鍘嬪叆鏂囦欢
@@ -57,8 +64,11 @@
// 鐢熸垚婵�娲荤爜
public static void main(String[] args) {
- String code = AesUtils.encrypt("20200801152500", SystemProperties.SALT);
- System.out.println(code);
+ String timeStr = "2021-08-01 17:48:35";
+ Date exprTime = DateUtils.convert(timeStr);
+ String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
+ System.out.println("婵�娲荤爜锛�"+code);
+ System.out.println("鏈夋晥鏈熻嚦锛�"+timeStr);
// saveActivationCode(SysOsType.Windows.getActivationCodePath(), code);
// String activationCode = getActivationCode(OSinfo.getOSname().getActivationCodePath());
// String decrypt = AesUtils.decrypt(activationCode, "123456789qwertyu");
--
Gitblit v1.9.1