diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index b2996a26..f9145ed7 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -224,7 +224,7 @@ public class InProduceOrderController extends BaseController { dto.setPrintNum(DF.format(BigDecimal.ONE)); } dto.setSupplierCode(""); - dto.setBatchNo(""); + dto.setBatchNo(item.getBatchNo()); dto.setQrCode(QRCodeUtil.generateQRCodeBase64(generateQRContent(dto, ""), 100, 100)); datas.add(dto); } @@ -304,6 +304,7 @@ public class InProduceOrderController extends BaseController { .toList(); Integer type = bomService.getScanType(it.getMaterialNo()); children.forEach(child -> { + child.setQiTao(Objects.nonNull(type)); if (Objects.equals(type, 0)) { child.setMustScan(false); } @@ -355,7 +356,7 @@ public class InProduceOrderController extends BaseController { datas.forEach(it -> { InProduceOrderReceiveMaterialQO materialQO = request.getItems() .stream() - .filter(q -> Objects.equals(q.getId(), it.getId())) + .filter(q -> StrUtil.equals(q.getMaterialNo(), it.getMaterialNo())) .findFirst() .orElse(null); if (Objects.isNull(materialQO)) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index ab5f04c6..c70a56dc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -281,7 +281,6 @@ public class OutProduceController extends BaseController { WmsOutProduce order = outProduceService.lambdaQuery().eq(WmsOutProduce::getNo, no).one(); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); List datas = outProduceItemService.getList(order.getId()); - Integer type = bomService.getScanType(order.getPlnbez()); return ApiResult.success(new OutProduce1VO() .setId(order.getId()) .setAufnr(order.getAufnr()) @@ -300,6 +299,7 @@ public class OutProduceController extends BaseController { .setMeins(item.getMeins()) .setNum(item.getSqsl().subtract(item.getNum())); vo.setQiTao(bomService.isParent(item.getMatnr())); + Integer type = bomService.getScanType(item.getMatnr()); if (vo.isQiTao() && Objects.equals(type, 1)) { vo.setChildren(bomService.getChildrenVO(item.getMatnr())); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 9ac8710f..c611bae4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -519,16 +519,19 @@ public class TransferCompanyController extends BaseController { .setCreateTime(Instant.now()) ); }); - List items = transferCompanyTicketItemService.getList(ticket.getId()); - items.removeIf(it -> qo.getItems().stream().anyMatch(q -> Objects.equals(q.getId(), it.getId()))); - VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(items)) - .throwMessage("以下物料未设置入库储位：" + StrUtil.join(",", items.stream().map(TransferCompanyItemVO::getMatnr).toList())); +// List items = transferCompanyTicketItemService.getList(ticket.getId()); +// items.removeIf(it -> qo.getItems().stream().anyMatch(q -> Objects.equals(q.getId(), it.getId()))); +// VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(items)) +// .throwMessage("以下物料未设置入库储位：" + StrUtil.join(",", items.stream().map(TransferCompanyItemVO::getMatnr).toList())); List ticketItems = qo.getItems().stream() + .filter(it -> StrUtil.isNotBlank(it.getBinNos())) .map(q -> new WmsTransferCompanyTicketItem() .setId(q.getId()) .setBinNos1(q.getBinNos()) ).toList(); - transferCompanyTicketItemService.updateBatchById(ticketItems); + if (CollectionUtil.isNotEmpty(ticketItems)) { + transferCompanyTicketItemService.updateBatchById(ticketItems); + } inventoryService.in(records.stream() .collect(Collectors.groupingBy(InMaterialScanRecord::getKey)) .values() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index 5328d4ef..1b60fe37 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -415,7 +415,7 @@ public class SapService { .throwMessage(STATE.SAPErr, "SAP：" + structure.getString("MSG")); JCoTable table = function.getTableParameterList().getTable("T_OUT"); - log.info("SAP返回: {}", table); + log.trace("SAP返回: {}", table); List datas = JCoUtil.toBeanList(table, SAPMaterialInfoInOrderDTO.class); log.debug("数据:{}", JSONUtil.toJsonStr(datas)); return datas; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java index b3a8bed2..14c3af71 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java @@ -1,7 +1,6 @@ package com.nflg.wms.common.pojo.qo; import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; import lombok.Data; import java.util.List; @@ -9,9 +8,6 @@ import java.util.List; @Data public class InProduceOrderReceiveMaterialQO { - @NotNull - private Long id; - /** * 物料编号 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java index d7bc062d..c439e679 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java @@ -1,5 +1,6 @@ package com.nflg.wms.common.pojo.vo; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -66,6 +67,12 @@ public class InProduceOrderItemVO { */ private String sernr; + /** + * 是否齐套物料 + */ + @JsonProperty("isQiTao") + private boolean isQiTao = false; + /** * 是否必须扫码，如果为false的话可以不扫码 */ diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml index bece4445..e53167a3 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsStructuralPackageOrderMapper.xml @@ -50,7 +50,7 @@