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 index 9e5f9379..3ce810ef 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/WmsPdaApiController.java @@ -101,6 +101,7 @@ public class WmsPdaApiController extends BaseController { if (wmsInventory == null) { R.fail("物料不在待出库列表内"); } + assert wmsInventory != null; if (wmsInventory.getInventoryQty().compareTo(outstockRecord.getOutstockQty()) < 0) { R.fail("当前库位库存为:" + wmsInventory.getInventoryQty()); } @@ -253,7 +254,7 @@ public class WmsPdaApiController extends BaseController { /** * 查询库存存储库位 * - * @param type 原材料、半成品? + * @param type 原材料、半成品盘点 * @param storeId 仓库id */ @PostMapping("/storeCheck/selectInventorLocationList") diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java index e414f7c3..e0f02cef 100644 --- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsHppStorageDetail.java @@ -3,6 +3,7 @@ package org.dromara.wms.domain; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.io.Serial; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -14,7 +15,7 @@ import java.util.Date; */ @Data @TableName("wms_hpp_storage_detail") -public class WmsHppStorageDetail { +public class WmsHppStorageDetail implements Serializable { @Serial private static final long serialVersionUID = 1L; 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 9ffbf218..f2be1389 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,7 @@ public interface WmsPdaApiMapper { int shiftChangeSubmit(ShiftChange shiftChange); List selectRawStore(); - + List selectSemiStore(); /** * @param storeId 仓库 * @return @@ -47,4 +47,8 @@ public interface WmsPdaApiMapper { @Update("UPDATE wms_inventory_check SET check_status =#{status} ,end_time = getdate() WHERE check_code =#{checkCode} ") int updateWmsInventoryCheck(@Param("checkCode") String checkCode,@Param("status") int status); + + List selectSemiCheckLocationList(Long storeId); + + } 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 5e9fb93b..9517f76d 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 @@ -257,14 +257,27 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService { @Override public List selectStoreInfo(String type) { - return apiMapper.selectRawStore(); + if (type.equals("原材料盘点")){ + return apiMapper.selectRawStore(); + }else if (type.equals("半成品盘点")){ + return apiMapper.selectSemiStore(); + } + return null; } @Override public List storeCheckSelectLocation(String type, Long storeId) { - return apiMapper.selectRawCheckLocationList(storeId); + + if (type.equals("原材料盘点")){ + return apiMapper.selectRawCheckLocationList(storeId); + }else if (type.equals("半成品盘点")){ + return apiMapper.selectSemiCheckLocationList(storeId); + } + + + return null; } // 查询盘点工单 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 1cf3e5aa..ec60d3d6 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 @@ -81,11 +81,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + +