diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsFileController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsFileController.java index e2013c17..60546b4e 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsFileController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsFileController.java @@ -12,6 +12,7 @@ import com.nflg.wms.common.pojo.vo.QmsFileCategoryTreeVO; import com.nflg.wms.common.pojo.vo.QmsFileVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; +import com.nflg.wms.repository.entity.QmsFileHistory; import com.nflg.wms.repository.entity.User; import com.nflg.wms.repository.service.IUserService; import com.nflg.wms.starter.BaseController; @@ -23,6 +24,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -83,6 +85,15 @@ public class QmsFileController extends BaseController { return ApiResult.success(); } + /** + * 获取文件历史版本 + * @param id 文件ID + */ + @GetMapping("getHistory") + public ApiResult> getHistory(@RequestParam @NotNull Long id){ + return ApiResult.success(fileControllerService.getHistory(id)); + } + /** * 删除文件 * @param id 文件ID diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index d917b544..5ac33d32 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -951,6 +951,7 @@ public class IncomingInspectionTaskControllerService { inspectionStandardItemService.lambdaQuery() .select(QmsInspectionStandardItem::getId, QmsInspectionStandardItem::getPdfDrawing) .eq(QmsInspectionStandardItem::getInspectionStandardId, standard.getId()) + .eq(QmsInspectionStandardItem::getItemType,1) .list() .stream() .map(it -> new PdfDrawingVO(it.getId(), it.getPdfDrawing())) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsFileControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsFileControllerService.java index eefcebc3..74477be4 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsFileControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsFileControllerService.java @@ -695,4 +695,11 @@ public class QmsFileControllerService { fileService.updateById(file); redisTemplate.delete(key); } + + public List getHistory(Long id) { + return historyService.lambdaQuery() + .eq(QmsFileHistory::getFileId, id) + .orderByDesc(QmsFileHistory::getId) + .list(); + } } \ No newline at end of file diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 894ff5e1..f82b65a0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -403,9 +403,9 @@ public class NormalPGIController extends BaseController { .setSupplierCode(order.getSupplierNum()) .setSupplierName(order.getSupplierName()) .setDeliveryOrderNo(order.getNoteNum()) - .setDeliveryOrderLine(String.valueOf(qcItem.getLineNumber())) - .setPurchaseOrderNo(qcItem.getNoteNum()) - .setPurchaseOrderLine(String.valueOf(qcItem.getLineNumber())) + .setDeliveryOrderLine(qcItem.getLineNumber()) + .setPurchaseOrderNo(qcItem.getPoNum()) + .setPurchaseOrderLine(qcItem.getPoLineNumber()) .setFactory(order.getIuCode()) .setInspectionQty(qcItem.getReceiptNum() != null ? qcItem.getReceiptNum().intValue() : 0) .setPurchaseGroup(order.getPurchaseGroup()) @@ -1184,9 +1184,9 @@ public class NormalPGIController extends BaseController { .setSupplierCode(order.getSupplierNum()) .setSupplierName(order.getSupplierName()) .setDeliveryOrderNo(order.getNoteNum()) - .setDeliveryOrderLine(String.valueOf(item.getLineNumber())) - .setPurchaseOrderNo(item.getNoteNum()) - .setPurchaseOrderLine(String.valueOf(item.getLineNumber())) + .setDeliveryOrderLine(item.getLineNumber()) + .setPurchaseOrderNo(item.getPoNum()) + .setPurchaseOrderLine(item.getPoLineNumber()) .setFactory(order.getIuCode()) .setInspectionQty(item.getReceiptNum() != null ? item.getReceiptNum().intValue() : 0) .setPurchaseGroup(order.getPurchaseGroup()) diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsFileHistory.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsFileHistory.java index 5eae58bb..efdcd6d1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsFileHistory.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsFileHistory.java @@ -38,6 +38,11 @@ public class QmsFileHistory implements Serializable { */ private Integer version; + /** + * 存储路径 + */ + private String storagePath; + /** * 文件大小（字节） */ diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java index fb04ec5e..06df073f 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java @@ -43,18 +43,9 @@ import java.util.Objects; @RequestMapping("/qms") public class QmsController extends BaseController { - @Resource - private IWmsSrmOrderService srmOrderService; - - @Resource - private IWmsSrmOrderItemService srmOrderItemService; - @Resource private IWmsSrmQualityInspectionService srmQualityInspectionService; - @Resource - private IWmsInTaskService taskService; - @Resource private IWmsQcReceiveItemService qcReceiveItemService; @@ -113,8 +104,8 @@ public class QmsController extends BaseController { .setInspectionType("IQC来料检测") .setPoLineNumber(qo.getPurchaseOrderLine()) .setInspectionQty(BigDecimal.valueOf(qo.getInspectionQty())) -// .setItemName("") -// .setUnit("") + .setItemName(receiveItem.getItemName()) + .setUnit(receiveItem.getUomCode()) // .setReceivedWarehouse("") // .setUnqualifiedReason(data.getUnqualifiedReason()) // .setReceiveNum(data.getReceiveNum()) @@ -138,6 +129,7 @@ public class QmsController extends BaseController { // 如果物料没有生成过二维码，则直接入库（参考NormalPGIController.takeDeliveryConfirm方法） if (!hasQrCode) { inspect.setIsIn(true); + inspect.setInTime(LocalDateTime.now()); log.info("物料没有生成过二维码, 执行直接入库, 质检单号: {}", qo.getTaskNo()); // 构建库存入库数据 @@ -159,7 +151,7 @@ public class QmsController extends BaseController { zwm3A17DTO.getItem1().add(new ZWM3A17Item1DTO() .setEBELP(receiveItem.getPoLineNumber()) .setMATNR(receiveItem.getItemCode()) - .setERFMG(receiveItem.getQualifiedQty()) + .setERFMG(BigDecimal.valueOf(qo.getQualifiedQty())) .setMEINS(receiveItem.getUomCode()) .setCHARG(inventoryDTO.getBatchNo()) .setWERKS(qo.getFactory())