Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/balance/index.ts

@@ -120,6 +120,18 @@ export const getBalancePageByBusinessTypeByItemType = async (params) => {
   }
 }
 
+
+// 查询库存余额列表根据业务类型的物料类型--制品回收
+export const getBalancePageByBusinessTypeByItemTypeProductredress = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/balance/seniorBusinessTypeByItemTypeProductredress', data })
+  } else {
+    return await request.get({ url: `/wms/balance/pageBusinessTypeByItemTypeProductredress`, params })
+  }
+}
+
 // 备件出库查询库存余额列表
 export const getBalancePageSpare = async (params) => {
   if (params.isSearch) {

src/router/modules/remaining.ts

@@ -36,7 +36,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/redirect',
     component: Layout,
-    name: 'Redirect',
+    name: 'redirectNew',
     children: [
       {
         path: '/redirect/:path(.*)',

src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts

@@ -257,7 +257,7 @@ export const CountPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false
+    isTable: true
   },
   {
     label: '创建者',

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -173,12 +173,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         //车间代码
         setV['productionLineCode'] = ''
         setV['workStationCode'] = ''
+        tableData.value = []
       }else if('productionLineCode'==formField){
         //生产线
         setV['workStationCode'] = ''
+        tableData.value = []
       }else if('workStationCode'==formField){
         //工位代码
-        setV['productionLineCode1'] = val[0]['productionLineCode']//用于没选生产线代码，给后端用
+        setV['productionLineCode'] = val[0]['productionLineCode']//用于没选生产线代码，给后端用
+        tableData.value = []
       }
       formRef.setValues(setV)
     }

src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts

@@ -557,7 +557,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       searchField: 'itemCode', // 查询弹窗赋值字段
       searchTitle: '库存余额信息', // 查询弹窗标题
       searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类
-      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType, // 查询弹窗所需分页方法
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemTypeProductredress, // 查询弹窗所需分页方法
       searchCondition: [{
         key: 'businessType',
         value: businessTypeData.code,

src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts

@@ -601,6 +601,30 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '制品单价',
+    field: 'singlePrice',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
+  {
+    label: '制品金额',
+    field: 'amount',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    }
+  },
   {
     label: '原料物料代码',
     field: 'itemCodeThird',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -211,7 +211,7 @@ export const Version = useCrudSchemas(reactive<CrudSchema[]>([
     label: '子表版本',
     field: 'detailVersion',
     sort: 'custom',
-  }
+  },
 ]))
 export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
@@ -362,6 +362,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '先前累计需求',
+    field: 'schdPcrQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '累计收货量',
+    field: 'schdCumrcQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   {
     label: '到货日期',
     field: 'dueDate',

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/demandforecastingMain.data.ts

@@ -148,6 +148,22 @@ export const DemandforecastingMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '先前累计需求',
+    field: 'schdPcrQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
+  {
+    label: '累计收货量',
+    field: 'schdCumrcQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    }
+  },
   {
     label: '到货日期',
     field: 'dueDate',

src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/index.vue

@@ -290,7 +290,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const data = await SupplierApbalanceMainApi.exportSupplierApbalanceMain(tableObject.params)
-    download.excel(data, '供应商余额明细主.xlsx')
+    download.excel(data, '供应商对账管理.xlsx')
   } catch {
   } finally {
     loadDone()