diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java index dc14d2dc..74c49d61 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java @@ -20,4 +20,6 @@ public interface ErrorCodeConstants { ErrorCode ORDER_DONT_SUBMIT = new ErrorCode(1_008_000_050, "该订单不支持审批"); ErrorCode MTRL_CODE_NOT_EXISTS = new ErrorCode(1_008_000_150, "中铜物料不存在"); ErrorCode WAREHOUSE_CODE_OR_FACTORY_CODE_NOT_EXISTS = new ErrorCode(1_008_000_151, "{}"); + + ErrorCode ORDER_DETAIL_NOT_EXISTS = new ErrorCode(1_008_000_060, "订单明细不能为空"); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java index 9e535b7c..ea7c07f2 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java @@ -153,7 +153,7 @@ public class PurchaseOrderSaveReqVO { @Schema(description = "订单明细") @ExcelProperty("订单明细") - private List prchOrdDtlSaveReqVOS; + private List details; @Schema(description = "流程实例编号") diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java index c81d92f6..d8186c0c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java @@ -201,5 +201,8 @@ public class SalesOrderSaveReqVO { @Schema(description = "货权转移类型(字典：ASY_MTNG_TP)") @ExcelProperty("货权转移类型(字典：ASY_MTNG_TP)") private String meteringType; + @Schema(description = "订单明细") + @ExcelProperty("订单明细") + private List details; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlService.java index 0454f86d..4aecd7b7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlService.java @@ -69,6 +69,13 @@ public interface PrchOrdDtlService { * @return List */ List batchCreatePrchOrdDtl(@Valid List createReqVOS); + /** + * 批量更新采购订单明细 + * + * @param createReqVOS 更新信息 + * @return List + */ + List batchUpdatePrchOrdDtl(@Valid List createReqVOS); /** * 批量删除采购订单明细 * diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java index 5b04b4c8..0be45246 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PrchOrdDtlServiceImpl.java @@ -149,6 +149,14 @@ public class PrchOrdDtlServiceImpl implements PrchOrdDtlService { return BeanUtils.toBean(prchOrdDtlDOS, PrchOrdDtlRespVO.class); } + @Override + public List batchUpdatePrchOrdDtl(List createReqVOS) { + List prchOrdDtlDOS = BeanUtils.toBean(createReqVOS, PrchOrdDtlDO.class); + prchOrdDtlMapper.insertOrUpdate(prchOrdDtlDOS); + log.info("批量更新采购订单明细成功,更新【{}】条数据", prchOrdDtlDOS.size()); + return BeanUtils.toBean(prchOrdDtlDOS, PrchOrdDtlRespVO.class); + } + @Override public void deletePrchOrdDtlListByOrdIds(List ordIds) { //通过订单组件查询订单明细 diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java index 6282cf22..1a7b2b3b 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java @@ -115,14 +115,14 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { purchaseOrder.setSystemOrderNumber(orderNumber); purchaseOrderMapper.insert(purchaseOrder); -// if (createReqVO.getPrchOrdDtlSaveReqVOS()==null||createReqVO.getPrchOrdDtlSaveReqVOS().isEmpty()) { -// return BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class); -// } -// //批量插入订单明细 -// createReqVO.getPrchOrdDtlSaveReqVOS().forEach(prchOrdDtlSaveReqVO -> prchOrdDtlSaveReqVO.setOrdId(purchaseOrder.getId())); -// List prchOrdDtlRespVOS = prchOrdDtlService.batchCreatePrchOrdDtl(createReqVO.getPrchOrdDtlSaveReqVOS()); -// PurchaseOrderRespVO purchaseOrderRespVO = BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class); -// purchaseOrderRespVO.setPrchOrdDtlRespVOS(prchOrdDtlRespVOS); + if (createReqVO.getDetails()==null||createReqVO.getDetails().isEmpty()) { + throw exception(ORDER_DETAIL_NOT_EXISTS); + } + //批量插入订单明细 + createReqVO.getDetails().forEach(details -> details.setOrdId(purchaseOrder.getId())); + List prchOrdDtlRespVOS = prchOrdDtlService.batchCreatePrchOrdDtl(createReqVO.getDetails()); + PurchaseOrderRespVO purchaseOrderRespVO = BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class); + purchaseOrderRespVO.setPrchOrdDtlRespVOS(prchOrdDtlRespVOS); return BeanUtils.toBean(purchaseOrder, PurchaseOrderRespVO.class); } @@ -134,22 +134,25 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService { // 更新 PurchaseOrderDO updateObj = BeanUtils.toBean(updateReqVO, PurchaseOrderDO.class); purchaseOrderMapper.updateById(updateObj); - //删除订单明细 -// prchOrdDtlService.deletePrchOrdDtlListByOrdIds(Collections.singletonList(updateReqVO.getId())); -// log.info("删除旧的订单明细成功"); - // 返回 - //批量插入订单明细 -// updateReqVO.getPrchOrdDtlSaveReqVOS().forEach(prchOrdDtlSaveReqVO -> prchOrdDtlSaveReqVO.setOrdId(updateReqVO.getId())); -// prchOrdDtlService.batchCreatePrchOrdDtl(updateReqVO.getPrchOrdDtlSaveReqVOS()); +// 批量插入订单明细 + updateReqVO.getDetails().forEach(prchOrdDtlSaveReqVO ->{ + //表示新增 + if (prchOrdDtlSaveReqVO.getId() == null){ + prchOrdDtlSaveReqVO.setOrdId(updateReqVO.getId()); + } + }); + prchOrdDtlService.batchUpdatePrchOrdDtl(updateReqVO.getDetails()); log.info("更新订单明细成功"); } @Override + @Transactional(rollbackFor = Exception.class) public void deletePurchaseOrder(Long id) { // 校验存在 validatePurchaseOrderExists(id); // 删除 purchaseOrderMapper.deleteById(id); + prchOrdDtlService.deletePrchOrdDtlListByOrdIds(Collections.singletonList(id)); } @Override diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailService.java index 79013800..53408e11 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailService.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailService.java @@ -40,7 +40,12 @@ public interface SalesOrderDetailService { * @param updateReqVO 更新信息 */ void updateSalesOrderDetail(@Valid SalesOrderDetailSaveReqVO updateReqVO); - + /** + * 批量更新销售订单明细 + * + * @param updateReqVO 更新信息 + */ + void updateSalesOrderDetailList(@Valid List updateReqVO); /** * 删除销售订单明细 * diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java index e1b8a789..2caac902 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderDetailServiceImpl.java @@ -77,7 +77,7 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public List createSalesOrderDetail(List createReqVOS) { List salesOrderDetailDOS = BeanUtils.toBean(createReqVOS, SalesOrderDetailDO.class); salesOrderDetailDOS.forEach(salesOrderDetail -> { @@ -96,6 +96,11 @@ public class SalesOrderDetailServiceImpl implements SalesOrderDetailService { salesOrderDetailMapper.updateById(updateObj); } + @Override + public void updateSalesOrderDetailList(List updateReqVO) { + salesOrderDetailMapper.insertOrUpdate(BeanUtils.toBean(updateReqVO, SalesOrderDetailDO.class)); + } + @Override public void deleteSalesOrderDetail(Long id) { // 校验存在 diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java index ad4da072..5f86fb3c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java @@ -98,7 +98,7 @@ public class SalesOrderServiceImpl implements SalesOrderService { private InternalWarehouseService internalWarehouseService; @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public SalesOrderRespVO createSalesOrder(SalesOrderSaveReqVO createReqVO) { // 插入 SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class); @@ -108,22 +108,35 @@ public class SalesOrderServiceImpl implements SalesOrderService { String orderNumber = generateOrderNumber(salesOrderDO.getMtrlTp()); salesOrderDO.setSystemOrderNumber(orderNumber); salesOrderMapper.insert(salesOrderDO); + //插入订单明细 + if (createReqVO.getDetails()==null||createReqVO.getDetails().isEmpty()) { + throw exception(Sales_ORD_DTL_NOT_EXISTS); + } + createReqVO.getDetails().forEach(details ->details.setOrderId(String.valueOf(salesOrderDO.getId()))); + List salesOrderDetail = salesOrderDetailService.createSalesOrderDetail(createReqVO.getDetails()); // 返回 - return BeanUtils.toBean(salesOrderDO, SalesOrderRespVO.class); + SalesOrderRespVO bean = BeanUtils.toBean(salesOrderDO, SalesOrderRespVO.class); + bean.setSalesOrderDetailRespVOS(salesOrderDetail); + return bean; } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void updateSalesOrder(SalesOrderSaveReqVO updateReqVO) { // 校验存在 validateSalesOrderExists(updateReqVO.getId()); // 更新 SalesOrderDO updateObj = BeanUtils.toBean(updateReqVO, SalesOrderDO.class); salesOrderMapper.updateById(updateObj); + if (updateReqVO.getDetails()==null||updateReqVO.getDetails().isEmpty()) { + return; + } + updateReqVO.getDetails().forEach(details ->details.setOrderId(String.valueOf(updateObj.getId()))); + salesOrderDetailService.updateSalesOrderDetailList(updateReqVO.getDetails()); } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void deleteSalesOrder(Long id) { // 校验存在 validateSalesOrderExists(id); @@ -132,7 +145,7 @@ public class SalesOrderServiceImpl implements SalesOrderService { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void deleteSalesOrderListByIds(List ids) { // 校验存在 validateSalesOrderExists(ids); diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java new file mode 100644 index 00000000..e414b86c --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseApi.java @@ -0,0 +1,29 @@ +package com.zt.plat.module.erp.api; + +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.erp.api.dto.internalWarehouse.InternalWarehouseDTO; +import com.zt.plat.module.erp.enums.ApiConstants; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +@FeignClient(name = ApiConstants.NAME) +@Tag(name = "RPC 服务 - ERP") +public interface InternalWarehouseApi { + String PREFIX = ApiConstants.PREFIX + "/internal-warehouse"; + /** + * 根据工厂代码和仓库代码获取仓库列表 + * + * @param factoryCode 工厂代码 + * @param warehouseCode 仓库代码 + * @return 仓库列表 + */ + @GetMapping(PREFIX + "/list-by-factory-code-and-warehouse-code") + @Operation(summary = "根据工厂代码和仓库代码获取仓库列表", description = "根据工厂代码和仓库代码获取仓库列表;factoryCode是工厂编码,warehouseCode是仓库编码,mmsiType是业务类型,operationType是操作类型") + CommonResult> getInternalWarehouseListByFactoryCodeAndWarehouseCode(@RequestParam(value = "factoryCode") String factoryCode, @RequestParam(value = "warehouseCode") String warehouseCode, @RequestParam(value = "mmsiType", required = false) String mmsiType, @RequestParam(value = "operationType", required = false) String operationType); + +} diff --git a/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/internalWarehouse/InternalWarehouseDTO.java b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/internalWarehouse/InternalWarehouseDTO.java new file mode 100644 index 00000000..b5957674 --- /dev/null +++ b/zt-module-erp/zt-module-erp-api/src/main/java/com/zt/plat/module/erp/api/dto/internalWarehouse/InternalWarehouseDTO.java @@ -0,0 +1,55 @@ +package com.zt.plat.module.erp.api.dto.internalWarehouse; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Schema(description = "内部仓库DTO") +@Data +public class InternalWarehouseDTO { + @Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "5015") + private Long id; + + @Schema(description = "公司名称") + private String companyNameCustom; + + @Schema(description = "公司编码") + private String companyIdCustom; + + @Schema(description = "操作类型", example = "2") + private String operationType; + + @Schema(description = "业务类型", example = "2") + private String mmsiType; + + @Schema(description = "erp源工厂名称", example = "赵六") + private String erpSourceFactoryName; + + @Schema(description = "erp源工厂编码") + private String erpSourceFactoryNumber; + + @Schema(description = "erp源库位名称", example = "赵六") + private String erpSourceWarehouseName; + + @Schema(description = "erp源库位编码") + private String erpSourceWarehouseNumber; + + @Schema(description = "erp目标工厂名称", example = "赵六") + private String erpTargetFactoryName; + + @Schema(description = "erp目标工厂编码") + private String erpTargetFactoryNumber; + + @Schema(description = "erp目标库位名称", example = "ZT") + private String erpTargetWarehouseName; + + @Schema(description = "erp目标库位编码") + private String erpTargetWarehouseNumber; + + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) + private LocalDateTime createTime; + + @Schema(description = "主库位ID") + private Long mainWarehouseId; +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseImpl.java new file mode 100644 index 00000000..5fbc5a42 --- /dev/null +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/api/InternalWarehouseImpl.java @@ -0,0 +1,39 @@ +package com.zt.plat.module.erp.api; + +import cn.hutool.core.bean.BeanUtil; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.module.erp.api.dto.internalWarehouse.InternalWarehouseDTO; +import com.zt.plat.module.erp.controller.admin.erp.internalwarehouse.vo.InternalWarehouseRespVO; +import com.zt.plat.module.erp.controller.admin.erp.vo.WarehouseFactoryRespVO; +import com.zt.plat.module.erp.dal.dataobject.erp.internalwarehouse.InternalWarehouseDO; +import com.zt.plat.module.erp.service.erp.WarehouseFactoryService; +import com.zt.plat.module.erp.service.erp.internalwarehouse.InternalWarehouseService; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; + +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +@RestController +@Validated +@Slf4j +public class InternalWarehouseImpl implements InternalWarehouseApi { + @Resource + private InternalWarehouseService internalWarehouseService; + @Resource + private WarehouseFactoryService warehouseFactoryService; + @Override + public CommonResult>getInternalWarehouseListByFactoryCodeAndWarehouseCode(String factoryCode, String warehouseCode, String mmsiType,String operationType) { + InternalWarehouseDO internalWarehouse = internalWarehouseService.getInternalWarehouseByFactoryCodeAndWarehouseCode(factoryCode, warehouseCode); + if (internalWarehouse == null){ + return success(new ArrayList<>()); + } + List warehouseFactoryByParams = warehouseFactoryService.getWarehouseFactoryByParams(internalWarehouse.getId(), mmsiType, operationType); + return success(BeanUtil.copyToList(warehouseFactoryByParams, InternalWarehouseDTO.class)); + } +} diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryService.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryService.java index ce0b8b5a..dae07fe3 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryService.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryService.java @@ -70,4 +70,6 @@ public interface WarehouseFactoryService { */ List getWarehouseFactoryByMainId(String mainId); + List getWarehouseFactoryByParams(Long id, String mmsiType, String operationType); + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryServiceImpl.java index 8c9a6a69..9c751f7c 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/WarehouseFactoryServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.erp.controller.admin.erp.vo.WarehouseFactoryPageReqVO; import com.zt.plat.module.erp.controller.admin.erp.vo.WarehouseFactoryRespVO; import com.zt.plat.module.erp.controller.admin.erp.vo.WarehouseFactorySaveReqVO; @@ -59,12 +60,12 @@ public class WarehouseFactoryServiceImpl implements WarehouseFactoryService { } @Override - public void deleteWarehouseFactoryListByIds(List ids) { + public void deleteWarehouseFactoryListByIds(List ids) { // 校验存在 validateWarehouseFactoryExists(ids); // 删除 warehouseFactoryMapper.deleteByIds(ids); - } + } private void validateWarehouseFactoryExists(List ids) { List list = warehouseFactoryMapper.selectByIds(ids); @@ -92,7 +93,7 @@ public class WarehouseFactoryServiceImpl implements WarehouseFactoryService { @Override public List getWarehouseFactoryByMainId(String mainId) { List warehouseFactoryDOS = warehouseFactoryMapper.selectList(WarehouseFactoryDO::getMainWarehouseId, mainId); - List warehouseFactoryRespVOS=new ArrayList<>(); + List warehouseFactoryRespVOS = new ArrayList<>(); for (WarehouseFactoryDO warehouseFactoryDO : warehouseFactoryDOS) { WarehouseFactoryRespVO bean = BeanUtils.toBean(warehouseFactoryDO, WarehouseFactoryRespVO.class); bean.setMmsiType(warehouseFactoryDO.getMmsiType()); @@ -101,4 +102,14 @@ public class WarehouseFactoryServiceImpl implements WarehouseFactoryService { return warehouseFactoryRespVOS; } + @Override + public List getWarehouseFactoryByParams(Long mainId, String mmsiType, String operationType) { + return BeanUtils.toBean( + warehouseFactoryMapper.selectList(new LambdaQueryWrapperX() + .eq(WarehouseFactoryDO::getMainWarehouseId, mainId) + .eqIfPresent(WarehouseFactoryDO::getMmsiType, mmsiType) + .eqIfPresent(WarehouseFactoryDO::getOperationType, operationType)), + WarehouseFactoryRespVO.class); + } + } \ No newline at end of file diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java index 5160d946..a2b7217b 100644 --- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java +++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/internalwarehouse/InternalWarehouseServiceImpl.java @@ -136,4 +136,5 @@ public class InternalWarehouseServiceImpl implements InternalWarehouseService { ); } + } \ No newline at end of file