From 8a1e44de91b80e66faf11a6a70ed3a214af683c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Tue, 13 Jun 2023 15:25:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E8=BD=AC=E7=A7=BB=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/utils/tableColumns/index.js         |   1 +
 .../InventoryTransferLog-Query.vue            | 100 +++++++++++++++++-
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index dea918338..9c280ecf2 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -2653,6 +2653,7 @@ export const InventoryTransferLog =  [
   { label: "到箱码", prop: "toPackingCode" },
   { label: "事务类型", prop: "transType", type: "filter", filters: "TransType" },
   { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
+  { label: "接口对应类型", prop: "interfaceType", width: '360px', showProp: true },
   { label: "从事务编号", prop: "fromTransNumber", width: orderWidth },
   { label: "到事务编号", prop: "toTransNumber", width: orderWidth },
   { label: "操作员", prop: "worker" },
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
index 105024336..66aa88a25 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
@@ -80,7 +80,7 @@
   </div>
 </template>
 <script>
-import { byBalancesRequestManyParameter,inventoryTransferNote } from "@/api/wms-api"
+import { byBalancesRequestManyParameter,inventoryTransferNote, getPageList } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -215,6 +215,104 @@ export default {
     this.paging();
   },
   methods: {
+    //渲染数据
+    paging(callback) {
+      this.Loading.tableLoading = true;
+      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+      let _type25 = {
+        "logic": "And",
+        "column": "transType",
+        "action": "!=",
+        "value": "25"
+      }
+      let _type26 = {
+        "logic": "And",
+        "column": "transType",
+        "action": "!=",
+        "value": "26"
+      }
+      let _type35 = {
+        "logic": "And",
+        "column": "transType",
+        "action": "!=",
+        "value": "35"
+      }
+      // 默认事务类型不等于 结算出库、客户ASN、隔离
+      if(this.PageListParams.condition.filters.length <= 0){
+        this.PageListParams.condition.filters.push(_type25,_type26,_type35)
+      }else{
+        let _number = []
+        this.PageListParams.condition.filters.forEach(element => {
+          if(element.column == 'transType'){
+            _number.push(element.value)
+          }
+        });
+        if(_number.indexOf('25') < 0){
+          this.PageListParams.condition.filters.push(_type25)
+        }
+        if(_number.indexOf('26') < 0){
+          this.PageListParams.condition.filters.push(_type26)
+        }
+        if(_number.indexOf('35') < 0){
+          this.PageListParams.condition.filters.push(_type35)
+        }
+      }
+      getPageList(this.PageListParams, this.URL).then(res => {
+        
+        res.items.map(item => {
+          if (item.transType == 11) {
+            item.interfaceType = '【TYRP】-【采购单】'
+          } else if (item.transType == 12) {
+            item.interfaceType = '【TYRP】-【采购退货单】*【EOS】-【退货单】'
+          } else if (item.transType == 14 && item.transSubType == 4401) {
+            item.interfaceType = '【TYRP】-【验收单】*【EOS】-【验收单】'
+          } else if (item.transType == 14 && item.transSubType == 4401) {
+            item.interfaceType = '【TYRP】-【储位、线边仓调拨单 和  客户储位调拨单】'
+          } else if (item.transType == 15 && item.transSubType == 1505) {
+            item.interfaceType = '【TYRP】-【线边仓领料单】*【MES】-【发料单】'
+          } else if (item.transType == 15 && item.transSubType == 1501) {
+            item.interfaceType = '【TYRP】-【线边仓领料单】*【MES】-【发料单】'
+          } else if (item.transType == 16) {
+            item.interfaceType = '【TYRP】-【线边仓退料单】'
+          } else if (item.transType == 31 && item.transSubType == 3102) {
+            item.interfaceType = '【TYRP】-【储位、线边仓调拨单 和  客户储位调拨单】'
+          } else if (item.transType == 31 && item.transSubType == 3104) {
+            item.interfaceType = '【TYRP】-【储位、线边仓调拨单 和  客户储位调拨单】'
+          } else if (item.transType == 31 && item.transSubType == 3105) {
+            item.interfaceType = '【TYRP】-【储位、线边仓调拨单 和  客户储位调拨单】'
+          } else if (item.transType == 21) {
+            item.interfaceType = '【TYRP】-【缴库单】'
+          } else if (item.transType == 23 && item.transSubType == 2302) {
+            item.interfaceType = '【TYRP】-【出货单】'
+          } else if (item.transType == 23 && item.transSubType == 2303) {
+            item.interfaceType = '【TYRP】-【出货单】'
+          } else if (item.transType == 23) {
+            item.interfaceType = '【TYRP】-【非生产领料单】'
+          } else if (item.transType == 33 && item.transSubType == 0) {
+            item.interfaceType = '【TYRP】-【非生产退料】'
+          } else if (item.transType == 33 && item.transSubType ==  3301) {
+            item.interfaceType = '【TYRP】-【回收料入库单】'
+          } else if (item.transType == 22) {
+            item.interfaceType = '【TYRP】-【退拆单】'
+          } else if (item.transType == 37 && item.transSubType == 0) {
+            item.interfaceType = '【TYRP】-【盘点调整单】'
+          } else if (item.transType == 37 && item.transSubType == 3701) {
+            item.interfaceType = '【TYRP】-【线边仓调整单】'
+          } else if (item.transType == 38 && item.transSubType == 3302) {
+            item.interfaceType = '【TYRP】-【回收料调整单】'
+          } else if (item.transType == 36) {
+            item.interfaceType = '【TYRP】-【报废单、线边仓报废单】'
+          } else {
+            item.interfaceType = ''
+          }
+        })
+        this.tableData = res.items
+        this.totalCount = res.totalCount
+        this.pagingCallback(callback)
+      }).catch(err => {
+        this.Loading.tableLoading = false
+      })
+    },
     deleteRow(index, rows) {
       rows.splice(index, 1);
     },