diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java index d83492c6..e529d700 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java @@ -49,7 +49,7 @@ public class TransactionController { @Operation(summary = "创建库存事务并增加库存转运日志") @PreAuthorize("@ss.hasPermission('wms:transaction:create')") public CommonResult createTransactionAndTransferLog(@Valid @RequestBody TransactionCreateReqListVO transactionCreateReqListVO) { - return success(transactionService.createTransaction(transactionCreateReqListVO.getTransactionList(), transactionCreateReqListVO.getTransferlogList())); + return success(transactionService.createTransactionAndTransferlog(transactionCreateReqListVO.getTransactionList(), transactionCreateReqListVO.getTransferlogList())); } @PostMapping("/senior") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java index 5dcb0da6..7aca6811 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectin/ExpectinConvert.java @@ -1,16 +1,15 @@ package com.win.module.wms.convert.expectin; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExcelVO; import com.win.module.wms.controller.expectin.vo.ExpectinRespVO; import com.win.module.wms.controller.expectin.vo.ExpectinUpdateReqVO; +import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; + +import java.util.List; /** * 预计入库存 Convert @@ -34,4 +33,5 @@ public interface ExpectinConvert { List convertList02(List list); + List convertList03(List list); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java index 92f93a16..72795111 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/expectout/ExpectoutConvert.java @@ -1,16 +1,15 @@ package com.win.module.wms.convert.expectout; -import java.util.*; - import com.win.framework.common.pojo.PageResult; - import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExcelVO; import com.win.module.wms.controller.expectout.vo.ExpectoutRespVO; import com.win.module.wms.controller.expectout.vo.ExpectoutUpdateReqVO; +import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; -import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; + +import java.util.List; /** * 预计出库存 Convert @@ -34,4 +33,5 @@ public interface ExpectoutConvert { List convertList02(List list); + List convertList03(List list); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java index 1b968e8f..62a47e97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinService.java @@ -2,11 +2,12 @@ package com.win.module.wms.service.expectin; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; -import java.math.BigDecimal; +import javax.validation.Valid; import java.util.List; /** @@ -18,19 +19,10 @@ public interface ExpectinService { /** * 创建预计入库存 - * @param jobNumber 任务号 - * @param businessType 业务类型 - * @param itemCode 物料代码 - * @param batch 批次 - * @param inventoryStatus 库存状态 - * @param uom 计量单位 - * @param qty 数量 - * @param locationCode 库位代码 - * @param warehouseCode 仓库代码 - * @param ownerCode 货主代码 + * @param createReqVOList 预计入 * @return */ - Long createExpectin(String jobNumber, String businessType, String itemCode, String batch, String inventoryStatus, String uom, BigDecimal qty, String locationCode, String warehouseCode, String ownerCode); + void createExpectin(@Valid List createReqVOList); /** * 删除预计入库存 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java index b7c1ffbe..d3d6b479 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectin/ExpectinServiceImpl.java @@ -2,9 +2,10 @@ package com.win.module.wms.service.expectin; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.util.validation.ValidationUtils; +import com.win.module.wms.controller.expectin.vo.ExpectinCreateReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinExportReqVO; import com.win.module.wms.controller.expectin.vo.ExpectinPageReqVO; +import com.win.module.wms.convert.expectin.ExpectinConvert; import com.win.module.wms.dal.dataobject.expectin.ExpectinDO; import com.win.module.wms.dal.mysql.expectin.ExpectinMapper; import org.springframework.stereotype.Service; @@ -12,7 +13,6 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.Validator; -import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -35,22 +35,9 @@ public class ExpectinServiceImpl implements ExpectinService { private Validator validator; @Override - public Long createExpectin(String jobNumber, String businessType, String itemCode, String batch, String inventoryStatus, String uom, BigDecimal qty, String locationCode, String warehouseCode, String ownerCode) { - ExpectinDO expectinDO = new ExpectinDO(); - expectinDO.setJobNumber(jobNumber); - expectinDO.setItemCode(itemCode); - expectinDO.setBatch(batch); - expectinDO.setInventoryStatus(inventoryStatus); - expectinDO.setUom(uom); - expectinDO.setQty(qty); - expectinDO.setLocationCode(locationCode); - expectinDO.setWarehouseCode(warehouseCode); - expectinDO.setOwnerCode(ownerCode); - ValidationUtils.validate(validator, expectinDO); - // 插入 - expectinMapper.insert(expectinDO); - // 返回 - return expectinDO.getId(); + public void createExpectin(List createReqVOList) { + List expectinDOList = ExpectinConvert.INSTANCE.convertList03(createReqVOList); + expectinMapper.insertBatch(expectinDOList); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java index b48f4d6a..0453b9ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java @@ -2,11 +2,12 @@ package com.win.module.wms.service.expectout; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; +import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; -import java.math.BigDecimal; +import javax.validation.Valid; import java.util.List; /** @@ -19,19 +20,10 @@ public interface ExpectoutService { /** * 创建预计出库存 * - * @param jobNumber 任务号 - * @param businessType 业务类型 - * @param itemCode 物料代码 - * @param batch 批次 - * @param inventoryStatus 库存状态 - * @param uom 计量单位 - * @param qty 数量 - * @param locationCode 库位代码 - * @param warehouseCode 仓库代码 - * @param ownerCode 货主代码 + * @param createReqVOList 预计出 * @return 编号 */ - Long createExpectout(String jobNumber, String businessType, String itemCode, String batch, String inventoryStatus, String uom, BigDecimal qty, String locationCode, String warehouseCode, String ownerCode); + void createExpectout(@Valid List createReqVOList); /** * 删除预计出库存 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java index 941cf643..ecf541df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutServiceImpl.java @@ -3,9 +3,10 @@ package com.win.module.wms.service.expectout; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; -import com.win.framework.common.util.validation.ValidationUtils; +import com.win.module.wms.controller.expectout.vo.ExpectoutCreateReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutExportReqVO; import com.win.module.wms.controller.expectout.vo.ExpectoutPageReqVO; +import com.win.module.wms.convert.expectout.ExpectoutConvert; import com.win.module.wms.dal.dataobject.expectout.ExpectoutDO; import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper; import com.win.module.wms.service.rule.RuleService; @@ -14,7 +15,6 @@ import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; import javax.validation.Validator; -import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,21 +40,9 @@ public class ExpectoutServiceImpl implements ExpectoutService { private Validator validator; @Override - public Long createExpectout(String jobNumber, String businessType, String itemCode, String batch, String inventoryStatus, String uom, BigDecimal qty, String locationCode, String warehouseCode, String ownerCode) { - ExpectoutDO expectoutDO = new ExpectoutDO(); - expectoutDO.setJobNumber(jobNumber); - expectoutDO.setItemCode(itemCode); - expectoutDO.setBatch(batch); - expectoutDO.setInventoryStatus(inventoryStatus); - expectoutDO.setUom(uom); - expectoutDO.setQty(qty); - expectoutDO.setLocationCode(locationCode); - expectoutDO.setWarehouseCode(warehouseCode); - expectoutDO.setOwnerCode(ownerCode); - ValidationUtils.validate(validator, expectoutDO); - expectoutMapper.insert(expectoutDO); - // 返回 - return expectoutDO.getId(); + public void createExpectout(List createReqVOList) { + List expectoutDOList = ExpectoutConvert.INSTANCE.convertList03(createReqVOList); + expectoutMapper.insertBatch(expectoutDOList); } @Override diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java index fa5251da..aaf5c514 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionService.java @@ -33,7 +33,7 @@ public interface TransactionService { * @param transferlogCreateReqVOList 库存转移日志信息 * @return 编号 */ - Integer createTransaction(@Valid List transactionCreateReqVOList, List transferlogCreateReqVOList); + Integer createTransactionAndTransferlog(@Valid List transactionCreateReqVOList, List transferlogCreateReqVOList); /** * 获得用高级搜索库存事务分页列表 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java index 6810a64e..f8ef3ff5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transaction/TransactionServiceImpl.java @@ -71,7 +71,7 @@ public class TransactionServiceImpl implements TransactionService { @Override @Transactional - public Integer createTransaction(List transactionCreateReqVOList, List transferlogCreateReqVOList) { + public Integer createTransactionAndTransferlog(List transactionCreateReqVOList, List transferlogCreateReqVOList) { int result = 0; for(TransactionCreateReqVO createReqVO : transactionCreateReqVOList) { TransactionDO transactionDO = TransactionConvert.INSTANCE.convert(createReqVO);