From f638c59bf4d35a4e2f645a157cdc5ce787094012 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 10:57:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 20 +++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 30 ++-------------
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 23 ++---------
src/main/resources/application.yml | 4 ++
4 files changed, 31 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 4b17fd5..62e55f7 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -19,6 +19,7 @@
import com.zy.common.model.Shelves;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -30,6 +31,14 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Value("${channel.equipmentRow}")
+ private Integer equipmentRow;
+ @Value("${channel.quietRow}")
+ private Integer quietRow;
+ @Value("${channel.equipmentCount}")
+ private Integer equipmentCount;
+ @Value("${channel.channelMax}")
+ private Integer channelMax;
@RequestMapping(value = "/locMast/init/pwd")
public R locMastInitPwd(@RequestParam(required = false) String pwd) {
@@ -195,11 +204,20 @@
locMast.setAppeTime(now);
locMast.setModiUser(getUserId());
locMast.setModiTime(now);
+ if (r==equipmentRow){
+ locMast.setChannel(l+(b-2)*param.getEndLev());
+ locMast.setLocType1((short)1);
+ int i = (locMast.getChannel() - 1) / (channelMax / equipmentCount) + 1;
+ locMast.setLocType2((short)i);
+ }
+ if (r==quietRow){
+ locMast.setLocType1((short)2);
+ }
list.add(locMast);
}
}
}
-// locMastService.delete(new EntityWrapper<>());
+ locMastService.delete(new EntityWrapper<>());
locDetlService.delete(new EntityWrapper<>());
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 150e00f..6b9793f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -6,7 +6,6 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.TestMast;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -32,8 +31,6 @@
@Autowired
private OpenService openService;
- @Autowired
- private ApiLogService apiLogService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
@@ -211,16 +208,10 @@
public synchronized R hostName(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) HeartBeat param,
HttpServletRequest request) {
- appkey = "ea1f0459efc02a79f046f982767939ae";
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
-
- //........
- System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
- param.getId(), param.getHostName(), param.getRequestTime()));
-
return R.ok();
}
@@ -229,29 +220,16 @@
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
HttpServletRequest request) {
- appkey = "ea1f0459efc02a79f046f982767939ae";
+ log.info("鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�"+appkey+param);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
//鐢熸垚鍏ュ簱閫氱煡妗�
openService.combPACK(param);
-
- Map<String, Boolean> map = new HashMap<>();
- apiLogService.save(
- "mes鐢宠鍏ュ簱",
- "172.28.15.251",
- null,
- "127.0.0.1",
- JSON.toJSONString("PackNo:" + param.getPackNo()
- + " PackName:" + param.getPackName()
- + " RequestTime:" + param.getRequestTime()
- + " SettingTimes:" + param.getSettingTimes()),
- "172.28.15.251",
- true
- );
- map.put("isComplete", true);
- return R.ok(map);
+// Map<String, Boolean> map = new HashMap<>();
+// map.put("isComplete", true);
+ return R.ok();
}
@PostMapping("/rpc/pakOut/auth/v1")
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index c334d7a..3c49116 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -25,9 +25,6 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -590,18 +587,12 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getPackNo()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getPackNo()));
+ int countPakin = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getPackNo()));
if (countLoc > 0 || countWrk > 0) {
throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getPackNo());
+ }else if (countPakin>0){
+ throw new CoolException("閲嶅鐢宠" + param.getPackNo());
}
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- java.util.Date date1=null;
- try {
- date1= sdf.parse(param.getRequestTime());
- } catch (ParseException e) {
- e.printStackTrace();
- }
- java.sql.Date requestTime = new java.sql.Date(date1.getTime());
// 鐢熸垚鍏ュ簱閫氱煡妗�
// Mat mat = matService.selectByMatnr(param.getPackName());
@@ -616,7 +607,7 @@
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(1.0); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
- waitPakin.setManuDate(requestTime.toString());
+ waitPakin.setManuDate(param.getRequestTime());
waitPakin.setAppeUser(null);
waitPakin.setAppeTime(new Date());
waitPakin.setModiUser(null);
@@ -651,12 +642,6 @@
throw new CoolException("PACK鐮佷负锛�"+param.getPackNo()+"鐨勮揣鐗╁簱浣嶇姸鎬佷笉鏄�淔鈥�");
}else if (locMast.getFireStatus()!=0){
throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
-// }else if (locMast.getFireStatus()!=0){
-// throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
-// }else if (locMast.getFireStatus()!=0){
-// throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
-// }else if (locMast.getFireStatus()!=0){
-// throw new CoolException("璀﹀憡锛侊紒锛丳ACK鐮佷负锛�"+param.getPackNo()+"鐨勫簱浣嶏細"+locMast.getLocNo()+"娑堥槻鐘舵�佸紓甯革紒锛侊紒");
}else {
Date now = new Date();
Integer ioType = 101; //鍏ュ嚭搴撶被鍨�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4d29d35..b48ca6b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -66,6 +66,10 @@
channelMax: 48
# 鍏呮斁鐢垫祴璇曟煖鏁伴噺
equipmentCount: 6
+ # 娴嬭瘯搴撲綅鎵�鍦ㄦ帓鍙�
+ equipmentRow: 1
+ # 闈欑疆搴撲綅鎵�鍦ㄦ帓鍙�
+ quietRow: 2
# 鍏呮斁鐢垫祴璇曠郴缁�
ren:
--
Gitblit v1.9.1