From 857aafcfc1daa664bd3ca964dc845a141fc00ef2 Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 23 May 2025 17:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/controller/api/MachineApiController.java | 3 +-- .../{ => api}/WmsPdaApiController.java | 14 +++++++++++--- .../dromara/wms/domain/WmsHppOutStockDetail.java | 6 +++--- .../wms/domain/bo/WmsHppOutStockDetailBo.java | 11 ++++++----- .../wms/domain/vo/WmsHppOutStockDetailVo.java | 4 +--- .../wms/mapper/WmsHppStorageDetailMapper.java | 2 +- .../org/dromara/wms/mapper/WmsPdaApiMapper.java | 7 +++---- .../dromara/wms/service/IWmsPdaApiService.java | 2 ++ .../wms/service/impl/WmsPdaApiServiceImpl.java | 16 +++++++++++++--- .../resources/mapper/wms/WmsPdaApiMapper.xml | 7 +++++++ 10 files changed, 48 insertions(+), 24 deletions(-) rename ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/{ => api}/WmsPdaApiController.java (96%) diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java index 66f6872..fad57db 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java @@ -2,7 +2,6 @@ package org.dromara.wms.controller.api; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.dromara.common.web.core.BaseController; import org.dromara.wms.domain.vo.WmsHppInStockDetailVo; import org.dromara.wms.domain.vo.WmsHppStorePlaceVo; @@ -31,7 +30,7 @@ public class MachineApiController extends BaseController { * * @param vo xinx */ - @ApiEncrypt + @PostMapping("/semi/submitInstore") public R semiSubmitInStoreInfo(@RequestBody WmsHppInStockDetailVo vo) { // 验证库位条码 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/api/WmsPdaApiController.java similarity index 96% rename from ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsPdaApiController.java rename to ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java index 9f93d7d..cfaac38 100644 --- 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/api/WmsPdaApiController.java @@ -1,4 +1,4 @@ -package org.dromara.wms.controller; +package org.dromara.wms.controller.api; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -28,8 +28,16 @@ public class WmsPdaApiController extends BaseController { * 原材料退库-现场扫描 */ @PostMapping("/raw/returnSelectCode") - public R returnSelectCode(String code) { - WmsOutstockRecordVo wmsOutstockRecordVo = apiService.returnSelectCode(code); + public R returnSelectCode(String code,int type) { + + WmsOutstockRecordVo wmsOutstockRecordVo = null; + if (type == 1) { + + wmsOutstockRecordVo = apiService.returnSelectCode(code); + } else if (type == 2) { + wmsOutstockRecordVo = apiService.setHppOutRecord(code); + } + if (wmsOutstockRecordVo == null) { return R.fail("条码错误，不能退库"); diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java index 0203efd..4037fba 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppOutStockDetail.java @@ -1,9 +1,7 @@ package org.dromara.wms.domain; -import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serial; import java.util.Date; @@ -80,10 +78,12 @@ public class WmsHppOutStockDetail{ */ @TableField(fill = FieldFill.INSERT_UPDATE) private Date updateTime; - @TableField(exist = false) + // @TableField(exist = false) private String storePlaceCode; @TableField(exist = false) private String targertStorePlaceCode; + private Long materialId; + } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java index 8b82f8b..6b97cfc 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/bo/WmsHppOutStockDetailBo.java @@ -1,12 +1,13 @@ package org.dromara.wms.domain.bo; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.wms.domain.WmsHppOutStockDetail; /** @@ -62,5 +63,5 @@ public class WmsHppOutStockDetailBo extends BaseEntity { @NotNull(message = "目的库位不能为空", groups = { AddGroup.class, EditGroup.class }) private Long targetStorePlaceId; - + private Long materialId; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java index a425472..c8e09f7 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppOutStockDetailVo.java @@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; import org.dromara.wms.domain.WmsHppOutStockDetail; @@ -97,6 +95,6 @@ public class WmsHppOutStockDetailVo implements Serializable { private Date updateTime; private String storePlaceCode; private String targertStorePlaceCode; - + private Long materialId; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java index ca16b80..72f2b53 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsHppStorageDetailMapper.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Repository; */ @Repository public interface WmsHppStorageDetailMapper extends BaseMapperPlus { - @Select("select top 1 obj_id, card_no,shelf_no,material_id,storage_num,material_code,unit_name,create_time," + + @Select("select top 1 obj_id, card_no,shelf_no,material_id,store_place_code,storage_num,material_code,unit_name,create_time," + " dateadd(hh, min_parking_time, create_time) as min_time,dateadd(hh, max_parking_time, create_time) as max_time " + "from wms_hpp_storage_detail where card_no=#{code} ") WmsHppStorageDetailVo selectHppStorageDetailInfobyCode(String code); 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 index 393d06b..128e080 100644 --- 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 @@ -4,10 +4,7 @@ import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; import org.dromara.wms.domain.*; -import org.dromara.wms.domain.vo.StoreInfoVo; -import org.dromara.wms.domain.vo.TeamInfoVo; -import org.dromara.wms.domain.vo.WmsBaseLocationVo; -import org.dromara.wms.domain.vo.WmsPsmInLoadVo; +import org.dromara.wms.domain.vo.*; import org.springframework.stereotype.Repository; import java.util.List; @@ -55,4 +52,6 @@ public interface WmsPdaApiMapper { @Select("select station_code from prod_base_station_info where machine_id=#{machineId} and del_flag=0") List selectMachineStationList(@Param("machineId") Long machineId); + + WmsOutstockRecordVo setHppOutRecord(String code); } 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 index a3b2c75..27b1503 100644 --- 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 @@ -64,4 +64,6 @@ public interface IWmsPdaApiService { TyreInfo productBindSelectTyreCode(String code); List selectMachineStationList(Long machineId); + + WmsOutstockRecordVo setHppOutRecord(String code); } 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 index c20bae6..d0783eb 100644 --- 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 @@ -45,7 +45,11 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { @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); + 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); } @@ -129,8 +133,8 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { hppStorageDetail.setObjId(null); hppStorageDetail.setStorageNum(vo.getInstockNum()); BaseMaterialInfoVo baseMaterialInfoVo = baseMaterialInfoMapper.selectVoById(vo.getMaterialId()); - hppStorageDetail.setMinParkingTime(baseMaterialInfoVo.getMinParkingTime()); - hppStorageDetail.setMaxParkingTime(baseMaterialInfoVo.getMaxParkingTime()); + hppStorageDetail.setMinParkingTime(baseMaterialInfoVo.getMinParkingTime() / 3600); + hppStorageDetail.setMaxParkingTime(baseMaterialInfoVo.getMaxParkingTime() / 3600); hppStorageDetailMapper.insert(hppStorageDetail); return true; } @@ -162,6 +166,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { BeanUtils.copyProperties(vo, outStockDetail); outStockDetail.setObjId(null); outStockDetail.setCreateBy(LoginHelper.getUsername()); + // System.out.println(outStockDetail.getStorePlaceCode()); hppOutStockDetailMapper.insert(outStockDetail); return true; } @@ -386,4 +391,9 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { System.out.println(machineId); return apiMapper.selectMachineStationList(machineId); } + + @Override + public WmsOutstockRecordVo setHppOutRecord(String code) { + return apiMapper.setHppOutRecord(code); + } } 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 index 4680226..7bc6036 100644 --- a/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml +++ b/ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml @@ -151,6 +151,13 @@ select material_id,return_barcode from prod_product_plan_detail_4 where return_barcode =#{code} + + + + +