From eab76cd34bff799686f68e6b70f86c9001e4913f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 23 五月 2025 09:41:21 +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 | 16 ++++++++++------
rsf-admin/src/page/locItem/LocItemList.jsx | 4 +++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 5 +++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java | 5 ++++-
rsf-admin/src/i18n/zh.js | 1 +
rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx | 10 +++-------
rsf-admin/src/i18n/en.js | 2 ++
rsf-server/src/main/resources/application-dev.yml | 2 +-
8 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 25f3cc2..1a971d7 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -993,6 +993,8 @@
trackCode: "trackCode",
unit: "unit",
anfme: "anfme",
+ qty: 'Qty',
+ workQty: 'Work Qty',
batch: "batch",
splrBatch: "splrBatch",
spec: "spec",
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index d206f30..62d269e 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -988,6 +988,7 @@
matnrCode: "鐗╂枡缂栫爜",
trackCode: "璺熻釜鐮�",
workQty: '鎵ц鏁�',
+ qty: '瀹屾垚鏁�',
batch: "鎵规",
splrBatch: "渚涘簲鍟嗘壒娆�",
spec: "瑙勬牸",
diff --git a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
index ce29d0c..7680e2e 100644
--- a/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
+++ b/rsf-admin/src/page/histories/asnOrderLog/AsnOrderLogList.jsx
@@ -116,25 +116,21 @@
marginRight: drawerVal ? `${PAGE_DRAWER_WIDTH}px` : 0,
}}
title={"menu.asnOrderLog"}
- empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
+ empty={false}
filters={filters}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
<SelectColumnsButton preferenceKey='asnOrderLog' />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
>
<StyledDatagrid
preferenceKey='asnOrderLog'
- bulkActionButtons={
- <>
- <MyExportButton />
- </>
- }
+ bulkActionButtons={false}
rowClick={'edit'}
expand={false}
expandSingle={true}
diff --git a/rsf-admin/src/page/locItem/LocItemList.jsx b/rsf-admin/src/page/locItem/LocItemList.jsx
index 56089d1..2a39802 100644
--- a/rsf-admin/src/page/locItem/LocItemList.jsx
+++ b/rsf-admin/src/page/locItem/LocItemList.jsx
@@ -175,6 +175,8 @@
<TextField source="trackCode" label="table.field.locItem.trackCode" />,
<TextField source="unit" label="table.field.locItem.unit" />,
<NumberField source="anfme" label="table.field.locItem.anfme" />,
+ <NumberField source="workQty" label="table.field.locItem.workQty" />,
+ <NumberField source="qty" label="table.field.locItem.qty" />,
<TextField source="splrBatch" label="table.field.locItem.splrBatch" />,
<TextField source="fieldsIndex" label="table.field.locItem.fieldsIndex" />,
]
@@ -213,7 +215,7 @@
rowClick={false}
expand={false}
expandSingle={true}
- omit={['id', 'createTime', 'locId', 'orderId', 'orderItemId', 'matnrId', 'splrBatch', 'workQty', 'qty', 'createBy', 'memo', 'fieldsIndex']}
+ omit={['id', 'createTime','spec', 'model', 'locId', 'orderId', 'trackCode', 'orderItemId', 'matnrId', 'splrBatch','createBy', 'memo', 'fieldsIndex']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
index 7c7ddbf..4bd525e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItemWorking.java
@@ -43,9 +43,12 @@
@ApiModelProperty(value= "涓诲崟ID")
private Long locId;
- @ApiModelProperty("浠诲姟鏄庣粏ID")
+ @ApiModelProperty("浠诲姟ID")
private Long taskId;
+ @ApiModelProperty("搴撲綅鏄庣粏ID")
+ private Long locItemId;
+
/**
* 搴撲綅
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index 8da880e..238e703 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -87,6 +87,7 @@
}
Double orgQty = locItems.stream().mapToDouble(LocItem::getAnfme).sum();
+ Double workQty = locItems.stream().mapToDouble(LocItem::getWorkQty).sum();
List<LocItem> locItemList = listMap.get(key);
Double outQty = locItemList.stream().mapToDouble(LocItem::getOutQty).sum();
@@ -95,8 +96,8 @@
if (!Objects.isNull(serviceOne)) {
throw new CoolException("鎵樼洏浠诲姟鎵ц涓紝涓嶈兘閲嶅鍒涘缓锛�");
}
-
- if (orgQty.compareTo(outQty) > 0) {
+ Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;
+ if (orgQty.compareTo(useQty) > 0) {
//鎷ｆ枡鍑哄簱
task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_IN.type);
} else {
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 1d188d1..ac780a4 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
@@ -454,7 +454,10 @@
for (TaskItem taskItem : taskItems) {
LocItem locItem = new LocItem();
LocItemWorking locWorking = locItemWorkingService.getOne(new LambdaQueryWrapper<LocItemWorking>()
- .eq(LocItemWorking::getTaskId, taskItem.getTaskId()));
+ .eq(LocItemWorking::getTaskId, taskItem.getTaskId())
+ .eq(StringUtils.isNotBlank(taskItem.getBatch()), LocItemWorking::getBatch, taskItem.getBatch())
+ .eq(StringUtils.isNotBlank(taskItem.getFieldsIndex()), LocItemWorking::getFieldsIndex, taskItem.getFieldsIndex())
+ .eq(LocItemWorking::getMatnrId, taskItem.getMatnrId()));
if (Objects.isNull(locWorking)) {
throw new CoolException("鏁版嵁閿欒锛屼綔涓氫腑搴撳瓨鏁版嵁涓㈠け锛侊紒");
}
@@ -469,13 +472,14 @@
items.add(locItem);
}
- TaskItem taskItem = taskItems.stream().findFirst().get();
-
- saveStockItems(taskItems, null, null, taskItem.getWkType(), taskItem.getOrderType());
-
if (!locItemService.saveBatch(items)) {
throw new CoolException("浣滀笟搴撳瓨鍥炲啓澶辫触锛侊紒");
}
+
+ TaskItem taskItem = taskItems.stream().findFirst().get();
+ //淇濆瓨鍏ュ嚭搴撴祦姘�
+ saveStockItems(taskItems, null, null, taskItem.getWkType(), taskItem.getOrderType());
+
if (!locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()))) {
throw new CoolException("浣滀笟涓簱瀛樺垹闄ゅけ璐ワ紒锛�");
@@ -648,7 +652,7 @@
for (LocItem item : locItems) {
LocItemWorking working = new LocItemWorking();
BeanUtils.copyProperties(item, working);
- working.setId(null).setTaskId(task.getId());
+ working.setId(null).setTaskId(task.getId()).setLocItemId(item.getId());
workings.add(working);
}
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 19cef04..203032b 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@
driver-class-name: com.mysql.jdbc.Driver
# url: jdbc:mysql://47.76.147.249:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- url: jdbc:mysql://192.168.4.50:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://127.0.0.1:3306/rsf?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
# username: rsf
password: 34821015
type: com.alibaba.druid.pool.DruidDataSource
--
Gitblit v1.9.1