[CODE]:调拨、货物通关 列表中文展示

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

@@ -180,12 +180,56 @@
                 WHEN  bill.f_billstatus = '6' THEN '全部入账'
             END
                  AS fBillstatus,
-            CASE WHEN  bill.f_items_status = '1' THEN '计划'
-                 WHEN  bill.f_items_status = '2' THEN '待入库'
-                 WHEN  bill.f_items_status = '3' THEN '入库中'
-                 WHEN  bill.f_items_status = '4' THEN '已入库'
-            END
-                AS fItemsStatus,
+        CASE
+        WHEN bill.f_billtype = 'SJRK'
+        AND bill.f_items_status = '1' THEN
+        '计划'
+        WHEN bill.f_billtype = 'SJRK'
+        AND bill.f_items_status = '2' THEN
+        '待入库'
+        WHEN bill.f_billtype = 'SJRK'
+        AND bill.f_items_status = '3' THEN
+        '入库中'
+        WHEN bill.f_billtype = 'SJRK'
+        AND bill.f_items_status = '4' THEN
+        '已入库'
+        WHEN bill.f_billtype = 'SJCK'
+        AND bill.f_items_status = '1' THEN
+        '计划'
+        WHEN bill.f_billtype = 'SJCK'
+        AND bill.f_items_status = '2' THEN
+        '待出库'
+        WHEN bill.f_billtype = 'SJCK'
+        AND bill.f_items_status = '3' THEN
+        '出库中'
+        WHEN bill.f_billtype = 'SJCK'
+        AND bill.f_items_status = '4' THEN
+        '已出库'
+        WHEN bill.f_billtype = 'CKDB'
+        AND bill.f_items_status = '1' THEN
+        '计划'
+        WHEN bill.f_billtype = 'CKDB'
+        AND bill.f_items_status = '2' THEN
+        '待调拨'
+        WHEN bill.f_billtype = 'CKDB'
+        AND bill.f_items_status = '3' THEN
+        '调拨中'
+        WHEN bill.f_billtype = 'CKDB'
+        AND bill.f_items_status = '4' THEN
+        '已调拨'
+        WHEN bill.f_billtype = 'HWTG'
+        AND bill.f_items_status = '1' THEN
+        '计划'
+        WHEN bill.f_billtype = 'HWTG'
+        AND bill.f_items_status = '2' THEN
+        '待调拨'
+        WHEN bill.f_billtype = 'HWTG'
+        AND bill.f_items_status = '3' THEN
+        '调拨中'
+        WHEN bill.f_billtype = 'HWTG'
+        AND bill.f_items_status = '4' THEN
+        '已调拨'
+        END AS fItemsStatus,
             bill.f_billno AS fBillno,
             g.f_name AS fGoodsid,
             bill.f_storekeeper AS fStorekeeper
@@ -268,6 +312,11 @@
                 AND dictIn.dict_type = 'st_trans_type'
                 AND dictIn.status = '0'
             </if>
+            <if test="fBilltype != null  and fBilltype == 'HWTG'">
+                and bill.f_billtype = #{fBilltype}
+                AND dictIn.dict_type = 'st_trans_type'
+                AND dictIn.status = '0'
+            </if>
             <if test="fBillstatus != null  and fBillstatus != ''">and bill.f_billstatus = #{fBillstatus}</if>
             <if test="fItemsStatus != null  and fItemsStatus != ''">and bill.f_items_status = #{fItemsStatus}</if>
             <if test="createBy != null and createBy != ''">and bill.create_by = #{createBy}</if>
@@ -292,7 +341,7 @@
         bill.f_plannetweight AS fPlannetweight,
         bill.f_planvolumn AS fPlanvolumn,
         bill.f_bsdate AS fBsdate,
-        bill.f_trademodeid AS fTrademodeid,
+        dict.dict_label AS fTrademodeid,
         bill.f_truckno AS fTruckno,
         bill.f_driver_name AS fDriverName,
         bill.f_driver_tel AS fDriverTel,
@@ -306,18 +355,34 @@
         bill.f_grossweight AS fGrossweight,
         bill.f_product_name AS fProductName,
         bill.f_billing_deadline AS fBillingDeadline,
-        CASE WHEN  bill.f_billstatus = '1' THEN '录入'
-        WHEN  bill.f_billstatus = '2' THEN '暂存'
-        WHEN  bill.f_billstatus = '3' THEN '驳回'
-        WHEN  bill.f_billstatus = '4' THEN '请核'
-        WHEN  bill.f_billstatus = '5' THEN '审核中'
-        WHEN  bill.f_billstatus = '6' THEN '全部入账'
+        CASE
+        WHEN bill.f_billtype = 'HQZY' AND  bill.f_billstatus = '1' THEN '录入'
+        WHEN bill.f_billtype = 'HQZY' AND   bill.f_billstatus = '2' THEN '暂存'
+        WHEN bill.f_billtype = 'HQZY' AND   bill.f_billstatus = '3' THEN '驳回'
+        WHEN bill.f_billtype = 'HQZY' AND   bill.f_billstatus = '4' THEN '请核'
+        WHEN bill.f_billtype = 'HQZY' AND   bill.f_billstatus = '5' THEN '审核中'
+        WHEN bill.f_billtype = 'HQZY' AND   bill.f_billstatus = '6' THEN '全部入账'
+        WHEN bill.f_billtype = 'JSCCF' AND  bill.f_billstatus = '1' THEN '新建'
+        WHEN bill.f_billtype = 'JSCCF' AND   bill.f_billstatus = '2' THEN '暂存'
+        WHEN bill.f_billtype = 'JSCCF' AND   bill.f_billstatus = '3' THEN '审核驳回'
+        WHEN bill.f_billtype = 'JSCCF' AND   bill.f_billstatus = '4' THEN '提交审核'
+        WHEN bill.f_billtype = 'JSCCF' AND   bill.f_billstatus = '5' THEN '审核中'
+        WHEN bill.f_billtype = 'JSCCF' AND   bill.f_billstatus = '6' THEN '审核通过'
         END
         AS fBillstatus,
-        CASE WHEN  bill.f_items_status = '1' THEN '计划'
-        WHEN  bill.f_items_status = '2' THEN '待入库'
-        WHEN  bill.f_items_status = '3' THEN '入库中'
-        WHEN  bill.f_items_status = '4' THEN '已入库'
+        CASE
+        WHEN bill.f_billtype = 'HQZY'
+        AND bill.f_items_status = '1' THEN
+        '计划'
+        WHEN bill.f_billtype = 'HQZY'
+        AND bill.f_items_status = '2' THEN
+        '待货转'
+        WHEN bill.f_billtype = 'HQZY'
+        AND bill.f_items_status = '3' THEN
+        '货转中'
+        WHEN bill.f_billtype = 'HQZY'
+        AND bill.f_items_status = '4' THEN
+        '已货转'
         END
         AS fItemsStatus,
         bill.f_billno AS fBillno,
@@ -335,7 +400,10 @@
         LEFT JOIN t_warehouse ware1 ON ware1.f_id = bill.f_inwarehouseid
         LEFT JOIN t_warehousebillsitems item ON item.f_pid = bill.f_id
         LEFT JOIN t_goods goods ON goods.f_id = item.f_goodsid
+        LEFT JOIN sys_dict_data dict ON dict.dict_value = bill.f_trademodeid
         <where>
+            dict.status = '0'
+            AND dict.dict_type = 'data_trademodes'
             <if test="fBillno != null  and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
             <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and bill.f_customsdeclartion =
                 #{fCustomsdeclartion}