修改入库轮胎类型获取逻辑以及调拨出库功能

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. 异常捕获：防止后台报错导致前台卡死

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() {

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);
 }

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){

ruoyi-system/src/main/resources/mapper/tyre/BaseTyreMapper.xml

@@ -17,6 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="pressure"    column="pressure"    />
         <result property="tyreType"    column="tyre_type"    />
         <result property="team"    column="team"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -260,6 +261,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where tyre_id = #{tyreId}
     </update>
+    <update id="updateBaseTyreByEpc" parameterType="BaseTyre">
+        update base_tyre
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deptId != null  and deptId != ''">dept_id = #{deptId},</if>
+        </trim>
+        where tyre_epc = #{tyreEpc}
+    </update>
 
     <delete id="deleteBaseTyreById" parameterType="Long">
         delete from base_tyre where tyre_id = #{tyreId}