增加 工位查询

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<QcDefectDetail, QcDefectDetailVo> {
 
 }

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<QcDefectInfo, QcDefectInfoVo> {
 
 }

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<List<BaseMachineInfo>> slectMachineInfo() {
         List<BaseMachineInfo> list = apiService.slectMachineInfo();
         return R.ok(list);
     }
+
+    /**
+     * 查询机台工位
+     * @return prod_base_station_info
+     */
+    @PostMapping("/selectMachineStationList")
+    public R<List<String>> selectMachineStationList(Long machineId) {
+        List<String> list = apiService.selectMachineStationList(machineId);
+        return list == null ? R.fail() : R.ok(list);
+    }
+
 }

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<Void> 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<List<WmsInventoryVo>> storeCheckSelectInventory(String locationCode, String type) {
+        List<WmsInventoryVo> list = apiService.storeCheckSelectInventory(locationCode, type);
+        if (list == null || list.isEmpty()) {
+            return R.fail();
+        }
+        return R.ok(list);
+    }
+
+
+
+}