From 5d804ce9ee041df7389bc3a02e5175257b9098da Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 04 五月 2025 19:42:29 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 10 ++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 12 ++++++++++++
rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx | 8 +++-----
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
index 5565989..6f5ffc2 100644
--- a/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
+++ b/rsf-admin/src/page/orders/qlyInspect/QlyIsptItemList.jsx
@@ -111,7 +111,6 @@
actions={(
<TopToolbar>
<FilterButton />
- {/* <MyCreateButton onClick={() => { setCreateDialog(true) }} /> */}
<SelectColumnsButton preferenceKey='qlyIsptItem' />
<MyExportButton />
</TopToolbar>
@@ -122,21 +121,21 @@
preferenceKey='qlyIsptItem'
bulkActionButtons={() => <BulkDeleteButton mutationMode={OPERATE_MODE} />}
rowClick={false}
- omit={['id', 'createTime', 'createBy', 'memo', 'ispectId']}
+ omit={['id', 'createTime', 'createBy', 'memo', 'label', 'stockBatch','picPath', 'ispectId']}
>
<NumberField source="id" />
<NumberField source="ispectId" label="table.field.qlyIsptItem.ispectId" />
<TextField source="matnrCode" label="table.field.qlyIsptItem.matnrCode" />
<TextField source="maktx" label="table.field.qlyIsptItem.maktx" />
<TextField source="label" label="table.field.qlyIsptItem.label" />
- <TextField source="splrName" label="table.field.qlyIsptItem.splrName" />
<TextField source="splrBatch" label="table.field.qlyIsptItem.splrBatch" />
<TextField source="stockBatch" label="table.field.qlyIsptItem.stockBatch" />
<NumberField source="rcptQty" label="table.field.qlyIsptItem.rcptQty" />
- <NumberField source="isptResult$" label="table.field.qlyIsptItem.isptResult" />
<NumberField source="dlyQty" label="table.field.qlyIsptItem.dlyQty" />
<NumberField source="disQty" label="table.field.qlyIsptItem.disQty" />
<NumberField source="safeQty" label="table.field.qlyIsptItem.safeQty" />
+ <TextField source="splrName" label="table.field.qlyIsptItem.splrName" />
+ <NumberField source="isptResult$" label="table.field.qlyIsptItem.isptResult" />
<TextField source="picPath" label="table.field.qlyIsptItem.picPath" />
<TextField source="updateBy$" label="common.field.updateBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
@@ -144,7 +143,6 @@
<DateField source="createTime" label="common.field.createTime" showTime />
<BooleanField source="statusBool" label="common.field.status" sortable={false} />
<TextField source="memo" label="common.field.memo" sortable={false} />
-
</StyledDatagrid>
</List>
<QlyIsptItemCreate
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index 70dfef1..a2a2377 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -189,6 +189,18 @@
private Integer ntyStatus;
/**
+ * 璐ㄦ缁撴灉
+ */
+ @ApiModelProperty("璐ㄦ缁撴灉")
+ private Short isptResult;
+
+ /**
+ * 璐ㄦ鐘舵��
+ */
+ @ApiModelProperty("璐ㄦ鐘舵��")
+ private Double isptStatus;
+
+ /**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
index 4fbb4bf..ea34d24 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java
@@ -6,11 +6,13 @@
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.IsptItemsParams;
import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem;
+import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.QlyInspect;
import com.vincent.rsf.server.manager.enums.QlyIsptResult;
import com.vincent.rsf.server.manager.enums.QlyIsptStatus;
import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper;
import com.vincent.rsf.server.manager.entity.QlyIsptItem;
+import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.QlyInspectService;
import com.vincent.rsf.server.manager.service.QlyIsptItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -28,6 +30,7 @@
@Autowired
private QlyInspectService qlyInspectService;
+ private AsnOrderItemService asnOrderItemService;
/**
* @author Ryan
@@ -76,6 +79,13 @@
for (Long key : listMap.keySet()) {
QlyInspect inspect = qlyInspectService.getById(key);
List<QlyIsptItem> items = listMap.get(key);
+ items.forEach(qlyIsptItem -> {
+ AsnOrderItem orderItem = asnOrderItemService.getById(qlyIsptItem.getAsnItemId());
+ if (qlyIsptItem.getSafeQty().compareTo(orderItem.getAnfme()) >= 0.00) {
+ orderItem.setIsptResult()
+ }
+
+ });
Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum();
Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum();
Double qlyQty = safeQty + disQty;
--
Gitblit v1.9.1