diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java index face628e..5e803b85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java @@ -123,4 +123,8 @@ public class IssueRecordDetailBaseVO { @Schema(description = "供应商代码") private String supplierCode; + @Schema(description = "主表ID") + private Long masterId; + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java index 713b3297..4f04759e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java @@ -1,5 +1,6 @@ package com.win.module.wms.service.issueRecord; +import cn.hutool.core.util.StrUtil; import com.win.framework.common.pojo.CustomConditions; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; @@ -7,10 +8,7 @@ import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.system.enums.serialNumber.RuleCodeEnum; -import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainCreateReqVO; -import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainExportReqVO; -import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; -import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainUpdateReqVO; +import com.win.module.wms.controller.issueRecord.vo.*; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.issueRecord.IssueRecordDetailConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; @@ -37,6 +35,7 @@ import org.springframework.validation.annotation.Validated; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; import com.win.framework.common.pojo.PageResult; @@ -86,7 +85,7 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { // 插入 IssueRecordMainDO mainDO = IssueRecordMainConvert.INSTANCE.convert(createReqVO); AdminUserRespDTO userRespDTO = userApi.getUser(getLoginUserId()); - List subDOList = IssueRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); + List subDOListVO = createReqVO.getSubList(); String number = serialNumberApi.generateCode(RuleCodeEnum.ISSUE_RECORD.getCode()); mainDO.setNumber(number); mainDO.setDepartmentCode(String.valueOf(userRespDTO.getDeptId())); @@ -95,7 +94,7 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { mainDO.setAvailable("TRUE"); mainDO.setId(null); // 业务类型 - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("RepleinmentRecord"); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("IssueRecord"); mainDO.setToLocationTypes(businesstypeDO.getInLocationTypes()); mainDO.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); mainDO.setToAreaCodes(businesstypeDO.getInAreaCodes()); @@ -104,14 +103,14 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { mainDO.setInTransactionType(businesstypeDO.getInTransactionType()); mainDO.setBusinessType(businesstypeDO.getCode()); // 接口类型 - RecordsettingDO recordsettingDO = recordsettingService.selectRecordsettingExist("RepleinmentRecord"); + RecordsettingDO recordsettingDO = recordsettingService.selectRecordsettingExist("IssueRecord"); mainDO.setInterfaceType(recordsettingDO.getInterfaceType()); issueRecordMainMapper.insert(mainDO); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); - for (IssueRecordDetailDO detailDO : subDOList) { - List> recordList = IssueRecordDetailConvert.INSTANCE.convert(detailDO).getRecordList(); + for (IssueRecordDetailCreateReqVO detailDO : subDOListVO) { + List> recordList = detailDO.getRecordList(); detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode()); @@ -199,7 +198,7 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { transactionCreateReqVOList.add(transactionCreateReqVOOut); }); } - issueRecordDetailMapper.insertBatch(subDOList); + issueRecordDetailMapper.insertBatch(IssueRecordDetailConvert.INSTANCE.convertList03(subDOListVO)); //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); //增加操作记录