From e9ed17ca2d5eaafe69704ee817817a539d847e78 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 20 七月 2023 09:04:44 +0800
Subject: [PATCH] 登录页面
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index a990ca6..3c74df0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -6,7 +6,9 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.WmsWrkStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
@@ -87,6 +89,8 @@
private BasErrLogService basErrLogService;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
+ @Autowired
+ private WmsWrkService wmsWrkService;
@Value("${wms.url}")
private String wmsUrl;
@@ -305,6 +309,13 @@
if (wrkMastMapper.updateById(wrkMast) == 0) {
log.error("鏇存柊宸ヤ綔妗ｅけ璐ワ紒锛侊紒 [宸ヤ綔鍙凤細{}]", wrkMast.getWrkNo());
}
+
+ //鏇存柊WMS浠诲姟鐘舵��
+ WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
+ wmsWrk.setWmsStatus(WmsWrkStatusType.WORKING.id);//鎵ц涓�
+ wmsWrk.setModiTime(new Date());
+ wmsWrkService.updateById(wmsWrk);
+
} else {
log.error("鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
}
@@ -1029,8 +1040,9 @@
Date now = new Date();
wrkMast.setCrnEndTime(now);
wrkMast.setModiTime(now);
+ Integer integerWrkMast = wrkMastMapper.updateById(wrkMast);
// 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
- if (wrkMastMapper.updateById(wrkMast) > 0) {
+ if (integerWrkMast > 0) {
// 鍫嗗灈鏈哄浣�
crnThread.setResetFlag(true);
}
--
Gitblit v1.9.1