细节处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TOtherFeesController.java

@@ -35,6 +35,7 @@ public class TOtherFeesController extends BaseController {
         startPage();
         // 仓库其他账务
         tWarehouseBills.setfBilltype("QTZW");
+        tWarehouseBills.setfTypeid(10);
         return getDataTable(itWarehouseBillsService.getWarehouseBusinessList(tWarehouseBills));
     }
 

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

@@ -2046,6 +2046,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehouseBills, TWarehouseBills.class);
         String billsType = "QTZW";
         warehouseBills.setfBilltype(billsType);
+        warehouseBills.setfTypeid(10);
         // 判断提单号是否存在
         if (StringUtils.isNull(warehouseBills.getfId()) && tWarehouseBillsMapper.selectContainMblno(warehouseBills) > 0) {
             return AjaxResult.error("该参看编号已存在");
@@ -2088,7 +2089,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cr.setfBsdate(warehouseBills.getfBsdate());
                 cr.setfReviewDate(new Date());
                 cr.setfDc("C");
-                cr.setfBillstatus(billStatus);
+                if (StringUtils.isNull(cr.getfBillstatus())) {
+                    cr.setfBillstatus(billStatus);
+                }
                 cr.setCreateTime(new Date());
                 cr.setfPid(warehouseBills.getfId());
                 cr.setCreateBy(SecurityUtils.getUsername());
@@ -2110,7 +2113,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 dr.setfBsdate(warehouseBills.getfBsdate());
                 dr.setfReviewDate(new Date());
                 dr.setfDc("D");
-                dr.setfBillstatus(billStatus);
+                if (StringUtils.isNull(dr.getfBillstatus())) {
+                    dr.setfBillstatus(billStatus);
+                }
                 dr.setCreateTime(new Date());
                 dr.setfPid(warehouseBills.getfId());
                 dr.setCreateBy(SecurityUtils.getUsername());

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

@@ -327,7 +327,7 @@ public class TWarehousebillsModifyServiceImpl implements ITWarehousebillsModifyS
         auditItems.setBillNo(tWarehousebillsModify.getfBillno());
         auditItems.setRefno1(tWarehousebillsModify.getfCorpid().toString());
         auditItems.setRefno2(WarehouseTypeEnum.FYBG_NO.getType());
-        auditItems.setRefno3(tWarehousebillsModify.getfBillno());
+        auditItems.setRefno3(tWarehousebillsModify.getfMblno());
         auditItems.setSendUserId(loginUser.getUser().getUserId());
         auditItems.setSendName(loginUser.getUsername());
         auditItems.setSendTime(new Date());

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

@@ -74,7 +74,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by parent_id, order_num
+        order by parent_id, order_num, convert(f_name using gbk)
     </select>
 
     <select id="lazyList" parameterType="TWarehouse" resultMap="TWarehouseResult">
@@ -99,7 +99,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by ware.parent_id, ware.order_num
+        order by ware.parent_id, ware.order_num, convert(ware.f_name using gbk)
     </select>
 
     <select id="selectTWarehouseLists" parameterType="TWarehouse" resultMap="TWarehouseResult">

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -2468,7 +2468,7 @@
         LEFT JOIN t_vessel tv ON tw.f_vslid = tv.f_id
         LEFT JOIN t_voyage ty ON tw.f_voyid = ty.f_id
         <where>
-            tw.f_typeid = 1
+            tw.f_typeid in (1, 10)
             and tw.del_flag = '0'
             <if test="fVslid != null">and tw.f_vslid = #{fVslid}</if>
             <if test="fVoyid != null">and tw.f_voyid = #{fVoyid}</if>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -338,7 +338,8 @@
             LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
             LEFT JOIN sys_dict_data dictIn ON dictIn.dict_value = bill.f_business_type
         <where>
-            bill.f_typeid IS NULL
+            <if test="fTypeid == null or fTypeid == ''">and bill.f_typeid IS NULL</if>
+            <if test="fTypeid != null and fTypeid != ''">and bill.f_typeid = #{fTypeid}</if>
             <if test="fFeeStatus != null and fFeeStatus != ''">and bill.f_fee_status = #{fFeeStatus}</if>
             <if test="fBillno != null  and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
             <if test="fTruckno != null  and fTruckno != ''">and item.f_truckno like concat('%', #{fTruckno}, '%')</if>