From 444e9c739efa71c12d48fe8e9168cec70ecb19f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 29 Jul 2024 16:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-=E6=8A=A5=E8=A1=A8=E3=80=91?=
 =?UTF-8?q?=E6=96=B0=E6=8A=A5=E8=A1=A8=E5=8F=8A=E9=A2=9C=E8=89=B2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=B0=81=E8=A3=85=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/UI.DY.AgGridReport/src/api/api.js          |  4 ++
 .../src/components/AgTable/index.vue          | 18 ++++++
 fe/UI.DY.AgGridReport/src/router/index.js     | 19 +++++-
 fe/UI.DY.AgGridReport/src/utils/util.js       |  8 ++-
 .../src/views/report/InventoryBookDetail.vue  | 59 ++++++++++++++++++
 .../src/views/report/rawScrapList.vue         | 60 +++++++++++++++++++
 6 files changed, 166 insertions(+), 2 deletions(-)
 create mode 100644 fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue
 create mode 100644 fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue

diff --git a/fe/UI.DY.AgGridReport/src/api/api.js b/fe/UI.DY.AgGridReport/src/api/api.js
index 3c6eea401..7e2444ea0 100644
--- a/fe/UI.DY.AgGridReport/src/api/api.js
+++ b/fe/UI.DY.AgGridReport/src/api/api.js
@@ -46,3 +46,7 @@ export function getUnplannedReceiptType() {
 export function getInventoryBalanceStatus() {
     return axiosUtil.ajax_post(procApi+'Proc_InputWhere_InventoryBalance_Status',{})
 }
+
+export function inventoryTransactionSerial() {
+    return axiosUtil.ajax_post('http://dev.ccwin-in.com:60085/api/wms/inventory/inventory-transaction/item-serial-list?startDateTime=2024-07-01&endDateTime=2024-07-09T23:59:59&erpLocationCode=null')
+}
\ No newline at end of file
diff --git a/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue b/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue
index 6f3418f76..ae89deb58 100644
--- a/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue
+++ b/fe/UI.DY.AgGridReport/src/components/AgTable/index.vue
@@ -211,6 +211,24 @@ export default {
       &.centerAlign{
         justify-content: center;
       }
+
+      &.stateTag_danger{
+        background:#ff2f00;
+        justify-content: center;
+        color:#fff
+      }
+
+      &.stateTag_warning{
+        background:#ff9000;
+        justify-content: center;
+        color:#fff
+      }
+
+      &.stateTag_success{
+        background:green;
+        justify-content: center;
+        color:#fff
+      }
     }
 
     .ag-cell-value{
diff --git a/fe/UI.DY.AgGridReport/src/router/index.js b/fe/UI.DY.AgGridReport/src/router/index.js
index 44ad36432..f2ba52c7e 100644
--- a/fe/UI.DY.AgGridReport/src/router/index.js
+++ b/fe/UI.DY.AgGridReport/src/router/index.js
@@ -24,9 +24,10 @@ import ProductionIssueSummary from '../views/report/ProductionIssueSummary.vue'
 import ProductionReturnSummary from '../views/report/ProductionReturnSummary.vue'
 import ProductReceiptSummary from '../views/report/ProductReceiptSummary.vue'
 import SupplierAndOrderSummary from '../views/report/SupplierAndOrderSummary.vue'
+import rawScrapList from '../views/report/rawScrapList.vue'
+import InventoryBookDetail from '../views/report/InventoryBookDetail.vue'
 
 Vue.use(VueRouter)
-
 const routes = [
     {
         path: '/',
@@ -220,6 +221,22 @@ const routes = [
             title:"供应商发货订单汇总报表",
         }
     },
+    {
+        path: '/rawScrapList',
+        name: 'rawScrapList',
+        component: rawScrapList,
+        meta:{
+            title:"原物料过期报表",
+        }
+    },
+    // {
+    //     path: '/InventoryBookDetail',
+    //     name: 'InventoryBookDetail',
+    //     component: InventoryBookDetail,
+    //     meta:{
+    //         title:"库存流水账明细",
+    //     }
+    // },
 ]
 
 const router = new VueRouter({
diff --git a/fe/UI.DY.AgGridReport/src/utils/util.js b/fe/UI.DY.AgGridReport/src/utils/util.js
index 19a06a811..b9dd17c90 100644
--- a/fe/UI.DY.AgGridReport/src/utils/util.js
+++ b/fe/UI.DY.AgGridReport/src/utils/util.js
@@ -75,11 +75,17 @@ var numberPercentFormatter = function(number,isPercent,fixed){
   return _res;
 }
 
+// 状态类型颜色变化
+var stateTagClass = function(data,options){
+  return options[data.value] || options.init
+}
+
 export default {
     waitTime:20000,//滚屏列表刷新等待间隔配置项
     addEventResizeFlesh:addEventResizeFlesh,
     dateFilterParams:dateFilterParams,
     numberFixedFormatter,
     numberPercentFormatter,
-    formatTimeStrToStr
+    formatTimeStrToStr,
+    stateTagClass
 }
\ No newline at end of file
diff --git a/fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue b/fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue
new file mode 100644
index 000000000..f4cbf9534
--- /dev/null
+++ b/fe/UI.DY.AgGridReport/src/views/report/InventoryBookDetail.vue
@@ -0,0 +1,59 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'原物料过期报表'"
+    :procName="'Proc_原物料过期报表'"
+    :isSpecialData="true"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+import {inventoryTransactionSerial} from "@/api/api"
+
+export default {
+  name: "InventoryBookDetail",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '料号名称',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '料号描述',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '规格/颜色', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '箱码',  minWidth:180, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '批次',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '生产日期', minWidth:170,maxWidth:170, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '过期日期', minWidth:170,maxWidth:170, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '质保周期',maxWidth:100, cellClass:"rightAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '状态', cellClass:((data)=>{return util.stateTagClass(data,this.stateTagOption)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '过期时间差/天', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[],
+      searchForm:{},
+      BottomFixedItem:['过期时间差/天'],
+      stateTagOption:{
+        "过期":"stateTag_danger",
+        "即将过期":"stateTag_warning",
+        "正常":"stateTag_success",
+        "init":"centerAlign"
+      }
+    };
+  },
+  created(){
+    inventoryTransactionSerial().then(res=>{
+      // this.$refs.reportPage_Ref.updateTableData(res)
+      // this.$refs.reportPage_Ref.updateDownloadData(res)
+    })
+  },
+};
+</script>
\ No newline at end of file
diff --git a/fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue b/fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue
new file mode 100644
index 000000000..c52dd722a
--- /dev/null
+++ b/fe/UI.DY.AgGridReport/src/views/report/rawScrapList.vue
@@ -0,0 +1,60 @@
+<template>
+  <reportPage
+    :columnList="columnDefs" 
+    :searchConfig="searchConfig"
+    :searchForm="searchForm"
+    :BottomFixedItem="BottomFixedItem"
+    :reportName="'原物料过期报表'"
+    :procName="'Proc_原物料过期报表'"
+  ></reportPage>
+</template>
+  
+<script>
+import reportPage from "@/components/reportPage/index"
+import util from '@/utils/util'
+import {inventoryTransactionSerial} from "@/api/api"
+
+export default {
+  name: "rawScrapList",
+  components: {
+    reportPage
+  },
+  data () {
+    return {
+      columnDefs: [
+        { field: 'ERP料号',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '料号名称',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '料号描述',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '正厂编码',  cellClass:"centerAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '规格/颜色', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '库位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '储位', filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '箱码',  minWidth:180, filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '批次',  filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '生产日期', minWidth:170,maxWidth:170, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '过期日期', minWidth:170,maxWidth:170, valueFormatter: ((data)=>{return util.formatTimeStrToStr(data.value)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '质保周期',maxWidth:100, cellClass:"rightAlign", filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '状态', cellClass:((data)=>{return util.stateTagClass(data,this.stateTagOption)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+        { field: '过期时间差/天', type:"kiloNumber", cellClass:"rightAlign", valueFormatter: ((data)=>{return util.numberFixedFormatter(data.value,true)}), filter: 'agTextColumnFilter', suppressMenu: true, floatingFilterComponentParams: { suppressFilterButton: true } },
+      ],
+      searchConfig:[
+        {type:'selectExcess',prop:'ItemCode',label:'ERP料号',optionsProc:'itemCode',options:[],optionsTS:[],rangeNumber:100,rangeSize:100},
+        {type:'select',prop:'LocationErpCode',label:'ERP储位',optionsProc:'LocationErpCode',options:[]},
+        {type:'date',prop:'expireDateCondition',label:'过期时间'},
+      ],
+      searchForm:{
+        ItemCode:"",
+        LocationErpCode:'',
+        expireDateCondition:"",
+      },
+      BottomFixedItem:['过期时间差/天'],
+      stateTagOption:{
+        "过期":"stateTag_danger",
+        "即将过期":"stateTag_warning",
+        "正常":"stateTag_success",
+        "init":"centerAlign"
+      }
+    };
+  },
+};
+</script>
\ No newline at end of file