From 36df3b6c3eddc77dccf9cd787708e8028d7d7253 Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 5 Sep 2025 10:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=A7=BB=E5=BA=93?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=20PDA=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/WmsPdaApiController.java | 10 ++++++---- .../wms/service/IWmsMoveOrderService.java | 4 +++- .../service/impl/WmsMoveOrderServiceImpl.java | 18 +++++++++++------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java index 749246a2..d6d6aadc 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java @@ -231,11 +231,13 @@ public class WmsPdaApiController extends BaseController { moveOrderBo.setPlanLocationCode(vo.getLocationCode()); moveOrderBo.setTargetLocationCode(vo.getNewLocationCode()); - wmsMoveOrderService.insertByBo(moveOrderBo); - boolean result = apiService.moveSubmit(vo); + Boolean inserted = wmsMoveOrderService.pdaInsertByBo(moveOrderBo); + if (inserted){ + boolean result = apiService.moveSubmit(vo); + return result ? R.ok() : R.fail(); + } + return R.fail(); - - return result ? R.ok() : R.fail(); } @PostMapping("/product/selectVehicle") diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsMoveOrderService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsMoveOrderService.java index e3c8df47..21cb404c 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsMoveOrderService.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsMoveOrderService.java @@ -1,7 +1,7 @@ package org.dromara.wms.service; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.wms.domain.bo.WmsMoveOrderBo; import org.dromara.wms.domain.vo.WmsMoveOrderVo; @@ -65,4 +65,6 @@ public interface IWmsMoveOrderService { * @return 是否删除成功 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + Boolean pdaInsertByBo(WmsMoveOrderBo moveOrderBo); } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java index 6429a1bf..d8107774 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsMoveOrderServiceImpl.java @@ -1,19 +1,16 @@ package org.dromara.wms.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.yulichang.toolkit.JoinWrappers; import com.github.yulichang.wrapper.MPJLambdaWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.wms.domain.*; -import org.dromara.wms.domain.bo.WmsInventoryBo; import org.dromara.wms.domain.bo.WmsMoveOrderBo; import org.dromara.wms.domain.vo.WmsInventoryVo; import org.dromara.wms.domain.vo.WmsMoveOrderVo; @@ -188,4 +185,11 @@ public class WmsMoveOrderServiceImpl implements IWmsMoveOrderService { } return baseMapper.deleteByIds(ids) > 0; } + + @Override + public Boolean pdaInsertByBo(WmsMoveOrderBo moveOrderBo) { + WmsMoveOrder add = MapstructUtils.convert(moveOrderBo, WmsMoveOrder.class); + + return baseMapper.insert(add)>0; + } }