rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
@@ -85,14 +85,14 @@ </DialogTitle> <DialogContent sx={{ mt: 2 }}> <Grid container rowSpacing={2} columnSpacing={2}> {/* <Grid item xs={6} display="flex" gap={1}> <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.companys.code" source="code" parse={v => v} autoFocus readOnly /> </Grid> */} </Grid> <Grid item xs={6} display="flex" gap={1}> <TextInput label="table.field.companys.name" rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx
@@ -65,14 +65,14 @@ <Typography variant="h6" gutterBottom> {translate('common.edit.title.main')} </Typography> {/* <Stack direction='row' gap={2}> <Stack direction='row' gap={2}> <TextInput label="table.field.companys.code" source="code" parse={v => v} autoFocus readOnly /> </Stack> */} </Stack> <Stack direction='row' gap={2}> <TextInput label="table.field.companys.name" rsf-admin/src/page/orders/purchase/PurchaseList.jsx
@@ -128,11 +128,11 @@ > <StyledDatagrid preferenceKey='purchase' bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic"/>} bulkActionButtons={() => <BulkDeleteButton mutationMode="pessimistic" />} rowClick={false} expand={false} expandSingle={true} omit={['id', 'createTime', 'createBy','channel', 'platCode', 'memo', 'channel','startTime','workQty', 'endTime','createBy$']} omit={['id', 'createTime', 'createBy', 'channel', 'platCode', 'memo', 'channel', 'startTime', 'workQty', 'endTime', 'createBy$']} > <NumberField source="id" /> <TextField source="code" label="table.field.purchase.code" /> @@ -148,16 +148,16 @@ <DateField source="startTime" label="table.field.purchase.startTime" showTime /> <DateField source="endTime" label="table.field.purchase.endTime" showTime /> <TextField source="project" label="table.field.purchase.project" /> <TextField source="updateBy$" label="common.field.updateBy" /> <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> <TextField source="createBy$" label="common.field.createBy" /> <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime /> <BillStatusField cellClassName="status" source="exceStatus" label="table.field.asnOrder.exceStatus" /> {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */} <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt"> <EditButton label="toolbar.detail" sx={{ padding: '1px', fontSize: '.75rem' }} /> <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode="pessimistic"/> <DeleteButtons /> </WrapperField> </StyledDatagrid> </List> @@ -175,4 +175,12 @@ ) } const DeleteButtons = () => { const record = useRecordContext(); return ( record?.exceStatus == 0 ? <DeleteButton sx={{ padding: '1px', fontSize: '.75rem' }} mutationMode="pessimistic" /> : <></> ) } export default PurchaseList; rsf-admin/src/page/orders/wave/WaveList.jsx
@@ -165,7 +165,7 @@ <TextField source="updateBy$" label="common.field.updateBy" /> <DateField source="updateTime" label="common.field.updateTime" showTime /> <TextField source="createBy$" label="common.field.createBy" /> <CustomProcess source="progress" label="table.field.wave.progress" /> <TextField source="memo" label="common.field.memo" sortable={false} /> <TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} /> rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
@@ -88,7 +88,7 @@ companys.setCreateBy(getLoginUserId()); companys.setUpdateBy(getLoginUserId()); if (StringUtils.isNotBlank(companys.getCode())) { if (StringUtils.isBlank(companys.getCode())) { String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, companys); if (StringUtils.isBlank(ruleCode)) { throw new CoolException("编码规则错误：请检查「SYS_COMPANYS_CODE」是否设置完成！！"); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
@@ -63,7 +63,9 @@ throw new CoolException("表格内容不能为空！！"); } List<PurchaseTemplate> resultList = result.getList(); Map<String, List<PurchaseTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(PurchaseTemplate::getPoCode)); Map<String, List<PurchaseTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(item -> !Objects.isNull(item.getPoCode()) ? item.getPoCode() : SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ORDER_PO_CODE, null) )); for (String key : listMap.keySet()) { List<PurchaseTemplate> list = listMap.get(key); Purchase serviceOne = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, key)); @@ -119,7 +121,7 @@ throw new CoolException("供应商：" + template.getSplrName() + "不存在！！"); } } else { throw new CoolException("供应商不能为空！！"); throw new CoolException("供应商编码不能为空！！"); } if (!this.save(item)) { throw new CoolException("单据明细保存失败！！");
