rsf-admin/src/page/basicInfo/loc/BindModal.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
rsf-admin/src/page/basicInfo/loc/BindModal.jsx
@@ -76,14 +76,16 @@ const refresh = useRefresh(); const translate = useTranslate(); const notify = useNotify(); const [options, setOptions] = useState[{ condition: null }]; const [formData, setFormData] = useState({ areaMatId: null, groupId: null, matnrId: null, }); const { selectedIds, onUnselectItems, onSelectAll } = useListContext(); const { selectedIds, onUnselectItems } = useListContext(); const handleClose = (event, reason) => { if (reason !== "backdropClick") { setOpen(false); @@ -175,6 +177,9 @@ onChange={(e) => handleChange(e.target.value, 'groupId')} /> </Grid> <Grid item xs={4}> <TextInput></TextInput> </Grid> </Grid> <Grid item xs={4}> <List @@ -186,8 +191,7 @@ <StyledDatagrid preferenceKey='matnr' bulkActionButtons={<></>} onSelectAll={{limit: 1000}} rowClick={(id, resource, record) => { }} rowClick={false} omit={['id', 'createTime', 'createBy', 'memo', 'poDetlId', 'matnrId', 'asnId']} > <NumberField key="id" source="id" />, @@ -221,7 +225,7 @@ </Box> </DialogContent> <DialogActions sx={{ position: 'sticky', bottom: 0, backgroundColor: 'background.paper', zIndex: 1000 }}> <Box sx={{ width: '100%', display: 'flex', justifyContent: 'space-between' }}> <Box sx={{ width: '100%', display: 'flex', justifyContent: 'end' }}> <Button type="submit" variant="contained" startIcon={<SaveIcon />}> {translate('toolbar.confirm')} </Button> rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -144,6 +144,7 @@ <TextField source="poDetlId" label="table.field.asnOrderItem.poDetlId" /> <TextField source="poDetlCode" label="table.field.asnOrderItem.poDetlCode" /> <TextField source="matnrId" label="table.field.asnOrderItem.matnrId" /> <TextField source="matnrCode" label="table.field.asnOrderItem.matnrCode" /> <TextField source="maktx" label="table.field.asnOrderItem.maktx" /> <NumberField source="anfme" label="table.field.asnOrderItem.anfme" /> <TextField source="stockUnit" label="table.field.asnOrderItem.stockUnit" /> rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -618,7 +618,7 @@ .eq(AsnOrder::getId, OrderId) .eq(AsnOrder::getType, OrderType.ORDER_PLAT_IN.type)); if (Objects.isNull(order)) { throw new CoolException("单据不存在!!"); throw new CoolException("非平库单据不可执行人工上架!!"); } Stock stock = new Stock(); // if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {