From cc4e0bd14edeeb43268216f18c70be62e482b8f0 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期四, 05 二月 2026 14:31:17 +0800
Subject: [PATCH] 初始化未完成
---
src/main/java/com/zy/asrs/entity/result/TokenVo.java | 17 +++++
src/main/java/com/zy/asrs/controller/OpenController.java | 34 +++++++++++
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 4
src/main/webapp/static/js/common.js | 2
pom.xml | 2
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 8 ++
src/main/java/com/zy/asrs/entity/param/TokenParam.java | 19 ++++++
src/main/java/com/zy/common/service/CommonService.java | 53 ++++++++++++-----
src/main/resources/application.yml | 22 +++---
10 files changed, 128 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index ca051d4..6219ae1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
</dependencies>
<build>
- <finalName>jshdasrs</finalName>
+ <finalName>wms</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index a650919..f9a2ea6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -7,6 +7,7 @@
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.TokenVo;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
@@ -39,7 +40,21 @@
@Autowired
private OpenService openService;
- @PostMapping("/order/matSync/default/v2")
+ @PostMapping("/getToken")
+ public synchronized R getToken(@RequestBody(required = true) TokenParam param,
+ HttpServletRequest request){
+ authNew(param, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ TokenVo tokenVo = new TokenVo();
+ String token = Cools.enToken(System.currentTimeMillis() + param.getAppId(), param.getAppSecret());
+ tokenVo.setToken(token);
+ tokenVo.setValidTime(30);
+ return R.ok().add(tokenVo);
+ }
+
+ @PostMapping("/erp/mat/sync")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam.MatParam param,
@@ -183,6 +198,23 @@
}
}
+ private void authNew(TokenParam param, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appSecret:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", param.getAppSecret(), JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (!auth) {
+ return;
+ }
+ if (Cools.isEmpty(param.getAppId()) || Cools.isEmpty(param.getAppSecret())) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鍜宎ppSecret鏃犺锛�");
+ }
+ if (!param.getAppId().contains("FNWMS")){
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(param.getAppSecret())) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appSecret鏃犺锛�");
+ }
+ }
+
public static void main(String[] args) {
// 1
System.out.println("======================================");
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 298a252..ccbcb3b 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
@@ -23,16 +24,19 @@
/**
* 鍟嗗搧缂栧彿
*/
+ @JsonProperty("matNr")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
+ @JsonProperty("makTx")
private String maktx;
/**
* 鍟嗗搧鍒嗙被
*/
+ @JsonProperty("groupId")
private String groupCode;
/**
@@ -176,8 +180,9 @@
private Integer danger;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 鏂板锛堥粯璁わ級 2: 淇敼 3: 绂佺敤 4: 鍚敤
*/
+ @JsonProperty("operateType")
private Integer status;
/**
@@ -193,6 +198,7 @@
/**
* 澶囨敞
*/
+ @JsonProperty("describle")
private String memo;
}
diff --git a/src/main/java/com/zy/asrs/entity/param/TokenParam.java b/src/main/java/com/zy/asrs/entity/param/TokenParam.java
new file mode 100644
index 0000000..1d60b54
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/TokenParam.java
@@ -0,0 +1,19 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class TokenParam {
+
+ /**
+ * 搴旂敤缂栫爜 wms绾夸笅鍒嗛厤
+ */
+ private String appId;
+
+ /**
+ * 搴旂敤瀵嗛挜 wms绾夸笅鍒嗛厤
+ */
+ private String appSecret;
+
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/result/TokenVo.java b/src/main/java/com/zy/asrs/entity/result/TokenVo.java
new file mode 100644
index 0000000..fecbdec
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/TokenVo.java
@@ -0,0 +1,17 @@
+package com.zy.asrs.entity.result;
+
+import lombok.Data;
+
+@Data
+public class TokenVo {
+
+ /**
+ * token鍊�
+ */
+ private String token;
+
+ /**
+ * 鏈夋晥鏃堕棿 鍗曚綅锛氬垎閽�
+ */
+ private Integer validTime;
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index dfe6818..c35bf02 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -559,8 +559,8 @@
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
- if(param.getBarcode().length()!=6){
- throw new CoolException("鏉＄爜闀垮害涓嶆槸6浣�===>>" + param.getBarcode());
+ if(param.getBarcode().length()!=8){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
// if (param.getCombMats().size()>1){
// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index 6fa596c..0e437c1 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -138,7 +138,7 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine2() {
//鑾峰彇鏈笅鍙戝崟鎹�
List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(1);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index cf5f7e8..f53be7b 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -172,6 +172,11 @@
// }
int rowCount = params[0];
int nearRow = params[3];
+ int MIN_SPARE_SLOTS = 0;
+
+ if (rowLastno.getTypeId() == 1){
+ MIN_SPARE_SLOTS = 2;
+ }
// 鍙彇鏁伴噺鍒ゆ柇锛岄伩鍏嶆媺鏁� list
int availableLocCount = locMastService.selectCount(new EntityWrapper<LocMast>()
@@ -180,7 +185,7 @@
.eq("whs_type", rowLastnoType.getType().longValue()));
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
.eq("crn_no", crnNo).le("io_type", 100));
- if (availableLocCount - crnCountO <= 2) { // 鍙互鎻愭垚甯搁噺锛屾瘮濡� MIN_SPARE_SLOTS = 2
+ if (availableLocCount - crnCountO <= MIN_SPARE_SLOTS) { // 鍙互鎻愭垚甯搁噺锛屾瘮濡� MIN_SPARE_SLOTS = 2
log.error("{}鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", crnNo, JSON.toJSONString(locTypeDto), attempt);
attempt++;
continue;
@@ -242,15 +247,21 @@
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
Optional<CrnRowInfo> infoOpt = findAvailableCrnAndNearRow(rowLastno, curRow, crnNumber, times, findLocNoAttributeVo, locTypeDto, rowLastnoType);
- if (!infoOpt.isPresent()) {
- throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ if (infoOpt.isPresent()) {
+// throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
+ CrnRowInfo info = infoOpt.get();
+ crnNo = info.getCrnNo();
+ nearRow = info.getNearRow();
+ curRow = info.getCurRow();
+ rowCount = info.getRowCount();
+ times = info.getTimes();
}
- CrnRowInfo info = infoOpt.get();
- crnNo = info.getCrnNo();
- nearRow = info.getNearRow();
- curRow = info.getCurRow();
- rowCount = info.getRowCount();
- times = info.getTimes();
+// CrnRowInfo info = infoOpt.get();
+// crnNo = info.getCrnNo();
+// nearRow = info.getNearRow();
+// curRow = info.getCurRow();
+// rowCount = info.getRowCount();
+// times = info.getTimes();
boolean signRule1 = false;
@@ -440,19 +451,26 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
- .orderBy("lev1", true).orderBy("bay1", false));
+ .orderBy("lev1", true).orderBy("bay1", true));
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
if (Utils.BooleanWhsTypeStaIoType(rowLastno)) {
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
- .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
+
+ if (locMast1.getCrnNo() == 2) {
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ }
+ } else if (locMast1.getCrnNo() == 1) {
+ locMast = locMast1;
break;
}
+
} else {
if (!Cools.isEmpty(locMast1)) {
locMast = locMast1;
@@ -505,9 +523,10 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount * 2) {
+ if (times <= rowCount * 2) {
times = times + 1;
- return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
+// return getLocNoRun(whsType, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
+ return getLocNoRun(5, staDescId, sourceStaNo, findLocNoAttributeVo, moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c680cc4..a9eb6a0 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@
@@ -32,17 +32,17 @@
logging:
file:
- path: /stock/out/@pom.build.finalName@/logs
+ path: ./stock/out/@pom.build.finalName@/logs
super:
- pwd: asrs2023
+ pwd: xltys1995
swagger:
enable: false
#License鐩稿叧閰嶇疆
license:
- subject: jshdasrs
+ subject: hnfnasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
@@ -58,13 +58,13 @@
# 鍙屾繁
doubleDeep: true
# 鍙屾繁搴撲綅鎺掑彿
- doubleLocs: 1,4,5,8,9,12,13,16,17,20
+ doubleLocs: 3,6
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 1,5,9,13,17
+ doubleLocsLeft: 3
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 4,8,12,16,20
+ doubleLocsRight: 6
# wms鍙傛暟閰嶇疆
wms-parameter:
# 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
@@ -98,13 +98,13 @@
# 寮�鍏�
switch:
#璁℃椂鍣ㄤ笂鎶ュ紑鍏�
- ErpReportOld: true
+ ErpReportOld: false
#鑾峰彇鍗曟嵁寮�鍏�
- InboundOrderSwitch: true
+ InboundOrderSwitch: false
#鐧诲綍鎺ュ彛寮�鍏�
- LoginAuthenticationSwitch: true
+ LoginAuthenticationSwitch: false
#涓婃姤銆佸鏍稿崟鎹紑鍏�
- ReviewOrderSwitch: true
+ ReviewOrderSwitch: false
# 鍦板潃
address:
URL: https://shyucheng.test.kdgalaxy.com
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index e9a4aba..23a9465 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -1,4 +1,4 @@
-var baseUrl = "/jshdasrs";
+var baseUrl = "/wms";
// 璇︽儏绐楀彛-楂樺害
var detailHeight = '80%';
--
Gitblit v1.9.1