From 7885e0cb06992d03da37105c0a9f56ced99b338d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 19 七月 2025 10:27:05 +0800
Subject: [PATCH] 盘点差异单优化
---
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java | 2
rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx | 11 +-
rsf-admin/src/i18n/core/chineseMessages.js | 1
rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx | 33 +++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java | 23 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckDiffExceStatus.java | 13 ++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckExceStatus.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java | 113 +++++++++++++++++----------
rsf-admin/src/page/orders/check/CheckOrderList.jsx | 2
10 files changed, 139 insertions(+), 63 deletions(-)
diff --git a/rsf-admin/src/i18n/core/chineseMessages.js b/rsf-admin/src/i18n/core/chineseMessages.js
index 55cf186..fd05cb0 100644
--- a/rsf-admin/src/i18n/core/chineseMessages.js
+++ b/rsf-admin/src/i18n/core/chineseMessages.js
@@ -21,6 +21,7 @@
remove_filter: "绉婚櫎杩欎釜杩囨护鍣�",
remove_all_filters: "绉婚櫎鎵�鏈�",
remove: "绉婚櫎",
+ approved: "瀹℃牳",
save: "淇濆瓨",
search: "鎼滅储",
select_all_button: "鍏ㄩ儴閫変腑",
diff --git a/rsf-admin/src/page/orders/check/CheckOrderList.jsx b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
index 196c94d..b9cee96 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderList.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderList.jsx
@@ -81,7 +81,7 @@
<DictionarySelect
label='table.field.checkOrder.exceStatus'
name="exceStatus"
- dictTypeCode="sys_asn_exce_status"
+ dictTypeCode="sys_check_exce_status"
alwaysOn
/>,
]
diff --git a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx
index 885c0c0..9b4eef3 100644
--- a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx
+++ b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffEdit.jsx
@@ -6,8 +6,6 @@
useTranslate,
TextInput,
NumberInput,
- BooleanInput,
- DateInput,
SelectInput,
ReferenceInput,
ReferenceArrayInput,
@@ -20,7 +18,6 @@
useRecordContext,
DeleteButton,
} from 'react-admin';
-import { useWatch, useFormContext } from "react-hook-form";
import { Stack, Grid, Box, Typography } from '@mui/material';
import { EDIT_MODE, REFERENCE_INPUT_PAGESIZE } from '@/config/setting';
import EditBaseAside from "../../../components/EditBaseAside";
@@ -72,7 +69,7 @@
label="table.field.checkDiff.orderCode"
source="orderCode"
parse={v => v}
- autoFocus
+ readOnly
/>
<SelectInput
label="table.field.checkDiff.checkType"
@@ -81,29 +78,35 @@
{ id: 0, name: '鏄庣洏' },
{ id: 1, name: '鏆楃洏' },
]}
+ readOnly
/>
<NumberInput
label="table.field.checkDiff.areaId"
source="areaId"
+ readOnly
/>
<TextInput
label="table.field.checkDiff.areaName"
source="areaName"
parse={v => v}
+ readOnly
/>
</Stack>
<Stack direction='row' gap={2}>
<NumberInput
label="table.field.checkDiff.anfme"
source="anfme"
+ readOnly
/>
<NumberInput
label="table.field.checkDiff.checkQty"
source="checkQty"
+ readOnly
/>
<NumberInput
label="table.field.checkDiff.exceStatus"
source="exceStatus"
+ readOnly
/>
</Stack>
</Grid>
diff --git a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx
index a289f53..053acb4 100644
--- a/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx
+++ b/rsf-admin/src/page/orders/check/checkDiff/CheckDiffList.jsx
@@ -31,6 +31,7 @@
ReferenceArrayInput,
AutocompleteInput,
DeleteButton,
+ Button,
} from 'react-admin';
import { Box, Typography, Card, Stack } from '@mui/material';
import { styled } from '@mui/material/styles';
@@ -39,6 +40,9 @@
import EmptyData from "../../../components/EmptyData";
import MyCreateButton from "../../../components/MyCreateButton";
import MyExportButton from '../../../components/MyExportButton';
+import ApiOutlinedIcon from '@mui/icons-material/ApiOutlined';
+import BillStatusField from '../../../components/BillStatusField';
+import ConfirmButton from '../../../components/ConfirmButton';
import PageDrawer from "../../../components/PageDrawer";
import MyField from "../../../components/MyField";
import { PAGE_DRAWER_WIDTH, OPERATE_MODE, DEFAULT_PAGE_SIZE } from '@/config/setting';
@@ -66,7 +70,7 @@
<SelectInput source="checkType" label="table.field.checkDiff.checkType"
choices={[
{ id: 0, name: '鏄庣洏' },
- { id: 1, name: '鏆楃洏' },
+ { id: 1, name: '鏆楃洏' },
]}
/>,
<NumberInput source="areaId" label="table.field.checkDiff.areaId" />,
@@ -132,20 +136,17 @@
<TextField source="areaName" label="table.field.checkDiff.areaName" />
<NumberField source="anfme" label="table.field.checkDiff.anfme" />
<NumberField source="checkQty" label="table.field.checkDiff.checkQty" />
- <NumberField source="exceStatus" label="table.field.checkDiff.exceStatus" />
- <ReferenceField source="updateBy" label="common.field.updateBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
+ {/* <NumberField source="exceStatus" label="table.field.checkDiff.exceStatus" /> */}
+ <NumberField source="updateBy锟�" label="common.field.updateBy" />
+ <NumberField source="createBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
- <ReferenceField source="createBy" label="common.field.createBy" reference="user" link={false} sortable={false}>
- <TextField source="nickname" />
- </ReferenceField>
<DateField source="createTime" label="common.field.createTime" showTime />
- <BooleanField source="statusBool" label="common.field.status" sortable={false} />
+ <BillStatusField cellClassName="status" source="exceStatus" label="table.field.checkOrder.exceStatus" />
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt">
<EditButton sx={{ padding: '1px', fontSize: '.75rem' }} />
- <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} />
+ {/* <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode={OPERATE_MODE} /> */}
+ <CheckButton />
</WrapperField>
</StyledDatagrid>
</List>
@@ -164,3 +165,15 @@
}
export default CheckDiffList;
+
+const CheckButton = () => {
+ const record = useRecordContext();
+ const handleEditClick = (btn) => {
+ btn.stopPropagation()
+
+ }
+
+ return (
+ <ConfirmButton label={"ra.action.approved"} startIcon={<ApiOutlinedIcon />} onConfirm={handleEditClick} size={"small"} />
+ )
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java
index 36faced..d71e25c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiff.java
@@ -1,11 +1,18 @@
package com.vincent.rsf.server.manager.entity;
import com.baomidou.mybatisplus.annotation.TableLogic;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.manager.enums.OrderType;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
+
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -20,8 +27,10 @@
import com.vincent.rsf.framework.common.SpringUtils;
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
+
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -33,14 +42,14 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鐩樼偣鍗�
*/
- @ApiModelProperty(value= "鐩樼偣鍗�")
+ @ApiModelProperty(value = "鐩樼偣鍗�")
private String orderCode;
@@ -48,95 +57,96 @@
private Long orderId;
/**
- * 鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏
+ * 鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏
*/
- @ApiModelProperty(value= "鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏 ")
+ @ApiModelProperty(value = "鐩樼偣绫诲瀷 0: 鏄庣洏 1: 鏆楃洏 ")
private Integer checkType;
/**
* 搴撳尯ID
*/
- @ApiModelProperty(value= "搴撳尯ID")
+ @ApiModelProperty(value = "搴撳尯ID")
private Long areaId;
/**
* 搴撳尯鍚嶇О
*/
- @ApiModelProperty(value= "搴撳尯鍚嶇О")
+ @ApiModelProperty(value = "搴撳尯鍚嶇О")
private String areaName;
/**
* 甯愰潰搴撳瓨
*/
- @ApiModelProperty(value= "甯愰潰搴撳瓨")
+ @ApiModelProperty(value = "甯愰潰搴撳瓨")
private Double anfme;
/**
* 鐩樼偣搴撳瓨
*/
- @ApiModelProperty(value= "鐩樼偣搴撳瓨")
+ @ApiModelProperty(value = "鐩樼偣搴撳瓨")
private Double checkQty;
/**
* 鎵ц鐘舵��
*/
- @ApiModelProperty(value= "鎵ц鐘舵��")
+ @ApiModelProperty(value = "鎵ц鐘舵��")
private Integer exceStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
@TableLogic
private Integer deleted;
/**
* 绉熸埛
*/
- @ApiModelProperty(value= "绉熸埛")
+ @ApiModelProperty(value = "绉熸埛")
private Integer tenantId;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public CheckDiff() {}
+ public CheckDiff() {
+ }
- public CheckDiff(String orderCode,Integer checkType,Long areaId,String areaName,Double anfme,Double checkQty,Integer exceStatus,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public CheckDiff(String orderCode, Integer checkType, Long areaId, String areaName, Double anfme, Double checkQty, Integer exceStatus, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderCode = orderCode;
this.checkType = checkType;
this.areaId = areaId;
@@ -172,21 +182,39 @@
// null // 澶囨敞
// );
- public String getCheckType$(){
- if (null == this.checkType){ return null; }
- switch (this.checkType){
+ public String getCheckType$() {
+ if (null == this.checkType) {
+ return null;
+ }
+ switch (this.checkType) {
case 0:
return "鏄庣洏";
- case 1:
+ case 1:
return "鏆楃洏";
default:
return String.valueOf(this.checkType);
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ 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.SYS_CHECK_DIFF_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -196,43 +224,44 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
- public Boolean getStatusBool(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public Boolean getStatusBool() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return true;
case 0:
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
index 4c9fe2f..505177f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
@@ -4,6 +4,10 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -22,6 +26,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.Objects;
@Data
@Accessors(chain = true)
@@ -108,6 +113,9 @@
*/
@ApiModelProperty(value= "宸紓鍘熷洜")
private String reason;
+
+ @ApiModelProperty("鎵ц鐘舵��")
+ private Integer exceStatus;
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
@@ -219,6 +227,21 @@
}
}
+ 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.SYS_CHECK_DIFF_EXCE_STATUS)
+ .eq(DictData::getValue, this.exceStatus));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.createBy);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckDiffExceStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckDiffExceStatus.java
index bf08086..000e375 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckDiffExceStatus.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckDiffExceStatus.java
@@ -1,13 +1,18 @@
package com.vincent.rsf.server.manager.enums;
+/**
+ * @author Ryan
+ * @date 2025/7/19
+ * @description: 鐩樼偣宸紓鍗曟灇涓�
+ * @version 1.0
+ */
public enum CheckDiffExceStatus {
//鐩樼偣宸紓鍗曟墽琛岀姸鎬�
- CHECK_DIFF_EXCE_STATUS_UN("0", "鏈墽琛�"),
- CHECK_DIFF_EXCE_STATUS_INIT("1", "鍒濆鍖�"),
- CHECK_DIFF_EXCE_STATUS_ING("2", "鎵ц涓�"),
- CHECK_DIFF_EXCE_STATUS_DONE("3", "鎵ц瀹屾垚"),
+ CHECK_DIFF_EXCE_STATUS_INIT("0", "鍒濆鍖�"),
+ CHECK_DIFF_EXCE_STATUS_HOLD("1", "寰呭鏍�"),
+ CHECK_DIFF_EXCE_STATUS_END("2", "宸插鏍�"),
;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckExceStatus.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckExceStatus.java
index ea6d559..e9f3519 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckExceStatus.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/CheckExceStatus.java
@@ -2,7 +2,7 @@
public enum CheckExceStatus {
-
+ //鐩樼偣鍗曟墽琛岀姸鎬�
CHECK_ORDER_STATUS_UN_EXCE("0", "鏈墽琛�"),
CHECK_ORDER_STATUS_INIT("1", "鍒濆鍖�"),
CHECK_ORDER_STATUS_EXCE_ING("2", "鎵ц涓�"),
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
index 4c80343..ac2cbd1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/CheckOrderSchedules.java
@@ -68,7 +68,7 @@
checkDiff.setAnfme(order.getAnfme())
.setCheckType(order.getCheckType())
.setOrderCode(order.getCode())
- .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_ING.val)
+ .setExceStatus(CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_INIT.val)
.setCreateBy(loginUserId)
.setCreateTime(new Date())
.setUpdateBy(loginUserId)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
index 023c76a..0c77e1a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/DictTypeCode.java
@@ -85,4 +85,6 @@
/**鐩樼偣鍗曟墽琛岀姸鎬�*/
public final static String SYS_CHECK_EXCE_STATUS = "sys_check_exce_status";
+ /**鐩樼偣宸紓鍗曟墽琛岀姸鎬�*/
+ public final static String SYS_CHECK_DIFF_EXCE_STATUS = "sys_check_diff_exce_status";
}
--
Gitblit v1.9.1