From 389d32c6d56a9c9a1338ad744c0622736d04f328 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 26 Dec 2025 16:29:10 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-26=20=E5=85=B6=E5=AE=83=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=94=B9=E4=B8=BA=E5=85=B6=E4=BB=96=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/finishedProduct/controller/CRollinfoController.java | 2 +-
 .../modules/finishedProduct/controller/PageController.java      | 2 +-
 .../modules/finishedProduct/service/CRollinfoService.java       | 2 +-
 .../finishedProduct/service/impl/CRollinfoServiceImpl.java      | 2 +-
 .../finishedProduct/service/impl/TransheaderServiceImpl.java    | 2 +-
 src/main/resources/templates/productwarehouse/other/storage.ftl | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java
index 1ab351b..caec482 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/CRollinfoController.java
@@ -228,7 +228,7 @@ public class CRollinfoController extends AbstractController {
 
     /*
      * @Author sxm
-     * @Description 卷其它入库
+     * @Description 卷其他入库
      * @Date 11:32 2021/10/12
      * @Param [cRollInfoStorageVo]
      * @return [com.gaotao.modules.finishedProduct.vo.CRollInfoStorageVo]
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/controller/PageController.java b/src/main/java/com/gaotao/modules/finishedProduct/controller/PageController.java
index 07fe8e7..78d55f7 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/controller/PageController.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/controller/PageController.java
@@ -26,7 +26,7 @@ public class PageController {
 
     /*
      * @Author sxm
-     * @Description 其它入库
+     * @Description 其他入库
      * @Date 15:06 2021/10/16
      * @Param [request, model]
      * @return [javax.servlet.http.HttpServletRequest, org.springframework.ui.Model]
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java b/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java
index b773d9c..934d705 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/CRollinfoService.java
@@ -70,7 +70,7 @@ public interface CRollinfoService extends IService<CRollinfoEntity> {
 
     /*
      * @Author sxm
-     * @Description 卷其它入库
+     * @Description 卷其他入库
      * @Date 11:32 2021/10/12
      * @Param [cRollInfoStorageVo]
      * @return [com.gaotao.modules.finishedProduct.vo.CRollInfoStorageVo]
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index ecee443..d307173 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
@@ -492,7 +492,7 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
             cRollinfoEntity.setCreateddate(date);
             cRollinfoEntity.setStatusDb("I");
             cRollinfoEntity.setStatus("已入库");
-            cRollinfoEntity.setSourcetype("其它入库");
+            cRollinfoEntity.setSourcetype("其他入库");
             cRollinfoEntity.setPartno(cRollInfoStorageVo.getPartNo());
             cRollinfoEntity.setRolltype("合格卷");
             cRollinfoEntity.setRolltypeDb("0");
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java
index 537fc5d..4015fe7 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/TransheaderServiceImpl.java
@@ -56,7 +56,7 @@ public class TransheaderServiceImpl extends ServiceImpl<TransheaderDao, Transhea
         String remark = "";
         switch (tranType){
             case "OI":
-                remark = "其它入库";
+                remark = "其他入库";
                 break;
             case "OC":
                 remark = "其它出库";
diff --git a/src/main/resources/templates/productwarehouse/other/storage.ftl b/src/main/resources/templates/productwarehouse/other/storage.ftl
index afeeb6f..b1c4bf1 100644
--- a/src/main/resources/templates/productwarehouse/other/storage.ftl
+++ b/src/main/resources/templates/productwarehouse/other/storage.ftl
@@ -31,7 +31,7 @@
 				<div class="mint-header-button is-left">
 					<div class="header-title">
 						<a href="/pda/publicMenu?titleName=''&menuId=0" class="go-back"><i class="mintui mintui-back"></i></a>
-						<span>其它入库</span>
+						<span>其他入库</span>
 					</div>
 				</div>
 				<h1 class="mint-header-title"></h1>