From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 130 +++++++++++++++++++++----------
/dev/null | 24 ------
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 4
rsf-admin/src/page/task/TaskList.jsx | 24 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 5 -
rsf-admin/src/i18n/zh.js | 1
rsf-admin/src/i18n/en.js | 9 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 18 +++-
9 files changed, 133 insertions(+), 84 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 53ea47c..b429a7a 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -209,10 +209,10 @@
field: {
outBound: {
stockWithdrawal: 'StockWithdrawal',
- withdrawal:'Withdrawal'
+ withdrawal: 'Withdrawal'
},
basContainer: {
- containerType:'containerType',
+ containerType: 'containerType',
codeType: 'codeType',
areas: 'areas',
},
@@ -228,8 +228,8 @@
isWcs: 'isWcs',
wcsData: 'wcsData',
containerType: 'containerType',
- barcode: 'barcode',
- autoTransfer: 'autoTransfer',
+ barcode: 'barcode',
+ autoTransfer: 'autoTransfer',
},
host: {
@@ -1117,6 +1117,7 @@
locInit: 'loc init',
siteInit: 'site init',
batch: 'batch',
+ pick: 'Pick',
confirm: 'confirm',
cancel: "cancel",
query: "Query",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 6cba991..c00e157 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -1116,6 +1116,7 @@
continue: '缁х画鏀惰揣',
batch: '鎵归噺鎿嶄綔',
confirm: '纭',
+ pick: '鎷ｆ枡',
bulkExport: "鎵归噺瀵煎嚭",
selectSite: '閫夋嫨绔欑偣',
confirmSelect: '纭閫夋嫨',
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 068a809..f4fd8d1 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -43,6 +43,7 @@
import ConfirmButton from "../components/ConfirmButton";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
import * as Common from '@/utils/common';
+import ColorizeOutlinedIcon from '@mui/icons-material/ColorizeOutlined';
const StyledDatagrid = styled(DatagridConfigurable)(({ theme }) => ({
'& .css-1vooibu-MuiSvgIcon-root': {
@@ -157,10 +158,10 @@
{/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
- <EditButton label="toolbar.detail"/>
+ <EditButton label="toolbar.detail" />
<DoneButton sx={{ padding: '1px', fontSize: '.75rem' }} ></DoneButton>
<CancelButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
- <SetTopButton sx={{ padding: '1px', fontSize: '.75rem' }} ></SetTopButton>
+ <PickButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -178,6 +179,25 @@
/**
+ * 鎷ｆ枡鍑哄簱
+ * @returns
+ */
+const PickButton = () => {
+ const record = useRecordContext();
+ const notify = useNotify();
+ const refresh = useRefresh();
+
+ const pickClick = () => {
+
+ }
+
+ return (
+ record?.taskStatus == 103 ? <ConfirmButton label={"toolbar.pick"} startIcon={<ColorizeOutlinedIcon />} onConfirm={pickClick}/> : <></>
+ )
+}
+
+
+/**
* 瀹屾垚鎿嶄綔
* @returns
*/
diff --git a/rsf-server/src/main/java/basContainer.sql b/rsf-server/src/main/java/basContainer.sql
deleted file mode 100644
index 9c9ba12..0000000
--- a/rsf-server/src/main/java/basContainer.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- save basContainer record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.basContainer', '0', '/manager/basContainer', 'basContainer', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 瀹瑰櫒绠＄悊', '', '1', 'manager:basContainer:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 瀹瑰櫒绠＄悊', '', '1', 'manager:basContainer:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 瀹瑰櫒绠＄悊', '', '1', 'manager:basContainer:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 瀹瑰櫒绠＄悊', '', '1', 'manager:basContainer:remove', '3', '1', '1');
-
--- locale menu name
-basContainer: 'BasContainer',
-
--- locale field
-basContainer: {
- containerType: "containerType",
- codeType: "codeType",
- areas: "areas",
-},
-
--- ResourceContent
-import basContainer from './basContainer';
-
-case 'basContainer':
- return basContainer;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 1456ea1..ea8eabb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -132,10 +132,6 @@
}
List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
-// if (tasks.isEmpty()) {
-// throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿畬鎴愶紒锛�");
-// }
-// taskService.completeTask(tasks);
for (Task task : tasks) {
task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
}
@@ -146,6 +142,20 @@
return R.ok("瀹屾垚浠诲姟鎴愬姛");
}
+ /**
+ * 鎷ｆ枡鍑哄簱
+ * @return
+ */
+ @PreAuthorize("hasAuthority('manager:task:update')")
+ @ApiOperation("鎷ｆ枡鍑哄簱")
+ @PostMapping("/task/pick/{id}")
+ public R pickTask(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ throw new CoolException("鑳芥暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return taskService.pickTask(id);
+ }
+
// @PreAuthorize("hasAuthority('manager:task:update')")
// @ApiOperation("鍙栨秷浠诲姟")
// @PostMapping("/task/cancel/{id}")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 52d60b1..af97c8d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -253,7 +253,7 @@
if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
return null;
}
- return dictDatas.getLabel();
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
}
public String getTaskType$() {
@@ -267,7 +267,7 @@
if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
return null;
}
- return dictDatas.getLabel();
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
}
public String getStartTime$(){
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 0573073..2a17919 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -144,10 +144,5 @@
if (!taskItemService.removeByIds(itemIds)) {
throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
-
}
-
-
-
-
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index 0d8adf9..f2ec28d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -20,4 +20,6 @@
void completeTask(List<Task> task) throws Exception;
R removeTask(Long[] ids);
+
+ R pickTask(Long id);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 0863d97..baf1895 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -16,6 +16,7 @@
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.enums.LocStsType;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import lombok.Synchronized;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,8 @@
private WaveService waveService;
@Autowired
private BasStationService basStationService;
+ @Autowired
+ private TaskService taskService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -371,20 +374,39 @@
* @param tasks
* @throws Exception
*/
+ @Synchronized
@Override
@Transactional(rollbackFor = Exception.class)
- public synchronized void completeTask(List<Task> tasks) throws Exception {
+ public void completeTask(List<Task> tasks) throws Exception {
for (Task task : tasks) {
+ //鍑哄簱浠诲姟
if (task.getTaskType() < TaskType.TASK_TYPE_OUT.type) {
- //鍏ュ簱浠诲姟
- complateInstock(task);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
+ //1.鍏ュ簱
+ complateInstock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
+ //53.鎷ｆ枡鍐嶅叆搴�
+
+ }
} else {
//鍑哄簱浠诲姟
- complateOutStock(task);
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)) {
+ //鍏ㄦ墭鍑哄簱
+ complateOutStock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
+ //鎷ｆ枡鍑哄簱,
+ taskService.pickTask(task.getId());
+ }
}
}
}
+ /**
+ * 浠诲姟鍙栨秷
+ *
+ * @param ids
+ * @return
+ */
@Override
public R removeTask(Long[] ids) {
List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
@@ -415,7 +437,7 @@
}
if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.id)) {
BasStation basStation = null;
- if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) ) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, task.getOrgSite())
.eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
@@ -444,7 +466,50 @@
throw new CoolException("Delete Fail");
}
- return R.ok("鎿嶄綔鎴愬姛");
+ return R.ok("鍙栨秷瀹屾垚");
+ }
+
+ /**
+ * 鎷ｆ枡鍑哄簱
+ *
+ * @param id
+ * @return
+ */
+ @Override
+ public R pickTask(Long id) {
+ Task task = this.getById(id);
+ if (Objects.isNull(task)) {
+ throw new CoolException("褰撳墠浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.type)) {
+ throw new CoolException("闈炴嫞鏂欏嚭搴� 锛屼笉鍙墽琛屾鎿嶄綔锛侊紒");
+ }
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("娌℃湁绌哄簱浣嶏紒锛�");
+ }
+
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, task);
+ //鏇存柊浠诲姟涓诲崟
+ task.setTaskCode(ruleCode)
+ .setTaskType(TaskType.TASK_TYPE_PICK_IN.type)
+ .setTargLoc(task.getOrgLoc()) //鍑哄簱婧愬簱浣嶅彉鍏ュ簱鐩爣搴撲綅
+ .setTaskStatus(TaskStsType.GENERATE_IN.id);
+
+ if (!this.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+ //淇敼搴撲綅鐘舵�� 棰勭害鍑哄簱.R==>棰勭害鍏ュ簱.S
+ loc.setUseStatus(StaUseStatusType.TYPE_S.type);
+
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐ワ紒锛�");
+ }
+
+ return R.ok("鎷ｈ揣鎴愬姛锛侊紒");
}
/**
@@ -456,15 +521,23 @@
@Transactional(rollbackFor = Exception.class)
public synchronized void complateOutStock(Task task) {
if (Objects.isNull(task)) {
- return;
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("搴撲綅鐘舵�佷笉澶勭悊浜嶳.鍑哄簱棰勭害锛侊紒");
+ }
+
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
}
try {
//鏇存柊搴撲綅鏄庣粏
- subtractLocItem(taskItems, task.getId());
+ subtractLocItem(taskItems, loc);
} catch (Exception e) {
throw new RuntimeException(e.getMessage());
}
@@ -497,13 +570,9 @@
}
}
- /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
- if (locs.isEmpty()) {
- //濡傚崟鎹槑缁嗕负绌猴紝淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱
- if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getTargLoc()))) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
+ /**淇敼涓哄簱浣嶇姸鎬佷负O.绌哄簱*/
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, loc.getId()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -561,34 +630,9 @@
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
- public void subtractLocItem(List<TaskItem> items, Long taskId) throws Exception {
- Task task = this.getById(taskId);
- if (Objects.isNull(task)) {
- throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
- }
- for (TaskItem item : items) {
- LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
- .eq(LocItem::getBatch, item.getBatch())
- .eq(LocItem::getFieldsIndex, item.getFieldsIndex())
- .eq(LocItem::getMatnrId, item.getMatnrId())
- .eq(LocItem::getLocCode, task.getTargLoc()));
- if (Objects.isNull(locItem)) {
- throw new CoolException("搴撳瓨鏄庣粏涓嶅瓨鍦紒锛�");
- }
- //鍓╀綑搴撳瓨
- Double minuValue = (Math.round((locItem.getAnfme() - locItem.getWorkQty() - locItem.getQty()) * 10000.0) / 10000.0);
- if (minuValue.compareTo(item.getAnfme()) <= 0) {
- //鍓╀綑搴撳瓨灏忎簬鍑哄簱搴撳瓨锛岀Щ闄ゅ綋鍓嶅簱瀛樹俊鎭�
- if (!locItemService.removeById(locItem.getId())) {
- throw new CoolException("搴撳瓨鍒犻櫎澶辫触锛侊紒");
- }
- } else {
- locItem.setWorkQty((Math.round((locItem.getWorkQty() - minuValue) * 10000.0) / 10000.0));
- locItem.setQty((Math.round((minuValue + locItem.getQty()) * 10000.0) / 10000.0));
- if (!locItemService.updateById(locItem)) {
- throw new CoolException("搴撳瓨淇℃伅鏇存柊澶辫触锛侊紒");
- }
- }
+ public void subtractLocItem(List<TaskItem> items, Loc loc) throws Exception {
+ if (!locItemService.remove(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()))) {
+ throw new CoolException("搴撳瓨鏄庣粏鍒犻櫎澶辫触锛侊紒");
}
}
--
Gitblit v1.9.1