From 5dedabcc719edd3523263e2a7a47dfb5e3d1dcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Tue, 28 Apr 2026 17:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E8=BD=AE?=
=?UTF-8?q?=E8=83=8E=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=E4=BB=A5=E5=8F=8A=E8=B0=83=E6=8B=A8=E5=87=BA=E5=BA=93=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tyre/BaseInventoryController.java | 6 +++---
.../ruoyi/system/domain/BaseInventory.java | 10 +++++-----
.../ruoyi/system/mapper/BaseTyreMapper.java | 2 ++
.../impl/BaseInventoryServiceImpl.java | 20 ++++++++++++++++---
.../resources/mapper/tyre/BaseTyreMapper.xml | 8 ++++++++
5 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java
index 8966910a..095b447c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseInventoryController.java
@@ -142,13 +142,13 @@ public class BaseInventoryController extends BaseController
if (baseInventory == null) {
return error("库存对象不能为空");
}
- if (baseInventory.getType() == null) {
+ if (baseInventory.getOutType() == null) {
return error("出库类型不能为空");
}
// 2. 业务分发
try {
- switch (baseInventory.getType()) {
+ switch (baseInventory.getOutType()) {
case "0":
// 执行正常出库逻辑
return baseInventoryService.OutInventoryByPda(baseInventory, baseTyre);
@@ -158,7 +158,7 @@ public class BaseInventoryController extends BaseController
return baseInventoryService.transferOutInventoryByPda(baseInventory, baseTyre);
default:
// 如果出库类型不匹配，明确报错。
- return error("不支持的出库类型: " + baseInventory.getType());
+ return error("不支持的出库类型: " + baseInventory.getOutType());
}
} catch (Exception e) {
// 3. 异常捕获：防止后台报错导致前台卡死
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseInventory.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseInventory.java
index e07535a8..668b14e5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseInventory.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseInventory.java
@@ -44,14 +44,14 @@ public class BaseInventory extends BaseEntity
private Long deptId;
//出库类型 0正常出库 1调拨出库
- private String type;
+ private String outType;
- public String getType() {
- return type;
+ public String getOutType() {
+ return outType;
}
- public void setType(String type) {
- this.type = type;
+ public void setOutType(String outType) {
+ this.outType = outType;
}
public String getTeam() {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTyreMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTyreMapper.java
index 85b61fb5..760ebca3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTyreMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseTyreMapper.java
@@ -92,4 +92,6 @@ public interface BaseTyreMapper
BaseTyre selectBaseTyreByKeyParam(BaseTyre baseTyre);
+
+ int updateBaseTyreByEpc(BaseTyre baseTyre);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java
index b6b4b51e..193985a8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseInventoryServiceImpl.java
@@ -138,7 +138,20 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService
int m=0,t=0;
try {
if (isbaseInventory!=null){
- return AjaxResult.error("该轮胎已存在！");
+ //更改库存状态
+ baseInventory.setStatus("0");
+ baseInventory.setUpdateBy(baseInventory.getCreateBy());
+ baseInventory.setUpdateTime(DateUtils.getNowDate());
+ //更新库存表出仓-在仓
+ baseInventoryMapper.updateBaseInventoryByEpc(baseInventory);
+ //插入库记录表
+ RecordWarehousing recordWarehousing = new RecordWarehousing();
+ recordWarehousing.setTyreRfid(baseInventory.getTyreRfid());
+ recordWarehousing.setType("0");
+ recordWarehousing.setCreateTime(DateUtils.getNowDate());
+ recordWarehousing.setCreateBy(baseInventory.getCreateBy());
+ recordWarehousingMapper.insertRecordWarehousing(recordWarehousing);
+ return AjaxResult.success("入库成功!");
}else {
//插入库存表以及基础信息表
baseInventory.setStatus("0");
@@ -419,8 +432,9 @@ public class BaseInventoryServiceImpl implements IBaseInventoryService
recordWarehousing.setCreateBy(baseInventory.getCreateBy());
int m = recordWarehousingMapper.insertRecordWarehousing(recordWarehousing);
//调拨出库要修改轮胎的所属部门
- int w = baseTyreMapper.updateBaseTyre(baseTyre);
- if (n>0&&m>0){
+ baseTyre.setTyreEpc(baseInventory.getTyreRfid());
+ int w = baseTyreMapper.updateBaseTyreByEpc(baseTyre);
+ if (n>0&&m>0&&w>0){
return AjaxResult.success("出库成功！");
}
}catch (Exception e){
diff --git a/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml b/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
index 4c74e0b9..ce65d700 100644
--- a/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml
@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -260,6 +261,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where tyre_id = #{tyreId}
+
+ update base_tyre
+
+ dept_id = #{deptId},
+
+ where tyre_epc = #{tyreEpc}
+
delete from base_tyre where tyre_id = #{tyreId}