From 8974a45c4b03a1afdbf0bd7ae049eea1f17a815b Mon Sep 17 00:00:00 2001
From: zhaodw <13693325155@163.com>
Date: Sat, 12 Jul 2025 14:22:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/rysqlite3.db                              | Bin 223232 -> 232448 bytes
 .../item/controller/ItemController.java       |   2 +-
 src/main/resources/application-druid.yml      |   2 +-
 .../resources/mybatis/project/ItemMapper.xml  |   2 +-
 .../resources/templates/project/case/add.html |   9 +++++----
 .../templates/project/case/edit.html          |   8 ++++----
 .../resources/templates/project/item/add.html |   2 +-
 .../templates/project/item/edit.html          |   2 +-
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/sql/rysqlite3.db b/sql/rysqlite3.db
index 4e888e9f250f20b35ef41c3ea1dfc740075e105e..559fee06f6ab118789d6e7ba4f15853bdd8e7bf2 100644
GIT binary patch
delta 1971
zcmb_dTWB0r7(V};%;GM&xNbKW(~xFC(wJ;I=gjQv?m(#V#Y><RmZX=klI*%EMT@1)
zWovDk8QOwSA$1>)4?fuVAmV15HV><oQla`#3qe6>sa8#c559>A;zQ7XX7*yz#HeH+
z{$Yo6zT1EPIWu3?&Ad}T+bZ86gsfcJwHIz&9r<0ZSsh6InH%=>`1mfS8JrnPWbu;c
zk356g!KRk>w)T!zS*97LkEUNv^YB<Iu7<TSO%JCc89h9zM^h<1tz{UG<gPEqT2=>=
z?}Jz!NKdy;J>x?vp!W#9M+=Mooo8t7&Emc;(n$xs{|4~d$8g+_5Hi&Wy-N!;NzYRa
zfja2ZwA14wEe#C~UT=fS80VVCReUHs5>}#N=D1-|Ly3xHH|*}}l-Dn3_*=JJHF&&O
z=mvfSvSRsd_)r2*@nR0LzdZH|%%c*rB5Kb`pFaT);4XX(ci;=S37^0s%!`NTq&qsU
zcxcsNUA6%0kLEPiAI#HOzc;g3ADEL^zcVMWert|ny>Ff@uAG-T?l*dY68aGxq9Em^
z1Cj*ua1dzDzw>7)krfLI@Ir01M~SJwy<xhcX^F|o8wGtBj3p+@Zxs9+GZdZ}7Yn~h
z`-&f==porxhx9;h6LK3#ZU!!>=J*cs6qx>?x2a`Mdz-a4SNP^7q4YtW`0N<SVju|P
z;=P}szPJ>G-O>(}<4~!J3za7%k5F@g3;WH9wNR%vg90Wl_tU0kEtKpDWsZ#=eKlkZ
zhvLzg9*L@2JXT!xL$E}pA{&2{YI0kt8XZ?EGg#cFl3<KTU&0t3yTcH)M$D|k7AR*V
zo3gkv2NxkClrGvVmJU*%IC~3v{oHnR{KV08#&*Pd6>&95pA>rz(Y|{3c&diVEpASU
zrA9g@X2MjiY@Z63mvBc0C65#7T^Pa#v7R+g2kb^wMTq{(@YZ?>eUi&*w7FQi5sBd5
z*Z<Sr_VQjWj^<BogZX9`Q8Sd79WW&dk@7G}6g)bi01BMmP@rDP_c?#BVrP5uwTTmM
zxIEYYYj-KssKFEr^~~B(2Vw0RC2H+A-w+Fj={37seldH58o)(im_A>M9zPzMD-fgq
zv>d$!|4&^h$0$y!HDZxXa;%zk4v{0P=TW<k%u-hoQNhs8ZXxR*@$C32uGvPeYqo&j
zq$jRxyj8gEnr@qGL}YlDEolo`Te`NV9j`sb&`Q%j<n$V+{Y87)Ezc&BtJB^pW^X}H
dY1G{Db~}R_)fj4&H`G`Ka5PqCwQ>)u>R+1G0Z9M=

delta 436
zcmZpe!PjtscY-u)Cj$e+t%(ZujGY@3zO%CYxV&!X<Y+b>E<*)Fb1P#*D^tVG6WM;Q
zF=XNi6_=Ekl~<HzWo0%rO-)NOG)vV@OHMP=H8Dv_*0nG*HPAIRF;6i|OHDFKGE1Gj
zd$Wb)kIT!}Gfw|;WuCHhxdRu_Dn{n(49wS=*KHP5sAZnqx!q4wgE^Fu81tAm?O-er
zWNu|(W{w3L!5qtM%xnxaNRe3!D6AzZ$j{Ho$!~0EXk=t!Vq^qj7#NxA8kp-ELVROn
zWokS<R+~{n6X+66Nq$uISd^QXZC|I&Xq3)aGX3Es#+6JApSSl+W~}(Yk;M2IXavKp
z={zk=M}(BJ@{>GMl&qqa43%PaK)mUXT9{5x|Io$ACXt(;msyfuqz@F;PtHipOHU0h
zNh~QXo?JLhm=&yX`{Pz7#an!=OyLa7tC_=?8JX5Fg#-QN%ET00GJV4rCco{=lb9n}
E0psj_dH?_b

diff --git a/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java b/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java
index d638a62..93158e9 100644
--- a/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java
+++ b/src/main/java/com/ruoyi/project/project/item/controller/ItemController.java
@@ -75,7 +75,7 @@ public class ItemController extends BaseController
     public AjaxResult addSave(Item item)
     {
         int i = itemService.selectItemByItemNo(item);
-        if (i != 0){
+        if (i > 0){
             return error("物品编号重复，请检查！！！");
         }
         return toAjax(itemService.insertItem(item));
diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml
index 7990f3f..66a6911 100644
--- a/src/main/resources/application-druid.yml
+++ b/src/main/resources/application-druid.yml
@@ -8,7 +8,7 @@ spring:
             # 主库数据源 root
             master:
                 #url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:sqlite:D:\Java\test\ruo-yi-fast-sqlite-master\sql\rysqlite3.db?date_string_format=yyyy-MM-dd HH:mm:ss
+                url: jdbc:sqlite:D:\workSpace\shiwei\sql\rysqlite3.db?date_string_format=yyyy-MM-dd HH:mm:ss
                 username: 
                 password: 
             # 从库数据源
diff --git a/src/main/resources/mybatis/project/ItemMapper.xml b/src/main/resources/mybatis/project/ItemMapper.xml
index 48130be..8dabc4d 100644
--- a/src/main/resources/mybatis/project/ItemMapper.xml
+++ b/src/main/resources/mybatis/project/ItemMapper.xml
@@ -91,6 +91,6 @@
     </select>
 
     <select id="selectItemByItemNo" parameterType="Item" resultType="integer">
-        select count(*) from item where item_no = #{itemNo} and case_No = #{caseNo}
+        select count(*) from item where item_no = #{itemNo} and case_No = #{caseNo} and id != #{id}
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/project/case/add.html b/src/main/resources/templates/project/case/add.html
index 55a1f85..25dc666 100644
--- a/src/main/resources/templates/project/case/add.html
+++ b/src/main/resources/templates/project/case/add.html
@@ -47,17 +47,18 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label ">所在单位：</label>
+            <label class="col-sm-3 control-label ">职级：</label>
             <div class="col-sm-8">
-                <input name="department"  class="form-control" placeholder="请输入所在单位" type="text">
+                <input name="rank"  class="form-control" placeholder="请输入职级" type="text">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label ">职级：</label>
+            <label class="col-sm-3 control-label ">所在单位：</label>
             <div class="col-sm-8">
-                <input name="rank"  class="form-control" placeholder="请输入职级" type="text">
+                <input name="department"  class="form-control" placeholder="请输入所在单位" type="text">
             </div>
         </div>
+
         <div class="form-group">
             <label class="col-sm-3 control-label ">电话号码：</label>
             <div class="col-sm-8">
diff --git a/src/main/resources/templates/project/case/edit.html b/src/main/resources/templates/project/case/edit.html
index 05cbd77..4ef591a 100644
--- a/src/main/resources/templates/project/case/edit.html
+++ b/src/main/resources/templates/project/case/edit.html
@@ -48,15 +48,15 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">所在单位：</label>
+            <label class="col-sm-3 control-label is-required">职级：</label>
             <div class="col-sm-8">
-                <input name="department" required class="form-control" type="text" th:field="*{department}">
+                <input name="rank" required class="form-control" type="text" th:field="*{rank}">
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label is-required">职级：</label>
+            <label class="col-sm-3 control-label is-required">所在单位：</label>
             <div class="col-sm-8">
-                <input name="rank" required class="form-control" type="text" th:field="*{rank}">
+                <input name="department" required class="form-control" type="text" th:field="*{department}">
             </div>
         </div>
         <div class="form-group">
diff --git a/src/main/resources/templates/project/item/add.html b/src/main/resources/templates/project/item/add.html
index 45bc71a..50a4542 100644
--- a/src/main/resources/templates/project/item/add.html
+++ b/src/main/resources/templates/project/item/add.html
@@ -37,7 +37,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label ">数量：</label>
             <div class="col-sm-8">
-                <input name="number"  class="form-control" placeholder="请输入数量" type="text">
+                <input name="number"  class="form-control" placeholder="请输入数量" type="number" min="0" step="1">
             </div>
         </div>
         <div class="form-group">
diff --git a/src/main/resources/templates/project/item/edit.html b/src/main/resources/templates/project/item/edit.html
index d484d61..24365ce 100644
--- a/src/main/resources/templates/project/item/edit.html
+++ b/src/main/resources/templates/project/item/edit.html
@@ -17,7 +17,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">物品编号：</label>
             <div class="col-sm-8">
-                <input name="itemNo" required class="form-control" type="text" th:field="*{itemNo}">
+                <input name="itemNo" required class="form-control"  type="text" th:field="*{itemNo}">
             </div>
         </div>
         <div class="form-group">