From b152acfd4750dbd8af3a07aa52f6e384532fe0f2 Mon Sep 17 00:00:00 2001 From: wanghao Date: Mon, 20 Jan 2025 19:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=80=80=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/WmsPdaApiController.java | 39 ++++++++++++++++ .../org/dromara/wms/domain/WmsMoveOrder.java | 8 +--- .../dromara/wms/domain/WmsOutstockRecord.java | 2 + .../wms/domain/bo/WmsReturnOrderBo.java | 2 +- .../wms/domain/vo/WmsOutstockRecordVo.java | 2 + .../wms/mapper/WmsOutstockRecordMapper.java | 2 + .../dromara/wms/mapper/WmsPdaApiMapper.java | 9 ++++ .../wms/service/IWmsPdaApiService.java | 9 ++++ .../service/impl/WmsPdaApiServiceImpl.java | 46 +++++++++++++++++++ .../impl/WmsReturnOrderServiceImpl.java | 1 + .../resources/mapper/wms/WmsPdaApiMapper.xml | 11 +++++ 11 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java create mode 100644 ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java new file mode 100644 index 00000000..30498982 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java @@ -0,0 +1,39 @@ +package org.dromara.wms.controller; + +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.web.core.BaseController; +import org.dromara.wms.domain.bo.WmsReturnOrderBo; +import org.dromara.wms.domain.vo.WmsOutstockRecordVo; +import org.dromara.wms.service.IWmsPdaApiService; +import org.dromara.wms.service.IWmsReturnOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/pda") +public class WmsPdaApiController extends BaseController { + @Autowired + private IWmsPdaApiService apiService; + @Autowired + private IWmsReturnOrderService wmsReturnOrderService; + + @PostMapping("/raw/returnSelectCode") + public R returnSelectCode(String code) { + WmsOutstockRecordVo wmsOutstockRecordVo = apiService.returnSelectCode(code); + + if (wmsOutstockRecordVo == null) { + return R.fail("条码错误，不能退库"); + } + return R.ok(wmsOutstockRecordVo); + } + @PostMapping("/raw/returnSubmit") + public R rawReturnSubmit( @RequestBody WmsReturnOrderBo bo) { + Boolean result = wmsReturnOrderService.insertByBo(bo); + if (result) { + apiService.rawReturnSubmitUpdateStateById(bo.getOutstockRecordId()); + } + return toAjax(result); + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java index 4001f252..f4553441 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsMoveOrder.java @@ -90,8 +90,7 @@ public class WmsMoveOrder{ * 租户id */ private String tenantId; - @TableField(fill = FieldFill.INSERT) - private String createBy; + /** * 创建时间 @@ -99,11 +98,6 @@ public class WmsMoveOrder{ @TableField(fill = FieldFill.INSERT) private Date createTime; - /** - * 更新者 - */ - @TableField(fill = FieldFill.INSERT_UPDATE) - private String updateBy; /** * 更新时间 diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java index d2af59a4..d7bfa7cc 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsOutstockRecord.java @@ -92,4 +92,6 @@ public class WmsOutstockRecord extends TenantEntity { @TableField(exist = false) private java.math.BigDecimal returnQty; private String returnFlag; + @TableField(exist = false) + private Long warehouseId; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java index 11991a37..9a586633 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsReturnOrderBo.java @@ -122,6 +122,6 @@ public class WmsReturnOrderBo extends BaseEntity{ private String tenantId; private String materialCode; - + private Long outstockRecordId; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java index 9075c6ec..d74d90be 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsOutstockRecordVo.java @@ -110,4 +110,6 @@ public class WmsOutstockRecordVo implements Serializable { private String materialUnit; private String materialSpec; private String returnFlag; + private Long warehouseId; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockRecordMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockRecordMapper.java index fbbd0b6b..6eafe674 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockRecordMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsOutstockRecordMapper.java @@ -3,6 +3,7 @@ package org.dromara.wms.mapper; import org.dromara.wms.domain.WmsOutstockRecord; import org.dromara.wms.domain.vo.WmsOutstockRecordVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.springframework.stereotype.Repository; /** * 出库记录Mapper接口 @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author Yinq * @date 2025-01-09 */ +@Repository public interface WmsOutstockRecordMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java new file mode 100644 index 00000000..f1eb44c3 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java @@ -0,0 +1,9 @@ +package org.dromara.wms.mapper; + +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +@Repository +public interface WmsPdaApiMapper { + void rawReturnSubmitUpdateStateById(@Param("warehouseId") Long warehouseId); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java new file mode 100644 index 00000000..78d9dab0 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/IWmsPdaApiService.java @@ -0,0 +1,9 @@ +package org.dromara.wms.service; + +import org.dromara.wms.domain.vo.WmsOutstockRecordVo; + +public interface IWmsPdaApiService { + WmsOutstockRecordVo returnSelectCode(String code); + + void rawReturnSubmitUpdateStateById(Long warehouseId); +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java new file mode 100644 index 00000000..4f4d2887 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java @@ -0,0 +1,46 @@ +package org.dromara.wms.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.yulichang.toolkit.JoinWrappers; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import io.github.linpeilie.BaseMapper; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.wms.domain.BaseMaterialInfo; +import org.dromara.wms.domain.WmsBaseLocation; +import org.dromara.wms.domain.WmsBaseWarehouse; +import org.dromara.wms.domain.WmsOutstockRecord; +import org.dromara.wms.domain.vo.WmsOutstockRecordVo; +import org.dromara.wms.mapper.WmsOutstockRecordMapper; +import org.dromara.wms.mapper.WmsPdaApiMapper; +import org.dromara.wms.service.IWmsPdaApiService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class WmsPdaApiServiceImpl implements IWmsPdaApiService { + @Autowired + private WmsOutstockRecordMapper wmsOutstockRecordMapper; +@Autowired +private WmsPdaApiMapper apiMapper; + + + @Override + public WmsOutstockRecordVo returnSelectCode(String code) { + MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsOutstockRecord.class) + .selectAll(WmsOutstockRecord.class) + .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec) + .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId) + .select(WmsBaseLocation::getWarehouseId) + .leftJoin(WmsBaseLocation.class,WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode) + .eq(WmsOutstockRecord::getBatchCode, code) + .eq(WmsOutstockRecord::getReturnFlag, 0) + .orderByDesc(WmsOutstockRecord::getCreateTime); + return wmsOutstockRecordMapper.selectVoOne(lqw); + } + + @Override + public void rawReturnSubmitUpdateStateById(Long warehouseId) { + apiMapper.rawReturnSubmitUpdateStateById(warehouseId); + + } +} diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsReturnOrderServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsReturnOrderServiceImpl.java index fecc37f5..80b1cedc 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsReturnOrderServiceImpl.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsReturnOrderServiceImpl.java @@ -133,6 +133,7 @@ public class WmsReturnOrderServiceImpl implements IWmsReturnOrderService { @Override public Boolean insertByBo(WmsReturnOrderBo bo) { WmsReturnOrder add = MapstructUtils.convert(bo, WmsReturnOrder.class); + validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { diff --git a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml new file mode 100644 index 00000000..f25459d5 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml @@ -0,0 +1,11 @@ + + + + + + + update wms_outstock_record set return_flag= '1' where outstock_record_id=#{warehouseId} + +