From d7041dfde46d11117e48e047be321e0be9209d0f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 13:24:32 +0800
Subject: [PATCH] 0507问题修复

---
 rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx                                           |    2 
 rsf-admin/src/page/task/TaskList.jsx                                                              |   17 +++++---
 rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx                                           |    4 +-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java        |    4 +-
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaitPakinServiceImpl.java    |    2 -
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/PurchaseItemServiceImpl.java |    8 +++-
 rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml                               |   32 ++++++++--------
 rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx                                           |    2 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java           |    4 ++
 rsf-admin/src/page/orders/purchase/PurchaseItemEdit.jsx                                           |   17 +++-----
 rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx                                           |   18 +++++++-
 12 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
index c78bcf7..bc1bf9f 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnOrderItemList.jsx
@@ -157,9 +157,9 @@
             <NumberField source="purQty" label="table.field.asnOrderItem.purQty" />
             <TextField source="purUnit" label="table.field.asnOrderItem.purUnit" />
             <NumberField source="qty" label="table.field.asnOrderItem.qty" />
-            <NumberField source="safeQty" label="table.field.asnOrderItem.safeQty" />
+            {/* <NumberField source="safeQty" label="table.field.asnOrderItem.safeQty" />
             <NumberField source="disQty" label="table.field.asnOrderItem.disQty" />
-            <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" />
+            <TextField source="isptResult$" label="table.field.asnOrderItem.isptResult" /> */}
             <TextField source="splrCode" label="table.field.asnOrderItem.splrCode" />
             <TextField source="splrName" label="table.field.asnOrderItem.splrName" />
             <TextField source="qrcode" label="table.field.asnOrderItem.qrcode" />
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseItemEdit.jsx b/rsf-admin/src/page/orders/purchase/PurchaseItemEdit.jsx
index be298d4..2e51cff 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseItemEdit.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseItemEdit.jsx
@@ -62,7 +62,7 @@
                 aria-labelledby="form-dialog-title"
                 fullWidth
                 disableRestoreFocus
-                maxWidth="md"
+                maxWidth="lg"
             >
                 <DialogTitle id="form-dialog-title" sx={{
                     position: 'sticky',
@@ -78,6 +78,7 @@
                 </DialogTitle>
                 <EditBase
                     resource="purchaseItem"
+                    id={record?.id}
                     mutationMode={EDIT_MODE}
                     actions={<CustomerTopToolBar />}
                 >
@@ -89,9 +90,8 @@
                         defaultValues={{}}
                     >
                         <DialogContent sx={{ mt: 2 }}>
-
                             <Grid container width={{ xs: '100%', xl: '100%' }} rowSpacing={3} columnSpacing={3}>
-                                <Grid item xs={12} md={8} gap={2}>
+                                <Grid item xs={16} md={10} gap={2}>
                                     <Typography variant="h6" gutterBottom>
                                         {translate('common.edit.title.main')}
                                     </Typography>
@@ -141,17 +141,12 @@
                                             validate={required()}
                                         />
                                         <NumberInput
-                                            label="table.field.purchaseItem.asnQty"
-                                            source="asnQty"
-                                            validate={required()}
-                                        />
-                                    </Stack>
-                                    <Stack direction='row' gap={2}>
-                                        <NumberInput
                                             label="table.field.purchaseItem.printQty"
                                             source="printQty"
                                             validate={required()}
                                         />
+                                    </Stack>
+                                    <Stack direction='row' gap={2}>
                                         <TextInput
                                             label="table.field.purchaseItem.splrName"
                                             source="splrName"
@@ -169,7 +164,7 @@
                                         />
                                     </Stack>
                                 </Grid>
-                                <Grid item xs={12} md={4} >
+                                <Grid item xs={8} md={2} >
                                     <Typography variant="h6" gutterBottom>
                                         {translate('common.edit.title.common')}
                                     </Typography>
diff --git a/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx b/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
index 0522994..204641e 100644
--- a/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
+++ b/rsf-admin/src/page/orders/purchase/PurchaseItemList.jsx
@@ -105,7 +105,7 @@
               <FilterButton />
               <MyCreateButton onClick={() => { setCreateDialog(true) }} />
               <SelectColumnsButton preferenceKey='purchaseItem' />
-              <MyExportButton />
+              {/* <MyExportButton /> */}
             </TopToolbar>
           )}
           perPage={DEFAULT_PAGE_SIZE}
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx
index 18528e3..d33d9d9 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectEdit.jsx
@@ -35,8 +35,7 @@
 
     return (
         <Toolbar sx={{ justifyContent: 'end' }}>
-            <SaveButton />
-            <DeleteButton mutationMode="optimistic" />
+            <></>
         </Toolbar>
     )
 }
@@ -60,7 +59,20 @@
                     mode="onTouched"
                     defaultValues={{}}
                 >
-                    <Grid container width={{ xs: '100%', xl: '100%' }}>
+                    <Grid container width={{ xs: '100%', xl: '100%' }} sx={{
+                        "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
+                            bgcolor: 'white',
+                            WebkitTextFillColor: "rgba(0, 0, 0)"
+                        },
+
+                        "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
+                            bgcolor: 'white',
+                            WebkitTextFillColor: "rgba(0, 0, 0)"
+                        },
+                        "& .MuiFilledInput-root.MuiInputBase-sizeSmall": {
+                            bgcolor: 'white',
+                        }
+                    }}>
                         <Grid item xs={24} md={12}>
                             <Typography variant="h6" gutterBottom>
                                 {translate('common.edit.title.main')}
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
index f9b848c..215bfbe 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyInspectList.jsx
@@ -148,7 +148,7 @@
                     <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 />
+                        <EditButton label="toolbar.detail" />
                         <InspectionButton />
                         <CompleteButton />
                         <CloseButton />
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 0904353..1b85223 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -172,7 +172,7 @@
  */
 const DoneButton = (props) => {
     const record = useRecordContext();
-    const notify = useNotify(); 
+    const notify = useNotify();
     const refresh = useRefresh();
     const clickComplete = (event) => {
         event.stopPropagation();
@@ -211,7 +211,7 @@
         cancleTask(record)
     };
     //鍙栨秷浠诲姟
-    const cancleTask = async (row) => { 
+    const cancleTask = async (row) => {
         console.log(row);
         const { data: { code, data, msg } } = await request.post(`/task/remove/` + row.id);
         if (code === 200) {
@@ -222,11 +222,14 @@
         }
     }
     return (
-        <Button
-            onClick={clickCancel}
-            label="toolbar.cancel">
-            <CancelIcon />
-        </Button>
+        record.taskStatus === 1 ?
+            <Button
+                onClick={clickCancel}
+                label="toolbar.cancel">
+                <CancelIcon />
+            </Button>
+            :
+            <></>
     )
 }
 /**
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 0032365..50a6bfa 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
@@ -697,6 +697,8 @@
         stock.setAnfme(sum)
                 .setSourceId(order.getId())
                 .setType(order.getType())
+                .setUpdateBy(loginUserId)
+                .setCreateBy(loginUserId)
                 .setWkType(Short.parseShort(order.getWkType()));
         if (!stockService.save(stock)) {
             throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
@@ -715,6 +717,8 @@
                     .setId(null)
                     .setLocCode(loc.getCode())
                     .setOrderId(order.getId())
+                    .setUpdateBy(loginUserId)
+                    .setUpdateBy(loginUserId)
                     .setOrderItemId(asnOrderItem.getId())
                     .setWkType(Short.parseShort(order.getWkType()))
                     .setType(order.getType());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
index c36fa76..a00d906 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/AsnOrderTemplate.java
@@ -28,8 +28,8 @@
     /**
      * 缂栧彿
      */
-    @Excel(name = "*缂栧彿")
-    @ApiModelProperty(value = "*缂栧彿")
+    @Excel(name = "*ASN鍗曞彿")
+    @ApiModelProperty(value = "*ASN鍗曞彿")
     @ExcelComment(value = "code", example = "ASN5945272236")
     private String code;
 
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index 13186f7..7607b8b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -87,7 +87,7 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
+    public synchronized R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
         ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
         if (result.getList().isEmpty()) {
             throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
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 552b351..29370c0 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
@@ -30,6 +30,7 @@
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -72,6 +73,8 @@
             }
             PurchaseTemplate template = list.stream().findFirst().get();
             Purchase purchase = new Purchase();
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            Date date = dateFormat.parse(template.getArrTime());
             BeanUtils.copyProperties(template, purchase);
             purchase.setCode(template.getPoCode());
             if (StringUtils.isBlank(template.getPoCode())) {
@@ -81,6 +84,7 @@
             purchase.setType(OrderType.getTypeVal(template.getType()))
                     .setWkType(OrderWorkType.getWorkType(template.getWkType()))
                     .setSource(OrderSourceType.ORDER_SOURCE_TYPE_EXCEL.desc)
+                    .setPreArr(date)
                     .setCreateBy(loginUserId)
                     .setUpdateBy(loginUserId);
             if (!purchaseService.save(purchase)) {
@@ -101,6 +105,7 @@
                         .setPlatItemId(template.getPlatItemId())
                         .setAnfme(template.getAnfme())
                         .setPurchaseId(purchase.getId())
+                        .setUnit(matnr.getUnit())
                         .setNromQty(matnr.getNromNum())
                         .setSplrBatch(template.getSplrBatch())
                         .setCreateBy(loginUserId)
@@ -125,8 +130,7 @@
             }
 
             double anfmes = items.stream().mapToDouble(PurchaseItem::getAnfme).sum();
-            double qty = items.stream().mapToDouble(PurchaseItem::getQty).sum();
-            purchase.setAnfme(anfmes).setQty(qty);
+            purchase.setAnfme(anfmes);
 
            if (!purchaseService.updateById(purchase)) {
                throw new CoolException("涓诲崟鏁伴噺淇敼澶辫触锛侊紒");
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 99b3d68..c325590 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
@@ -183,8 +183,6 @@
                 }
                 items.add(pakinItem);
 
-
-
             }
         }
         double sum1 = items.stream().mapToDouble(WaitPakinItem::getAnfme).sum();
diff --git a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
index 7192284..0d22aa0 100644
--- a/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
+++ b/rsf-server/src/main/resources/mapper/manager/AsnOrderItemMapper.xml
@@ -24,8 +24,8 @@
                     aoi.pur_unit,
                     aoi.prod_time,
                     aoi.qty,
-                    qii.safe_qty,
-                    qii.dis_qty,
+--                     qii.safe_qty,
+--                     qii.dis_qty,
                     aoi.splr_code,
                     aoi.splr_batch,
                     aoi.splr_name,
@@ -35,19 +35,19 @@
                     aoi.pack_name,
                     aoi.nty_status,
                     aoi.`status`,
-                    CASE
-                        aoi.ispt_result
-                        WHEN 0 THEN
-                            '鏈'
-                        WHEN 1 THEN
-                            '鍚堟牸'
-                        WHEN 2 THEN
-                            '涓嶅悎鏍�'
-                        WHEN 3 THEN
-                            '寰呭畾'
-                        WHEN 4 THEN
-                            '閮ㄥ垎鍚堟牸'
-                        END AS isptResult$,
+--                     CASE
+--                         aoi.ispt_result
+--                         WHEN 0 THEN
+--                             '鏈'
+--                         WHEN 1 THEN
+--                             '鍚堟牸'
+--                         WHEN 2 THEN
+--                             '涓嶅悎鏍�'
+--                         WHEN 3 THEN
+--                             '寰呭畾'
+--                         WHEN 4 THEN
+--                             '閮ㄥ垎鍚堟牸'
+--                         END AS isptResult$,
                     aoi.deleted,
                     aoi.tenant_id,
                     aoi.create_by,
@@ -57,7 +57,7 @@
                     aoi.memo
                 FROM
                     man_asn_order_item aoi
-                        LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
+--                         LEFT JOIN man_qly_ispt_item qii ON aoi.id = qii.asn_item_id
             ) t
         ${ew.customSqlSegment}
     </select>

--
Gitblit v1.9.1