增加 工位查询

pom.xml

@@ -71,10 +71,10 @@
 
     <profiles>
         <profile>
-            <id>dev</id>
+            <id>devw</id>
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <profiles.active>dev</profiles.active>
+                <profiles.active>devw</profiles.active>
                 <nacos.server>127.0.0.1:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>

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;
 }

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

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/mapper/WmsPdaApiMapper.java

@@ -38,7 +38,6 @@ public interface WmsPdaApiMapper {
     List<StoreInfoVo> selectSemiStore();
     /**
      * @param storeId 仓库
-     * @return
      */
     List<WmsBaseLocationVo> 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<String> selectMachineStationList(@Param("machineId") Long machineId);
 }

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<String> selectMachineStationList(Long machineId);
 }

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<String> 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<WmsHppInStockDetail> 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<WmsOutstockDetailVo> outSelectByOrderCode(String orderCode) {
         MPJLambdaWrapper<WmsOutstockDetail> 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<WmsBaseLocationVo> 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<String> selectMachineStationList(Long machineId) {
+        System.out.println(machineId);
+        return apiMapper.selectMachineStationList(machineId);
+    }
 }

ruoyi-modules/hwmom-wms/src/main/resources/mapper/wms/WmsPdaApiMapper.xml

@@ -115,7 +115,8 @@
 
     </resultMap>
     <select id="slectMachineInfo" resultMap="baseMachineMap">
-        select machine_code,
+        select machine_id,
+               machine_code,
                machine_name,
                concat(machine_ip, ':', machine_port) as machine_ip
         from prod_base_machine_info
@@ -150,4 +151,6 @@
        select material_id,return_barcode from prod_product_plan_detail_4 where  return_barcode =#{code}
     </select>
 
+
+
 </mapper>

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