From f679ac0947417416900ab28308dd3bf235336078 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 三月 2026 13:00:57 +0800
Subject: [PATCH] 描述修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/RcsPubTaskParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OutStockToTaskParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 8 +-
rsf-admin/src/layout/index.jsx | 14 ++++
rsf-admin/src/page/rcsTest/components/ComponentConfigPanel.jsx | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 6 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java | 6 +-
rsf-admin/src/i18n/zh.js | 8 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskItemParam.java | 2
rsf-admin/src/layout/MyMenu.jsx | 8 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java | 6 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 6 +-
rsf-admin/src/page/rcsTest/RcsTestCustomMode.jsx | 6 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java | 10 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java | 8 +-
rsf-admin/src/page/rcsTest/RcsTestList.jsx | 4
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/CheckOrderItemParams.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/LocItem.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/WavePickItemsParams.java | 2
rsf-admin/src/App.jsx | 2
rsf-admin/src/page/rcsTest/RcsTestStandalonePage.jsx | 45 +++++++++++++++
31 files changed, 119 insertions(+), 60 deletions(-)
diff --git a/rsf-admin/src/App.jsx b/rsf-admin/src/App.jsx
index c8601b9..d47094e 100644
--- a/rsf-admin/src/App.jsx
+++ b/rsf-admin/src/App.jsx
@@ -28,6 +28,7 @@
DATA_PROVIDER_SPRING,
} from "./config/setting";
import ResourceContent from "./page/ResourceContent";
+import RcsTestStandalonePage from "./page/rcsTest/RcsTestStandalonePage";
import { getSystemInfo, getSystemDicts, tenants } from "@/api/auth";
import chineseMessages from 'ra-language-chinese';
import { createTheme, ThemeProvider } from '@mui/material/styles';
@@ -119,6 +120,7 @@
<CustomRoutes>
<Route path="/dashboard" element={<Dashboard />} />
<Route path="/settings" element={<Settings />} />
+ <Route path="/rcsTest-page" element={<RcsTestStandalonePage />} />
</CustomRoutes>
</Admin>
</>
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index c7a17eb..089f883 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -507,7 +507,7 @@
maktx: "鐗╂枡鍚嶇О",
matnrCode: "鐗╂枡缂栫爜",
locCode: '搴撲綅',
- barcode: '鎵樼洏鐮�',
+ barcode: '鏂欑鐮�',
count: "鎬绘鏁�",
batch: "鎵规",
anfme: "鏁伴噺",
@@ -776,7 +776,7 @@
matnrCode: "鐗╂枡缂栫爜",
spec: "瑙勬牸",
model: "鍨嬪彿",
- barcode: "鎵樼洏鐮�",
+ barcode: "鏂欑鐮�",
batch: "鎵规",
anfme: "搴撳瓨鏁伴噺",
checkQty: "瀹炵洏鏁伴噺",
@@ -1069,7 +1069,7 @@
orgSite: "婧愮珯鐐�",
targLoc: "鐩爣搴撲綅",
targSite: "鐩爣绔欑偣",
- barcode: "鎵樼洏鐮�",
+ barcode: "鏂欑鐮�",
robotCode: "鏈哄櫒缂栫爜",
exceStatus: "鎵ц鐘舵��",
expDesc: "寮傚父璇存槑",
@@ -1087,7 +1087,7 @@
orgSite: "婧愮珯鐐�",
targLoc: "鐩爣搴撲綅",
targSite: "鐩爣绔欑偣",
- barcode: "鎵樼洏鐮�",
+ barcode: "鏂欑鐮�",
robotCode: "鏈哄櫒缂栫爜",
exceStatus: "鎵ц鐘舵��",
expDesc: "寮傚父璇存槑",
diff --git a/rsf-admin/src/layout/MyMenu.jsx b/rsf-admin/src/layout/MyMenu.jsx
index f671891..1d5e543 100644
--- a/rsf-admin/src/layout/MyMenu.jsx
+++ b/rsf-admin/src/layout/MyMenu.jsx
@@ -80,18 +80,16 @@
);
} else {
if (node.component) {
+ // RCS娴嬭瘯锛氭寚鍚戠嫭绔嬮〉璺敱锛屽彲鍗曠嫭鎵撳紑涓�鏁撮〉锛堟棤渚ц竟鏍�/鏍囩鏍忥級
+ const to = node.component === 'rcsTest' ? '/rcsTest-page' : node.component;
return (
<MenuItemLink
key={node.id}
- to={node.component} // correspond to Resource.name
+ to={to}
state={{ _scrollToTop: true }}
- // primaryText={translate(`resources.orders.name`, {
- // smart_count: 2,
- // })}
primaryText={node.name}
leftIcon={getIcon(node.icon)}
dense={dense}
- // sx={{ '& .RaMenuItemLink-icon': { visibility: 'hidden' } }}
/>
);
}
diff --git a/rsf-admin/src/layout/index.jsx b/rsf-admin/src/layout/index.jsx
index 2298066..e095920 100644
--- a/rsf-admin/src/layout/index.jsx
+++ b/rsf-admin/src/layout/index.jsx
@@ -1,4 +1,5 @@
import { createPortal } from 'react-dom';
+import { useLocation } from 'react-router-dom';
import { Layout as RALayout, CheckForApplicationUpdate, useSidebarState } from "react-admin";
import AppBar from './AppBar';
import { MyMenu } from './MyMenu';
@@ -6,10 +7,23 @@
import { Box } from '@mui/material';
import { TabDialogStateProvider } from '@/context/TabDialogStateContext';
+/** RCS娴嬭瘯鐙珛椤佃矾鐢憋細涓嶆樉绀轰晶杈规爮鍜屾爣绛炬爮锛屾暣椤靛彧鏄剧ずRCS娴嬭瘯鍐呭 */
+const RCS_TEST_STANDALONE_PATH = '/rcsTest-page';
+
const LayoutContent = ({ children }) => {
+ const location = useLocation();
const [sidebarIsOpen] = useSidebarState();
const sidebarWidth = sidebarIsOpen ? 200 : 50;
+ if (location.pathname === RCS_TEST_STANDALONE_PATH) {
+ return (
+ <Box sx={{ width: '100%', height: '100vh', overflow: 'hidden' }}>
+ {children}
+ <CheckForApplicationUpdate />
+ </Box>
+ );
+ }
+
const tabsBarEl = (
<Box sx={{
position: 'fixed',
diff --git a/rsf-admin/src/page/rcsTest/RcsTestCustomMode.jsx b/rsf-admin/src/page/rcsTest/RcsTestCustomMode.jsx
index 877f8bb..9569900 100644
--- a/rsf-admin/src/page/rcsTest/RcsTestCustomMode.jsx
+++ b/rsf-admin/src/page/rcsTest/RcsTestCustomMode.jsx
@@ -657,10 +657,10 @@
});
}
- // 濡傛灉娌℃湁鎸囧畾鎵樼洏鐮侊紝灏濊瘯浠庡彉閲忎腑鑾峰彇
+ // 濡傛灉娌℃湁鎸囧畾鏂欑鐮侊紝灏濊瘯浠庡彉閲忎腑鑾峰彇
if (!inboundBarcode && currentVariables.barcode) {
inboundBarcode = currentVariables.barcode;
- addLog('info', `浠庡彉閲忚幏鍙栨墭鐩樼爜: ${inboundBarcode}`);
+ addLog('info', `浠庡彉閲忚幏鍙栨枡绠辩爜: ${inboundBarcode}`);
}
const inboundRequestData = {
@@ -1016,7 +1016,7 @@
</Select>
</FormControl>
<TextField
- label="鎵樼洏鐮�"
+ label="鏂欑鐮�"
fullWidth
value={config.barcode || ''}
onChange={(e) =>
diff --git a/rsf-admin/src/page/rcsTest/RcsTestList.jsx b/rsf-admin/src/page/rcsTest/RcsTestList.jsx
index 0608637..1224656 100644
--- a/rsf-admin/src/page/rcsTest/RcsTestList.jsx
+++ b/rsf-admin/src/page/rcsTest/RcsTestList.jsx
@@ -657,7 +657,7 @@
<Typography variant="subtitle2">鍏抽敭淇℃伅锛�</Typography>
<Stack direction="row" spacing={2} sx={{ mt: 1 }}>
{testResult.barcode && (
- <Chip label={`鎵樼洏鐮�: ${testResult.barcode}`} />
+ <Chip label={`鏂欑鐮�: ${testResult.barcode}`} />
)}
{testResult.locNo && (
<Chip label={`搴撲綅鍙�: ${testResult.locNo}`} />
@@ -893,7 +893,7 @@
<Typography variant="subtitle2">鍏抽敭淇℃伅锛�</Typography>
<Stack direction="row" spacing={2} sx={{ mt: 1 }}>
{testResult.barcode && (
- <Chip label={`鎵樼洏鐮�: ${testResult.barcode}`} />
+ <Chip label={`鏂欑鐮�: ${testResult.barcode}`} />
)}
{testResult.locNo && (
<Chip label={`搴撲綅鍙�: ${testResult.locNo}`} />
diff --git a/rsf-admin/src/page/rcsTest/RcsTestStandalonePage.jsx b/rsf-admin/src/page/rcsTest/RcsTestStandalonePage.jsx
new file mode 100644
index 0000000..1195a65
--- /dev/null
+++ b/rsf-admin/src/page/rcsTest/RcsTestStandalonePage.jsx
@@ -0,0 +1,45 @@
+import React from "react";
+import { useNavigate } from "react-router-dom";
+import { Box, IconButton, Typography } from "@mui/material";
+import ArrowBackIcon from "@mui/icons-material/ArrowBack";
+import RcsTestList from "./RcsTestList";
+
+/**
+ * RCS娴嬭瘯鐙珛椤甸潰锛氭棤渚ц竟鏍忋�佹棤鏍囩鏍忥紝鍙崟鐙墦寮�鎴栧湪鏂版爣绛鹃〉鎵撳紑
+ */
+const RcsTestStandalonePage = () => {
+ const navigate = useNavigate();
+
+ return (
+ <Box sx={{ display: "flex", flexDirection: "column", height: "100vh" }}>
+ <Box
+ sx={{
+ display: "flex",
+ alignItems: "center",
+ px: 1,
+ py: 0.5,
+ borderBottom: 1,
+ borderColor: "divider",
+ backgroundColor: "background.paper",
+ }}
+ >
+ <IconButton
+ onClick={() => navigate("/dashboard")}
+ size="small"
+ title="杩斿洖绯荤粺"
+ sx={{ mr: 1 }}
+ >
+ <ArrowBackIcon />
+ </IconButton>
+ <Typography variant="subtitle1" component="span">
+ RCS鍏ㄦ祦绋嬭嚜鍔ㄦ祴璇曪紙鐙珛椤碉級
+ </Typography>
+ </Box>
+ <Box sx={{ flex: 1, overflow: "auto" }}>
+ <RcsTestList />
+ </Box>
+ </Box>
+ );
+};
+
+export default RcsTestStandalonePage;
diff --git a/rsf-admin/src/page/rcsTest/components/ComponentConfigPanel.jsx b/rsf-admin/src/page/rcsTest/components/ComponentConfigPanel.jsx
index 8693f01..d1cd8c0 100644
--- a/rsf-admin/src/page/rcsTest/components/ComponentConfigPanel.jsx
+++ b/rsf-admin/src/page/rcsTest/components/ComponentConfigPanel.jsx
@@ -895,7 +895,7 @@
const renderPalletizeTaskConfig = () => (
<Stack spacing={2}>
<TextField
- label="鎵樼洏鐮侊紙鍙�夛紝涓嶅～鍒欒嚜鍔ㄧ敓鎴愶紝鏀寔鍙橀噺锛�"
+ label="鏂欑鐮侊紙鍙�夛紝涓嶅～鍒欒嚜鍔ㄧ敓鎴愶紝鏀寔鍙橀噺锛�"
value={config.barcode || ''}
onChange={(e) => handleConfigChange('barcode', e.target.value)}
fullWidth
@@ -958,7 +958,7 @@
</Select>
</FormControl>
<TextField
- label="鎵樼洏鐮侊紙鏀寔鍙橀噺锛屽锛�${barcode}锛�"
+ label="鏂欑鐮侊紙鏀寔鍙橀噺锛屽锛�${barcode}锛�"
value={config.barcode || ''}
onChange={(e) => handleConfigChange('barcode', e.target.value)}
fullWidth
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/LocItem.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/LocItem.java
index f855443..913dd80 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/LocItem.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/LocItem.java
@@ -166,7 +166,7 @@
@TableField(exist = false)
private Map<String, String> extendFields;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
@TableField(exist = false)
private String barcode;
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/RcsPubTaskParams.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/RcsPubTaskParams.java
index 52aa46c..6a7f578 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/RcsPubTaskParams.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/RcsPubTaskParams.java
@@ -40,7 +40,7 @@
@ApiModelProperty("鐩爣绔欑偣")
private String destSta;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String zpallet;
@ApiModelProperty("浼樺厛绾�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java
index af7757a..4b2d2dc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/ManualShelvingParams.java
@@ -18,7 +18,7 @@
@ApiModelProperty("搴撲綅缂栫爜")
private String locCode;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String barcode;
@ApiModelProperty("鍗曟嵁鏄庣粏")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index efdfc01..a3dadf9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -166,7 +166,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ return R.error("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
@@ -182,7 +182,7 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (org.apache.commons.lang3.StringUtils.isBlank(param.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ return R.error("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
return R.error("瑙ｇ粦鏄庣粏涓嶈兘涓虹┖锛侊紒");
@@ -286,7 +286,7 @@
}
- @ApiOperation("鑾峰彇涓嶈壇鎵樼洏鐗╂枡")
+ @ApiOperation("鑾峰彇涓嶈壇鏂欑鐗╂枡")
@PostMapping("/defect/matnrs")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getAsnDefectItemByCode(@RequestBody Map<String, Object> map) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index d4ca9e3..d885a21 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -84,7 +84,7 @@
@ApiOperation("鏌ヨ鍑哄簱浠诲姟鎷ｈ揣鏄庣粏")
public R getTaskItem(@RequestBody Map<String, String> params) {
if (Objects.isNull(params.get("barcode"))) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌�");
+ return R.error("鏂欑鐮佷笉鑳戒负绌�");
}
return pdaOutStockService.getTaskItems(params);
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskItemParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskItemParam.java
index 999db77..dd31dce 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskItemParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/TaskItemParam.java
@@ -28,7 +28,7 @@
@ApiModelProperty("鐩爣绔欑偣")
private String destSta;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String zpallet;
@ApiModelProperty("浼樺厛绾�")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/WavePickItemsParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/WavePickItemsParams.java
index 96ad0c9..24242ba 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/WavePickItemsParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/WavePickItemsParams.java
@@ -13,7 +13,7 @@
@ApiModel(value = "WavePickItemsParams", description = "娉㈡鎷ｈ揣鏄庣粏")
public class WavePickItemsParams {
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String barcode;
@ApiModelProperty("璁㈠崟ID")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index 5054fa3..7141848 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -962,7 +962,7 @@
@Override
public R operateToStock(OpStockParams params) {
if (org.apache.commons.lang3.StringUtils.isBlank(params.getBarcode())) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, params.getBarcode())
@@ -1171,15 +1171,15 @@
.eq(WaitPakin::getFlagDefect, flagDefect)
.in(WaitPakin::getIoStatus, asList));
// if (!Cools.isEmpty(waitPakin)) {
-// throw new CoolException("鎵樼洏涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
+// throw new CoolException("鏂欑涓嶅彲鐢�,鍦ㄧ粍鎵樹腑宸插瓨鍦�");
// }
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, params.get("barcode").toString()));
if (!tasks.isEmpty()) {
- throw new CoolException("鎵樼洏鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
+ throw new CoolException("鏂欑鐮佸凡鍦ㄤ换鍔℃。鎵ц锛侊紒");
}
List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, params.get("barcode").toString()));
if (!Cools.isEmpty(locs)) {
- throw new CoolException("鎵樼洏涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
+ throw new CoolException("鏂欑涓嶅彲鐢紝鍦ㄥ簱浣嶄腑宸插瓨鍦�");
}
// List<WaitPakinItem> items = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, waitPakin.getId()));
// items.forEach(item -> {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
index 9252455..34f1dda 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaCheckOrderServiceImpl.java
@@ -309,7 +309,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(map.get("barcode"))) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(map.get("matnrs"))) {
throw new CoolException("鏂板鐗╂枡涓嶈兘涓虹┖锛侊紒");
@@ -380,7 +380,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(map.get("barcode"))) {
- throw new CoolException("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ throw new CoolException("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(map.get("items"))) {
throw new CoolException("鏂板鐗╂枡涓嶈兘涓虹┖锛侊紒");
@@ -446,7 +446,7 @@
ReportParams params = new ReportParams();
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
if (Objects.isNull(taskItems) || taskItems.isEmpty()) {
- throw new CoolException("鎵樼洏鏄庣粏涓虹┖锛�1");
+ throw new CoolException("鏂欑鏄庣粏涓虹┖锛�1");
}
List<ReportDataParam> reportDataParams = new ArrayList<>();
taskItems.forEach(taskItem -> {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
index 69b689b..60ac13b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java
@@ -282,7 +282,7 @@
@Transactional(rollbackFor = Exception.class)
public synchronized R wavePickItems(WavePickItemsParams params) {
if (Objects.isNull(params.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ return R.error("鏂欑鐮佷笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(params.getOrderId())) {
return R.error("璁㈠崟ID涓嶈兘涓虹┖锛侊紒");
@@ -294,7 +294,7 @@
.orderByDesc(Task::getId)
.last("limit 1"));
if (null == task) {
- return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
+ return R.error("鏈壘鍒版枡绠卞搴旂殑浠诲姟");
}
if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄弨鏂欑媭鎱�");
@@ -463,7 +463,7 @@
.in(Task::getTaskType, integers)
.eq(Task::getBarcode, params.get("barcode")), false);
if (Objects.isNull(task)) {
- return R.error("鎵樼洏鎵�鍦ㄤ换鍔′笉瀛樺湪锛侊紒");
+ return R.error("鏂欑鎵�鍦ㄤ换鍔′笉瀛樺湪锛侊紒");
}
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
taskItems.forEach(taskItem -> {
@@ -558,7 +558,7 @@
.orderByDesc(Task::getId)
.last("limit 1"));
if (null == task) {
- return R.error("鏈壘鍒版墭鐩樺搴旂殑浠诲姟");
+ return R.error("鏈壘鍒版枡绠卞搴旂殑浠诲姟");
}
if (!task.getTaskStatus().equals(TaskStsType.WAVE_SEED.id)) {
return R.error("浠诲姟鐘舵�佷笉鏄緟鎻�鐙�鎱�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
index c41549f..ab8859b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/LocStockDto.java
@@ -20,7 +20,7 @@
@ApiModelProperty("搴撲綅ID")
private String locId;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String barcode;
@ApiModelProperty("鐗╂枡鍚嶇О")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/CheckOrderItemParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/CheckOrderItemParams.java
index 656d21d..556adc5 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/CheckOrderItemParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/CheckOrderItemParams.java
@@ -19,7 +19,7 @@
@ApiModelProperty("搴撲綅鏄庣粏ID")
private Long id;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String barcode;
@ApiModelProperty("鎵规")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OutStockToTaskParams.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OutStockToTaskParams.java
index 6a676bb..ca934b4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OutStockToTaskParams.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/OutStockToTaskParams.java
@@ -20,7 +20,7 @@
@ApiModelProperty("搴撲綅鏄庣粏ID")
private Long id;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String barcode;
@ApiModelProperty("鎵规")
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 be896a2..1720dff 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
@@ -83,9 +83,9 @@
private String model;
/**
- * 鎵樼洏鐮�
+ * 鏂欑鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value= "鏂欑鐮�")
private String barcode;
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index bea0103..aedda15 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -192,7 +192,7 @@
@TableField(exist = false)
private Map<String, String> extendFields;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
@TableField(exist = false)
private String barcode;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java
index 17b88f7..196a065 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java
@@ -75,7 +75,7 @@
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String updateBy;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
private String barcode;
@ApiModelProperty("搴撲綅")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index a8ca7fa..dd29650 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -102,9 +102,9 @@
private String targSite;
/**
- * 鎵樼洏鐮�
+ * 鏂欑鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value= "鏂欑鐮�")
private String barcode;
/**
@@ -236,7 +236,7 @@
// null, // 浠诲姟绫诲瀷
// null, // 婧愬簱浣�
// null, // 鐩爣搴撲綅
-// null, // 鎵樼洏鐮�
+// null, // 鏂欑鐮�
// null, // 鏈哄櫒浜虹紪鐮�
// null, // 鎵ц鐘舵��
// null, // 寮傚父鎻忚堪
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
index f821c0d..8633508 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskLog.java
@@ -83,9 +83,9 @@
private String targLoc;
/**
- * 鎵樼洏鐮�
+ * 鏂欑鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value= "鏂欑鐮�")
private String barcode;
/**
@@ -219,7 +219,7 @@
// null, // 浠诲姟绫诲瀷
// null, // 婧愬簱浣�
// null, // 鐩爣搴撲綅
-// null, // 鎵樼洏鐮�
+// null, // 鏂欑鐮�
// null, // 鏈哄櫒浜虹紪鐮�
// null, // 鎵ц鐘舵��
// null, // 寮傚父鎻忚堪
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index eab7be5..84953c7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -372,7 +372,7 @@
/**
* 姣忎簲绉掓牎楠屾繁搴撲綅鏄惁涓虹┖锛屽鏋滄祬搴撲綅鏈夎揣锛屽皢娴呭簱浣嶇Щ鑷虫繁搴撲綅
- *///TODO 鐢熸垚绉诲簱浠诲姟鍓嶏紝闇�瑕佹鏌ユ槸鍚︽湁浠诲姟鍓嶅線褰撳墠鎵樼洏
+ *///TODO 鐢熸垚绉诲簱浠诲姟鍓嶏紝闇�瑕佹鏌ユ槸鍚︽湁浠诲姟鍓嶅線褰撳墠鏂欑
// @Scheduled(cron = "0/35 * * * * ? ")
// @Transactional(rollbackFor = Exception.class)
// public void shallocToDeep() throws Exception {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index 6dfe9eb..8405e90 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -286,7 +286,7 @@
}
Task task1 = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, key));
if (!Objects.isNull(task1)) {
- throw new CoolException("鎵樼洏浠诲姟宸插瓨鍦紒锛�");
+ throw new CoolException("鏂欑浠诲姟宸插瓨鍦紒锛�");
}
List<CheckOrderItemParams> itemParams = listMap.get(key);
CheckOrderItemParams checkItem = itemParams.stream().findFirst().get();
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java
index 7fa708e..ffe81ce 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java
@@ -150,10 +150,10 @@
}
steps.add("鏌ヨ鍒扮墿鏂欐暟閲忥細" + matnrs.size());
- // 3.3 鐢熸垚闅忔満鎵樼洏鐮�
+ // 3.3 鐢熸垚闅忔満鏂欑鐮�
barcode = generateBarcode();
- steps.add("鐢熸垚鎵樼洏鐮侊細" + barcode);
- log.info("鐢熸垚鐨勬墭鐩樼爜锛歿}", barcode);
+ steps.add("鐢熸垚鏂欑鐮侊細" + barcode);
+ log.info("鐢熸垚鐨勬枡绠辩爜锛歿}", barcode);
// 3.4 鑷姩缁勬墭
WaitPakinParam waitPakinParam = new WaitPakinParam();
@@ -172,7 +172,7 @@
throw new CoolException("缁勬墭澶辫触锛岃繑鍥炵粨鏋滀负绌猴紒");
}
steps.add("缁勬墭鎴愬姛锛岀粍鎵樼紪鐮侊細" + waitPakin.getCode());
- log.info("缁勬墭鎴愬姛锛岀粍鎵樼紪鐮侊細{}锛屾墭鐩樼爜锛歿}", waitPakin.getCode(), barcode);
+ log.info("缁勬墭鎴愬姛锛岀粍鎵樼紪鐮侊細{}锛屾枡绠辩爜锛歿}", waitPakin.getCode(), barcode);
// 3.5 鑷姩鍏ュ簱
String inboundStation = params.getInboundStation();
@@ -517,7 +517,7 @@
}
/**
- * 鐢熸垚闅忔満鎵樼洏鐮�
+ * 鐢熸垚闅忔満鏂欑鐮�
*/
private String generateBarcode() {
return "TEST_" + System.currentTimeMillis() + "_" + (int)(Math.random() * 10000);
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 476bf94..970c770 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -722,7 +722,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void moveToDeep(Long loginUserId, String curLoc) throws Exception {
- //娴呭簱浣嶏紝鍒ゆ柇娣卞搴旀繁搴撲綅鏄惁涓虹┖锛屽鏋滀负绌虹敓鎴愪竴涓Щ搴撲换鍔★紝灏嗘墭鐩橀�佸叆娣卞簱浣�
+ //娴呭簱浣嶏紝鍒ゆ柇娣卞搴旀繁搴撲綅鏄惁涓虹┖锛屽鏋滀负绌虹敓鎴愪竴涓Щ搴撲换鍔★紝灏嗘枡绠遍�佸叆娣卞簱浣�
String deepLoc = LocUtils.getDeepLoc(curLoc);
if (StringUtils.isBlank(deepLoc)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
@@ -960,7 +960,7 @@
batchNo = task.getTaskCode();
}
}
- log.info("浠诲姟宸蹭笅鍙戝埌RCS锛岄渶瑕佸彇娑圧CS浠诲姟 - 浠诲姟ID锛歿}锛屼换鍔＄紪鍙凤細{}锛屼换鍔＄姸鎬侊細{}锛屾墭鐩樼爜锛歿}",
+ log.info("浠诲姟宸蹭笅鍙戝埌RCS锛岄渶瑕佸彇娑圧CS浠诲姟 - 浠诲姟ID锛歿}锛屼换鍔＄紪鍙凤細{}锛屼换鍔＄姸鎬侊細{}锛屾枡绠辩爜锛歿}",
task.getId(), task.getTaskCode(), task.getTaskStatus(), task.getBarcode());
}
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
index 45f82f8..137fa7a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java
@@ -61,7 +61,7 @@
throw new CoolException("鍙傛暟閿欒锛氱墿鏂欒窡韪爜涓虹┖锛�");
}
if (StringUtils.isBlank(waitPakin.getBarcode())) {
- throw new CoolException("鍙傛暟閿欒锛氭墭鐩樼爜涓虹┖锛侊紒");
+ throw new CoolException("鍙傛暟閿欒锛氭枡绠辩爜涓虹┖锛侊紒");
}
WaitPakin pakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
.eq(WaitPakin::getBarcode, waitPakin.getBarcode()));
@@ -73,7 +73,7 @@
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, waitPakin.getBarcode()));
if (!tasks.isEmpty()) {
- throw new CoolException("褰撳墠鎵樼洏宸叉湁浠诲姟妗ｅ湪鎵ц锛屼笉鑳藉啀娆＄粍鎵橈紒锛�");
+ throw new CoolException("褰撳墠鏂欑宸叉湁浠诲姟妗ｅ湪鎵ц锛屼笉鑳藉啀娆＄粍鎵橈紒锛�");
}
// 妫�鏌ュ鍣ㄥ彿鏄惁鍦ㄥ簱瀛樹腑瀛樺湪锛堥�氳繃搴撲綅琛ㄦ煡璇級
--
Gitblit v1.9.1