From f3e6038bf82c53982cfabd1f8f920d483397ea06 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 19 八月 2025 13:17:04 +0800
Subject: [PATCH] no message
---
rsf-admin/src/page/orders/check/SelectMatnrModal.jsx | 12 ++++++++----
rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx | 1 -
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java | 3 +--
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckDiffParams.java | 15 +++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 15 +++++++++++++++
5 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
index b91f92f..a25c4c0 100644
--- a/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
+++ b/rsf-admin/src/page/orders/check/SelectMatnrModal.jsx
@@ -200,7 +200,7 @@
aria-hidden
fullWidth
disableRestoreFocus
- maxWidth="lg" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
+ maxWidth="xl" // 'xs' | 'sm' | 'md' | 'lg' | 'xl'
>
<DialogTitle id="form-dialog-title" sx={{
position: 'sticky',
@@ -394,6 +394,7 @@
const AsnOrderModalTable = ({ tabelData, setTableData, asnId, selectedRows, setSelectedRows, tableRef }) => {
const translate = useTranslate();
const notify = useNotify();
+ const [check, setCheck] = useState([]);
const [columns, setColumns] = useState([
{
@@ -410,9 +411,9 @@
},
{
field: 'anfme',
- headerName: translate('table.field.outStockItem.anfme') + "*",
+ headerName: translate('table.field.checkOrder.anfme') + "*",
type: 'number',
- minWidth: 100,
+ minWidth: 120,
flex: 1,
editable: true,
valueFormatter: (val) => val < 0 ? 0 : val,
@@ -481,7 +482,9 @@
let cdata = useRef([]);
useEffect(() => {
- getDynamicFields();
+ if (check == null || check.length < 1) {
+ getDynamicFields();
+ }
}, []);
useEffect(() => {
@@ -502,6 +505,7 @@
flex: 1,
editable: false
}))
+ setCheck(cols);
setColumns([...columns, ...cols, action])
} else {
notify(msg);
diff --git a/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx b/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx
index a8911d0..f3e589e 100644
--- a/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx
+++ b/rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx
@@ -29,7 +29,6 @@
import MemoInput from "@/page/components/MemoInput";
import ReviseLogList from "./ReviseLogList";
import * as Common from '@/utils/common';
-import request from '@/utils/request';
const LocReviseEdit = () => {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
similarity index 95%
rename from rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
index 2823aca..5bedb8f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ReceiveMsgController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
@@ -4,7 +4,6 @@
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
-import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.framework.common.R;
@@ -33,7 +32,7 @@
@RestController
@RequestMapping("/erp")
@Api(tags = "缁煎悎鏌ヨ")
-public class ReceiveMsgController extends BaseController {
+public class ErpQueryController extends BaseController {
@Autowired
private ReceiveMsgService receiveMsgService;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
index b4321e1..b8c42c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.api.controller.erp;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.controller.erp.params.CheckDiffParams;
import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
import com.vincent.rsf.server.common.utils.ExcelUtil;
@@ -79,4 +80,18 @@
System.out.println(template);
// return R.ok();
}
+
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 鍚屾鐩樼偣鍗曟嵁
+ * @version 1.0
+ */
+ @ApiOperation("鍚屾鐩樼偣鍗�")
+ @PostMapping("/sync/checks")
+ public R syncCheckResult(@RequestBody List<CheckDiffParams> checkDiffs) {
+
+ return R.ok();
+ }
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckDiffParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckDiffParams.java
new file mode 100644
index 0000000..d7dac78
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/CheckDiffParams.java
@@ -0,0 +1,15 @@
+package com.vincent.rsf.server.api.controller.erp.params;
+
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "CheckDiffParams", description = "鍚屾鐩樼偣鍙傛暟")
+public class CheckDiffParams {
+
+ private String orderNo;
+
+}
--
Gitblit v1.9.1