From 168d191eaa6bb0ec514bbc3d25ff1633fab3276e Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 22 May 2025 09:35:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../dromara/wms/domain/BaseMachineInfo.java | 1 + .../dromara/wms/domain/BaseToolingInfo.java | 5 ---- .../dromara/wms/mapper/WmsPdaApiMapper.java | 4 +++- .../wms/service/IWmsPdaApiService.java | 2 ++ .../service/impl/WmsPdaApiServiceImpl.java | 24 +++++++++---------- .../resources/mapper/wms/WmsPdaApiMapper.xml | 5 +++- .../src/main/resources/application.properties | 2 +- 8 files changed, 24 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index b415946..e9b0e53 100644 --- a/pom.xml +++ b/pom.xml @@ -71,10 +71,10 @@ - dev + devw - dev + devw 127.0.0.1:8848 DEFAULT_GROUP DEFAULT_GROUP diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java index 839ff7d..0ba95ab 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseMachineInfo.java @@ -7,4 +7,5 @@ public class BaseMachineInfo { private String machineCode, machineName, machineIp; + private Long machineId; } diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java index 7859bb8..d02a054 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/BaseToolingInfo.java @@ -1,15 +1,10 @@ package org.dromara.wms.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; import org.dromara.common.tenant.core.TenantEntity; import java.io.Serial; -import java.math.BigDecimal; /** * 载具工装信息对象 base_tooling_info 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 d693f35..393d06b 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 @@ -38,7 +38,6 @@ public interface WmsPdaApiMapper { List selectSemiStore(); /** * @param storeId 仓库 - * @return */ List selectRawCheckLocationList(@Param("storeId") Long storeId); @@ -53,4 +52,7 @@ public interface WmsPdaApiMapper { BaseToolingInfo productBindSelectVehicle(@Param("code") String code); TyreInfo productBindSelectTyreCode(@Param("code") String code); + + @Select("select station_code from prod_base_station_info where machine_id=#{machineId} and del_flag=0") + List selectMachineStationList(@Param("machineId") Long machineId); } 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 82053f0..a3b2c75 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 @@ -62,4 +62,6 @@ public interface IWmsPdaApiService { BaseToolingInfo productBindSelectVehicle(String code); TyreInfo productBindSelectTyreCode(String code); + + List selectMachineStationList(Long machineId); } 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 0579d60..5a0557d 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 @@ -40,7 +40,7 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { private final WmsInventoryMapper wmsInventoryMapper; private final WmsOutstockDetailMapper wmsOutstockDetailMapper; private final BaseMaterialInfoMapper baseMaterialInfoMapper;//物料基础信息 - + private final WmsHppTransferMapper wmsHppTransferMapper; @Override public WmsOutstockRecordVo returnSelectCode(String code) { @@ -59,7 +59,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return apiMapper.productSelectVehicleInfo(code); } - @Override public Boolean bindVehicleSubmit(String vehicleCode, List productList) { String userId = String.valueOf(LoginHelper.getUserId()); @@ -75,7 +74,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return false; } - @Translation(type = "Exception") @Override public Boolean productSubmitInStoreInfo(WmsPsmInLoadVo vo) { @@ -110,11 +108,13 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return baseMapper.semiSelectVehicleInfo(code); } - @Override public Boolean updataInStoreRecord(WmsHppInStockDetailVo vo) { LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId()).set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId()).set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime()).set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername()); + lambdaUpdateWrapper.eq(WmsHppInStockDetail::getObjId, vo.getObjId()) + .set(WmsHppInStockDetail::getStorePlaceId, vo.getStorePlaceId()) + .set(WmsHppInStockDetail::getUpdateTime, DateUtils.getTime()) + .set(WmsHppInStockDetail::getUpdateBy, LoginHelper.getUsername()); int rows = hppInStockDetailMapper.update(null, lambdaUpdateWrapper); if (rows > 0) { // System.out.println("更新成功"); @@ -144,7 +144,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return hppStorageDetailMapper.selectHppStorageDetailInfobyCode(code); } - @Override public Boolean semiSubmitOutInfo(WmsHppStorageDetailVo vo) { if (vo.getStorageNum() == vo.getOutNumber()) { @@ -162,13 +161,11 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return true; } - @Override public WmsInstockPrintVo inSelectCode(String code) { return wmsInstockPrintMapper.inSelectCode(code); } - @Override public Boolean inSubmit(WmsInstockPrintVo vo) { // 插入记录 @@ -193,7 +190,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return true; } - @Override public List outSelectByOrderCode(String orderCode) { MPJLambdaWrapper lqw = JoinWrappers.lambda(WmsOutstockDetail.class).selectAll(WmsOutstockDetail.class).select(BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec).leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockDetail::getMaterialId).eq(WmsOutstockDetail::getOutstockCode, orderCode); @@ -265,7 +261,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return null; } - @Override public List storeCheckSelectLocation(String type, Long storeId) { @@ -321,7 +316,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { return null; } - @Override public Boolean storeCheckSubmitCheckRecord(WmsInventoryCheckRecord wmsInventoryCheckRecord) { wmsInventoryCheckRecord.setCheckStatus( @@ -351,8 +345,6 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { } - private final WmsHppTransferMapper wmsHppTransferMapper; - @Override public Boolean seimMoveSubmit(Long id, String placeId) { // 查询 @@ -383,4 +375,10 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { public TyreInfo productBindSelectTyreCode(String code) { return apiMapper.productBindSelectTyreCode(code); } + + @Override + public List selectMachineStationList(Long machineId) { + System.out.println(machineId); + return apiMapper.selectMachineStationList(machineId); + } } 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 8d475a8..4680226 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 @@ -115,7 +115,8 @@ + + diff --git a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties index eccc3b9..25e4b6b 100644 --- a/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties +++ b/ruoyi-visual/ruoyi-nacos/src/main/resources/application.properties @@ -46,7 +46,7 @@ db.num=1 db.url.0=jdbc:mysql://1.13.177.47:3306/hwmom_config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true db.user.0=root -db.password.0=haiwei@123 +db.password.0=Haiwei123456 ### the maximum retry times for push nacos.config.push.maxRetryTime=50