From 3f22772b5b70f6d0808e7e7c8f16793fb0ea47bb Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 31 五月 2024 15:07:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/PlaController.java | 7 ++++++-
src/main/webapp/views/saasLog/saasLog.html | 10 ++++++++++
src/main/resources/application.yml | 2 +-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index 5e5abb6..b449dca 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -9,6 +9,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
@@ -50,6 +51,9 @@
private PlaLogService plaLogService;
@Autowired
private MatService matService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
@RequestMapping(value = "/pla/list/auth")
@ManagerAuth
@@ -387,9 +391,10 @@
}
}
+ @Synchronized
private R addPakOUT(PlaQty plaQty,Long userId){
ManPakOut manPakOut=new ManPakOut();
- manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
+ manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+String.valueOf(snowflakeIdWorker.nextId()));
manPakOut.setWrkSts((long)1);
manPakOut.setAnfme(plaQty.getOrderWeight());
manPakOut.setMaktx(plaQty.getBrand());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a660664..763c980 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
compression:
diff --git a/src/main/webapp/views/saasLog/saasLog.html b/src/main/webapp/views/saasLog/saasLog.html
index 8a7cfc0..0c4c54f 100644
--- a/src/main/webapp/views/saasLog/saasLog.html
+++ b/src/main/webapp/views/saasLog/saasLog.html
@@ -42,6 +42,16 @@
<input class="layui-input" type="text" name="workshop" placeholder="杞﹂棿" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="package_no" placeholder="鍖呭彿" autocomplete="off">
+ </div>
+ </div>
<div class="layui-inline" style="width: 300px">
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">-->
--
Gitblit v1.9.1