From 828420badeb7c60f4afc7a3a97626fe5836eca29 Mon Sep 17 00:00:00 2001 From: wanghao Date: Thu, 22 May 2025 14:29:49 +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 --- .../qms/mapper/QcDefectDetailMapper.java | 4 +- .../qms/mapper/QcDefectInfoMapper.java | 4 +- .../wms/controller/WmsPdaApiController.java | 16 ++++- .../controller/api/MachineApiController.java | 61 +++++++++++++++++++ 4 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java index 575decd1..d15310cf 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectDetailMapper.java @@ -1,8 +1,9 @@ package org.dromara.qms.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.qms.domain.QcDefectDetail; import org.dromara.qms.domain.vo.QcDefectDetailVo; -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 LionLi * @date 2025-01-10 */ +@Repository public interface QcDefectDetailMapper extends BaseMapperPlus { } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java index f38ee043..3a547437 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/mapper/QcDefectInfoMapper.java @@ -1,8 +1,9 @@ package org.dromara.qms.mapper; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.qms.domain.QcDefectInfo; import org.dromara.qms.domain.vo.QcDefectInfoVo; -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 LionLi * @date 2025-01-10 */ +@Repository public interface QcDefectInfoMapper extends BaseMapperPlus { } 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 98bd172b..7a468ec7 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 @@ -317,10 +317,24 @@ public class WmsPdaApiController extends BaseController { return result ? R.ok() : R.fail(); } - + /** + * 查询机台 + * @return + */ @PostMapping("/selectMachineInfo") public R> slectMachineInfo() { List list = apiService.slectMachineInfo(); return R.ok(list); } + + /** + * 查询机台工位 + * @return prod_base_station_info + */ + @PostMapping("/selectMachineStationList") + public R> selectMachineStationList(Long machineId) { + List list = apiService.selectMachineStationList(machineId); + return list == null ? R.fail() : R.ok(list); + } + } 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 new file mode 100644 index 00000000..66f68720 --- /dev/null +++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/MachineApiController.java @@ -0,0 +1,61 @@ +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; +import org.dromara.wms.domain.vo.WmsInventoryVo; +import org.dromara.wms.service.IWmsHppStorePlaceService; +import org.dromara.wms.service.IWmsPdaApiService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RequiredArgsConstructor +@RestController +@RequestMapping("/machineApi") +public class MachineApiController extends BaseController { + + private final IWmsPdaApiService apiService; + + private final IWmsHppStorePlaceService wmsHppStorePlaceService; + + + /** + * 半成品入库提交 + * + * @param vo xinx + */ + @ApiEncrypt + @PostMapping("/semi/submitInstore") + public R semiSubmitInStoreInfo(@RequestBody WmsHppInStockDetailVo vo) { + // 验证库位条码 + WmsHppStorePlaceVo wmsPsmStorePlace = wmsHppStorePlaceService.selectStorePlaceInfoByCode(vo.getStorePlaceCode()); + if (wmsPsmStorePlace == null) { + return R.fail("库位编码扫描错误"); + } + vo.setStorePlaceId(wmsPsmStorePlace.getObjId()); + Boolean result = apiService.updataInStoreRecord(vo); + return result ? R.ok() : R.fail(); + } + + + + // 根据库位查询库存 + @PostMapping("/storeCheck/selectInventory") + public R> storeCheckSelectInventory(String locationCode, String type) { + List list = apiService.storeCheckSelectInventory(locationCode, type); + if (list == null || list.isEmpty()) { + return R.fail(); + } + return R.ok(list); + } + + + +}