【nev-pc】1208字段更改+临时更改

5 months ago · 6943c8bb76
6 changed files with 158 additions and 34 deletions
--- a/fe/PC/public/config.js
+++ b/fe/PC/public/config.js
@ -46,7 +46,70 @@ window.SITE_CONFIG['pageHasMOrDList'] = [
    // 'PurchaseOrder_mrt','PurchaseOrder_det',//采购订单信息
 ]

+window.SITE_CONFIG['inventoryBalanceItemTemp']=[
+    'AEQ6LA0AFH31','AEQ6LA0AFW31','AEQ6LA0AFW32','AEQ6LA0AFB31','AEQ6LA0AFH34',
+    'AEQ6LA0AFL31','AEQ6LA0AFH33','AEQ6LA0AFQ33','AEQ6LA0AFQ34','AEQ6LA0AFH41',
+    'AEQ6LA0AFW41','AEQ6LA0AFW42','AEQ6LA0AFB41','AEQ6LA0AFH44','AEQ6LA0AFL41',
+    'AEQ6LA0AFH43','AEQ6LA0AFQ43','AEQ6LA0AFQ44','AEQ6LA0AFH51','AEQ6LA0AFW51',
+    'AEQ6LA0AFW52','AEQ6LA0AFB51',

+    'AEQ6LA0AFH54','AEQ6LA0AFL51','AEQ6LA0AFH53','AEQ6LA0AFQ53','AEQ6LA0AFQ54',
+    'AEQ6LA0AFH61','AEQ6LA0AFW61','AEQ6LA0AFW62','AEQ6LA0AFB61','AEQ6LA0AFH64',
+    'AEQ6LA0AFL61','AEQ6LA0AFH63','AEQ6LA0AFQ63','AEQ6LA0AFQ64','AEQ6LA0A072AA',
+    'AEQ6LA0A075AA','AEQ6LA0A076AA','AEQ6LA0A071AA','AEQ6LA0A073AA','AEQ6LA0A074AA',
+    'AEQ6LA0A077AA','AEQ6LA0A078AA','AEQ6LA0A079AA','AEQ6LA0A071A','AEQ6LA0A101AB',
+    'AEQ6LA0A641AG','AEQ6LA0A111AB','AEQ6LA0A651AG','AEQ6LA0A081AA','AEQ6LA0A081A',
+    'AEQ6LA0A621AB','AEQ6LA0A761AG','AEQ6LA0A631AB','AEQ6LA0A771AG','AEQ6LA0A091AA',
+    'AEQ6LA0A091A','AEQ6LA0A721AB','AEQ6LA0A781AG','AEQ6LA0A731AB','AEQ6LA0A791AG',
+    'AEQ6LA0A781AB','AEQ6LA0A791AB','AEQ6LA0A201AB','AEQ6LA0A211AB',
+
+    'AEQ6LA0A802AB','AEQ6LA0A771AB','AEQ6LA0A841AB','AEQ6LA0A971AB','AEQ6LA0A801AB',
+    'AEQ6LA0A811AB','AEQ6LA0A811AG','AEQ6LA0A821AB','AEQ6LA0A821AG','AEQ6LA0A741AB',
+    'AEQ6LA0A751AB','AEQ6LA0A991AB','AEQ6LA0A831AB','VQ300A0A471AG','AEQ6LA0A471AG',
+    'AEQ6LA0A321AB','AEQ6LA0A851AB','AEQ6LA0A341AB','AEQ6LA0A861AB','AEQ6LA0A481AB',
+    'AEQ6LA0A711AG','AEQ6LA0A481AG','AEQ6LA0A871AB','AEQ6LA0A051A','AEQ6LA0A062AA',
+    'AEQ6LA0A065AA','AEQ6LA0A066AA','AEQ6LA0A061AA','AEQ6LA0A063AA','AEQ6LA0A064AA',
+    'AEQ6LA0A067AA','AEQ6LA0A068AA','AEQ6LA0A069AA','AEQ6LA0A061A','AEQ6LA0A881AB',
+    'AEQ6LA0A891AB','AEQ6LA0A421AB','AEQ6LA0A431AB','AEQ6LA0A701AG','AEQ6LA0A901A',
+    'AEQ6LA0A501AB','AEQ6LA0A501AG','AEQ6LA0A511AG','VMB8LA0A241AG',
+
+    'AEQ6LA0A521AG','AEQ6LA0A531AG','AEQ6LA0A542AB','AEQ6LA0A545AB','AEQ6LA0A546AB',
+    'AEQ6LA0A541AB','AEQ6LA0A543AB','AEQ6LA0A544AB','AEQ6LA0A547AB','AEQ6LA0A548AB',
+    'AEQ6LA0A549AB','AEQ6LA0A541AG','AEQ6LA0A551AG','AEQ6LA0A561AG','AEQ6LA0A571AG',
+    'AEQ6LA0A911AB','AEQ6LA0A921AB','AEQ6LA0A581AG','AEQ6LA0A201AG','AEQ6LA0A211AG',
+    'AEQ6LA0A591AG','AEQ6LA0A911AG','AEQ6LA0A921AG','AEQ6LA0A931AG','VC800A0A871AG',
+    'VC8SLA0A851AG','AEQ6LA0A801AG','AEQ6LD0A011AA','AEQ6LD0A012AA','AEQ6LD0A013AA',
+    'AEQ6LD0A014AA','AEQ6LD0A015AA','AEQ6LD0A016AA','AEQ6LD0A017AA','AEQ6LD0A018AA',
+    'AEQ6LD0A019AA','AEQ6LD0A011A','AEQ6LD0A101AB','AEQ6LD0A111AB','AEQ6LD0A341AG',
+    'FEQ6LA90181AG','AEQ6LD0A121AB','AEQ6LD0A351AG','AEQ6LD0A131AB',
+
+    'AEQ6LD0A141AB','AEQ6LD0A031A','AEQ6LD0A351A','VQ300D0A271AG','AEQ6LD0A421AG',
+    'AEQ6LD0A041AA','AEQ6LD0A042AA','AEQ6LD0A043AA','AEQ6LD0A044AA','AEQ6LD0A045AA',
+    'AEQ6LD0A046AA','AEQ6LD0A047AA','AEQ6LD0A048AA','AEQ6LD0A049AA','AEQ6LD0A021AB',
+    'AEQ6LD0A041A','AEQ6LD0A161AB','AEQ6LD0A162AB','AEQ6LD0A163AB','AEQ6LD0A164AB',
+    'AEQ6LD0A165AB','AEQ6LD0A166AB','AEQ6LD0A167AB','AEQ6LD0A168AB','AEQ6LD0A169AB',
+    'AEQ6LD0A361AG','AEQ6LD0A171AB','AEQ6LD0A172AB','AEQ6LD0A173AB','AEQ6LD0A174AB',
+    'AEQ6LD0A175AB','AEQ6LD0A176AB','AEQ6LD0A177AB','AEQ6LD0A178AB','AEQ6LD0A179AB',
+    'AEQ6LD0A371AG','AEQ6LD0A181AB','AEQ6LD0A182AB','AEQ6LD0A183AB','AEQ6LD0A184AB',
+    'AEQ6LD0A185AB','AEQ6LD0A186AB','AEQ6LD0A187AB','AEQ6LD0A188AB',
+
+    'AEQ6LD0A189AB','AEQ6LD0A381AG','AEQ6LD0A191AB','AEQ6LD0A192AB','AEQ6LD0A193AB',
+    'AEQ6LD0A194AB','AEQ6LD0A195AB','AEQ6LD0A196AB','AEQ6LD0A197AB','AEQ6LD0A198AB',
+    'AEQ6LD0A199AB','AEQ6LD0A391AG','AEQ6LD0A051A','AEQ6LD0A341AB','AEQ6LD0A311AB',
+    'AEQ6LD0A321AB','AEQ6LD0A361AB','AEQ6LD0A331AB','AEQ6LD0A261AG','AEQ6LD0A271AB',
+    'AEQ6LD0A271AG','AEQ6LA0A512AB','AEQ6LA0A515AB','AEQ6LA0A516AB','AEQ6LA0A511AB',
+    'AEQ6LA0A513AB','AEQ6LA0A514AB','AEQ6LA0A517AB','AEQ6LA0A518AB','AEQ6LA0A519AB',
+    'AEQ6LD0A431AG','AEQ6LD0A432AB','AEQ6LD0A435AB','AEQ6LD0A436AB','AEQ6LD0A431AB',
+    'AEQ6LD0A433AB','AEQ6LD0A434AB','AEQ6LD0A437AB','AEQ6LD0A438AB','AEQ6LD0A439AB',
+    'AEQ6LD0A281AG','AEQ6LD0A291AG','AE6LD0A221AG','AEQ6LD0A311AG',
+
+    'AEQ6LD0A321AG','VQ5DVD0A311AG','AEQ6LD0A441AG','AEQ6LD0A331AG','AEQ6LD0A241AB',
+    'AEQ6LD0A401AG','AEQ6LD0A251AB','AEQ6LD0A411AG','FEQ6LA90111AG','AEQ6LA40011AB',
+    'AEQ6LA40021AB','AEQ6LA40031A','AEQ6LD40011AB','AEQ6LD40021AB','AEQ6LD40031AB',
+    'AEQ6LD40041AB'
+]
+
+window.SITE_CONFIG['inventoryBalanceLocalTemp']=['XMIPA','XMPPA']

 // mock
 // window.SITE_CONFIG['apifoxToken'] = 'NXHNi5mp0dnUHGt0wkCrjvfcidsFKV33'
--- a/fe/PC/src/App.vue
+++ b/fe/PC/src/App.vue
@ -37,6 +37,9 @@ localStorage.setItem('MOrDFasterUrl_inventory',window.SITE_CONFIG['MOrDFasterUrl
 localStorage.setItem('pageHasMOrDList',window.SITE_CONFIG['pageHasMOrDList'])
 localStorage.setItem('showGrabimageIframeTest',window.SITE_CONFIG['showGrabimageIframeTest'])
 localStorage.setItem('grabRegulateIframePage',window.SITE_CONFIG['grabRegulateIframePage'])
+// 20241208暂时更改
+localStorage.setItem('inventoryBalanceItemTemp',window.SITE_CONFIG['inventoryBalanceItemTemp'])
+localStorage.setItem('inventoryBalanceLocalTemp',window.SITE_CONFIG['inventoryBalanceLocalTemp'])

 </script>
 <style lang="scss">
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@ -2192,32 +2192,32 @@ export const InventoryBalance = [
  // { label: "类型", prop: 'item_typeFromFE', type: "filter", filters: "ItemTypeBasic", showProp:true },
  { label: "库存数量", prop: "qty",isNumber:true },
  { label: "计量单位", prop: "uom" },
-  { label: "标准成本单价", prop: "stdCostPrice" },
-  { label: "标准成本金额", prop: "stdCost" },
+  // { label: "标准成本单价", prop: "stdCostPrice" },
+  // { label: "标准成本金额", prop: "stdCost" },
  { label: "批次", prop: "lot" },
  { label: "库位代码", prop: "locationCode" },
  { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
  { label: "箱码", prop: "packingCode" },
  { label: _Names.locationErpCode, prop: "locationErpCode" },
-  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
-  { label: "入库时间", prop: "putInTime", type: "dateTime" },
-  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
-  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
-  { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
-  { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
+  // { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  // { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  // { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
+  // { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  // { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "最后盘点时间", prop: "lastCountTime",type: "dateTime" },
+  // { label: "最后盘点计划单号", prop: "lastCountPlanNumber",width: orderWidth },	
  // { label: "最后盘点标签", prop: "lastCountLabel" },
-  { label: "标包数量", prop: "stdPackQty",isNumber:true },
+  // { label: "标包数量", prop: "stdPackQty",isNumber:true },
  // { label: "库位组", prop: "locationGroup" },
  // { label: "库区", prop: "locationArea" },
  // { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
  // { label: "序号", prop: "serialNumber" },
  // { label: "备注", prop: "remark" },
-  { label: "到货日期", prop: "arriveDate",type: "dateTime" },
+  // { label: "到货日期", prop: "arriveDate",type: "dateTime" },
  // { label: "供应商批次", prop: "supplierBatch" },
-  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
-  { label: "最后事务编号", prop: 'lastTransNumber' },
+  // { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
+  // { label: "最后事务编号", prop: 'lastTransNumber' },
 ]

 // 库存余额(解/冻) 
@ -2299,9 +2299,9 @@ export const InventoryTransaction = [
  { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
  // { label: "供应商批次", prop: "supplierBatch" },
  { label: "备注", prop: "remark" },
-  { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "生效日期", prop: 'activeDate', type: "dateTime" },
+  // { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
 ]

 // 库存快照
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@ -1402,29 +1402,29 @@ export const InventoryInitialNote = [
  { label: "库存状态", prop: "status",type: "filter",  filters: "inventoryStage" },
  { label: "箱码", prop: 'packingCode' },
  { label: _Names.locationErpCode, prop: "locationErpCode" },
-  { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
-  { label: "入库时间", prop: "putInTime", type: "dateTime" },
-  { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
-  { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
-  { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
-  { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
+  // { label: "是否可用", prop: "isActive", type: "filter", filters: "whetherOrNot" },
+  // { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  // { label: "生产日期", prop: "produceDate" ,type: "dateTime" },
+  // { label: "入库时间", prop: "putInTime", type: "dateTime" },
+  // { label: "过期日期", prop: "expireDate" ,type: "dateTime" },
+  // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
+  // { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
+  // { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
  // { label: "最后盘点标签号", prop: "lastCountLabel" },
  { label: _Names.itemDesc1, prop: "itemDesc1" },
  { label: _Names.itemDesc2, prop: "itemDesc2" },
-  { label: "标包数量", prop: 'stdPackQty' },
-  { label: "标准成本单价", prop: "stdCostPrice" },
-  { label: "标准成本金额", prop: "stdCost" },
+  // { label: "标包数量", prop: 'stdPackQty' },
+  // { label: "标准成本单价", prop: "stdCostPrice" },
+  // { label: "标准成本金额", prop: "stdCost" },
  // { label: "供应商批次", prop: 'supplierBatch' },
  // { label: "序号", prop: "serialNumber" },
  // { label: "备注", prop: 'remark' },
  { label: "最后事务编号", prop: "lastTransNumber" },
-  { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
+  // { label: "最后事务类型", prop: "lastTransType", type: "filter", filters: "TransTypeBase" },
  // { label: "库区", prop: "locationArea" },
  // { label: "库位组", prop: "locationGroup" },
  // { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
-  { label: "到货时间", prop: "arriveDate",type:"dateTime" },
+  // { label: "到货时间", prop: "arriveDate",type:"dateTime" },
 ]

 // 库存余额(解/冻)
@ -1483,9 +1483,9 @@ export const InventoryTransaction = [
  { label: "计量单位", prop: "uom" },
  { label: "标包数量", prop: 'stdPackQty' },
  // { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
-  { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
-  { label: "生效日期", prop: "activeDate",type: "dateTime" },
+  // { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  // { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime"},
+  // { label: "生效日期", prop: "activeDate",type: "dateTime" },
  { label: "生产日期", prop: "produceDate",type: "dateTime" },
  { label: "到货日期", prop: "arriveDate",type:"dateTime" },
  { label: "过期日期", prop: "expireDate",type:"dateTime" },
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue
@ -69,7 +69,7 @@
  </div>
 </template>
 <script>
-import { updateExpireDate, postDelete ,getDetailed,inventoryBalanceActive } from "@/api/wms-api"
+import { updateExpireDate, postDelete ,getPageList,getDetailed,inventoryBalanceActive } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@ -172,6 +172,41 @@ export default {
    this.paging();
  },
  methods: {
+    // 20241208暂时更改
+    paging(callback) {
+      let _hasItem = false
+      let _hasLocal = false
+      this.PageListParams.condition.filters.forEach(item=>{
+        if(item.column == "itemCode" && item.action == "In"){_hasItem = true}
+        if(item.column == "locationErpCode" && item.action == "NotIn"){_hasLocal = true}
+      })
+      if(!_hasItem){
+        this.PageListParams.condition.filters.push({
+          "logic": "And",
+          "column": "itemCode",
+          "action": "In",
+          "value": JSON.stringify(localStorage.getItem('inventoryBalanceItemTemp').split(","))
+        })
+      }
+      if(!_hasLocal){
+        this.PageListParams.condition.filters.push({
+          "logic": "And",
+          "column": "locationErpCode",
+          "action": "NotIn",
+          "value": JSON.stringify(localStorage.getItem('inventoryBalanceLocalTemp').split(","))
+        })
+      }
+      this.initPagingHeaderBtn()
+      this.Loading.tableLoading = true;
+      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount,
+        getPageList(this.PageListParams, this.URL,this.pagingShowDetail,this.listURL).then(res => {
+          this.tableData = res.items
+          this.totalCount = res.totalCount
+          this.pagingCallback(callback)
+        }).catch(err => {
+          this.Loading.tableLoading = false
+        })
+    },
    drawerbutton(val){
      // 启用
      if(val == "active"){
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue
@ -145,6 +145,29 @@ export default {
      if(this.userFilterSet && this.userFilterSet()){
        this.PageListParams.condition.filters.push(this.userFilterSet())
      }
+      // 20241208暂时更改
+      let _hasItem = false
+      let _hasLocal = false
+      this.PageListParams.condition.filters.forEach(item=>{
+        if(item.column == "itemCode" && item.action == "In"){_hasItem = true}
+        if(item.column == "locationErpCode" && item.action == "NotIn"){_hasLocal = true}
+      })
+      if(!_hasItem){
+        this.PageListParams.condition.filters.push({
+          "logic": "And",
+          "column": "itemCode",
+          "action": "In",
+          "value": JSON.stringify(localStorage.getItem('inventoryBalanceItemTemp').split(","))
+        })
+      }
+      if(!_hasLocal){
+        this.PageListParams.condition.filters.push({
+          "logic": "And",
+          "column": "locationErpCode",
+          "action": "NotIn",
+          "value": JSON.stringify(localStorage.getItem('inventoryBalanceLocalTemp').split(","))
+        })
+      }
      getPageList(this.PageListParams, this.URL).then(res => {
        this.tableData = initInterfaceType(res.items)
        this.totalCount = res.totalCount