From de010011aa92785f04b6f0345411c584d49a92d4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 四月 2025 14:59:06 +0800
Subject: [PATCH] #优化 1. 出库单据优化 2. 字典类型数据优化
---
rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java | 18 ---------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 4 ++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java | 26 +-----------
rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java | 5 +-
rsf-admin/src/i18n/zh.js | 4 +
rsf-admin/src/page/orders/outStock/OutOrderList.jsx | 9 ++--
rsf-admin/src/page/orders/outStock/OutOrderCreate.jsx | 5 +-
rsf-admin/src/i18n/en.js | 4 +
rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx | 2
rsf-admin/.env | 2
rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx | 18 ++++----
11 files changed, 33 insertions(+), 64 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index ccb3f34..6801446 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,3 +1,3 @@
-VITE_BASE_IP=192.168.4.25
+VITE_BASE_IP=192.168.4.56
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 9849d55..c248085 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -171,7 +171,9 @@
permissions: 'Permissions',
delivery: 'Delivery',
outStock: 'Out Stock',
- outStockItem: 'Out Stock Item'
+ outStockItem: 'Out Stock Item',
+ inStockPoces: 'In Stock Pocess',
+ outStockPoces: 'Out Stock Pocess',
},
table: {
field: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index b54b235..710f535 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -172,7 +172,9 @@
permissions: '鏉冮檺绠＄悊',
delivery: 'DO鍗�',
outStock: '鍑哄簱鍗�',
- outStockItem: '鍑哄簱鍗曟槑缁�'
+ outStockItem: '鍑哄簱鍗曟槑缁�',
+ inStockPoces: '鍏ュ簱娴佺▼',
+ outStockPoces: '鍑哄簱娴佺▼',
},
table: {
field: {
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderCreate.jsx b/rsf-admin/src/page/orders/outStock/OutOrderCreate.jsx
index 037fb01..ec66955 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderCreate.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderCreate.jsx
@@ -97,7 +97,7 @@
label="table.field.asnOrder.poId"
source="poId"
/>
- <AutocompleteInput
+ {/* <AutocompleteInput
choices={dicts}
optionText="label"
label="table.field.asnOrder.type"
@@ -105,8 +105,7 @@
optionValue="value"
validate={required()}
parse={v => v}
- />
-
+ /> */}
</Grid>
<Grid item xs={12} display="flex" gap={1}>
<AutocompleteInput
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx b/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx
index d4e0b39..3c223c2 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderEdit.jsx
@@ -73,13 +73,13 @@
</Typography>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.asnOrder.code"
+ label="table.field.outStock.code"
source="code"
readOnly
parse={v => v}
/>
<TextInput
- label="table.field.asnOrder.poCode"
+ label="table.field.outStock.poCode"
source="poCode"
readOnly
parse={v => v}
@@ -87,7 +87,7 @@
<AutocompleteInput
choices={dicts}
optionText="label"
- label="table.field.asnOrder.type"
+ label="table.field.outStock.type"
source="type"
optionValue="value"
parse={v => v}
@@ -96,7 +96,7 @@
<AutocompleteInput
choices={business}
optionText="label"
- label="table.field.asnOrder.wkType"
+ label="table.field.outStock.wkType"
source="wkType"
optionValue="value"
parse={v => v}
@@ -105,30 +105,30 @@
</Stack>
<Stack direction='row' gap={2}>
<TextInput
- label="table.field.asnOrder.logisNo"
+ label="table.field.outStock.logisNo"
source="logisNo"
readOnly
parse={v => v}
/>
<TextInput
- label="table.field.asnOrder.anfme"
+ label="table.field.outStock.anfme"
source="anfme"
readOnly
parse={v => v}
/>
<TextInput
- label="table.field.asnOrder.qty"
+ label="table.field.outStock.qty"
source="qty"
readOnly
parse={v => v}
/>
<DateInput
- label="table.field.asnOrder.arrTime"
+ label="table.field.outStock.arrTime"
source="arrTime"
readOnly
/>
<SelectInput
- label="table.field.asnOrder.rleStatus"
+ label="table.field.outStock.rleStatus"
source="rleStatus"
readOnly
choices={[
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
index 2ec290e..f20cf78 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderList.jsx
@@ -223,10 +223,11 @@
const record = useRecordContext();
const notify = useNotify();
const refresh = useRefresh();
-
- const cancelOrder = async (event) => {
- event.stopPropagation();
- const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record.id}`);
+ console.log(record);
+
+ const cancelOrder = async () => {
+ console.log(event);
+ const { data: { code, data, msg } } = await request.get(`/outStock/cancel/${record?.id}`);
if (code === 200) {
notify(msg);
refresh()
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx b/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
index 17ae71d..e5b7332 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictTypeList.jsx
@@ -91,7 +91,7 @@
title={"menu.dictType"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
filters={filters}
- sort={{ field: "sort", order: "asc" }}
+ sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
<FilterButton />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
index 0cf149b..d6642a3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java
@@ -98,6 +98,10 @@
asnOrder.setType(OrderType.ORDER_OUT.type)
.setUpdateBy(getLoginUserId())
.setUpdateTime(new Date());
+ if (Objects.isNull(asnOrder.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_OUT_STOCK_CODE, asnOrder);
+ asnOrder.setCode(ruleCode);
+ }
if (!outStockService.updateById(asnOrder)) {
return R.error("Update Fail");
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
index f8c4cf4..1017e0e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java
@@ -187,34 +187,14 @@
this.memo = memo;
}
-// AsnOrder asnOrder = new AsnOrder(
-// null, // 缂栧彿
-// null, // PO鍗曞彿
-// null, // PO鍗曟嵁鏍囪瘑
-// null, // 鍗曟嵁绫诲瀷[闈炵┖]
-// null, // 涓氬姟绫诲瀷[闈炵┖]
-// null, // 閫佽揣鏁伴噺[闈炵┖]
-// null, // 宸叉敹鏁伴噺[闈炵┖]
-// null, // 鐗╂祦鍗曞彿
-// null, // 棰勮鍒拌揪鏃堕棿
-// null, // 閲婃斁鐘舵�乕闈炵┖]
-// null, // 鍚嶇О
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
public String getExceStatus$() {
if (Cools.isEmpty(this.exceStatus)){
return "";
}
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS).eq(DictData::getValue, this.exceStatus));
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
if (Objects.isNull(dictData)) {
return null;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
index 5be7630..dd4893a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/SerialRule.java
@@ -155,24 +155,6 @@
this.memo = memo;
}
-// SerialRule serialRule = new SerialRule(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 鍒嗛殧绗�
-// null, // 搴忓彿閲嶇疆瑙勫垯[闈炵┖]
-// null, // 閲嶇疆渚濊禆
-// null, // 褰撳墠鍊�
-// null, // 鏈�杩戠敓鎴愮紪鐮�
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
public String getReset$(){
if (null == this.reset){ return null; }
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
index 5bbc861..4e67c2f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/utils/SerialRuleUtils.java
@@ -64,9 +64,9 @@
if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_YEAR.type)) {
format = DateUtils.format(new Date(), "yyyy");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_MONTH.type)) {
- format = DateUtils.format(new Date(), "MM");
+ format = DateUtils.format(new Date(), "yyyyMM");
} else if (serialRule.getReset().equals(SerialRuleReset.SERIAL_REST_TYPE_DAYS.type)){
- format = DateUtils.format(new Date(), "dd");
+ format = DateUtils.format(new Date(), "yyyyMMdd");
}
//褰撳墠鍊艰嚜鍔ㄥ姞1
Integer curVal = serialRule.getCurrValue() + 1;
@@ -91,7 +91,6 @@
}
}
});
-
serialRule.setLastCode(buffer.toString());
//淇敼褰撳墠瑙勫垯缂栫爜鍙疯嚦鏁版嵁搴�
if (!ruleService.saveOrUpdate(serialRule)) {
--
Gitblit v1.9.1