diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 7f2533fcf..88f92aef8 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -543,6 +543,8 @@ public class IoAddInoutService { } + @Resource + IoCodeLostService codeLostService; /** * 手持终端-----新增出入库单据 * @@ -582,6 +584,22 @@ public class IoAddInoutService { if (CollUtil.isNotEmpty(pdaPostOrderRequest.getCodeTempEntities())) { for (IoCodeTempEntity codeTempEntity : codeTempEntities) { codeTempEntity.setOrderId(orderNo); + + String produceDate = codeTempEntity.getProduceDate(); + String expireDate = codeTempEntity.getExpireDate(); + String batchNo = codeTempEntity.getBatchNo(); + if ( + StrUtil.isEmpty(produceDate) || + StrUtil.isEmpty(expireDate) || + StrUtil.isEmpty(batchNo) + ){ + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeTempEntity.getCode()); + if (codeLostEntity != null) { + codeTempEntity.setBatchNo(codeLostEntity.getBatchNo()); + codeTempEntity.setProduceDate(codeLostEntity.getProduceDate()); + codeTempEntity.setExpireDate(codeLostEntity.getExpireDate()); + } + } } codeTempService.insertBatch(codeTempEntities); }