diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java index b8150096d..efe87076d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderAssembler.java @@ -92,9 +92,14 @@ public class ExecutionStockInOrderAssembler { stockInOrderDO.setCreateTime(new Date()); stockInOrderDO.setDelFlag(1); // 新增入库单时,如果入库单类型为空,默认设置为普通入库 - String orderTypeCode = stockInOrderDO.getOrderTypeCode(); - if (orderTypeCode == null || orderTypeCode.trim().length() == 0) { - stockInOrderDO.setOrderTypeCode("pu_tong_ru_ku"); + // 前端新增只传业务类型(businessType)不传单据类型时,先用业务类型回填单据类型编码, + // 否则退货单会被兜底成pu_tong_ru_ku,再被setDataDict按字典反查覆盖成"普通入库" + if (stockInOrderDO.getOrderTypeCode() == null || stockInOrderDO.getOrderTypeCode().trim().length() == 0) { + if (stockInOrderDO.getBusinessType() != null && stockInOrderDO.getBusinessType().trim().length() > 0) { + stockInOrderDO.setOrderTypeCode(stockInOrderDO.getBusinessType().trim()); + } else { + stockInOrderDO.setOrderTypeCode("pu_tong_ru_ku"); + } } String orderTypeName = stockInOrderDO.getOrderTypeName(); if (orderTypeName == null || orderTypeName.trim().length() == 0) {