From c5e50d7aefa40b95d2c474c178de8a20950247b9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 24 五月 2025 10:19:02 +0800
Subject: [PATCH] 库位初始化添加巷道
---
rsf-admin/src/page/basicInfo/loc/InitModal.jsx | 88 +++++++++++++++--------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 5 +
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx | 5 +
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java | 4 +
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | 4
rsf-admin/src/page/basicInfo/loc/LocItemList.jsx | 22 +++---
rsf-admin/src/i18n/zh.js | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 4 +
rsf-admin/src/page/basicInfo/loc/LocList.jsx | 1
9 files changed, 76 insertions(+), 59 deletions(-)
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 5606f1f..a637289 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -448,7 +448,7 @@
row: "鎺�",
col: "鍒�",
lev: "灞�",
- channel: "閫氶亾",
+ channel: "宸烽亾",
maxParts: "鏈�澶ч浂浠舵暟",
maxPack: "鏈�澶у寘瑁呮暟",
flagLabelMange: "鏍囩绠＄悊",
diff --git a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
index 8704732..cc4e572 100644
--- a/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/InitModal.jsx
@@ -58,8 +58,8 @@
const InitModal = ({ open, setOpen }) => {
const refresh = useRefresh();
const translate = useTranslate();
- const {filterValues} = useListContext(); // 鑾峰彇鍒楄〃涓婁笅鏂�
-
+ const { filterValues } = useListContext(); // 鑾峰彇鍒楄〃涓婁笅鏂�
+
const notify = useNotify();
const [disabled, setDisabled] = useState(false)
@@ -149,10 +149,7 @@
filterToQuery={(val) => ({ name: val })}
/>
</ReferenceInput>
-
</Grid>
-
-
<Grid item xs={4}>
<ReferenceArrayInput source="typeIds" reference="locType" >
<SelectArrayInput label="table.field.loc.type" validate={[required()]} onChange={(e) => handleChange(e.target.value, 'typeIds')} />
@@ -161,31 +158,6 @@
<SelectArrayInput label="table.field.loc.type" onChange={(e) => handleChange(e.target.value, 'typeIds')} validate={[required()]} />
</ReferenceArrayInput> */}
</Grid>
-
- <Grid item xs={4}>
- <TextInput
- label={translate("table.field.loc.startBay")}
- name="startBay"
- value={formData.startBay}
- onChange={(e) => handleChange(+e.target.value, 'startBay')}
- size="small"
- type="number"
- validate={[required()]}
- />
- </Grid>
-
- <Grid item xs={4}>
- <TextInput
- label={translate("table.field.loc.startLev")}
- name="startLev"
- value={formData.startLev}
- onChange={(e) => handleChange(+e.target.value, 'startLev')}
- size="small"
- type="number"
- validate={[required()]}
- />
- </Grid>
-
<Grid item xs={4}>
<TextInput
label={translate("table.field.loc.startRow")}
@@ -197,31 +169,28 @@
validate={[required()]}
/>
</Grid>
-
<Grid item xs={4}>
<TextInput
- label={translate("table.field.loc.endBay")}
- name="endBay"
- value={formData.endBay}
- onChange={(e) => handleChange(+e.target.value, 'endBay')}
+ label={translate("table.field.loc.startBay")}
+ name="startBay"
+ value={formData.startBay}
+ onChange={(e) => handleChange(+e.target.value, 'startBay')}
size="small"
type="number"
validate={[required()]}
/>
</Grid>
-
<Grid item xs={4}>
<TextInput
- label={translate("table.field.loc.endLev")}
- name="endLev"
- value={formData.endLev}
- onChange={(e) => handleChange(+e.target.value, 'endLev')}
+ label={translate("table.field.loc.startLev")}
+ name="startLev"
+ value={formData.startLev}
+ onChange={(e) => handleChange(+e.target.value, 'startLev')}
size="small"
type="number"
validate={[required()]}
/>
</Grid>
-
<Grid item xs={4}>
<TextInput
label={translate("table.field.loc.endRow")}
@@ -233,9 +202,40 @@
validate={[required()]}
/>
</Grid>
-
+ <Grid item xs={4}>
+ <TextInput
+ label={translate("table.field.loc.endBay")}
+ name="endBay"
+ value={formData.endBay}
+ onChange={(e) => handleChange(+e.target.value, 'endBay')}
+ size="small"
+ type="number"
+ validate={[required()]}
+ />
+ </Grid>
+ <Grid item xs={4}>
+ <TextInput
+ label={translate("table.field.loc.endLev")}
+ name="endLev"
+ value={formData.endLev}
+ onChange={(e) => handleChange(+e.target.value, 'endLev')}
+ size="small"
+ type="number"
+ validate={[required()]}
+ />
+ </Grid>
+ <Grid item xs={4}>
+ <TextInput
+ label={"table.field.loc.channel"}
+ name="channel"
+ value={formData.channel}
+ onChange={(e) => handleChange(+e.target.value, 'channel')}
+ size="small"
+ type="number"
+ validate={[required()]}
+ />
+ </Grid>
</Grid>
-
</Box>
</DialogContent>
<DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}>
@@ -251,4 +251,6 @@
);
}
+
+
export default InitModal;
\ No newline at end of file
diff --git a/rsf-admin/src/page/basicInfo/loc/LocItemList.jsx b/rsf-admin/src/page/basicInfo/loc/LocItemList.jsx
index 2f86c7b..308d7b3 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocItemList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocItemList.jsx
@@ -58,8 +58,8 @@
const filters = [
<SearchInput source="condition" alwaysOn />,
- <DateInput label='common.time.after' source="timeStart" />,
- <DateInput label='common.time.before' source="timeEnd" />,
+ <DateInput label='common.time.after' source="timeStart" />,
+ <DateInput label='common.time.before' source="timeEnd" />,
<NumberInput source="locId" label="table.field.locItem.locId" />,
<NumberInput source="orderId" label="table.field.locItem.orderId" />,
<TextInput source="type$" label="table.field.locItem.type" />,
@@ -98,7 +98,7 @@
<Box display="flex">
<List
resource="locItem"
- filter={{locId: locId}}
+ filter={{ locId: locId }}
sx={{
flexGrow: 1,
transition: (theme) =>
@@ -116,7 +116,7 @@
<FilterButton />
{/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='locItem' />
- <MyExportButton />
+ {/* <MyExportButton /> */}
</TopToolbar>
)}
perPage={DEFAULT_ITEM_PAGE_SIZE}
@@ -127,21 +127,21 @@
rowClick={(id, resource, record) => false}
expand={false}
expandSingle={true}
- omit={['id', 'locId', 'orderId', 'orderItemId', 'matnrId', 'createTime', 'createBy', 'memo']}
+ omit={['id', 'locId', 'orderId', 'orderItemId', 'matnrId', 'statusBool','trackCode', 'createTime', 'fieldsIndex','splrBatch', 'createBy', 'spec', 'model', 'memo']}
>
<NumberField source="id" />
<NumberField source="locId" label="table.field.locItem.locId" />
<NumberField source="orderId" label="table.field.locItem.orderId" />
- <TextField source="type" label="table.field.locItem.type" />
+ <TextField source="type$" label="table.field.locItem.type" />
<NumberField source="orderItemId" label="table.field.locItem.orderItemId" />
- <NumberField source="wkType" label="table.field.locItem.wkType" />
+ <NumberField source="wkType$" label="table.field.locItem.wkType" />
<NumberField source="matnrId" label="table.field.locItem.matnrId" />
- <TextField source="maktx" label="table.field.locItem.maktx" />
<TextField source="matnrCode" label="table.field.locItem.matnrCode" />
- <TextField source="trackCode" label="table.field.locItem.trackCode" />
- <TextField source="unit" label="table.field.locItem.unit" />
- <NumberField source="anfme" label="table.field.locItem.anfme" />
+ <TextField source="maktx" label="table.field.locItem.maktx" />
<TextField source="batch" label="table.field.locItem.batch" />
+ <TextField source="trackCode" label="table.field.locItem.trackCode" />
+ <NumberField source="anfme" label="table.field.locItem.anfme" />
+ <TextField source="unit" label="table.field.locItem.unit" />
<TextField source="splrBatch" label="table.field.locItem.splrBatch" />
<TextField source="spec" label="table.field.locItem.spec" />
<TextField source="model" label="table.field.locItem.model" />
diff --git a/rsf-admin/src/page/basicInfo/loc/LocList.jsx b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
index ef686d0..f2a1915 100644
--- a/rsf-admin/src/page/basicInfo/loc/LocList.jsx
+++ b/rsf-admin/src/page/basicInfo/loc/LocList.jsx
@@ -229,6 +229,7 @@
<NumberField source="row" label="table.field.loc.row" />
<NumberField source="col" label="table.field.loc.col" />
<NumberField source="lev" label="table.field.loc.lev" />
+ <NumberField source="channel" label="table.field.loc.channel" />
{/* <NumberField source="channel" label="table.field.loc.channel" />
<NumberField source="maxParts" label="table.field.loc.maxParts" />
<NumberField source="maxPack" label="table.field.loc.maxPack" />
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index 8b35a24..9ad335c 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -191,10 +191,10 @@
<TextField source="spec" label="table.field.asnOrderItem.spec" />,
<TextField source="model" label="table.field.asnOrderItem.model" />,
<NumberField source="anfme" label="table.field.asnOrderItem.anfme" />,
+ <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
<TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" />,
<NumberField source="purQty" label="table.field.asnOrderItem.purQty" />,
<TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />,
- <NumberField source="qty" label="table.field.asnOrderItem.qty" />,
<TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />,
<TextField source="splrName" label="table.field.asnOrderItem.splrName" />,
<TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />,
@@ -238,7 +238,7 @@
preferenceKey='asnOrderItem'
bulkActionButtons={false}
rowClick={(id, resource, record) => false}
- omit={['id', 'asnId', 'poDetlId', 'poDetlCode', 'matnrId', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
+ omit={['id', 'asnId', 'asnCode', 'poDetlId', 'poDetlCode', 'matnrId', 'spec', 'model', 'purQty', 'purUnit', 'qrcode', 'trackCode', 'splrCode', 'platWorkCode', 'projectCode']}
>
{columns.map((column) => column)}
</StyledDatagrid>}
diff --git a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
index 353332f..4a16266 100644
--- a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
+++ b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
@@ -182,7 +182,8 @@
<Stack direction='row' spacing={2} minWidth={200}>
<SubmitButton
orgLoc={orgLoc}
- tarLoc={tarLoc}
+ tarLoc={tarLoc}
+ tabelData={tabelData}
/>
</Stack>
</Box>
@@ -213,7 +214,7 @@
const notify = useNotify();
const redirect = useRedirect();
const refresh = useRefresh();
- const { orgLoc, tarLoc } = props;
+ const { orgLoc, tarLoc, tabelData } = props;
const move = () => {
console.log(orgLoc, tarLoc);
if (orgLoc === "" || orgLoc === undefined || orgLoc === null) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 33d6939..618bb55 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -222,6 +222,10 @@
if (Objects.isNull(param.getEndLev())) {
return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
}
+ if (Objects.isNull(param.getChannel())) {
+ return R.error("宸烽亾涓嶈兘涓虹┖锛侊紒");
+ }
+
return locService.initLocs(param, getLoginUserId());
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java
index d66cae0..fb73741 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/LocMastInitParam.java
@@ -50,5 +50,9 @@
@NotBlank(message = "搴撲綅绫诲瀷")
private List<Long> typeIds;
+ @ApiModelProperty("宸烽亾")
+ @NotBlank(message = "宸烽亾")
+ private Integer channel;
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index c2fdab5..a3cb5d2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -103,7 +103,11 @@
}
List<Loc> list = new ArrayList<>();
+ Integer chanl = 1; //榛樿绗竴宸烽亾
for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
+ if (r % param.getChannel() == 0) {
+ chanl ++;
+ }
for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
@@ -114,6 +118,7 @@
.setRow(r)
.setCol(b)
.setLev(l)
+ .setChannel(chanl)
.setType(join)
.setAreaId(param.getAreaId())
.setUpdateBy(loginUserId)
--
Gitblit v1.9.1