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 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: 冻结 ") 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;
