From d329d3764120f1caa5932f69654248331604a890 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 09:59:01 +0800
Subject: [PATCH] 盘点功能代码优化
---
rsf-admin/src/page/components/BillStatusField.jsx | 5 --
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java | 19 ++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java | 34 -----------------
rsf-admin/src/i18n/zh.js | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java | 2
rsf-admin/src/page/orders/check/CheckOrderList.jsx | 19 ++-------
7 files changed, 25 insertions(+), 58 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index ab9b188..1392588 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -646,7 +646,7 @@
arrTime: "棰勮鍒拌揪鏃堕棿",
rleStatus: "閲婃斁鐘舵��",
ntyStatus: "涓婃姤鐘舵��",
- exceStatus: '鍗曟嵁鐘舵��'
+ exceStatus: '鎵ц鐘舵��'
},
asnOrderItem: {
asnId: "涓诲崟鏍囪瘑",
diff --git a/rsf-admin/src/page/components/BillStatusField.jsx b/rsf-admin/src/page/components/BillStatusField.jsx
index 1bfafa0..5d4a206 100644
--- a/rsf-admin/src/page/components/BillStatusField.jsx
+++ b/rsf-admin/src/page/components/BillStatusField.jsx
@@ -22,10 +22,7 @@
14: '#FF4D4F',
}
return (
- <Typography
- variant="body2"
- sx={{ display: 'flex', alignItems: 'center' }}
- >
+ <Typography variant="body2" sx={{ display: 'flex', alignItems: 'center', }} >
<CircleIcon sx={{ fontSize: 10, color: color[record.exceStatus || 0], marginRight: '3px' }} /> {record.exceStatus$}
</Typography >
)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index 8f52ad1..47ea727 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
@@ -67,25 +67,14 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
<TextInput source="code" label="table.field.checkOrder.code" alwaysOn />,
- <TextInput source="poCode" label="table.field.checkOrder.poCode" />,
- <NumberInput source="poId" label="table.field.checkOrder.poId" />,
<ReferenceInput source="type" reference="dictData" filter={{ dictTypeCode: 'sys_order_type', group: '3' }} label="table.field.checkOrder.type" alwaysOn>
<AutocompleteInput label="table.field.checkOrder.type" optionValue="value" />
</ReferenceInput>,
- <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type' }} label="table.field.checkOrder.wkType" alwaysOn>
- <AutocompleteInput label="table.field.checkOrder.wkType" optionValue="value" />
+ <ReferenceInput source="wkType" reference="dictData" filter={{ dictTypeCode: 'sys_check_order_type' }} label="table.field.checkOrder.checkType" alwaysOn>
+ <AutocompleteInput label="table.field.checkOrder.checkType" optionValue="value" />
</ReferenceInput>,
- <NumberInput source="anfme" label="table.field.checkOrder.anfme" />,
- <NumberInput source="qty" label="table.field.checkOrder.qty" />,
<TextInput source="logisNo" label="table.field.checkOrder.logisNo" />,
<DateInput source="arrTime" label="table.field.checkOrder.arrTime" />,
- <SelectInput source="rleStatus" label="table.field.checkOrder.rleStatus"
- choices={[
- { id: 0, name: ' 姝ｅ父' },
- { id: 1, name: ' 宸查噴鏀�' },
- ]}
- />,
-
<TextInput label="common.field.memo" source="memo" />,
<DictionarySelect
label='table.field.checkOrder.exceStatus'
@@ -143,7 +132,7 @@
<FilterButton />
<MyCreateButton onClick={() => { setManualDialog(true); setmodalType(0) }} />
<SelectColumnsButton preferenceKey='check' />
- <ImportButton value={'checkItem'} />
+ <ImportButton value={'check'} />
</TopToolbar>
)}
perPage={DEFAULT_PAGE_SIZE}
@@ -162,7 +151,7 @@
<NumberField source="anfme" label="table.field.checkOrder.anfme" />
<NumberField source="workQty" label="table.field.checkOrder.workQty" />
<NumberField source="qty" label="table.field.checkOrder.qty" />
- <TextField source="rleStatus$" label="table.field.checkOrder.rleStatus" sortable={false} />
+ <DateField source="arrTime" label="table.field.checkOrder.arrTime" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<TextField source="createBy$" label="common.field.createBy" />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
index 06f336b..e17c4a6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java
@@ -12,6 +12,8 @@
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.WkOrder;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
+import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -135,7 +137,21 @@
return checkOrderService.saveCheckOrder(params, getLoginUserId());
}
-
+ /**
+ * @author Ryan
+ * @description 涓嬭浇妯℃澘
+ * @param
+ * @return
+ * @time 2025/4/18 08:17
+ */
+ @PostMapping("/check/template/download")
+ @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
+ @PreAuthorize("hasAuthority('manager:check:update')")
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
+ List<CheckOrderTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
+ }
/**
* 鐩樼偣鍗曞鍏�
@@ -152,6 +168,5 @@
HashMap<String, Object> hashMap = new HashMap<>();
return checkOrderService.excelImport(file, hashMap, getLoginUserId());
}
-
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
index 5b13799..76683cd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderItemController.java
@@ -115,38 +115,4 @@
return R.ok().add(vos);
}
- /**
- * @author Ryan
- * @date 2025/7/14
- * @description: 鐩樼偣鍗曞鍑�
- * @version 1.0
- */
- @PreAuthorize("hasAuthority('manager:check:list')")
- @PostMapping("/checkItem/export")
- public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- List<WkOrderItem> orders = new ArrayList<>();
- if (!Objects.isNull(map.get("ids"))) {
- orders = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().in(WkOrderItem::getId, map.get("ids")));
- } else {
- orders = checkOrderItemService.list();
- }
- ExcelUtil.build(ExcelUtil.create(orders, WkOrderItem.class), response);
- }
-
- /**
- * @author Ryan
- * @description 涓嬭浇妯℃澘
- * @param
- * @return
- * @time 2025/4/18 08:17
- */
- @PostMapping("/checkItem/template/download")
- @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
- @PreAuthorize("hasAuthority('manager:check:update')")
- public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
- List<CheckOrderTemplate> list = Arrays.asList(template);
- ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
- }
-
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
similarity index 99%
rename from rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
index 2bd086e..6d21210 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
@@ -38,7 +38,7 @@
@RestController
@Api(tags = "ASN鍏ュ簱閫氱煡鍗�")
-public class AsnOrderController extends BaseController {
+public class WkOrderController extends BaseController {
@Autowired
private AsnOrderService asnOrderService;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
similarity index 99%
rename from rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
index 26996e9..5f22c54 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderItemController.java
@@ -34,7 +34,7 @@
@Api(tags = "ASN鍗曟槑缁�")
@RestController
-public class AsnOrderItemController extends BaseController {
+public class WkOrderItemController extends BaseController {
@Autowired
private AsnOrderItemService asnOrderItemService;
--
Gitblit v1.9.1