From 66e109e8532be294d454335541368a7383a9b598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZR20090193-=E9=99=88=E6=95=AC=E5=8B=87?= Date: Tue, 30 May 2023 18:06:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=A3=85=E9=87=8D=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/components/BusinessAnalysis.vue | 2 +- .../src/views/wms/common/WmsTruckRecord.vue | 2 +- .../wms/wmsclearance/WmsClearanceModal.vue | 61 ++++++++++++++++++- .../views/wms/wmsinplan/WmsInPlanVxeModal.vue | 60 +++++++++++++++++- .../views/wms/wmsoutplan/WmsOutPlanModal.vue | 61 ++++++++++++++++++- gslk-wmsapi-service-client/Api.xml | 37 +++++++++++ .../DS.WMS.WebApi/Logs/internal-nlog.txt | 3 + .../DS.WMS.WebApi/Logs/internal-nlog.txt | 10 +++ .../PublishProfiles/FolderProfile2.pubxml | 5 ++ 9 files changed, 231 insertions(+), 10 deletions(-) diff --git a/gslk-wms-web-server/src/views/dashboard/analysis/components/BusinessAnalysis.vue b/gslk-wms-web-server/src/views/dashboard/analysis/components/BusinessAnalysis.vue index b8e02cd..5994eca 100644 --- a/gslk-wms-web-server/src/views/dashboard/analysis/components/BusinessAnalysis.vue +++ b/gslk-wms-web-server/src/views/dashboard/analysis/components/BusinessAnalysis.vue @@ -46,7 +46,7 @@ yAxis: [ { type: 'value', - max: 100, + max: 1000, splitNumber: 4, axisTick: { show: false, diff --git a/gslk-wms-web-server/src/views/wms/common/WmsTruckRecord.vue b/gslk-wms-web-server/src/views/wms/common/WmsTruckRecord.vue index 289d662..cd63394 100644 --- a/gslk-wms-web-server/src/views/wms/common/WmsTruckRecord.vue +++ b/gslk-wms-web-server/src/views/wms/common/WmsTruckRecord.vue @@ -27,7 +27,7 @@ - + diff --git a/gslk-wms-web-server/src/views/wms/wmsclearance/WmsClearanceModal.vue b/gslk-wms-web-server/src/views/wms/wmsclearance/WmsClearanceModal.vue index 6ecfbc6..d07c05f 100644 --- a/gslk-wms-web-server/src/views/wms/wmsclearance/WmsClearanceModal.vue +++ b/gslk-wms-web-server/src/views/wms/wmsclearance/WmsClearanceModal.vue @@ -18,7 +18,8 @@ - + + @@ -59,6 +60,7 @@ import WmsTruckRecord from '/@/views/wms/common/WmsTruckRecord.vue' import { CollapseContainer } from '/@/components/Container' import chapter from '/@/utils/chapter' + import {getTruckRecordList} from "/@/views/wms/common/api"; // 声明Emits const emit = defineEmits(['change', 'update:value', 'success', 'register']) const isUpdate = ref(true) @@ -67,6 +69,7 @@ const billStatus = ref(0) const storeHouse = ref('') const dataSource = ref([]) + const recordSource = ref([]) const areaList = ref([]) const activeKey = ref('detailTab') const [registerForm, { resetFields, setFieldsValue, validate, updateSchema, getFieldsValue }] = @@ -80,7 +83,7 @@ setModalProps({ confirmLoading: false, loading: true }) isUpdate.value = !!data?.isUpdate // console.log(data.record) - activeKey.value = 'recordTab' + activeKey.value = 'detailTab' if (unref(isUpdate)) { // setModalProps({ confirmLoading: true }); rowId.value = data.record.wmsplanid @@ -205,6 +208,52 @@ toolbarConfig: {}, data: dataSource, }) + + const recordOptions = reactive({ + border: true, + height: 500, + align: null, + columnConfig: { + resizable: true, + }, + columns: [ + { + title: '序号', + type: 'seq', + fixed: 'left', + width: 50, + align: 'center', + }, + { + title: '记录时间', + field: 'recordTime', + width: 200, + fixed: 'left', + }, + { + title: '记录类型', + field: 'recordTypeName', + width: 100, + }, + { + title: '车牌号', + field: 'truckno', + width: 100, + }, + { + title: '箱号', + field: 'boxNo', + width: 200, + }, + { + title: '磅重', + field: 'weigth', + width: 100, + }, + ], + toolbarConfig: {}, + data: recordSource, + }) async function loadListData() { // const { summaryFunc, summaryData } = props; const res: API.DataResult = await getDetailList({ id: unref(rowId) }) @@ -215,6 +264,14 @@ dataSource.value = [] } console.log(dataSource.value) + + const records: API.DataResult = await getTruckRecordList({ id: unref(rowId) }) + // console.log(res) + if (records.succeeded) { + recordSource.value = records.data + } else { + recordSource.value = [] + } } const getTitle = computed(() => (!unref(isUpdate) ? '预约清关-新增' : '预约清关-审批')) diff --git a/gslk-wms-web-server/src/views/wms/wmsinplan/WmsInPlanVxeModal.vue b/gslk-wms-web-server/src/views/wms/wmsinplan/WmsInPlanVxeModal.vue index 156a563..ab1cd77 100644 --- a/gslk-wms-web-server/src/views/wms/wmsinplan/WmsInPlanVxeModal.vue +++ b/gslk-wms-web-server/src/views/wms/wmsinplan/WmsInPlanVxeModal.vue @@ -51,7 +51,8 @@ - + + @@ -102,6 +103,7 @@ import { get } from 'lodash-es' import WmsFeeRateModal from './WmsFeeRateModal.vue' import WmsTruckRecord from '/@/views/wms/common/WmsTruckRecord.vue' + import {getTruckRecordList} from "/@/views/wms/common/api"; // 声明Emits const emit = defineEmits(['change', 'update:value', 'success', 'register']) const isUpdate = ref(true) @@ -109,6 +111,7 @@ const rowId = ref('') const billStatus = ref(0) const dataSource = ref([]) + const recordSource = ref([]) const feeSource = ref([]) const activeKey = ref('detailTab') const activeMainKey = ref('mainTab') @@ -128,7 +131,7 @@ resetFields() setModalProps({ confirmLoading: false, loading: true }) isUpdate.value = !!data?.isUpdate - activeKey.value = 'recordTab' + activeKey.value = 'detailTab' if (unref(isUpdate)) { // setModalProps({ confirmLoading: true }); rowId.value = data.record.wmsplanid @@ -196,8 +199,59 @@ } else { feeSource.value = [] } - console.log(dataSource.value) + const records: API.DataResult = await getTruckRecordList({ id: unref(rowId) }) + // console.log(res) + if (records.succeeded) { + recordSource.value = records.data + } else { + recordSource.value = [] + } } + const recordOptions = reactive({ + border: true, + height: 500, + align: null, + columnConfig: { + resizable: true, + }, + columns: [ + { + title: '序号', + type: 'seq', + fixed: 'left', + width: 50, + align: 'center', + }, + { + title: '记录时间', + field: 'recordTime', + width: 200, + fixed: 'left', + }, + { + title: '记录类型', + field: 'recordTypeName', + width: 100, + }, + { + title: '车牌号', + field: 'truckno', + width: 100, + }, + { + title: '箱号', + field: 'boxNo', + width: 200, + }, + { + title: '磅重', + field: 'weigth', + width: 100, + }, + ], + toolbarConfig: {}, + data: recordSource, + }) const gridOptions = reactive({ border: true, height: 500, diff --git a/gslk-wms-web-server/src/views/wms/wmsoutplan/WmsOutPlanModal.vue b/gslk-wms-web-server/src/views/wms/wmsoutplan/WmsOutPlanModal.vue index f32292d..10dc1c3 100644 --- a/gslk-wms-web-server/src/views/wms/wmsoutplan/WmsOutPlanModal.vue +++ b/gslk-wms-web-server/src/views/wms/wmsoutplan/WmsOutPlanModal.vue @@ -18,7 +18,8 @@ - + + @@ -60,6 +61,7 @@ import WmsTruckRecord from '/@/views/wms/common/WmsTruckRecord.vue' import {Divider, TabPane, Tabs} from 'ant-design-vue' import { CollapseContainer } from '/@/components/Container' + import {getTruckRecordList} from "/@/views/wms/common/api"; // 声明Emits const emit = defineEmits(['change', 'update:value', 'success', 'register']) const isUpdate = ref(true) @@ -68,6 +70,7 @@ const billStatus = ref(0) const storeHouse = ref('') const dataSource = ref([]) + const recordSource = ref([]) const areaList = ref([]) const activeKey = ref('detailTab') const [registerForm, { resetFields, setFieldsValue, validate, updateSchema, getFieldsValue }] = @@ -80,7 +83,7 @@ resetFields() setModalProps({ confirmLoading: false, loading: true }) isUpdate.value = !!data?.isUpdate - activeKey.value = 'recordTab' + activeKey.value = 'detailTab' if (unref(isUpdate)) { // setModalProps({ confirmLoading: true }); rowId.value = data.record.wmsplanid @@ -202,6 +205,51 @@ toolbarConfig: {}, data: dataSource, }) + const recordOptions = reactive({ + border: true, + height: 500, + align: null, + columnConfig: { + resizable: true, + }, + columns: [ + { + title: '序号', + type: 'seq', + fixed: 'left', + width: 50, + align: 'center', + }, + { + title: '记录时间', + field: 'recordTime', + width: 200, + fixed: 'left', + }, + { + title: '记录类型', + field: 'recordTypeName', + width: 100, + }, + { + title: '车牌号', + field: 'truckno', + width: 100, + }, + { + title: '箱号', + field: 'boxNo', + width: 200, + }, + { + title: '磅重', + field: 'weigth', + width: 100, + }, + ], + toolbarConfig: {}, + data: recordSource, + }) async function loadListData() { // const { summaryFunc, summaryData } = props; const res: API.DataResult = await getWmsOutPlanGoodslist({ id: unref(rowId) }) @@ -212,11 +260,18 @@ dataSource.value = [] } console.log(dataSource.value) + + const records: API.DataResult = await getTruckRecordList({ id: unref(rowId) }) + // console.log(res) + if (records.succeeded) { + recordSource.value = records.data + } else { + recordSource.value = [] + } } const getTitle = computed(() => (!unref(isUpdate) ? '预约出库-新增' : '预约出库-审批')) - async function handleAudit() { try { const values = await validate() diff --git a/gslk-wmsapi-service-client/Api.xml b/gslk-wmsapi-service-client/Api.xml index 6f7d5ab..01b07d1 100644 --- a/gslk-wmsapi-service-client/Api.xml +++ b/gslk-wmsapi-service-client/Api.xml @@ -191,6 +191,13 @@ + + + 获取车号磅重箱号记录 + + + + 构造函数 @@ -217,6 +224,36 @@ + + + 构造函数 + + + + + + 获取首页数据-业务数据 + + + + + + 商品品类 + + + + + + 园区告警 + + + + + + 业务趋势 + + + 客户端公告模块 diff --git a/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt b/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt index 3bcc42f..7a8893c 100644 --- a/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt +++ b/gslk-wmsapi-service-client/DS.WMS.WebApi/Logs/internal-nlog.txt @@ -5614,3 +5614,6 @@ 2023-05-30 16:52:21.0531 Info Adding target ColoredConsoleTarget(Name=console) 2023-05-30 16:52:21.1108 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-client\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config 2023-05-30 16:52:21.1249 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2023-05-30 17:07:59.8058 Info Shutdown() called. Logger closing... +2023-05-30 17:07:59.8058 Info Closing old configuration. +2023-05-30 17:07:59.9249 Info Logger has been closed down. diff --git a/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt b/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt index 708c3af..e059bbe 100644 --- a/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt +++ b/gslk-wmsapi-service-server/DS.WMS.WebApi/Logs/internal-nlog.txt @@ -8580,3 +8580,13 @@ 2023-05-30 14:01:17.4010 Info Shutdown() called. Logger closing... 2023-05-30 14:01:17.4010 Info Closing old configuration. 2023-05-30 14:01:17.4391 Info Logger has been closed down. +2023-05-30 17:39:18.3303 Info Message Template Auto Format enabled +2023-05-30 17:39:18.3668 Info Loading assembly: NLog.Web.AspNetCore +2023-05-30 17:39:18.6738 Info Adding target FileTarget(Name=allfile) +2023-05-30 17:39:18.6846 Info Adding target FileTarget(Name=ownFile-web) +2023-05-30 17:39:18.7240 Info Adding target ColoredConsoleTarget(Name=console) +2023-05-30 17:39:18.7770 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\sdgslk-wms-solution\gslk-wmsapi-service-server\DS.WMS.WebApi\bin\Debug\net6.0\nlog.config +2023-05-30 17:39:18.7770 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2023-05-30 18:04:00.1889 Info Shutdown() called. Logger closing... +2023-05-30 18:04:00.1889 Info Closing old configuration. +2023-05-30 18:04:00.2930 Info Logger has been closed down. diff --git a/gslk-wmsapi-service-server/DS.WMS.WebApi/Properties/PublishProfiles/FolderProfile2.pubxml b/gslk-wmsapi-service-server/DS.WMS.WebApi/Properties/PublishProfiles/FolderProfile2.pubxml index 505aa3e..bc53a65 100644 --- a/gslk-wmsapi-service-server/DS.WMS.WebApi/Properties/PublishProfiles/FolderProfile2.pubxml +++ b/gslk-wmsapi-service-server/DS.WMS.WebApi/Properties/PublishProfiles/FolderProfile2.pubxml @@ -13,5 +13,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. D:\Publish\GSLKServiceApi FileSystem <_TargetId>Folder + + net6.0 + win-x64 + 9bf88456-d3d9-4d55-bc93-1b5527aa6d6a + false \ No newline at end of file