From e6ad5f2957e3024eccb0128203d41f74cbd683ce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 21 七月 2025 08:51:07 +0800
Subject: [PATCH] 问题修复

---
 rsf-admin/src/page/orders/purchase/PurchaseList.jsx                                               |   18 +++++++++++++-----
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java        |    2 +-
 rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx                                            |    6 +++---
 rsf-admin/src/page/orders/wave/WaveList.jsx                                                       |    2 +-
 rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx                                          |    6 +++---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java |    6 ++++--
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
index c4b519f..47f456d 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysCreate.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx b/rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx
index 741ecf7..6bfa344 100644
--- a/rsf-admin/src/page/basicInfo/companys/CompanysEdit.jsx
+++ b/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"
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
index 5c50456..f1d37e6 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseList.jsx
+++ b/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;
diff --git a/rsf-admin/src/page/orders/wave/WaveList.jsx b/rsf-admin/src/page/orders/wave/WaveList.jsx
index 96e5f0b..e59f4f3 100644
--- a/rsf-admin/src/page/orders/wave/WaveList.jsx
+++ b/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} />
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
index b75b092..49cbae8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java
+++ b/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("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_COMPANYS_CODE銆嶆槸鍚﹁缃畬鎴愶紒锛�");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
index 8bea065..92994bb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java
+++ b/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("鍗曟嵁鏄庣粏淇濆瓨澶辫触锛侊紒");

--
Gitblit v1.9.1