From e8ed1a91c77ab62a924f12acd55777f227bacd7e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 21 十一月 2025 17:15:17 +0800
Subject: [PATCH] 工位组删除后，其下工位移动到默认组
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
index 7f34e2c..ca6b628 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/WorkstationFeedbackServiceImpl.java
@@ -37,11 +37,11 @@
import com.qianwen.smartman.common.constant.ExtCacheConstant;
import com.qianwen.smartman.common.enums.GlobalWcsTypeEnum;
import com.qianwen.smartman.common.utils.Lambda;
-import com.qianwen.smartman.modules.cps.entity.Employee;
-import com.qianwen.smartman.modules.cps.entity.Workstation;
-import com.qianwen.smartman.modules.cps.service.IEmployeeService;
-import com.qianwen.smartman.modules.cps.service.IGlobalWcsService;
-import com.qianwen.smartman.modules.cps.service.IWorkstationService;
+import com.qianwen.smartman.modules.smis.entity.Employee;
+import com.qianwen.smartman.modules.smis.entity.Workstation;
+import com.qianwen.smartman.modules.smis.service.IEmployeeService;
+import com.qianwen.smartman.modules.smis.service.IGlobalWcsService;
+import com.qianwen.smartman.modules.smis.service.IWorkstationService;
import com.qianwen.smartman.modules.mdc.convert.StatusRecordConvert;
import com.qianwen.smartman.modules.mdc.dto.GroupFeedbackCacheDTO;
import com.qianwen.smartman.modules.mdc.dto.WorkstationEndAndStartImmediateFeedBackDTO;
@@ -132,14 +132,6 @@
return getOne(Lambda.eq(WorkstationFeedback::getWorkstationId, workstationId)
.eq(WorkstationFeedback::getFeedbackType, FeedbackType.IMMEDIATE.getValue())
.isNull(WorkstationFeedback::getEndTime));
- /*
- return (WorkstationFeedback) getOne((Wrapper) ((ExtraLambdaQueryWrapper) Lambda.eq((v0) -> {
- return v0.getWorkstationId();
- }, workstationId).eq((v0) -> {
- return v0.getFeedbackType();
- }, Integer.valueOf(FeedbackType.IMMEDIATE.getValue()))).isNull((v0) -> {
- return v0.getEndTime();
- }));*/
}
@Override
@@ -157,7 +149,7 @@
updateById(oldFeedback);
}
WorkstationFeedback addFeedback = new WorkstationFeedback();
- addFeedback.setWorkstationId(Long.valueOf(Long.parseLong(workstationId)));
+ addFeedback.setWorkstationId(Long.parseLong(workstationId));
addFeedback.setStartTime(now);
addFeedback.setFeedbackTime(now);
if (Func.isNotEmpty(dto.getFeedUser())) {
@@ -211,7 +203,7 @@
}
/**
- * 鎵归噺娓呴櫎 鍙嶉
+ * 鎵归噺娓呴櫎鍙嶉鐨勭紦瀛橈紝涓昏鐢ㄤ簬鍒锋柊鍓嶇鐨勬樉绀烘暟鎹�
* @param startTime
* @param endTime
* @param workstationIds
@@ -225,7 +217,7 @@
}
/**
- * 鍗曚釜娓呮缂撳瓨涓殑鍙嶉锛屼粠catcheName=WORK_FEEDBACK_EXP3缂撳瓨涓垹闄� 瀹為檯key涓� group:feedback:list:blade:feedback#259200${workstationId}:yyyy-MM-dd HH:mm:ss
+ * 鍗曚釜娓呮缂撳瓨涓殑鍙嶉锛屼粠catcheName=WORK_FEEDBACK_EXP3缂撳瓨涓垹闄� 瀹為檯key涓� blade:feedback:group:feedback:list:blade:feedback#259200${workstationId}:yyyy-MM-dd HH:mm:ss
* @param start
* @param end
* @param workstationId
--
Gitblit v1.9.3