From a0aa910ea8454d4af002ec0833d980b9ccd988ce Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Mon, 7 Jul 2025 09:42:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/controller/api/MachineApiController.java     | 12 +++++++-----
 .../dromara/wms/domain/vo/WmsHppInStockDetailVo.java |  3 +--
 .../java/org/dromara/wms/mapper/WmsPdaApiMapper.java |  2 ++
 .../org/dromara/wms/service/IWmsPdaApiService.java   |  2 ++
 .../wms/service/impl/WmsPdaApiServiceImpl.java       |  5 +++++
 .../main/resources/mapper/wms/WmsPdaApiMapper.xml    |  5 +++++
 6 files changed, 22 insertions(+), 7 deletions(-)

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
index fad57db..d8a07db 100644
--- 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
@@ -8,10 +8,7 @@ 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 org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -43,6 +40,12 @@ public class MachineApiController extends BaseController {
         return result ? R.ok() : R.fail();
     }
 
+    //删除
+    @GetMapping("/semi/deleteErrorCode")
+    public R<Void> semiDeleteErrorCode(String code) {
+       int i= apiService.semiDeleteErrorCode (code);
+        return R.ok();
+    }
 
 
     // 根据库位查询库存
@@ -56,5 +59,4 @@ public class MachineApiController extends BaseController {
     }
 
 
-
 }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java
index daca3b8..e193bf3 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsHppInStockDetailVo.java
@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import org.dromara.wms.domain.WmsHppInStockDetail;
@@ -112,5 +110,6 @@ public class WmsHppInStockDetailVo implements Serializable {
     private String storePlaceCode;
     private String materialCode;
     private String unitName;
+    private String machineTableId;
 
 }
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 128e080..ed99bb0 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
@@ -54,4 +54,6 @@ public interface WmsPdaApiMapper {
     List<String> selectMachineStationList(@Param("machineId") Long machineId);
 
     WmsOutstockRecordVo setHppOutRecord(String code);
+
+    int semiDeleteErrorCode(String code);
 }
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 27b1503..3a56e18 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
@@ -66,4 +66,6 @@ public interface IWmsPdaApiService {
     List<String> selectMachineStationList(Long machineId);
 
     WmsOutstockRecordVo setHppOutRecord(String code);
+
+    int semiDeleteErrorCode(String code);
 }
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 46e3e5c..33d5b32 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
@@ -388,4 +388,9 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
     public WmsOutstockRecordVo setHppOutRecord(String code) {
         return apiMapper.setHppOutRecord(code);
     }
+    // 上位机删除
+    @Override
+    public int semiDeleteErrorCode(String code) {
+        return apiMapper.semiDeleteErrorCode(code);
+    }
 }
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 8583255..5e16be7 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
@@ -171,5 +171,10 @@
         ORDER BY out.create_time DESC
     </select>
 
+    <delete id="semiDeleteErrorCode">
+        delete  from wms_hpp_storage_detail where card_no=#{code}
+        delete  from wms_hpp_in_stock_detail where card_no=#{code}
+    </delete>
+
 
 </mapper>