From 6a9275fe27d5291d3ea8063bcc3712dde42fe8e7 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 19 三月 2026 19:05:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/controller/HWmsApiController.java | 2 ++
src/main/java/com/zy/asrs/entity/LocAroundBind.java | 11 +++++++++++
src/main/java/com/zy/asrs/service/WorkService.java | 3 ++-
src/main/java/com/zy/common/config/AdminInterceptor.java | 2 +-
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 31 ++++++++++++++++---------------
src/main/webapp/static/js/locAroundBind/locAroundBind.js | 6 +++---
7 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/api/controller/HWmsApiController.java b/src/main/java/com/zy/api/controller/HWmsApiController.java
index a154d8d..a7d5f81 100644
--- a/src/main/java/com/zy/api/controller/HWmsApiController.java
+++ b/src/main/java/com/zy/api/controller/HWmsApiController.java
@@ -1,6 +1,7 @@
package com.zy.api.controller;
+import com.alibaba.fastjson.JSONObject;
import com.zy.api.controller.params.PageRequestParams;
import com.zy.api.entity.PubOrderParams;
import com.zy.api.entity.ReportOrderParam;
@@ -44,6 +45,7 @@
@ApiOperation("鍏ュ簱鍗曚笅鍙�")
@PostMapping("/sendInDispatch")
public XSR receiveOrders(@RequestBody List<PubOrderParams> params) {
+ log.info(JSONObject.toJSONString(params));
if (Objects.isNull(params)) {
return XSR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 07d0aec..b546436 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -123,9 +123,9 @@
// if (!wrkMastService.updateById(mast)) {
// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
// }
- workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
- return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
+ return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
+
}
/**
diff --git a/src/main/java/com/zy/asrs/entity/LocAroundBind.java b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
index 02f3873..ec077df 100644
--- a/src/main/java/com/zy/asrs/entity/LocAroundBind.java
+++ b/src/main/java/com/zy/asrs/entity/LocAroundBind.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasDeviceService;
import com.zy.asrs.service.BasLocStsService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -85,6 +87,15 @@
return "榛樿";
}
}
+ public String getDevNo$() {
+ BasDeviceService bean = SpringUtils.getBean(BasDeviceService.class);
+ BasDevice type = bean.selectOne(new EntityWrapper<BasDevice>().eq("type", devNo));
+ if (type == null) {
+ return "<UNK>";
+ }else {
+ return type.getDevNo();
+ }
+ }
public String getLocType$() {
if (this.locType == null) {
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 5701b4a..c024dd5 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service;
+import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkMast;
@@ -97,7 +98,7 @@
* @param workNo
* @param userId
*/
- void backLocOperation(String workNo, Long userId);
+ R backLocOperation(String workNo, Long userId);
/**
* 閫氱煡妗ｆ墜鍔ㄧ敓鎴愪换鍔�
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index be3e4b6..a285935 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
+import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
@@ -1445,13 +1442,13 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void backLocOperation(String workNo, Long userId) {
+ public R backLocOperation(String workNo, Long userId) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (Cools.isEmpty(wrkMast)) {
- throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
+ return R.error(workNo+"宸ヤ綔妗ｄ笉瀛樺湪");
}
if (wrkMast.getWrkSts() != 15) {
- throw new CoolException("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屾鎿嶄綔锛�");
+ return R.error("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屾鎿嶄綔锛�");
}
Integer ioType = wrkMast.getIoType() - 50;
@@ -1463,7 +1460,7 @@
// ioType = 10;
// }
if (Objects.isNull(wrkMast.getIsSuplus())) {
- throw new CoolException("鍥炲簱绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ return R.error("鍥炲簱绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
if (wrkMast.getIsSuplus() == 0) {
@@ -1481,12 +1478,12 @@
.eq("crn_no", locMast1.getCrnNo()); // 鍫嗗灈鏈哄彿
StaDesc staDesc = staDescService.selectOne(wrapper);
if (Cools.isEmpty(staDesc)) {
- throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ return R.error("鍏ュ簱璺緞涓嶅瓨鍦�");
}
int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("barcode", wrkMast.getBarcode()));
if (count >= 2) {
- throw new CoolException("浠诲姟妗ｅ凡鐢熸垚锛屼笉鍙互閲嶅鐢熸垚鐩稿悓鐨勫瓙浠诲姟锛侊紒");
+ return R.error("浠诲姟妗ｅ凡鐢熸垚锛屼笉鍙互閲嶅鐢熸垚鐩稿悓鐨勫瓙浠诲姟锛侊紒");
}
WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
@@ -1516,11 +1513,11 @@
mast.setModiTime(now);
mast.setModiUser(userId);
if (!wrkMastService.insert(mast)) {
- throw new CoolException("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
+ return R.error("鏇存柊宸ヤ綔妗ｆ暟鎹姸鎬佸け璐�");
}
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
if (Cools.isEmpty(wrkDetls)) {
- throw new CoolException("鏁版嵁閿欒锛屼换鍔℃。鏄庣粏涓嶅瓨鍦� 锛侊紒");
+ return R.error("鏁版嵁閿欒锛屼换鍔℃。鏄庣粏涓嶅瓨鍦� 锛侊紒");
}
// 淇敼搴撲綅鐘舵�� Q.鎷ｆ枡/鐩樼偣/骞舵澘鍐嶅叆搴�
@@ -1529,14 +1526,14 @@
inLoc.setModiTime(now);
inLoc.setModiUser(userId);
if (!locMastService.updateById(inLoc)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ return R.error("淇敼搴撲綅鐘舵�佸け璐�");
}
LocAroundBind aroundBind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", mast.getSourceLocNo()));
if (!Objects.isNull(aroundBind)) {
aroundBind.setLocType(LocStsType.LOC_STS_TYPE_R.type);
if (!locAroundBindService.updateById(aroundBind)) {
- throw new CoolException("宸ヤ綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ return R.error("宸ヤ綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
@@ -1559,7 +1556,7 @@
locMast.setModiTime(now);
locMast.setModiUser(userId);
if (!locMastService.updateById(locMast)) {
- throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
+ return R.error("淇敼搴撲綅鐘舵�佸け璐�");
}
// wrkMast.setWrkCode(null);
@@ -1567,6 +1564,10 @@
// if (!wrkMastService.updateById(wrkMast)) {
// throw new CoolException("浠诲姟妗ｆ洿鏂板け璐ワ紒锛�");
// }
+ if (Cools.isEmpty(mast)) {
+ return R.error("娌℃湁鐢熸垚浠诲姟");
+ }
+ return R.ok("鐢熸垚鍥炲簱浠诲姟鎴愬姛锛侊紒");
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 795e7a1..ea13bb7 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -123,7 +123,7 @@
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 3600000){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/webapp/static/js/locAroundBind/locAroundBind.js b/src/main/webapp/static/js/locAroundBind/locAroundBind.js
index 673bf17..b18f984 100644
--- a/src/main/webapp/static/js/locAroundBind/locAroundBind.js
+++ b/src/main/webapp/static/js/locAroundBind/locAroundBind.js
@@ -23,9 +23,9 @@
cols: [[
{type: 'checkbox'}
, {field: 'id', align: 'center', title: 'ID', hide: true}
- , {field: 'devId', align: 'center', title: '鏈哄彴ID', hide: true}
- , {field: 'devNo', align: 'center', title: '鏈哄彴鍙�'}
- , {field: 'devName', align: 'center', title: '璁惧鍚嶇О'}
+ , {field: 'devNo$', align: 'center', title: '鏈哄彴鍙�'}
+ , {field: 'devId', align: 'center', title: '鏈哄彴ID'}
+ , {field: 'devName', align: 'center', title: '璁惧鍚嶇О', hide: true }
, {field: 'blocId', align: 'center', title: '搴撲綅ID', hide: true}
, {field: 'blocNo', align: 'center', title: '宸ヤ綅'}
, {field: 'locType$', align: 'center', title: '宸ヤ綅鐘舵��'}
--
Gitblit v1.9.1