修正sql语句，修改入库计算仓储费自定义填写

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -416,7 +416,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 如果是新数据
             warehouseBills.setfBillstatus(2L);
             warehouseBills.setCreateBy(loginUser.getUser().getUserName());
-            warehouseBills.setfChargedate(warehouseBills.getfBsdate());
             warehouseBills.setfBilltype(billsType);
             warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
             // 业务编码
@@ -427,12 +426,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 Date time = new Date();
                 String bscorpno = billnoSerialServiceImpl.getCorpNo(warehouseBills.getfCorpid(), time);
                 warehouseBills.setfBscorpno(bscorpno);
+            } else {
+                warehouseBills.setfChargedate(warehouseBills.getfBsdate());
             }
             tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
             fPid = warehouseBills.getfId();
         } else {
             fPid = warehouseBills.getfId();
-            warehouseBills.setfChargedate(warehouseBills.getfBsdate());
+            if (!"SJRK".equals(billsType)) {
+                warehouseBills.setfChargedate(warehouseBills.getfBsdate());
+            }
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             warehouseBills.setUpdateTime(new Date());
             tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
@@ -585,7 +588,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 warehouseBills.setfReviewDate(new Date());
             }
             warehouseBills.setfBilltype(billsType);
-            warehouseBills.setfChargedate(warehouseBills.getfBsdate());
+            if (!"SJRK".equals(billsType)) {
+                warehouseBills.setfChargedate(warehouseBills.getfBsdate());
+            }
             warehouseBills.setfBsdeptid(loginUser.getUser().getDeptId());
             warehouseBills.setCreateBy(loginUser.getUser().getUserName());
             String billNo = billnoSerialServiceImpl.getBillNo(billsType, warehouseBills.getfBsdate());
@@ -604,7 +609,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 warehouseBills.setfReviewDate(new Date());
             }
             warehouseBills.setUpdateTime(new Date());
-            warehouseBills.setfChargedate(warehouseBills.getfBsdate());
+            if (!"SJRK".equals(billsType)) {
+                warehouseBills.setfChargedate(warehouseBills.getfBsdate());
+            }
             warehouseBills.setUpdateBy(loginUser.getUser().getUserName());
             tEnclosureMapper.deleteByFPid(fPid);
             tWarehousebillsfeesMapper.deleteByFPid(fPid);

ruoyi-warehouse/src/main/resources/mapper/basicData/TCorpsMapper.xml

@@ -76,8 +76,8 @@
             <if test="fUbankname != null  and fUbankname != ''">and f_ubankname like concat('%', #{fUbankname}, '%')
             </if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
-            ORDER BY  CONVERT(f_name USING gbk)
         </where>
+        ORDER BY  CONVERT(f_name USING gbk) asc
     </select>
 
     <select id="selectTCorpsById" parameterType="Long" resultMap="TCorpsResult">

ruoyi-warehouse/src/main/resources/mapper/basicData/TFeesMapper.xml

@@ -34,7 +34,7 @@
             <if test="fCurrency != null  and fCurrency != ''">and f_currency like concat('%', #{fCurrency}, '%')</if>
             <if test="fStatus != null  and fStatus != ''">and f_status = #{fStatus}</if>
         </where>
-        ORDER BY CONVERT(f_name USING gbk)
+        ORDER BY CONVERT(f_name USING gbk) asc
     </select>
 
     <select id="selectTFeesById" parameterType="Long" resultMap="TFeesResult">