From 2e114371163bbc7ca5a3ab525b11bf48d0b3b2b8 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 04 三月 2026 12:38:49 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 12 +++++++-----
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java | 4 ++--
rsf-admin/src/page/orders/preparation/PreparationSelectMatnrModal.jsx | 16 ++++++++--------
rsf-admin/src/page/components/StickyDataTable.jsx | 17 ++++++++++++++++-
4 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/rsf-admin/src/page/components/StickyDataTable.jsx b/rsf-admin/src/page/components/StickyDataTable.jsx
index 728665b..94ce6b5 100644
--- a/rsf-admin/src/page/components/StickyDataTable.jsx
+++ b/rsf-admin/src/page/components/StickyDataTable.jsx
@@ -63,6 +63,10 @@
* DataTable 鏍峰紡甯搁噺
*/
const tableStyles = {
+ '& .RaBulkActionsToolbar-toolbar': {
+ top: 0,
+ zIndex: 6,
+ },
'& .MuiTableCell-head': {
zIndex: 4,
borderBottom: 'none'
@@ -140,12 +144,14 @@
* - label: 鏄剧ず鐨勬爣绛撅紝鏀寔缈昏瘧 key 鎴栫洿鎺ユ樉绀虹殑鏂囨湰
* - render: 鍙�夛紝鑷畾涔夋覆鏌撳嚱鏁� (value, data) => ReactNode
* @param {string} props.footerLabel - footer 绗竴鍒楁爣绛撅紝榛樿'鍚堣'
+ * @param {number} props.bulkActionsOffsetY - 鎵归噺鎿嶄綔鏍忓睍寮�鏃跺悜涓嬪亸绉伙紙px锛�
*/
export const StickyDataTable = ({
stickyLeft = [],
stickyRight = [],
footerConfig,
footerLabel = '鍚堣',
+ bulkActionsOffsetY = 0,
children,
...props
}) => {
@@ -197,8 +203,17 @@
return () => <StickyTableFooter footerConfig={footerConfig} footerLabel={footerLabel} />;
}, [footerConfig, footerLabel]);
+ const dataTableStyles = useMemo(() => {
+ return {
+ ...tableStyles,
+ '& .RaBulkActionsToolbar-toolbar:not(.RaBulkActionsToolbar-collapsed)': {
+ transform: `translateY(${bulkActionsOffsetY}px)`,
+ },
+ };
+ }, [bulkActionsOffsetY]);
+
return (
- <DataTable {...props} foot={footerComponent} sx={tableStyles}>
+ <DataTable {...props} foot={footerComponent} sx={dataTableStyles}>
{/* {processedChildren} */}
{processedChildren
.map((column) => (
diff --git a/rsf-admin/src/page/orders/preparation/PreparationSelectMatnrModal.jsx b/rsf-admin/src/page/orders/preparation/PreparationSelectMatnrModal.jsx
index c15d5dc..3ca6579 100644
--- a/rsf-admin/src/page/orders/preparation/PreparationSelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/preparation/PreparationSelectMatnrModal.jsx
@@ -130,7 +130,7 @@
"orders": formData,
"items": tabelData,
}
- const res = await request.post(`/outStock/items/save`, parmas);
+ const res = await request.post(`/preparation/items/save`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -143,7 +143,7 @@
"orders": formData,
"items": tabelData,
}
- const res = await request.post(`/outStock/items/update`, parmas);
+ const res = await request.post(`/preparation/items/update`, parmas);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -158,7 +158,7 @@
const handleDelete = async () => {
- const res = await request.post(`/outStock/remove/${asnId}`);
+ const res = await request.post(`/preparation/remove/${asnId}`);
if (res?.data?.code === 200) {
setOpen(false);
refresh();
@@ -168,7 +168,7 @@
};
const requestGetHead = async () => {
- const res = await request.get(`/outStock/${asnId}`);
+ const res = await request.get(`/preparation/${asnId}`);
if (res?.data?.code === 200) {
setFormData(res.data.data)
} else {
@@ -227,7 +227,7 @@
required
/>
</Grid> */}
- <Grid item md={2}>
+ {/* <Grid item md={2}>
<DictSelect
label={translate("table.field.outStock.wkType")}
value={formData.wkType}
@@ -237,7 +237,7 @@
dictTypeCode="sys_business_type"
required
/>
- </Grid>
+ </Grid> */}
<Grid item md={2}>
<TextField
label={translate("table.field.outStock.poCode")}
@@ -247,7 +247,7 @@
onChange={(e) => handleChange(e.target.value, 'poCode')}
/>
</Grid>
- <Grid item md={2}>
+ {/* <Grid item md={2}>
<TextField
label={translate("table.field.outStock.logisNo")}
value={formData.logisNo}
@@ -255,7 +255,7 @@
size='small'
onChange={(e) => handleChange(e.target.value, 'logisNo')}
/>
- </Grid>
+ </Grid> */}
<Grid item md={2}>
<DateInput
source="arrTime"
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
index 50ee0e0..6d5c0bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WkOrderItem.java
@@ -384,9 +384,9 @@
public BigDecimal getAbleQty() {
if (anfme == null) { anfme = 0.0;}
- if (qty == null) { qty = 0.0;}
+ if (workQty == null) { workQty = 0.0;}
BigDecimal anfmeDec = new BigDecimal(anfme.toString());
- BigDecimal qtyDec = new BigDecimal(qty.toString());
+ BigDecimal qtyDec = new BigDecimal(workQty.toString());
return anfmeDec.subtract(qtyDec);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index dfdfba0..7a4f7b4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -6,6 +6,7 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
import com.vincent.rsf.server.api.utils.LocUtils;
import com.vincent.rsf.server.common.constant.Constants;
import com.vincent.rsf.server.manager.controller.dto.ExistDto;
@@ -382,11 +383,12 @@
throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
- if (StringUtils.isBlank(ruleCode)) {
- throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
- }
- orders.setCode(ruleCode)
+// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, orders);
+// if (StringUtils.isBlank(ruleCode)) {
+// throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_OUT_STOCK_CODE銆嶆槸鍚﹁缃纭紒锛�");
+// }
+ orders.setCode(orders.getPoCode())
+ .setWkType(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
.setType(OrderType.ORDER_OUT.type)
.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
.setUpdateBy(loginUserId)
--
Gitblit v1.9.1