From de14adf3250bfecdf41600aa0ea8789111523ad1 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 09:43:36 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/common/properties/SystemProperties.java | 2
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 166 ++++++++++++++++++++++++++++++-------------------------
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 9 +++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2
4 files changed, 102 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index b0112aa..a43c796 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.OrderServiceImpl;
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.slf4j.Logger;
@@ -55,6 +56,8 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private FlowLogService flowLogService;
+ @Autowired
+ private OrderServiceImpl orderService;
/*
@@ -198,15 +201,15 @@
String matnr = params.get("matnr");
String floor = params.get("floor");
- Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
// wrapper.eq("orderNo",orderNo);
- wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
- if (threeCode.substring(0, 2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
+ if (threeCode.substring(0,2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
List<AgvLocDetl> locDetls = new ArrayList<>();
@@ -216,10 +219,10 @@
agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
} else {
// 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
- if ("JG".equals(orderNo.substring(0, 2))) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ if ("JG".equals(orderNo.substring(0,2))) {
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
}
}
@@ -237,31 +240,31 @@
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@PostMapping("/query/locDetl/v3")
- public R queryAgvLocDetl3(@RequestBody HashMap<String, String> params) {
+ public R queryAgvLocDetl3(@RequestBody HashMap<String,String> params){
String orderNo = params.get("orderNo");
String threeCode = params.get("threeCode");
String matnr = params.get("matnr");
String floor = params.get("floor");
- Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts", 1);
+ Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).ne("process_sts",1);
// wrapper.eq("orderNo",orderNo);
- wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
- if (threeCode.substring(0, 2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
+ if (threeCode.substring(0,2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
List<AgvLocDetl> locDetls = new ArrayList<>();
for (AgvLocDetl agvLocDetl : agvLocDetls) {
AgvLocMast agvLocMast = new AgvLocMast();
if (Cools.isEmpty(floor)) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
}
if (Cools.isEmpty(agvLocMast)) continue;
@@ -278,7 +281,7 @@
鏌ヨ搴撳瓨 鍏ュ簱璁㈠崟涓庨攢鍞崟鍙�
*/
@PostMapping("/query/locDetl/v2")
- public R queryAgvLocDetl2(@RequestBody HashMap<String, String> params) {
+ public R queryAgvLocDetl2(@RequestBody HashMap<String,String> params){
String orderNo = params.get("orderNo");
String threeCode = params.get("threeCode");
@@ -291,23 +294,23 @@
// wrapper.eq("orderNo",orderNo);
- wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code", threeCode);
+ wrapper = Cools.isEmpty(threeCode) ? wrapper.isNull("three_code") : wrapper.eq("three_code",threeCode);
- if (threeCode.substring(0, 2).equals(30)) {
- wrapper.isNull("specs").or().eq("specs", "").eq("floor", 1);
+ if (threeCode.substring(0,2).equals(30)) {
+ wrapper.isNull("specs").or().eq("specs","").eq("floor",1);
}
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(wrapper);
List<AgvLocDetl> locDetls = new ArrayList<>();
for (AgvLocDetl agvLocDetl : agvLocDetls) {
AgvLocMast agvLocMast = new AgvLocMast();
if (Cools.isEmpty(floor)) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no", "F1"));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).notLike("loc_no","F1"));
} else {
// 濡傛灉鏄姞宸ュ崟 鍙湪 lev1 = 1 鏌ュ簱瀛�
if (orderDetl.getSource().equals(35)) {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1", 1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("lev1",1).eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
} else {
- agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no", floor));
+ agvLocMast = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvLocDetl.getLocNo()).like("loc_no",floor));
}
}
@@ -327,7 +330,7 @@
@PostMapping("/check/detl/v1")
@ManagerAuth(memo = "搴撳瓨鐩樼偣")
@Synchronized
- public R checkLocDetl(@RequestBody HashMap<String, String> param) {
+ public R checkLocDetl(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
@@ -335,16 +338,16 @@
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
- if (!Cools.isEmpty(locNo)) {
+ if(!Cools.isEmpty(locNo)){
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
- if (!Cools.isEmpty(locNo)) {
+ if(!Cools.isEmpty(locNo)){
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
- Map<String, Object> result = new HashMap<String, Object>();
- result.put("locNo", listByLocNo);
- result.put("containerCode", listByContainerCode);
+ Map<String,Object> result = new HashMap<String,Object>();
+ result.put("locNo",listByLocNo);
+ result.put("containerCode",listByContainerCode);
return R.ok(result);
@@ -356,21 +359,21 @@
@PostMapping("/update/detl/v1")
@ManagerAuth(memo = "绾犳搴撲綅")
@Synchronized
- public R updateLocDetlLocNo(@RequestBody HashMap<String, String> param) {
+ public R updateLocDetlLocNo(@RequestBody HashMap<String,String> param){
String locNo = param.get("locNo");
String containerCode = param.get("containerCode");
- if (Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)) {
+ if(Cools.isEmpty(locNo) || Cools.isEmpty(containerCode)){
return R.error("鍙傛暟涓嶅叏");
}
List<AgvLocDetl> listByLocNo = null;
List<AgvLocDetl> listByContainerCode = null;
- if (!Cools.isEmpty(locNo)) {
+ if(!Cools.isEmpty(locNo)){
// 婧愬簱浣�
listByLocNo = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
}
- if (!Cools.isEmpty(locNo)) {
+ if(!Cools.isEmpty(locNo)){
// 鐩爣搴撲綅
listByContainerCode = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("supp_code", containerCode));
}
@@ -401,7 +404,7 @@
agvLocMastByLocNo.setBarcode(containerCode);
agvLocMastService.updateById(agvLocMastByLocNo);
- if (!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F", agvLocMastByContainerCode.getLocSts())) {
+ if(!Cools.isEmpty(agvLocMastByContainerCode) && Cools.eq("F",agvLocMastByContainerCode.getLocSts())){
agvLocMastByContainerCode.setLocSts("D");
agvLocMastByContainerCode.setBarcode(barcode1);
agvLocMastService.updateById(agvLocMastByContainerCode);
@@ -413,13 +416,13 @@
// -------------2-----------------------------
//搴撲綅淇℃伅涓嶄负绌� 璐ф灦淇℃伅涓虹┖
- if (!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)) {
+ if(!Cools.isEmpty(listByLocNo) && Cools.isEmpty(listByContainerCode)){
String newLocNo = agvLocMastByContainerCode.getLocNo();
//鏇存柊璐ф灦淇℃伅鐨勫簱浣嶄负褰撳墠搴撲綅
listByLocNo.forEach(agvLocDetl -> {
String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByContainerCode.getLocNo());
- agvLocDetlService.updateLocNo(newLocNo, sourceLoc, agvLocDetl);
+ agvLocDetlService.updateLocNo(newLocNo,sourceLoc,agvLocDetl);
});
agvLocMastByContainerCode.setLocSts("F");
@@ -433,7 +436,7 @@
return R.ok("缁存姢鎴愬姛");
}
- if ((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)) {
+ if((listByLocNo == null && listByContainerCode == null) || listByLocNo.equals(listByContainerCode)){
//agvLocMastByContainerCode.setBarcode(agvLocMastByLocNo.getBarcode());
//agvLocMastService.updateById(agvLocMastByContainerCode);
@@ -444,12 +447,13 @@
}
+
// --------------3----------------------------
String locNo1 = listByContainerCode.get(0).getLocNo();
listByContainerCode.forEach(agvLocDetl -> {
String sourceLoc = agvLocDetl.getLocNo();
agvLocDetl.setLocNo(agvLocMastByLocNo.getLocNo());
- agvLocDetlService.updateLocNo(locNo, sourceLoc, agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo,sourceLoc,agvLocDetl);
});
if (!Cools.isEmpty(listByLocNo)) {
@@ -458,7 +462,7 @@
supp_codes.forEach(agvLocDetl -> {
agvLocDetl.setLocNo(locNo1);
- agvLocDetlService.updateLocNo(locNo1, locNo, agvLocDetl);
+ agvLocDetlService.updateLocNo(locNo1,locNo,agvLocDetl);
});
}
@@ -481,11 +485,11 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove(@RequestBody HashMap<String, Object> params) {
+ public R agvLocMove(@RequestBody HashMap<String,Object> params){
String fl = String.valueOf(params.get("floor"));
- short floor = (short) Integer.parseInt(fl.substring(0, 1));
- List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
- params.get("dbList");
+ short floor =(short)Integer.parseInt(fl.substring(0, 1));
+ List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ params.get("dbList");
Object mT = params.get("moveType");
String moveType = "";
if (mT.equals("unAuto")) {
@@ -499,15 +503,15 @@
AgvLocMast agvLocMast = agvLocMastService.selectOne(wrapper);
agvLocMast.setLocType(moveType);
agvLocMast.setLocType3(floor);
- agvLocMastService.update(agvLocMast, wrapper);
+ agvLocMastService.update(agvLocMast,wrapper);
// 鍚屾璋冩嫧鍗�
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
// 鏇存柊璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", "DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no","DB" + agvLocDetl.getOrderNo()).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
}
}
}
@@ -518,13 +522,14 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove2(@RequestBody HashMap<String, Object> params) {
+ public R agvLocMove2(@RequestBody HashMap<String,Object> params){
Date now = new Date();
String fl = String.valueOf(params.get("floor"));
Integer floor = Integer.parseInt(fl.substring(0, 1));
- List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
params.get("dbList");
Object mT = params.get("moveType");
+ String orderNo = params.get("orderNo").toString();
String moveType = "";
Integer ioType = 0;
if (mT.equals("unAuto")) {
@@ -546,11 +551,11 @@
if (!Cools.isEmpty(source_loc_no)) {
throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
}
- AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
if (Cools.isEmpty(locMastS)) {
- throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
}
- AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30, floor);
+ AgvWrkMast wrkMast = createWrkMast(ioType, 22L, locNo, "", barcode, now, getUserId(), 30,floor);
// 鍚屾璋冩嫧鍗�
long flowId = snowflakeIdWorker.nextId();
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
@@ -559,6 +564,7 @@
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.sync(agvLocDetl);
wrkDetl.setSuppCode(agvLocDetl.getSuppCode());
+ wrkDetl.setModel(orderNo);
wrkDetl.setIoTime(now);
wrkDetl.setAppeUser(getUserId());
wrkDetl.setAppeTime(now);
@@ -567,10 +573,13 @@
if (!agvWrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
-
// 鏇存柊璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
-// FlowLog flowLog = new FlowLog();
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
+ // 鍒ゆ柇璁㈠崟鏄惁瓒呴噺
+ if (orderDetl.getQty() >= orderDetl.getAnfme()) {
+ throw new CoolException("璋冩嫧鍗�:" + orderNo + "鐨�<" + agvLocDetl.getMatnr() + ">宸插畬鎴愯皟鎷ㄦ暟閲�,璇锋鏌�!");
+ }
+ // FlowLog flowLog = new FlowLog();
// flowLog.setFid(String.valueOf(flowId));
// flowLog.setSpare2(wrkMast.getWrkNo().toString());
// flowLog.setLocNo(wrkMast.getSourceLocNo());
@@ -597,8 +606,16 @@
// throw new CoolException("鍚屾鍗婃垚鍝佽皟鎷ㄥ崟娴佹按璁板綍澶辫触");
// }
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("source", 33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no",orderNo).eq("source",33).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ throw new CoolException("璁㈠崟鍙凤細{"+orderNo+"}鏇存柊璁㈠崟鏄庣粏澶辫触锛� 寮傚父鐗╂枡:"+agvLocDetl.getMatnr()+"(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+ }
+ // 鏇存柊璁㈠崟鐘舵��
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ Long settle = order.getSettle();
+ if (settle == 1L) {
+ if (!orderService.updateSettle(order.getId(),2L,getUserId())) {
+ throw new CoolException("璁㈠崟鍙凤細{"+order.getOrderNo()+"}鏇存柊璁㈠崟鐘舵�侊細1-->2 澶辫触锛�(鍗婃垚鍝佽皟鎷ㄥ崟浠诲姟)" );
+ }
}
}
// 鏇存柊婧愬簱浣�
@@ -613,9 +630,9 @@
@Transactional
@ManagerAuth(memo = "鍥炶皟鍗曚换鍔′笅鍙�")
@Synchronized
- public R agvLocMove3(@RequestBody HashMap<String, Object> params) {
+ public R agvLocMove3(@RequestBody HashMap<String,Object> params){
Date now = new Date();
- List<HashMap<String, String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
+ List<HashMap<String,String>> dbList = (List<HashMap<String, String>>) params.get("dbList");
params.get("dbList");
for (HashMap<String, String> map : dbList) {
String locNo = map.get("locNo");
@@ -624,11 +641,11 @@
if (!Cools.isEmpty(source_loc_no)) {
throw new CoolException("褰撳墠搴撲綅宸茬敓鎴愪换鍔★紒");
}
- AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts", "F"));
+ AgvLocMast locMastS = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo).eq("loc_sts","F"));
if (Cools.isEmpty(locMastS)) {
- throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�=" + locNo);
+ throw new CoolException("褰撳墠搴撲綅闈炲湪搴撶姸鎬侊紒搴撲綅鍙�="+locNo);
}
- AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30, 1);
+ AgvWrkMast wrkMast = createWrkMast(114, 22L, locNo, "", barcode, now, getUserId(), 30,1);
// 鍚屾璋冩嫧鍗�
List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("loc_no", locNo));
for (AgvLocDetl agvLocDetl : agvLocDetls) {
@@ -647,10 +664,10 @@
// 鏇存柊璁㈠崟
// 鍏堟煡璇㈠簱璁㈠崟鏄庣粏 鎵�灞炵殑璁㈠崟
- OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source", 36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()));
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()));
orderDetl.setQty(orderDetl.getQty() + agvLocDetl.getAnfme());
- if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("source", 36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code", agvLocDetl.getThreeCode()))) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + agvLocDetl.getOrderNo() + agvLocDetl.getMatnr());
+ if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("source",36).eq("matnr", agvLocDetl.getMatnr()).eq("three_code",agvLocDetl.getThreeCode()))){
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+agvLocDetl.getOrderNo()+agvLocDetl.getMatnr());
}
}
// 鏇存柊婧愬簱浣�
@@ -665,7 +682,7 @@
@Transactional
@ManagerAuth(memo = "鎵嬪姩搴撲綅杞Щ")
@Synchronized
- public R handControlLocMove(@RequestBody LocMoveParam param) {
+ public R handControlLocMove(@RequestBody LocMoveParam param){
agvMobileService.handControlLocMove(param, getUserId());
return R.ok();
}
@@ -674,7 +691,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧绂诲満")
@Synchronized
- public R allocationOut(@RequestBody AgvMobileStartPakin param) {
+ public R allocationOut(@RequestBody AgvMobileStartPakin param){
agvMobileService.allocationOut(param, getUserId());
return R.ok();
}
@@ -683,7 +700,7 @@
@Transactional
@ManagerAuth(memo = "璋冩嫧杩涘満")
@Synchronized
- public R allocationIn(@RequestBody AgvMobileStartPakin param) {
+ public R allocationIn(@RequestBody AgvMobileStartPakin param){
agvMobileService.allocationIn(param, getUserId());
return R.ok();
}
@@ -692,7 +709,7 @@
@Transactional
@ManagerAuth(memo = "绌烘灦绂诲満")
@Synchronized
- public R empOut(@RequestBody AgvMobileStartPakin param) {
+ public R empOut(@RequestBody AgvMobileStartPakin param){
agvMobileService.empOut(param, getUserId());
return R.ok();
}
@@ -701,7 +718,7 @@
@Transactional
@ManagerAuth(memo = "绌烘灦杩涘満")
@Synchronized
- public R empIn(@RequestBody AgvMobileStartPakin param) {
+ public R empIn(@RequestBody AgvMobileStartPakin param){
agvMobileService.empIn(param, getUserId());
return R.ok();
}
@@ -710,8 +727,8 @@
@Transactional
@ManagerAuth(memo = "绔欑偣鍥為��")
@Synchronized
- public R doBack(@RequestBody AgvMobileStartPakin param) {
- if (Cools.isEmpty(param)) {
+ public R doBack(@RequestBody AgvMobileStartPakin param){
+ if (Cools.isEmpty(param)){
return R.error("鍙傛暟涓虹┖");
}
agvMobileService.doBack(param, getUserId());
@@ -722,7 +739,7 @@
@Transactional
@ManagerAuth(memo = "杞墜鍔ㄥ洖娴�")
@Synchronized
- public R handBack(@RequestBody AgvMobileStartPakin param) {
+ public R handBack(@RequestBody AgvMobileStartPakin param){
agvMobileService.handBack(param, getUserId());
return R.ok();
}
@@ -731,7 +748,7 @@
@Transactional
@ManagerAuth(memo = "纭鍔犲伐瀹屾垚")
@Synchronized
- public R processed(@RequestBody AgvMobileStartPakin param) {
+ public R processed(@RequestBody AgvMobileStartPakin param){
agvMobileService.processed(param, getUserId());
return R.ok();
}
@@ -755,11 +772,10 @@
System.out.println(agvLocDetls22.equals(agvLocDetls2));
}
-
/*
鐢熸垚宸ヤ綔妗�
*/
- private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor) {
+ private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType,int floor){
AgvWrkMast wrkMast = new AgvWrkMast();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
@@ -788,7 +804,7 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo));
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
return wrkMast;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 25d00d2..03b6140 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -520,6 +520,15 @@
if (Cools.isEmpty(orderDetl)) {
throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
}
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ if (Cools.isEmpty(order)) {
+ throw new CoolException("褰撳墠鐗╂枡鐨勮皟鎷ㄥ崟涓嶅瓨鍦紒");
+ }
+ if (order.getSettle() == 4L) {
+ if (!orderService.updateSettle(order.getId(),2L,userId)) {
+ throw new CoolException("璋冩嫧鍗曞洖婊氬紓甯�!");
+ }
+ }
orderDetl.setQty(orderDetl.getQty() - agvLocDetl.getAnfme());
if (!orderDetlService.updateById(orderDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 70646f1..13fd364 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -56,7 +56,7 @@
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- //濡傛灉鏄姞宸ュ崟鍒欒繘琛屽垽鏂�
+ //濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
if (order.getDocType() == 33) {
//鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index 0f4136a..344afb2 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-08-01 17:48:35";
+ String timeStr = "2025-11-01 00:00:00";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
System.out.println("婵�娲荤爜锛�"+code);
--
Gitblit v1.9.1