From 2de09bec5cc05bf875543fa8956167ca7db73021 Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期三, 25 六月 2025 11:36:44 +0800
Subject: [PATCH] 合并
---
项目代码/PDA/static/image/return.png | 0
项目代码/DP/src/assets/iconfont/iconfont.woff2 | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/check2.png | 0
项目代码/PDA/uview-ui/components/u-avatar/u-avatar.vue | 0
项目代码/PDA/uview-ui/components/u-verification-code/u-verification-code.vue | 0
项目代码/PDA/uview-ui/components/u-steps/u-steps.vue | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2 | 0
项目代码/PDA/uview-ui/theme.scss | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs | 38
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs | 11
项目代码/PDA/static/image/callB.png | 0
项目代码/DP/src/views/indexs/center-bottom.vue | 264 +
项目代码/PDA/static/image/ReceivingGoodsA.png | 0
项目代码/PDA/components/uni-grid-item/uni-grid-item copy.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/changebox1.png | 0
项目代码/DP/src/components/echart/centerLeft1Chart/index.vue | 55
项目代码/PDA/components/uni-status-bar/uni-status-bar.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/callE.png | 0
项目代码/PDA/uview-ui/components/u-picker/u-picker.vue | 0
项目代码/PDA/pages/Check/Check.vue | 0
项目代码/PDA/components/uni-countdown/uni-countdown.vue | 0
项目代码/PDA/components/uni-popup/uni-popup-dialog.vue | 0
项目代码/DP/src/assets/css/index.scss | 361 +
项目代码/PDA/static/image/returnbox.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsC.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs | 6
项目代码/PDA/static/image/out4.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 80
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs | 51
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsD.png | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes_hty.vue | 111
项目代码/PDA/uview-ui/components/u-form-item/u-form-item.vue | 0
项目代码/DP/src/assets/css/theme/fonts/element-icons.woff | 0
项目代码/DP/src/views/indexs/pass-two.vue | 314 +
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyService.csproj.CopyComplete | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2 | 0
项目代码/PDA/uview-ui/components/u-row/u-row.vue | 0
项目代码/PDA/uview-ui/components/u-loading/u-loading.vue | 0
项目代码/PDA/uview-ui/components/u-radio/u-radio.vue | 0
项目代码/PDA/uview-ui/components/u-circle-progress/u-circle-progress.vue | 0
项目代码/DP/src/assets/iconfont/iconfont.ttf | 0
项目代码/PDA/uview-ui/components/u-section/u-section.vue | 0
项目代码/PDA/uview-ui/components/u-alert-tips/u-alert-tips.vue | 0
项目代码/DP/src/views/indexs/index.vue | 182
项目代码/PDA/components/uni-calendar/uni-calendar-item.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/Test.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/forkliftB.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/out2.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs | 57
项目代码/PDA/static/image/check1.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/appoint.png | 0
项目代码/PDA/uview-ui/components/u-notice-bar/u-notice-bar.vue | 0
项目代码/DP/src/views/indexs/left-bottom.vue | 278 +
项目代码/PDA/components/uni-number-box/uni-number-box.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zj.png | 0
项目代码/PDA/components/uni-badge/uni-badge.vue | 0
项目代码/PDA/static/image/binding.png | 0
项目代码/PDA/components/uni-section/uni-section.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 169
项目代码/PDA/static/image/zjjg.png | 0
项目代码/DP/src/assets/img/titles/zuo.png | 0
项目代码/DP/src/views/setting.vue | 106
项目代码/PDA/uview-ui/libs/css/style.nvue.scss | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out5.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsB.png | 0
项目代码/PDA/uview-ui/components/u-index-anchor/u-index-anchor.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/login.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs | 144
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Release/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CopyComplete | 0
项目代码/PDA/static/image/ReceivingGoodsB.png | 0
项目代码/PDA/uview-ui/components/u-empty/u-empty.vue | 0
项目代码/DP/src/assets/img/left_top_huang.png | 0
项目代码/PDA/components/uni-list/uni-list.vue | 0
项目代码/PDA/components/uni-rate/uni-rate.vue | 0
项目代码/PDA/components/watch-login/watch-input.vue | 0
项目代码/PDA/uview-ui/components/u-full-screen/u-full-screen.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/新文件夹/IToCheckService.cs | 24
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/boxing2.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/check1.png | 0
项目代码/PDA/uview-ui/components/u-gap/u-gap.vue | 0
项目代码/PDA/uview-ui/components/u-no-network/u-no-network.vue | 0
项目代码/PDA/pages/Inbound/InboundEmpty.vue | 0
项目代码/PDA/uview-ui/components/u-icon/u-icon.vue | 0
项目代码/PDA/uview-ui/components/u-line-progress/u-line-progress.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/__uniapperror.png | 0
项目代码/PDA/components/uni-fav/uni-fav.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/login.png | 0
项目代码/PDA/uview-ui/components/u-loading-page/u-loading-page.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyService.csproj.CopyComplete | 0
项目代码/PDA/static/image/callC.png | 0
项目代码/DP/.env.production | 7
项目代码/PDA/unpackage/dist/build/app-plus/static/image/binding.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsE.png | 0
项目代码/DP/src/assets/img/center_map.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs | 134
项目代码/PDA/static/image/out5.png | 0
项目代码/DP/src/views/indexs/center-map.vue | 123
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs | 10
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs | 6
项目代码/PDA/static/image/qualityOut.png | 0
项目代码/PDA/components/uni-drawer/uni-drawer.vue | 0
项目代码/PDA/uview-ui/components/u-tag/u-tag.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Release/net6.0/WIDESEAWCS_ProcessRepository.csproj.CopyComplete | 0
项目代码/PDA/uview-ui/components/u-grid/u-grid.vue | 0
项目代码/PDA/components/uni-nav-bar/uni-nav-bar.vue | 0
项目代码/PDA/components/uni-goods-nav/uni-goods-nav.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Release/net6.0/WIDESEAWCS_SystemRepository.csproj.CopyComplete | 0
项目代码/PDA/uview-ui/components/u-upload/u-upload.vue | 0
项目代码/PDA/pages/index/index.vue | 0
项目代码/PDA/uview-ui/components/u-badge/u-badge.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/exp.png | 0
项目代码/PDA/uview-ui/components/u-calendar/u-calendar.vue | 0
项目代码/DP/src/views/indexs/right-bottom.vue | 194
项目代码/PDA/uview-ui/components/u-back-top/u-back-top.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs | 6
项目代码/PDA/components/uni-grid/uni-grid.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/forkliftB.png | 0
项目代码/DP/src/assets/img/gysp.mp4 | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/cancel.png | 0
项目代码/PDA/pages/Inbound/ZDPInbound.vue | 44
项目代码/PDA/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/out1.png | 0
项目代码/PDA/components/uni-search-bar/uni-search-bar.vue | 0
项目代码/PDA/static/image/in1.png | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo | 0
项目代码/PDA/pages/Inbound/InoutboundBoxing.vue | 479 ++
项目代码/PDA/uview-ui/components/u-count-down/u-count-down.vue | 0
项目代码/PDA/uview-ui/components/u-cell-group/u-cell-group.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/全局异常错误日志_1743004371.log | 20
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mes_htyService.cs | 7
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs | 10
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/qualityIn.png | 0
项目代码/PDA/uview-ui/components/u-column-notice/u-column-notice.vue | 0
项目代码/DP/src/assets/css/modules/variables.scss | 98
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs | 39
项目代码/PDA/components/uni-swiper-dot/uni-swiper-dot.vue | 0
项目代码/PDA/unpackage/cache/apk/apkurl | 1
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callE.png | 0
项目代码/DP/src/assets/img/2.mp4 | 0
项目代码/PDA/components/uni-list-item/uni-list-item.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out4.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CopyComplete | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/return.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/boxing1.png | 0
项目代码/DP/src/assets/css/public.scss | 156
项目代码/PDA/static/image/changebox.png | 0
项目代码/PDA/uview-ui/components/u-link/u-link.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Boxing/IDt_CZInfo_mesService.cs | 4
项目代码/PDA/uview-ui/components/u-td/u-td.vue | 0
项目代码/DP/src/assets/img/left_top_lv.png | 0
项目代码/PDA/unpackage/cache/cloudcertificate/certini | 4
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVInterface/Respon/AGVResponBase.cs | 2
项目代码/PDA/uview-ui/libs/css/style.h5.scss | 0
项目代码/PDA/static/image/boxing1.png | 0
项目代码/PDA/pages/Outbound/ZDPxp.vue | 694 +++
项目代码/DP/.gitignore | 24
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zjjg.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsE.png | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 15
项目代码/PDA/unpackage/dist/build/app-plus/static/image/inorder.png | 0
项目代码/PDA/uview-ui/index.scss | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/in1.png | 0
项目代码/PDA/static/image/Test.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Location/ILocationInfoService.cs | 7
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes.vue | 106
项目代码/DP/src/views/indexs/left-center-right.vue | 257 +
项目代码/PDA/pages/index/main.vue | 2
项目代码/PDA/uview-ui/components/u-parse/u-parse.vue | 0
项目代码/PDA/unpackage/cache/certdata | 3
项目代码/DP/src/components/scale-screen/scale-screen.vue | 253 +
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin | 0
项目代码/PDA/uview-ui/components/u-dropdown-item/u-dropdown-item.vue | 0
项目代码/DP/.babelrc | 12
项目代码/PDA/static/image/zdp.png | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes.vue | 26
项目代码/DP/src/assets/img/xieyou.png | 0
项目代码/PDA/uview-ui/components/u-row-notice/u-row-notice.vue | 0
项目代码/PDA/static/image/callA.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/lend.png | 0
项目代码/PDA/uview-ui/components/u-count-to/u-count-to.vue | 0
项目代码/PDA/uview-ui/components/u-card/u-card.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue | 21
项目代码/PDA/components/uni-icons/uni-icons.vue | 0
项目代码/PDA/uview-ui/components/u-input/u-input.vue | 0
项目代码/PDA/common/demo.scss | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/logo.png | 0
项目代码/PDA/uview-ui/README.md | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2 | 0
项目代码/PDA/pages/Outbound/OutboundCall.vue | 0
项目代码/DP/src/assets/img/guang.png | 0
项目代码/PDA/components/uni-popup/uni-popup.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock.vue | 105
项目代码/PDA/components/uni-card/uni-card.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs | 52
项目代码/DP/src/assets/img/left_top_hong.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/ortherbox.png | 0
项目代码/PDA/uview-ui/components/u-popup/u-popup.vue | 0
项目代码/PDA/components/uni-popup/uni-popup-message.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsD.png | 0
项目代码/DP/src/views/home.scss | 261 +
项目代码/PDA/uview-ui/components/u-subsection/u-subsection.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Release/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CopyComplete | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/returnbox.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 23
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs | 6
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_Task_HtyService.cs | 8
项目代码/DP/src/App.vue | 21
项目代码/PDA/static/image/forklift.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zdp.png | 0
项目代码/PDA/uview-ui/components/u-rate/u-rate.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/zj.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 41
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs | 6
项目代码/PDA/uview-ui/components/u-loadmore/u-loadmore.vue | 0
项目代码/DP/src/views/indexs/right-top.vue | 299 +
项目代码/PDA/uview-ui/components/u-modal/u-modal.vue | 0
项目代码/DP/src/components/kong.vue | 43
项目代码/PDA/unpackage/dist/build/app-plus/static/image/forklift.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Release/net6.0/WIDESEAWCS_IProcessService.csproj.CopyComplete | 0
项目代码/PDA/uview-ui/components/u-radio-group/u-radio-group.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/qualityIn.png | 0
项目代码/PDA/static/image/exp.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/BasicInfo/Dt_SelectionStandardsService.cs | 54
项目代码/PDA/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out3.png | 0
项目代码/DP/src/assets/img/3DScreen.jpg | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/uni.ttf | 0
项目代码/PDA/uview-ui/components/u-line/u-line.vue | 0
项目代码/PDA/uview-ui/components/u-sticky/u-sticky.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/appoint.png | 0
项目代码/PDA/uview-ui/LICENSE | 0
项目代码/PDA/pages/Outbound/OutbundCZStraight.vue | 620 ++
项目代码/PDA/App.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Release/net6.0/WIDESEAWCS_SystemServices.csproj.CopyComplete | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/changebox1.png | 0
项目代码/PDA/uview-ui/components/u-car-keyboard/u-car-keyboard.vue | 0
项目代码/PDA/uview-ui/components/u-slider/u-slider.vue | 0
项目代码/PDA/pages/Outbound/OutbundZdpStraight.vue | 65
项目代码/PDA/uview-ui/components/u-grid-item/u-grid-item.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/returnbox.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs | 9
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 671 ++
项目代码/DP/src/assets/img/xiezuo.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/check2.png | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue | 22
项目代码/PDA/static/image/inorder.png | 0
项目代码/PDA/static/image/changebox1.png | 0
项目代码/PDA/components/uni-link/uni-link.vue | 0
项目代码/PDA/static/image/zj.png | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/Home.vue | 283
项目代码/PDA/pages/Outbound/OutboundCheck.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs | 1
项目代码/PDA/uview-ui/components/u-cell-item/u-cell-item.vue | 0
项目代码/DP/src/assets/iconfont/iconfont.woff | 0
项目代码/PDA/components/uni-segmented-control/uni-segmented-control.vue | 0
项目代码/PDA/uview-ui/components/u-tabbar/u-tabbar.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_CZInfo_mes.cs | 13
项目代码/PDA/uview-ui/components/u-toast/u-toast.vue | 0
项目代码/PDA/components/uni-swipe-action/uni-swipe-action.vue | 0
项目代码/DP/README.md | 238 +
项目代码/DP/src/assets/img/frame.png | 0
项目代码/PDA/uview-ui/components/u-mask/u-mask.vue | 0
项目代码/PDA/uview-ui/components/u-message-input/u-message-input.vue | 0
项目代码/PDA/components/uni-combox/uni-combox.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs | 97
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/uni.ttf | 0
项目代码/PDA/unpackage/dist/build/app-plus/__uniappsuccess.png | 0
项目代码/PDA/static/image/boxing2.png | 0
项目代码/PDA/uview-ui/components/u-switch/u-switch.vue | 0
项目代码/PDA/uni.scss | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ortherbox.png | 0
项目代码/DP/src/assets/img/top.png | 0
项目代码/PDA/uview-ui/components/u-swiper/u-swiper.vue | 0
项目代码/DP/src/assets/img/zuo_xuxian.png | 0
项目代码/PDA/components/watch-login/watch-button.vue | 0
项目代码/PDA/uview-ui/components/u-top-tips/u-top-tips.vue | 0
项目代码/PDA/uview-ui/libs/css/color.scss | 0
项目代码/PDA/components/uni-collapse/uni-collapse.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTask/agvTask.cs | 46
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/callB.png | 0
项目代码/PDA/components/uni-tag/uni-tag.vue | 0
项目代码/DP/src/views/indexs/station-one.vue | 84
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs | 6
项目代码/PDA/static/image/login.png | 0
项目代码/PDA/components/uni-swipe-action-item/uni-swipe-action-item.vue | 0
项目代码/PDA/uview-ui/components/u-th/u-th.vue | 0
项目代码/PDA/uview-ui/components/u-swipe-action/u-swipe-action.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue | 4
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 13
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue | 121
项目代码/PDA/static/image/ReceivingGoodsD.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/exp.png | 0
项目代码/PDA/uview-ui/libs/css/style.components.scss | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 9
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out2.png | 0
项目代码/PDA/components/uni-title/uni-title.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Release/net6.0/WIDESEAWCS_ISystemRepository.csproj.CopyComplete | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/JobBase.cs | 9
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/cancel.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs | 142
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callC.png | 0
项目代码/PDA/uview-ui/components/u-parse/libs/handler.wxs | 0
项目代码/PDA/uview-ui/components/u-field/u-field.vue | 0
项目代码/PDA/uview-ui/libs/css/common.scss | 0
项目代码/PDA/components/uni-collapse-item/uni-collapse-item.vue | 0
项目代码/PDA/static/image/appoint.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyRepository.csproj.CopyComplete | 0
项目代码/PDA/components/uni-steps/uni-steps.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 6
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock_hty.vue | 98
项目代码/PDA/uview-ui/components/u-button/u-button.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callD.png | 0
项目代码/DP/src/assets/img/left_top_lan.png | 0
项目代码/PDA/uview-ui/components/u-select/u-select.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/check1.png | 0
项目代码/PDA/pages/Outbound/OutboundCompleted.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Release/net6.0/WIDESEAWCS_DTO.csproj.CopyComplete | 0
项目代码/DP/src/components/reacquire/reacquire.vue | 64
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs | 4
项目代码/PDA/uview-ui/libs/css/style.vue.scss | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2 | 0
项目代码/PDA/uview-ui/components/u-checkbox/u-checkbox.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CopyComplete | 0
项目代码/DP/src/views/indexs/plan.vue | 247 +
项目代码/PDA/unpackage/dist/build/app-plus/static/image/out5.png | 0
项目代码/PDA/pages/Outbound/YxOutboundCall.vue | 688 +++
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs | 14
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task_HtyController.cs | 35
项目代码/DP/src/assets/img/pageBg.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/Dt_CZInfo_mesController.cs | 25
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsA.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out1.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 104
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs | 11
项目代码/DP/src/components/item-wrap/item-wrap.vue | 97
项目代码/PDA/uview-ui/components/u-col/u-col.vue | 0
项目代码/PDA/components/uni-load-more/uni-load-more.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/HandTask/ManualOutboundTask.vue | 11
项目代码/PDA/components/uni-swipe-action-item/index.wxs | 0
项目代码/PDA/unpackage/cache/cloudcertificate/package.keystore | 0
项目代码/PDA/uview-ui/components/u-form/u-form.vue | 0
项目代码/PDA/components/uni-popup/uni-popup-share.vue | 0
项目代码/PDA/static/image/out1.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CopyComplete | 0
项目代码/DP/src/views/tjfx/tjfx.vue | 37
项目代码/PDA/uview-ui/components/u-number-box/u-number-box.vue | 0
项目代码/PDA/uview-ui/components/u-dropdown/u-dropdown.vue | 0
项目代码/DP/src/components/echart/index.vue | 70
项目代码/PDA/static/image/forkliftB.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 66
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Release/net6.0/WIDESEAWCS_Tasks.csproj.CopyComplete | 0
项目代码/PDA/uview-ui/components/u-index-list/u-index-list.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/callA.png | 0
项目代码/PDA/static/image/ReceivingGoodsC.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs | 11
项目代码/PDA/uview-ui/components/u-keyboard/u-keyboard.vue | 0
项目代码/PDA/uview-ui/components/u-image/u-image.vue | 0
项目代码/PDA/uview-ui/components/u-parse/libs/trees.vue | 0
项目代码/PDA/uview-ui/components/u-divider/u-divider.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes_hty.vue | 109
项目代码/PDA/uview-ui/components/u-search/u-search.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/out4.png | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_SelectionStandards.vue | 3
项目代码/PDA/static/image/out2.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/changebox.png | 0
项目代码/PDA/uview-ui/components/u-checkbox-group/u-checkbox-group.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutZdp_hty.vue | 93
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/return.png | 0
项目代码/DP/src/views/home.vue | 102
项目代码/PDA/uview-ui/components/u-read-more/u-read-more.vue | 0
项目代码/DP/LICENSE | 21
项目代码/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsA.png | 0
项目代码/DP/src/components/message/message.vue | 74
项目代码/PDA/uview-ui/components/u-waterfall/u-waterfall.vue | 0
项目代码/DP/src/assets/img/titles/you.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/__uniappsuccess.png | 0
项目代码/PDA/components/uni-list/uni-refresh.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/ToAGVService.cs | 8
项目代码/DP/src/assets/css/modules/reset.scss | 200
项目代码/PDA/uview-ui/components/u-tr/u-tr.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyRepository.csproj.CopyComplete | 0
项目代码/PDA/uview-ui/components/u-navbar/u-navbar.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue | 29
项目代码/DP/src/views/indexs/left-center.vue | 256 +
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_hty.vue | 30
项目代码/PDA/pages/Inbound/InboundBoxing.vue | 0
项目代码/PDA/static/image/callD.png | 0
项目代码/DP/public/favicon.ico | 0
项目代码/PDA/uview-ui/components/u-time-line-item/u-time-line-item.vue | 0
项目代码/PDA/components/wyb-popup/wyb-popup.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs | 22
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsB.png | 0
项目代码/PDA/uview-ui/components/u-skeleton/u-skeleton.vue | 0
项目代码/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task_Hty.jsx | 24
项目代码/DP/src/components/echart/centerLeft1Chart/chart.vue | 87
项目代码/DP/.env.dev | 7
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/Task/IDt_Task_HtyRepository.cs | 5
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Release/net6.0/WIDESEAWCS_IProcessRepository.csproj.CopyComplete | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/callD.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs | 19
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callA.png | 0
项目代码/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin | 0
项目代码/PDA/uview-ui/components/u-action-sheet/u-action-sheet.vue | 0
项目代码/DP/src/assets/css/theme/fonts/element-icons.ttf | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs | 2
项目代码/PDA/components/xfl-select/xfl-select.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CopyComplete | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/__uniapperror.png | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/UntieStation.cs | 56
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mesService.cs | 98
项目代码/PDA/unpackage/dist/build/app-plus/static/image/qualityOut.png | 0
项目代码/PDA/uview-ui/components/u-number-keyboard/u-number-keyboard.vue | 0
项目代码/DP/src/views/indexs/station-four.vue | 237 +
项目代码/PDA/unpackage/dist/build/app-plus/static/image/boxing2.png | 0
项目代码/PDA/components/uni-list/uni-refresh.wxs | 0
项目代码/PDA/components/uni-grid-item/uni-grid-item.vue | 0
项目代码/PDA/uview-ui/components/u-tabs/u-tabs.vue | 0
项目代码/DP/src/assets/img/headers/juxing2.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/zjjg.png | 0
项目代码/DP/src/views/indexs/left-top.vue | 250 +
项目代码/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue | 20
项目代码/PDA/static/image/out3.png | 0
项目代码/PDA/components/uni-indexed-list/uni-indexed-list.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/zdp.png | 0
项目代码/PDA/static/image/cancel.png | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/Test.png | 0
项目代码/PDA/static/image/qualityIn.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/lend.png | 0
项目代码/PDA/components/uni-transition/uni-transition.vue | 0
项目代码/PDA/uview-ui/components/u-table/u-table.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/out3.png | 0
项目代码/PDA/uview-ui/libs/css/style.mp.scss | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json | 1
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/qualityOut.png | 0
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/changebox.png | 0
项目代码/DP/src/assets/css/variable.scss | 50
项目代码/DP/src/assets/img/3DScreen.png | 0
项目代码/DP/src/views/indexs/right-center.vue | 238 +
项目代码/PDA/static/image/callE.png | 0
项目代码/PDA/static/image/logo.png | 0
项目代码/PDA/pages/Inbound/ClboundInfo.vue | 38
项目代码/PDA/components/uni-fab/uni-fab.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs | 6
项目代码/PDA/static/image/ortherbox.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/logo.png | 0
项目代码/DP/.env.test | 4
项目代码/PDA/components/uni-calendar/uni-calendar.vue | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Release/net6.0/WIDESEAWCS_ISystemServices.csproj.CopyComplete | 0
项目代码/PDA/components/tki-qrcode/tki-qrcode.vue | 0
项目代码/PDA/components/uni-notice-bar/uni-notice-bar.vue | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/callC.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Release/net6.0/WIDESEAWCS_BasicInfoService.csproj.CopyComplete | 0
项目代码/PDA/pages/Inbound/InboundOrderBoxing.vue | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_Task_HtyService.cs | 64
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsC.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_StationManagerService.cs | 35
项目代码/PDA/components/uni-indexed-list/uni-indexed-list-item.vue | 0
项目代码/DP/src/views/indexs/station-three.vue | 148
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.csproj.CopyComplete | 0
项目代码/PDA/static/uni.ttf | 0
项目代码/PDA/uview-ui/components/u-collapse/u-collapse.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/binding.png | 0
项目代码/PDA/static/image/ReceivingGoodsE.png | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/boxing1.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_SignalR/obj/Release/net6.0/WIDESEAWCS_SignalR.csproj.CopyComplete | 0
项目代码/DP/src/views/indexs/station-two.vue | 99
项目代码/PDA/static/image/lend.png | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callB.png | 0
项目代码/PDA/static/image/check2.png | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Release/net6.0/WIDESEAWCS_Model.csproj.CopyComplete | 0
项目代码/PDA/unpackage/dist/build/app-plus/static/image/in1.png | 0
项目代码/PDA/uview-ui/components/u-collapse-item/u-collapse-item.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/inorder.png | 0
项目代码/PDA/pages/Inbound/InboundInfo.vue | 38
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Release/net6.0/WIDESEAWCS_QuartzJob.csproj.CopyComplete | 0
项目代码/DP/src/assets/img/headers/juxing1.png | 0
/dev/null | 0
项目代码/PDA/unpackage/release/__UNI__6F62323.wgt | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Release/net6.0/WIDESEAWCS_ProcessService.csproj.CopyComplete | 0
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/agvCallback.cs | 124
项目代码/PDA/uview-ui/components/u-time-line/u-time-line.vue | 0
项目代码/PDA/components/uni-pagination/uni-pagination.vue | 0
项目代码/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/forklift.png | 0
项目代码/PDA/uview-ui/components/u-lazy-load/u-lazy-load.vue | 0
489 files changed, 11,880 insertions(+), 694 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.babelrc" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.babelrc"
new file mode 100644
index 0000000..ef058f1
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.babelrc"
@@ -0,0 +1,12 @@
+{
+ "presets": [["es2015", { "modules": false }]],
+ "plugins": [
+ [
+ "component",
+ {
+ "libraryName": "element-ui",
+ "styleLibraryName": "theme-chalk"
+ }
+ ]
+ ]
+ }
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.dev" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.dev"
new file mode 100644
index 0000000..0d4ff64
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.dev"
@@ -0,0 +1,7 @@
+
+# 寮�鍙戠幆澧冿紝寮�鍙戞椂姝ｅ父閮界敤杩欎釜
+NODE_ENV = development
+# 褰撳墠鐜锛屽紑鍙戠幆澧冿紝鍙互闅忎究淇敼锛岄厤鍚堟墦鍖呭閰嶇疆涓庢鏂囦欢鍚嶅瓧
+VUE_APP_URL_ENV = development
+# 鎵撳寘鍚庢枃浠跺す鍚嶅瓧
+VUE_APP_outputDir = development
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.production" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.production"
new file mode 100644
index 0000000..d1dec1a
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.production"
@@ -0,0 +1,7 @@
+
+# 姝ｅ紡鐜锛屾墦鍖呴兘鐢ㄨ繖涓甯哥殑灏辫锛屼笉鐢ㄦ敼
+NODE_ENV = production
+# 褰撳墠鐜锛屾寮忓寘锛宼est姝ｅ紡鍖咃紝鍙互闅忎究淇敼锛岄厤鍚堟墦鍖呭閰嶇疆涓庢鏂囦欢鍚嶅瓧 鍙互鏀�
+VUE_APP_URL_ENV = production
+# 鎵撳寘鍚庢枃浠跺す鍚嶅瓧
+VUE_APP_outputDir = dist-production
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.test" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.test"
new file mode 100644
index 0000000..c75c0d1
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.env.test"
@@ -0,0 +1,4 @@
+# 鐪� .env.development 閲岄潰鐨勬敞閲�
+NODE_ENV = production
+VUE_APP_URL_ENV = test
+VUE_APP_outputDir = dist-test
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.gitignore" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.gitignore"
new file mode 100644
index 0000000..4c2e0cd
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/.gitignore"
@@ -0,0 +1,24 @@
+.DS_Store
+node_modules
+/dist
+/dist-*
+
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/LICENSE" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/LICENSE"
new file mode 100644
index 0000000..a782c28
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/LICENSE"
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 daidai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/README.md" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/README.md"
new file mode 100644
index 0000000..303b36b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/README.md"
@@ -0,0 +1,238 @@
+
+
+## 椤圭洰鎻忚堪
+
+
+
+鏍规嵁濂旇窇鍚ч潰鏉＄殑**[vue-big-screen](https://gitee.com/MTrun/big-screen-vue-datav)**寮�婧愭鏋跺熀纭�涓婅繘琛屼慨鏀广��
+
+- 椤圭洰闇�瑕佸叏灞忓睍绀猴紙鎸� F11锛夈��
+
+- 椤圭洰閮ㄥ垎鍖哄煙浣跨敤浜嗗叏灞�娉ㄥ唽鏂瑰紡锛屽鍔犱簡鎵撳寘浣撶Н锛屽湪瀹為檯杩愮敤涓浣跨敤 **鎸夐渶寮曞叆**銆�
+
+- 椤圭洰鐜锛歏ue-cli銆丏ataV銆丒charts銆乄ebpack銆丯pm銆丯ode锛宎xios,mock銆�
+
+- 璇锋媺鍙� master 鍒嗘敮鐨勪唬鐮侊紝鍏朵綑鍒嗘敮鏄紑鍙戝垎鏀��
+
+- 鍦ㄩ」鐩畃ublic鐩綍涓嬪瓨鏀惧湴鍥炬暟鎹悎闆嗭紝鏍规嵁鍦板競缂栧瓨鏀俱��
+
+
+鍙嬫儏閾炬帴锛�
+
+1. [Vue 瀹樻柟鏂囨。](https://gitee.com/link?target=https%3A%2F%2Fcn.vuejs.org%2Fv2%2Fguide%2Finstance.html)
+2. [DataV 瀹樻柟鏂囨。](https://gitee.com/link?target=http%3A%2F%2Fdatav.jiaminghi.com%2Fguide%2F)
+3. [echarts 瀹炰緥](https://gitee.com/link?target=https%3A%2F%2Fecharts.apache.org%2Fexamples%2Fzh%2Findex.html)锛孾echarts API 鏂囨。](https://gitee.com/link?target=https%3A%2F%2Fecharts.apache.org%2Fzh%2Fapi.html%23echarts)
+4. [mock.js瀹樼綉](http://mockjs.com/examples.html)
+5. [axios瀹樼綉](https://axios-http.com/)
+
+**椤圭洰灞曠ず**
+
+
+
+### 椤圭洰棰勮鍦板潃
+
+[https://www.daidaibg.com/bigscreen](https://www.daidaibg.com/bigscreen)
+
+### 椤圭洰浠撳簱鍦板潃
+
+**github鍦板潃**
+
+[https://github.com/daidaibg/IofTV-Screen](https://github.com/daidaibg/IofTV-Screen)
+
+**Gitee鍦板潃**
+
+[https://gitee.com/daidaibg/IofTV-Screen](https://gitee.com/daidaibg/IofTV-Screen)
+
+### vue3+vite鐗堟湰鍦板潃
+
+**github鍦板潃**
+
+[https://github.com/daidaibg/IofTV-Screen-Vue3](https://github.com/daidaibg/IofTV-Screen-Vue3)
+
+**Gitee鍦板潃**
+
+[https://gitee.com/daidaibg/IofTV-Screen-Vue3](https://gitee.com/daidaibg/IofTV-Screen-Vue3)
+
+### 1.1.0鐗堟湰寮�濮嬮噰鐢ㄨ嚜閫傚簲缁勪欢鏂瑰紡锛屼笉鍐嶄娇鐢╩ixin鏂瑰紡銆�
+
+### 婊氬姩璁剧疆锛岃嚜閫傚簲璁剧疆
+
+椤圭洰涓彲浠ヨ繘琛屾粴鍔ㄩ厤缃紝鍐呭鏄惁婊氬姩
+
+鐐瑰嚮鍙充笂瑙掕缃寜閽�
+
+
+
+
+鍙互杩涜浠ヤ笅閰嶇疆锛屽彲浠ヨ嚜琛屼唬鐮佷腑杩涜淇敼鎴栧鍔犻厤缃�
+
+
+
+
+
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/public/favicon.ico" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/public/favicon.ico"
new file mode 100644
index 0000000..05e57cc
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/public/favicon.ico"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/App.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/App.vue"
new file mode 100644
index 0000000..1381901
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/App.vue"
@@ -0,0 +1,21 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-01-12 14:06:47
+ * @LastEditors: daidai
+ * @LastEditTime: 2022-03-01 17:55:49
+ * @FilePath: \web-pc\src\pages\big-screen\App.vue
+-->
+<template>
+ <div id="app">
+ <router-view/>
+ </div>
+</template>
+
+<style lang="scss" scoped>
+#app {
+ width: 100vw;
+ height: 100vh;
+ background-color: #03050C;
+ // overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/index.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/index.scss"
new file mode 100644
index 0000000..1e52b4a
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/index.scss"
@@ -0,0 +1,361 @@
+@import "./modules/reset.scss";
+@import "./modules/variables.scss";
+@import './theme/index.css';
+@import '../iconfont//iconfont.css';
+
+[class*=" blq-icon-"],
+[class^=blq-icon-] {
+ font-family: iconfont !important;
+ speak: none;
+ font-style: normal;
+ font-weight: 400;
+ font-variant: normal;
+ text-transform: none;
+ line-height: 1;
+ vertical-align: middle;
+ display: inline-block;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale
+}
+
+*,
+:after,
+:before {
+ box-sizing: content-box;
+}
+
+.clearfix {
+ &::after {
+ content: "";
+ display: table;
+ height: 0;
+ line-height: 0;
+ visibility: hidden;
+ clear: both;
+ }
+}
+
+.contents {
+ width: 100%;
+ display: flex;
+ min-height: calc(100% - 60px);
+ justify-content: space-between;
+}
+
+.beautify-scroll-def {
+ overflow-y: auto;
+
+ &::-webkit-scrollbar-thumb {
+ //婊氬姩鏉＄殑璁剧疆
+ background-color: rgba(14, 59, 150, 0);
+ background-clip: padding-box;
+ border-radius: 4px;
+ }
+
+ &:hover {
+ &::-webkit-scrollbar-thumb {
+ //婊氬姩鏉＄殑璁剧疆
+ background-color: rgba(14, 59, 150, 0.5);
+ background-clip: padding-box;
+ border-radius: 4px;
+ }
+ }
+
+ &::-webkit-scrollbar-track-piece {
+ //婊氬姩鏉″嚬妲界殑棰滆壊锛岃繕鍙互璁剧疆杈规灞炴��
+ background-color: transparent;
+ }
+
+ &::-webkit-scrollbar {
+ //婊氬姩鏉＄殑瀹藉害
+ width: 8px;
+ height: 8px;
+ }
+
+
+
+ &::-webkit-scrollbar-thumb:hover {
+ background-color: rgba(14, 59, 150, .8);
+ }
+}
+
+
+.orderNum {
+ // min-width: 22px;
+ // height: 22px;
+ // background: #00b8ff;
+ // border-radius: 50%;
+ // text-align: center;
+ // line-height: 22px;
+ // font-size: 13px;
+ // font-weight: 900;
+ // color: #0f2854;
+ color: #00b8ff;
+}
+
+.yh-big-input {
+ width: 253px;
+ height: 14px;
+ background: transparent;
+ border: 1px solid rgba(255, 255, 255, .53);
+ border-radius: 4px;
+ color: #fff;
+ padding: 6px 10px;
+ font-size: 14px;
+ transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+
+ &:focus {
+ outline: none;
+ border-color: #31abe3;
+ }
+}
+
+.yh-big-el-input {
+ width: 253px;
+ font-size: 14px;
+
+ .el-input__inner {
+ padding: 6px 10px;
+ border: 1px solid rgba(255, 255, 255, .53);
+ background-color: transparent;
+ font-size: 14px;
+ line-height: 1;
+ color: #fff;
+ &:hover{
+ border-color: rgba(255, 255, 255, .8);
+ }
+ &:focus {
+ outline: none;
+ border-color: #31abe3;
+ }
+
+ }
+
+}
+
+.yh-big-button {
+ width: 53px;
+ height: 26px;
+ background: #00b1d6;
+ border-radius: 4px;
+ // border-color: #00b1d6;
+ border-width: 1px;
+ border: none;
+ cursor: pointer;
+ color: #fff;
+ font-size: 15px;
+
+ &:hover,
+ &:focus {
+ // border-color: #0597b4;
+ background: #0597b4;
+ }
+}
+
+
+//娴姩
+.float-r {
+ float: right;
+}
+
+//娴姩
+.float-l {
+ float: left;
+}
+
+// 瀛椾綋鍔犵矖
+.fw-b {
+ font-weight: bold;
+}
+
+//鏂囩珷涓�琛屾樉绀猴紝澶氫綑鐪佺暐鍙锋樉绀�
+.title-item {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+//琛ㄦ牸鏍峰紡閲嶇疆
+.ve-table {
+ $border-color: #525371;
+ // $border-color: rgba(255, 255, 255, .43);
+ box-sizing: border-box;
+
+ .ve-table-container {
+ &::-webkit-scrollbar-track-piece {
+ //婊氬姩鏉″嚬妲界殑棰滆壊锛岃繕鍙互璁剧疆杈规灞炴��
+ background-color: transparent;
+ }
+
+ &::-webkit-scrollbar {
+ //婊氬姩鏉＄殑瀹藉害
+ width: 8px;
+ height: 8px;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ //婊氬姩鏉＄殑璁剧疆
+ background-color: rgba(14, 59, 150, 0.5);
+ background-clip: padding-box;
+ border-radius: 4px;
+ }
+
+ &::-webkit-scrollbar-thumb:hover {
+ background-color: rgba(14, 59, 150, .8);
+ }
+
+ .ve-table-content {
+ &::after {
+ content: "";
+ position: absolute;
+ top: 0;
+ right: 0px;
+ width: 1px;
+ height: 100%;
+ background-color: $border-color;
+ z-index: 20;
+
+ }
+ }
+
+ }
+
+ &.ve-table-border-around {
+ border-color: $border-color;
+ }
+
+ .ve-table-container table.ve-table-content thead.ve-table-header tr.ve-table-header-tr {
+ height: 34px;
+ box-sizing: border-box;
+
+ th.ve-table-header-th {
+ background: #04004E;
+ color: #FFF;
+ border-color: $border-color;
+ box-sizing: border-box;
+ line-height: 1;
+ }
+ }
+
+ .ve-table-container table.ve-table-content tbody.ve-table-body {
+
+ tr.ve-table-body-tr td.ve-table-body-td,
+ tr.ve-table-expand-tr td.ve-table-body-td,
+ tr.ve-table-body-tr td.ve-table-expand-td,
+ tr.ve-table-expand-tr td.ve-table-expand-td {
+ background: transparent;
+ color: #FFF;
+ border-color: $border-color;
+ box-sizing: border-box;
+ }
+
+ tr.ve-table-body-tr,
+ tr.ve-table-expand-tr {
+ height: 34px;
+ box-sizing: border-box;
+ }
+
+ &.ve-table-row-hover tr.ve-table-body-tr:hover td {
+ background-color: rgba(0, 0, 0, .22);
+ box-sizing: border-box;
+ }
+ }
+
+
+
+ .ve-table-container .ve-table-border-x th,
+ .ve-table-container .ve-table-border-x td {
+ border-color: $border-color;
+ box-sizing: border-box;
+ }
+
+}
+
+
+
+//棰滆壊
+@each $colorkey,
+$color in $colors {
+ .text-#{$colorkey} {
+ color: $color;
+ }
+
+ .bg-#{$colorkey} {
+ background-color: $color;
+ }
+}
+
+//瀵归綈
+@each $var in (left, center, right) {
+ .text-#{$var} {
+ text-align: $var !important;
+ }
+}
+
+//flex
+@each $key,
+$value in $flex-jc {
+ .jc-#{$key} {
+ justify-content: $value;
+ }
+}
+
+@each $key,
+$value in $flex-ai {
+ .ai-#{$key} {
+ align-items: $value;
+ }
+}
+
+//瀛椾綋
+@each $fontkey,
+$fontvalue in $font-sizes {
+ .fs-#{$fontkey} {
+ font-size: $fontvalue * $base-font-size;
+ }
+}
+
+//.mt-1 => margin top
+//spacing
+
+@each $typekey,
+$type in $spacing-types {
+
+ //.m-1
+ @each $sizekey,
+ $size in $spacing-sizes {
+ .#{$typekey}-#{$sizekey} {
+ #{$type}: $size * $spacing-base-size;
+ }
+ }
+
+ //.mx-1
+ @each $sizekey,
+ $size in $spacing-sizes {
+ .#{$typekey}x-#{$sizekey} {
+ #{$type}-left: $size * $spacing-base-size;
+ #{$type}-right: $size * $spacing-base-size;
+ }
+
+ .#{$typekey}y-#{$sizekey} {
+ #{$type}-top: $size * $spacing-base-size;
+ #{$type}-bottom: $size * $spacing-base-size;
+ }
+ }
+
+ //.mt-1
+ @each $directionkey,
+ $direction in $spacing-directions {
+
+ @each $sizekey,
+ $size in $spacing-sizes {
+ .#{$typekey}#{$directionkey}-#{$sizekey} {
+ #{$type}-#{$direction}: $size * $spacing-base-size;
+ }
+ }
+ }
+
+ .#{$typekey} {
+ #{$type}: 0;
+ }
+}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/modules/reset.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/modules/reset.scss"
new file mode 100644
index 0000000..3c38101
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/modules/reset.scss"
@@ -0,0 +1,200 @@
+/**
+ * Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
+ * http://cssreset.com
+ */
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video,
+input {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font-weight: normal;
+ vertical-align: baseline;
+}
+
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+menu,
+nav,
+section {
+ display: block;
+}
+
+body {
+ line-height: 1;
+}
+
+blockquote,
+q {
+ quotes: none;
+}
+
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+ content: none;
+}
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+/* custom */
+
+a {
+ color: #7e8c8d;
+ -webkit-backface-visibility: hidden;
+ text-decoration: none;
+}
+
+li {
+ list-style: none;
+}
+
+body {
+ -webkit-text-size-adjust: none;
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+}
+
+.olControlScaleLineBottom {
+ display: none;
+}
+
+.olControlScaleLineTop {
+ color: #000 !important;
+ border-bottom: solid 3px #000 !important;
+ border-left: solid 2px #000 !important;
+ border-right: solid 2px #000 !important;
+ background-color: rgba(255, 255, 255, .4);
+ font-size: 10px;
+ text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff;
+}
+
+.olControlScaleLine {
+ z-index: 900 !important;
+}
+/*娓呴櫎娴姩*/
+.clearfix:after {
+ content: ".";
+ display: block;
+ height: 0;
+ clear: both;
+ visibility: hidden;
+}
+.clearfix {display: inline-block;}
+/* 鐐瑰嚮鎼滅储妗嗚幏鍙栫劍鐐� placeholder娑堝け-寮�濮� */
+/* WebKit browsers */
+
+// input:focus::-webkit-input-placeholder {
+// color: transparent;
+// }
+
+
+// /* Mozilla Firefox 4 to 18 */
+
+// input:focus:-moz-placeholder {
+// color: transparent;
+// }
+
+
+// /* Mozilla Firefox 19+ */
+
+// input:focus::-moz-placeholder {
+// color: transparent;
+// }
+
+
+// /* Internet Explorer 10+ */
+
+// input:focus:-ms-input-placeholder {
+// color: transparent;
+// }
+
+/* 鐐瑰嚮鎼滅储妗嗚幏鍙栫劍鐐� placeholder娑堝け-缁撴潫 */
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/modules/variables.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/modules/variables.scss"
new file mode 100644
index 0000000..e36162c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/modules/variables.scss"
@@ -0,0 +1,98 @@
+// 棰滆壊
+$colors: (
+ "primary": #1A5CD7,
+ "info-1": #4394e4,
+ "info": #4b67af,
+ "white": #ffffff,
+ "light": #f9f9f9,
+ "grey-1": #999999,
+ "grey": #666666,
+ "dark-1": #5f5f5f,
+ "dark": #222222,
+ "black-1": #171823,
+ "black": #000000,
+ "icon": #5cd9e8
+);
+
+// 瀛椾綋澶у皬
+$base-font-size: 0.2rem;
+$font-sizes: (
+ xxs: 0.1,
+ //8px
+ xs: 0.125,
+ //10px
+ sm: 0.2875,
+ //12px
+ md: 0.1625,
+ //13px
+ lg: 0.175,
+ //14px
+ xl: 0.2,
+ //16px
+ xxl: 0.225,
+ //18px
+ xxxl: 0.25 //20px,,,,
+);
+
+// 瀹介珮
+.w-100 {
+ width: 100%;
+}
+.h-100 {
+ height: 100%;
+}
+
+//flex
+.flex {
+ display: flex;
+}
+.flex-column {
+ flex-direction: column;
+}
+.flex-wrap {
+ flex-wrap: wrap;
+}
+.flex-nowrap {
+ flex-wrap: nowrap;
+}
+$flex-jc: (
+ start: flex-start,
+ end: flex-end,
+ center: center,
+ between: space-between,
+ around: space-around,
+ evenly: space-evenly,
+);
+
+$flex-ai: (
+ start: flex-start,
+ end: flex-end,
+ center: center,
+ stretch: stretch,
+);
+
+.flex-1 {
+ flex: 1;
+}
+
+//.mt-1 => margin top
+//spacing
+$spacing-types: (
+ m: margin,
+ p: padding,
+);
+$spacing-directions: (
+ t: top,
+ r: right,
+ b: bottom,
+ l: left,
+);
+$spacing-base-size: 0.5rem;
+$spacing-sizes: (
+ 0: 0,
+ 1: 0.5,
+ 2: 1,
+ 3: 1.5,
+ 4: 2,
+ 5: 2.5,
+);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/public.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/public.scss"
new file mode 100644
index 0000000..124a535
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/public.scss"
@@ -0,0 +1,156 @@
+.flex {
+ display: flex;
+}
+
+.flex-direction {
+ flex-direction: column;
+}
+
+.flex-wrap {
+ flex-wrap: wrap;
+}
+
+.align-start {
+ align-items: flex-start;
+}
+
+.align-end {
+ align-items: flex-end;
+}
+
+.align-center {
+ align-items: center;
+}
+
+.align-stretch {
+ align-items: stretch;
+}
+
+.self-start {
+ align-self: flex-start;
+}
+
+.self-center {
+ align-self: flex-center;
+}
+
+.self-end {
+ align-self: flex-end;
+}
+
+.self-stretch {
+ align-self: stretch;
+}
+
+.align-stretch {
+ align-items: stretch;
+}
+
+.justify-start {
+ justify-content: flex-start;
+}
+
+.justify-end {
+ justify-content: flex-end;
+}
+
+.justify-center {
+ justify-content: center;
+}
+
+.justify-between {
+ justify-content: space-between;
+}
+
+.justify-around {
+ justify-content: space-around;
+}
+@for $i from 0 through 12 {
+ .rdx-flex-#{$i} {
+ flex: $i;
+ }
+}
+
+@for $i from 9 to 50 {
+ .rdx-font-#{$i} {
+ font-size: $i + px;
+ }
+}
+
+@for $i from 2 to 50 {
+ .rdx-radius-#{$i} {
+ border-radius: $i + px;
+ }
+}
+@for $i from 10 to 50 {
+ .rdx-line-height-#{$i} {
+ line-height: $i + px;
+ }
+}
+
+// 瀹氫箟鍐呭杈硅窛锛屽巻閬�1-80
+@for $i from 0 through 80 {
+ // 鍙鍙屾暟鍜岃兘琚�5闄ゅ敖鐨勬暟
+ @if $i % 2 == 0 or $i % 5 == 0 {
+ // 寰楀嚭锛歶-margin-30鎴栬�卽-m-30
+ .rdx-m-#{$i} {
+ margin: $i + px !important;
+ }
+ // 寰楀嚭锛歶-padding-30鎴栬�卽-p-30
+ .rdx-p-#{$i} {
+ padding: $i + px !important;
+ }
+
+ @each $short, $long in l left, t top, r right, b bottom {
+ // 缂╁啓鐗堬紝缁撴灉濡傦細 u-m-l-30
+ // 瀹氫箟澶栬竟璺�
+ .rdx-m-#{$short}-#{$i} {
+ margin-#{$long}: $i + px !important;
+ }
+
+ // 瀹氫箟鍐呰竟璺�
+ .rdx-p-#{$short}-#{$i} {
+ padding-#{$long}: $i + px !important;
+ }
+
+ //鑷畾涔夊乏鍙冲唴杈硅窛
+ .rdx-p-lr-#{$i} {
+ padding-left:$i + px !important;
+ padding-right:$i + px !important;
+ }
+ //鑷畾涔変笂涓嬪唴杈硅窛
+ .rdx-p-tb-#{$i} {
+ padding-top:$i + px !important;
+ padding-bottom:$i + px !important;
+ }
+ }
+ }
+}
+i{font-style: normal;}
+.position-re{position: relative;}
+.position-ab{position: absolute; z-index: 9;}
+.position-fixed{position: fixed; background: rgba(92, 116, 143, 0.45); width: 100%; height: 100%; left: 0px; top: 0px; z-index: 10;}
+.round{border-radius: 50%;}
+.font-strong{font-weight: bold;}
+.color-del{color:$del-color}
+.color-primary{color: $primary-color;}
+.color-remark{color: #666666;}
+.color-9{color: #999999;}
+.color-green{color: #38a800;}
+.bg-white{background-color: white;}
+.line-bottom{border-bottom: 1px solid #eeeeee;}
+.button-pointer{cursor: pointer;}
+.box-shadow-item{box-shadow: 0px 0px 4px 0px rgba(45, 45, 46, 0.1);}
+.search-form .search-form-item label {text-align: right; padding-right: 6px;}
+
+
+.break-all{
+ word-break: break-all;
+}
+.blocks{
+ width: 100%;
+ height: 100%;
+}
+.cursor-pointer{
+ cursor: pointer;
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/theme/fonts/element-icons.ttf" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/theme/fonts/element-icons.ttf"
new file mode 100644
index 0000000..91b74de
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/theme/fonts/element-icons.ttf"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/theme/fonts/element-icons.woff" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/theme/fonts/element-icons.woff"
new file mode 100644
index 0000000..02b9a25
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/theme/fonts/element-icons.woff"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/variable.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/variable.scss"
new file mode 100644
index 0000000..6541052
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/css/variable.scss"
@@ -0,0 +1,50 @@
+// 棰滆壊
+$primary-color: #1890ff;
+$primary-color-hl: rgb(41, 52, 67);
+$default-color: #006569;
+$link: #1890ff;
+$active-color: rgb(0, 101, 105);
+$del-color: #ff1839;
+$content-background: #f3f5fa;
+$table-header-background: #d8eaff;
+
+$primary-color-rgba: rgba($color: $primary-color,
+ $alpha: 0.1,
+);
+//琛ㄦ牸涓婇潰button鎸夐挳棰滆壊
+$table-header-button: #18d1ff;
+// 闃村奖
+$primary-shadow: 0 2px 4px rgba(0, 0, 0, 0.12),
+0 0 6px rgba(0, 0, 0, 0.04);
+$primary-shadow-light: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+$baidu-shadow: 1px 2px 1px rgba(0, 0, 0, 0.15);
+$gaode-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.2),
+0 2px 6px 0 rgba(0, 0, 0, 0.19);
+
+// box-shadow: 0 2px 6px 0 rgb(114 124 245 / 50%);
+
+$primary-border: $primary-color solid 1px;
+
+$tool-top: 20px;
+
+//header 鐨勯珮搴�
+$index-height: 60px;
+$index-content-height: calc(100% - 60px);
+$index-tags-height: 36px;
+// 瀹藉害渚ц竟鏍�
+$aside-width: 200px;
+$content-padding: 16px;
+
+$default-zindex: 99;
+
+/*鏂囨湰鏍煎紡鍖栵紝瓒呭嚭鑼冨洿锛屾樉绀虹渷鐣ュ彿*/
+@mixin text-overflow($num: 1) {
+ word-break: break-all;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ display: -webkit-box;
+ -webkit-line-clamp: $num;
+ -webkit-box-orient: vertical;
+}
+
+
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.ttf" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.ttf"
new file mode 100644
index 0000000..4846ee3
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.ttf"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.woff" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.woff"
new file mode 100644
index 0000000..a4600dc
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.woff"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.woff2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.woff2"
new file mode 100644
index 0000000..8154396
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/iconfont/iconfont.woff2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/2.mp4" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/2.mp4"
new file mode 100644
index 0000000..ac7d883
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/2.mp4"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/3DScreen.jpg" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/3DScreen.jpg"
new file mode 100644
index 0000000..4a325eb
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/3DScreen.jpg"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/3DScreen.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/3DScreen.png"
new file mode 100644
index 0000000..afbeaa9
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/3DScreen.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/center_map.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/center_map.png"
new file mode 100644
index 0000000..71f4036
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/center_map.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/frame.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/frame.png"
new file mode 100644
index 0000000..150ec5e
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/frame.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/guang.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/guang.png"
new file mode 100644
index 0000000..3c49e9d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/guang.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/gysp.mp4" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/gysp.mp4"
new file mode 100644
index 0000000..c2084ab
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/gysp.mp4"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/headers/juxing1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/headers/juxing1.png"
new file mode 100644
index 0000000..36d901a
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/headers/juxing1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/headers/juxing2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/headers/juxing2.png"
new file mode 100644
index 0000000..5c99bd7
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/headers/juxing2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_hong.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_hong.png"
new file mode 100644
index 0000000..e19a5e9
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_hong.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_huang.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_huang.png"
new file mode 100644
index 0000000..5b12f88
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_huang.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_lan.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_lan.png"
new file mode 100644
index 0000000..f60cdb8
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_lan.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_lv.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_lv.png"
new file mode 100644
index 0000000..feb80ee
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/left_top_lv.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/pageBg.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/pageBg.png"
new file mode 100644
index 0000000..d393f2b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/pageBg.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/titles/you.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/titles/you.png"
new file mode 100644
index 0000000..3877b31
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/titles/you.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/titles/zuo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/titles/zuo.png"
new file mode 100644
index 0000000..b3b355d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/titles/zuo.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/top.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/top.png"
new file mode 100644
index 0000000..50c0c9a
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/top.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/xieyou.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/xieyou.png"
new file mode 100644
index 0000000..1744fae
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/xieyou.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/xiezuo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/xiezuo.png"
new file mode 100644
index 0000000..272249d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/xiezuo.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/zuo_xuxian.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/zuo_xuxian.png"
new file mode 100644
index 0000000..e54d037
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/assets/img/zuo_xuxian.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/centerLeft1Chart/chart.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/centerLeft1Chart/chart.vue"
new file mode 100644
index 0000000..ef0c909
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/centerLeft1Chart/chart.vue"
@@ -0,0 +1,87 @@
+<template>
+ <div>
+ <Echart
+ :options="options"
+ id="centreLeft1Chart"
+ height="220px"
+ width="360px"
+ ></Echart>
+ </div>
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+ data () {
+ return {
+ options: {},
+ };
+ },
+ components: {
+ echarts,
+ },
+ props: {
+ cdata: {
+ type: Object,
+ default: () => ({})
+ },
+ },
+ watch: {
+ cdata: {
+ handler (newData) {
+ this.options = {
+ color: [
+ "#37a2da",
+ "#32c5e9",
+ "#9fe6b8",
+ "#ffdb5c",
+ "#ff9f7f",
+ "#fb7293",
+ "#e7bcf3",
+ "#8378ea"
+ ],
+ legend:{
+ textStyle:{
+ color:"#ffffff",
+ fontSize:18
+ }
+ },
+ tooltip: {
+ trigger: "item",
+ formatter: "{a} <br/>{b} : {c} ({d}%)"
+ },
+ toolbox: {
+ show: true
+ },
+ calculable: true,
+ legend: {
+ orient: "horizontal",
+ icon: "circle",
+ bottom: 0,
+ x: "center",
+ data: newData.xData,
+ textStyle: {
+ color: "#fff"
+ }
+ },
+ series: [
+ {
+ name: "閫氳繃鐜囩粺璁�",
+ type: "pie",
+ radius: [20, 60],
+ roseType: "area",
+ center: ["50%", "50%"],
+ data: newData.seriesData
+ }
+ ]
+ }
+ },
+ immediate: true,
+ deep: true
+ }
+ }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/centerLeft1Chart/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/centerLeft1Chart/index.vue"
new file mode 100644
index 0000000..9c6e4aa
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/centerLeft1Chart/index.vue"
@@ -0,0 +1,55 @@
+<template>
+ <div>
+ <Chart :cdata="cdata" />
+ </div>
+ </template>
+
+ <script>
+ import Chart from './chart.vue';
+ import axios from 'axios';
+ export default {
+ data () {
+ return {
+ cdata: {
+ xData: ["绌烘墭", "瀹炴墭", "寰呮", "鍚堟牸", "妫�淇腑"],
+ seriesData: []
+ }
+ }
+ },
+ components: {
+ Chart,
+ },
+ mounted () {
+ this.changeTiming()
+ },
+ methods: {
+ changeTiming() {
+ this.changeNumber()
+ setInterval(() => {
+ this.changeNumber()
+ }, 3000)
+ },
+ changeNumber() {
+ axios.post("http://192.168.12.189:8098/api/VV_Container/GetContainerMessage", {
+ MainData: {
+ AGVName: "璐熸瀬"
+ }
+ }).then((res) => {
+ let GetLocationEmptyOrStored = [
+ {value:res.empty+1,name:'绌烘墭'},
+ {value:res.full+1,name:"瀹炴墭"},
+ {value:res.waitCheck+1,name:"寰呮"},
+ {value:res.qualified+1,name:"鍚堟牸"},
+ {value:res.checkIng+1,name:"妫�淇腑"}
+ ]
+ this.cdata.seriesData = GetLocationEmptyOrStored
+ }).catch((res) => {
+ console.log(res)
+ })
+ }
+ }
+ }
+ </script>
+
+ <style lang="scss" scoped>
+ </style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/index.vue"
new file mode 100644
index 0000000..0ae38d4
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/echart/index.vue"
@@ -0,0 +1,70 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-02-28 16:29:08
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-27 15:05:45
+ * @FilePath: \web-pc\src\pages\big-screen\components\echart\index.vue
+-->
+<template>
+ <div :id="id" :class="className" :style="{ height: height, width: width }" />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+export default {
+ name: 'echart',
+ props: {
+ className: {
+ type: String,
+ default: 'chart'
+ },
+ id: {
+ type: String,
+ default: 'chart'
+ },
+ width: {
+ type: String,
+ default: '100%'
+ },
+ height: {
+ type: String,
+ default: '100%'
+ },
+ options: {
+ type: Object,
+ default: ()=>({})
+ }
+ },
+ data () {
+ return {
+ chart: null
+ }
+ },
+ watch: {
+ options: {
+ handler (options) {
+ // 璁剧疆true娓呯┖echart缂撳瓨
+ this.chart.setOption(options, true)
+ },
+ deep: true
+ }
+ },
+ mounted () {
+ this.initChart();
+ },
+ beforeDestroy () {
+ this.chart.dispose()
+ this.chart = null
+ },
+ methods: {
+ initChart () {
+ // 鍒濆鍖杄chart
+ this.chart = echarts.init(this.$el)
+ this.chart.setOption(this.options, true)
+ }
+ }
+}
+</script>
+
+<style>
+</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/item-wrap/item-wrap.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/item-wrap/item-wrap.vue"
new file mode 100644
index 0000000..e58dc5e
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/item-wrap/item-wrap.vue"
@@ -0,0 +1,97 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-01 09:16:22
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-29 15:12:34
+ * @FilePath: \web-pc\src\pages\big-screen\components\item-wrap\item-wrap.vue
+-->
+<template>
+ <dv-border-box-13 class="lr_titles">
+ <div class="item_title" v-if="title !== ''">
+ <div class="zuo"></div>
+ <span class="title-inner"> {{ title }} </span>
+ <div class="you"></div>
+ </div>
+ <div
+ :class="title !== '' ? 'item_title_content' : 'item_title_content_def'"
+ >
+ <slot></slot>
+ </div>
+ </dv-border-box-13>
+</template>
+
+<script>
+export default {
+ data() {
+ return {};
+ },
+ props: {
+ title: {
+ type: String,
+ default: () => "",
+ },
+ },
+ created() {},
+
+ mounted() {},
+ methods: {},
+};
+</script>
+<style lang='scss' scoped>
+$item-title-height: 38px;
+$item_title_content-height: calc(100% - 38px);
+
+.lr_titles {
+ box-sizing: border-box;
+
+:deep(.border-box-content) {
+ box-sizing: border-box;
+ padding: 6px 16px 0px;
+ }
+
+ .item_title {
+ height: $item-title-height;
+ line-height: $item-title-height;
+ width: 100%;
+ color: #31abe3;
+ text-align: center;
+ // background: linear-gradient(to right, transparent, #0f0756, transparent);
+ position: relative;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ .zuo,
+ .you {
+ width: 58px;
+ height: 14px;
+ background-image: url("../../assets/img/titles/zuo.png");
+ }
+
+ .you {
+ transform: rotate(180deg);
+ }
+ .title-inner {
+ font-weight: 900;
+ letter-spacing: 2px;
+ background: linear-gradient(
+ 92deg,
+ #0072ff 0%,
+ #00eaff 48.8525390625%,
+ #01aaff 100%
+ );
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+ }
+
+ .item_title_content {
+ height: $item_title_content-height;
+ }
+
+ .item_title_content_def {
+ width: 100%;
+ height: 100%;
+ }
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/kong.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/kong.vue"
new file mode 100644
index 0000000..8732756
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/kong.vue"
@@ -0,0 +1,43 @@
+<template>
+ <div class='kong'>
+ <slot></slot>
+ </div>
+</template>
+
+<script>
+
+export default {
+ components: {},
+ data() {
+ return {
+
+ };
+ },
+ props:{
+ data:{
+ type:Array,
+ default:()=>[]
+ }
+ },
+ computed: {},
+ methods: {
+ init(){
+ },
+ },
+ created() {
+
+ },
+ mounted() {
+
+ },
+ beforeDestroy() {
+ },
+}
+</script>
+
+<style lang='scss' scoped>
+.kong{
+ width: 100%;
+ height: 100%;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/message/message.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/message/message.vue"
new file mode 100644
index 0000000..8c8c7a1
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/message/message.vue"
@@ -0,0 +1,74 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-02 17:07:40
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-04-26 11:41:27
+ * @FilePath: \web-pc\src\pages\big-screen\components\message\message.vue
+-->
+<template>
+ <div class="messages" v-if="visible">
+ <svg fill="none" viewBox="0 0 16 16" width="1em" height="1em" class="message-icon">
+ <path fill="currentColor" d="M15 8A7 7 0 101 8a7 7 0 0014 0zM8.5 4v5.5h-1V4h1zm-1.1 7h1.2v1.2H7.4V11z"
+ fill-opacity="0.9" v-if="'warning'==type"></path>
+ </svg>
+ {{ text }}
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ visible: false,
+ text: "",
+ type:'warning'
+ };
+ },
+ props: {},
+ created() { },
+
+ mounted() { },
+ methods: {
+ init(param) {
+ clearTimeout(this.timer);
+ this.visible = true;
+ this.text = param.text || "";
+ this.type = param.type || "success";
+ this.timer = setTimeout(() => {
+ this.visible = false;
+ clearTimeout(this.timer);
+ }, 2000);
+ },
+ },
+};
+</script>
+<style lang='scss' scoped>
+.messages {
+ position: fixed;
+ min-width: 200px;
+ top: 160px;
+ left: 50%;
+ transform: translate(-50%, 0);
+ border: solid 1px #4b4b4b;
+ // box-shadow: 0 16px 24px rgba(0, 0, 0, 0.14), 0 6px 30px rgba(0, 0, 0, 12%),
+ // 0 8px 10px rgba(0, 0, 0, 20%), inset 0 0.5px 0 #5e5e5e,
+ // inset 0.5px 0 0 #5e5e5e, inset 0 -0.5px 0 #5e5e5e, inset -0.5px 0 0 #5e5e5e;
+ width: fit-content;
+ border-radius: 6px;
+ display: flex;
+ align-items: center;
+ z-index: 999;
+ color: rgba(255, 255, 255, 0.9);
+ background-color: #242424;
+ line-height: 22px;
+ font-size: 14px;
+ padding: 13px 16px;
+
+ .message-icon {
+ color: #cf6e2d;
+ font-size: 20px;
+ margin-right: 8px;
+ fill: currentColor;
+ }
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/reacquire/reacquire.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/reacquire/reacquire.vue"
new file mode 100644
index 0000000..2f47845
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/reacquire/reacquire.vue"
@@ -0,0 +1,64 @@
+<template>
+ <div class='reacquire flex justify-center blocks cursor-pointer' :style="{ lineHeight: lineHeight }"
+ @click="getData">
+ <span>
+ 閲嶆柊鑾峰彇
+ </span>
+
+ </div>
+</template>
+
+<script>
+
+export default {
+ components: {},
+ props: {
+ lineHeight: {
+ type: String,
+ default: '200px'
+ }
+ },
+ data() {
+ return {
+
+ };
+ },
+ computed: {},
+ methods: {
+ init() {
+ },
+ getData(e){
+ this.$emit("onclick",e)
+ }
+ },
+ created() {
+
+ },
+ mounted() {
+
+ },
+ beforeDestroy() {
+ },
+}
+</script>
+
+<style lang='scss' scoped>
+.reacquire {
+
+ user-select:none;
+ color: rgb(168, 168, 168);
+ span:hover{
+ color:$primary-color ;
+ text-decoration: underline;
+ }
+}
+
+.blocks {
+ width: 100%;
+ height: 100%;
+}
+
+.cursor-pointer {
+ cursor: pointer;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/scale-screen/scale-screen.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/scale-screen/scale-screen.vue"
new file mode 100644
index 0000000..a8c5637
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/components/scale-screen/scale-screen.vue"
@@ -0,0 +1,253 @@
+<!--
+ * @Author: wei
+ * @description: 澶у睆鑷�傚簲瀹瑰櫒缁勪欢
+ * @LastEditTime: 2022-09-09 16:42:40
+-->
+<template>
+ <!-- <section class="screen-box" :style="boxStyle"> -->
+ <div class="screen-wrapper" ref="screenWrapper" :style="wrapperStyle">
+ <slot></slot>
+ </div>
+ <!-- </section> -->
+</template>
+<script>
+/**
+ * 闃叉姈鍑芥暟
+ * @param {T} fn
+ * @param {number} delay
+ * @return
+ */
+function debounce(fn, delay) {
+ let timer = null;
+ return function (...args) {
+ timer = setTimeout(
+ () => {
+ typeof fn === "function" && fn.apply(null, args);
+ clearTimeout(timer);
+ },
+ delay > 0 ? delay : 100
+ );
+ };
+}
+
+export default {
+ name: "VScaleScreen",
+ props: {
+ width: {
+ type: [String, Number],
+ default: 1920,
+ },
+ height: {
+ type: [String, Number],
+ default: 1080,
+ },
+ fullScreen: {
+ type: Boolean,
+ default: false,
+ },
+ autoScale: {
+ type: [Object, Boolean],
+ default: true,
+ },
+ selfAdaption: {
+ type: Boolean,
+ default: true,
+ },
+ delay: {
+ type: Number,
+ default: 500,
+ },
+ boxStyle: {
+ type: Object,
+ default: () => ({}),
+ },
+ wrapperStyle: {
+ type: Object,
+ default: () => ({}),
+ },
+ },
+ data() {
+ return {
+ currentWidth: 0,
+ currentHeight: 0,
+ originalWidth: 0,
+ originalHeight: 0,
+ onResize: null,
+ observer: null,
+ };
+ },
+ watch: {
+ selfAdaption(val) {
+ if (val) {
+ this.resize();
+ this.addListener();
+ } else {
+ this.clearListener();
+ this.clearStyle();
+ }
+ },
+ },
+ computed: {
+ screenWrapper() {
+ return this.$refs["screenWrapper"];
+ },
+ },
+ methods: {
+ initSize() {
+ return new Promise((resolve, reject) => {
+ // console.log("鍒濆鍖栨牱寮�");
+ //缁欑埗鍏冪礌璁剧疆 overflow:hidden
+ this.screenWrapper.parentNode.style.overflow = "hidden";
+ this.screenWrapper.parentNode.scrollLeft = 0;
+ this.screenWrapper.parentNode.scrollTop = 0;
+
+ this.$nextTick(() => {
+ // region 鑾峰彇澶у睆鐪熷疄灏哄
+ if (this.width && this.height) {
+ this.currentWidth = this.width;
+ this.currentHeight = this.height;
+ } else {
+ this.currentWidth = this.screenWrapper.clientWidth;
+ this.currentHeight = this.screenWrapper.clientHeight;
+ }
+ // endregion
+ // region 鑾峰彇鐢诲竷灏哄
+ if (!this.originalHeight || !this.originalWidth) {
+ this.originalWidth = window.screen.width;
+ this.originalHeight = window.screen.height;
+ }
+ // endregion
+ resolve();
+ });
+ });
+ },
+ updateSize() {
+ if (this.currentWidth && this.currentHeight) {
+ this.screenWrapper.style.width = `${this.currentWidth}px`;
+ this.screenWrapper.style.height = `${this.currentHeight}px`;
+ } else {
+ this.screenWrapper.style.width = `${this.originalWidth}px`;
+ this.screenWrapper.style.height = `${this.originalHeight}px`;
+ }
+ },
+ handleAutoScale(scale) {
+ if (!this.autoScale) return;
+ const screenWrapper = this.screenWrapper;
+ const domWidth = screenWrapper.clientWidth;
+ const domHeight = screenWrapper.clientHeight;
+ const currentWidth = document.body.clientWidth;
+ const currentHeight = document.body.clientHeight;
+ screenWrapper.style.transform = `scale(${scale},${scale}) `;
+ let mx = Math.max((currentWidth - domWidth * scale) / 2, 0);
+ let my = Math.max((currentHeight - domHeight * scale) / 2, 0);
+ if (typeof this.autoScale === "object") {
+ // @ts-ignore
+ !this.autoScale.x && (mx = 0);
+ // @ts-ignore
+ !this.autoScale.y && (my = 0);
+ }
+ // console.log({
+ // mx,
+ // my,
+ // currentWidth,
+ // currentHeight,
+ // domWidth,
+ // domHeight,
+ // scale,
+ // });
+ this.screenWrapper.style.margin = `${my}px ${mx}px`;
+ },
+ updateScale() {
+ const screenWrapper = this.screenWrapper;
+ // 鑾峰彇鐪熷疄瑙嗗彛灏哄
+ const currentWidth = document.body.clientWidth;
+ const currentHeight = document.body.clientHeight;
+ // 鑾峰彇澶у睆鏈�缁堢殑瀹介珮onResize
+ const realWidth = this.currentWidth || this.originalWidth;
+ const realHeight = this.currentHeight || this.originalHeight;
+ // 璁＄畻缂╂斁姣斾緥
+ const widthScale = currentWidth / realWidth;
+ const heightScale = currentHeight / realHeight;
+ // console.log({currentWidth, currentHeight,realWidth,realHeight});
+
+ // 鑻ヨ閾烘弧鍏ㄥ睆锛屽垯鎸夌収鍚勮嚜姣斾緥缂╂斁
+ if (this.fullScreen) {
+ screenWrapper.style.transform = `scale(${widthScale},${heightScale})`;
+ return false;
+ }
+ // 鎸夌収瀹介珮鏈�灏忔瘮渚嬭繘琛岀缉鏀�
+ const scale = Math.min(widthScale, heightScale);
+ this.handleAutoScale(scale);
+ },
+ initMutationObserver() {
+ const screenWrapper = this.screenWrapper;
+ const observer = (this.observer = new MutationObserver(() => {
+ this.onResize();
+ }));
+
+ observer.observe(screenWrapper, {
+ attributes: true,
+ attributeFilter: ["style"],
+ attributeOldValue: true,
+ });
+ },
+ clearListener() {
+ window.removeEventListener("resize", this.onResize);
+ },
+ addListener() {
+ window.addEventListener("resize", this.onResize);
+ },
+ clearStyle() {
+ // console.log("娓呴櫎");
+ const screenWrapper = this.screenWrapper;
+ screenWrapper.parentNode.style.overflow = "auto";
+
+ screenWrapper.style = "";
+ },
+ async resize() {
+ if (!this.selfAdaption) {
+ return;
+ }
+ await this.initSize();
+ this.updateSize();
+ this.updateScale();
+ },
+ },
+ mounted() {
+ this.onResize = debounce(() => {
+ this.resize();
+ }, this.delay);
+ this.$nextTick(() => {
+ if (this.selfAdaption) {
+ this.resize();
+ this.addListener();
+ }
+ });
+ },
+ beforeDestroy() {
+ this.clearListener();
+ // this.observer.disconnect()
+ },
+};
+//
+</script>
+
+<style scoped>
+.screen-box {
+ overflow: hidden;
+ background-size: 100% 100%;
+ background: #000;
+ width: 100vw;
+ height: 100vh;
+}
+
+.screen-wrapper {
+ transition-property: all;
+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+ transition-duration: 500ms;
+ position: relative;
+ overflow: hidden;
+ z-index: 100;
+ transform-origin: left top;
+}
+</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.scss"
new file mode 100644
index 0000000..3f194dc
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.scss"
@@ -0,0 +1,261 @@
+.scale-wrap {
+ color: #d3d6dd;
+ width: 1920px;
+ height: 1080px;
+ overflow: hidden;
+ // &.pageisScale {
+ // position: absolute;
+ // top: 50%;
+ // left: 50%;
+ // transform: translate(-50%, -50%);
+ // transform-origin: left top;
+ // }
+ .bg {
+ width: 100%;
+ height: 100%;
+ padding: 16px 16px 10px 16px;
+ box-sizing: border-box;
+ background-image: url("../assets/img/pageBg.png");
+ background-size: cover;
+ background-position: center center;
+ }
+
+ .host-body {
+ height: 100%;
+
+ .title_wrap {
+ height: 60px;
+ background-image: url("../assets/img/top.png");
+ background-size: cover;
+ background-position: center center;
+ position: relative;
+ margin-bottom: 4px;
+
+ .guang {
+ position: absolute;
+ bottom: -26px;
+ background-image: url("../assets/img/guang.png");
+ background-position: 80px center;
+ width: 100%;
+ height: 56px;
+ }
+
+ .zuojuxing,
+ .youjuxing {
+ position: absolute;
+ top: -2px;
+ width: 140px;
+ height: 6px;
+ background-image: url("../assets/img/headers/juxing1.png");
+ }
+
+ .zuojuxing {
+
+ left: 11%;
+ }
+
+ .youjuxing {
+ right: 11%;
+ transform: rotate(180deg);
+ }
+
+ .timers {
+ position: absolute;
+ right: 0;
+ top: 30px;
+ font-size: 18px;
+ display: flex;
+ align-items: center;
+
+ .blq-icon-shezhi02 {
+ cursor: pointer;
+ }
+ }
+ }
+
+ .title {
+ position: relative;
+ // width: 500px;
+ text-align: center;
+ background-size: cover;
+ color: transparent;
+ height: 60px;
+ line-height: 46px;
+
+ .title-text {
+ font-size: 38px;
+ font-weight: 900;
+ letter-spacing: 6px;
+ width: 100%;
+ background: linear-gradient(92deg, #0072FF 0%, #00EAFF 48.8525390625%, #01AAFF 100%);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+ }
+ }
+
+
+}
+
+.scale-wrap {
+ .pagetab {
+ position: absolute;
+ top: -35px;
+ display: flex;
+
+ .item {
+ width: 130px;
+ height: 36px;
+ border-radius: 18px 0px 0px 18px;
+ color: #00FBF8;
+ text-indent: 26px;
+ line-height: 36px;
+ font-size: 16px;
+ margin-right: 20px;
+ background: linear-gradient(to right, rgba(76, 245, 255, .5), rgba(76, 245, 255, 0));
+ }
+ }
+}
+
+.setting {
+ position: fixed;
+ width: 100%;
+ height: 100%;
+ z-index: 999;
+ top: 0;
+ left: 0;
+
+ .left_shu {
+ color: #000;
+ font-weight: 900;
+ position: relative;
+ text-indent: 10px;
+ padding:16px 0 10px 0 ;
+ &::before {
+ display: block;
+ content: " ";
+ height: 16px;
+ width: 4px;
+ border-radius: 2px;
+ background: #0072FF;
+ position: absolute;
+ left: 0px;
+ }
+ }
+
+ .setting_dislog {
+ background-color: rgba($color: #000000, $alpha: .5);
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: 0;
+ right: 0;
+ top: 0;
+ }
+
+ .setting_inner {
+ box-sizing: border-box;
+ background: #FFF;
+ width: 340px;
+ height: 100%;
+ position: absolute;
+ right: 0px;
+ top: 0;
+ z-index: 1;
+ color: #000000;
+ box-shadow: 0 8px 10px -5px rgba(0, 0, 0, .2), 0 16px 24px 2px rgba(0, 0, 0, .14), 0 6px 30px 5px rgba(0, 0, 0, .12);
+
+ .setting_header {
+ font-size: 20px;
+ color: rgb(0, 0, 0);
+ font-weight: 900;
+ text-align: center;
+ line-height: 40px;
+ }
+
+ .setting_body {
+ padding: 0px 16px;
+ box-sizing: border-box;
+ position: relative;
+ }
+
+ .setting_item {
+ font-size: 14px;
+ line-height: 1.5;
+
+ // display: flex;
+ .setting_label {
+ color: #555454;
+ }
+ .setting_label_tip{
+ font-size: 12px;
+ color: #838282;
+ }
+ }
+ }
+
+ .setting_inner {
+ animation: rtl-drawer-out .3s;
+ }
+}
+
+
+.settingShow {
+ .setting_inner {
+ animation: rtl-drawer-in .3s 1ms;
+ }
+
+}
+
+.yh-setting-fade-enter-active {
+ animation: yh-setting-fade-in .3s;
+}
+
+.yh-setting-fade-leave-active {
+
+ animation: yh-setting-fade-out .3s;
+
+}
+
+@keyframes yh-setting-fade-in {
+ 0% {
+ opacity: 0;
+ }
+
+ 100% {
+ opacity: 1;
+ }
+}
+
+@keyframes yh-setting-fade-out {
+ 0% {
+ opacity: 1;
+
+ }
+
+ 100% {
+ opacity: 0;
+ }
+}
+
+
+@keyframes rtl-drawer-in {
+ 0% {
+ transform: translate(100%, 0)
+ }
+
+ 100% {
+ -webkit-transform: translate(0, 0);
+ transform: translate(0, 0)
+ }
+}
+
+@keyframes rtl-drawer-out {
+ 0% {
+ transform: translate(0, 0)
+ }
+
+ 100% {
+ transform: translate(100%, 0)
+ }
+}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue"
new file mode 100644
index 0000000..ed4af2d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/home.vue"
@@ -0,0 +1,102 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-01-12 14:23:32
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-09 14:47:24
+ * @FilePath: \web-pc\src\pages\big-screen\view\home.vue
+-->
+<template>
+ <!-- <div id="index" ref="appRef" class="index_home" :class="{ pageisScale: isScale }"> -->
+ <ScaleScreen
+ :width="1920"
+ :height="1080"
+ class="scale-wrap"
+ :selfAdaption="$store.state.setting.isScale"
+ >
+ <div class="bg">
+ <dv-loading v-if="loading">Loading...</dv-loading>
+ <div v-else class="host-body">
+ <!-- 澶撮儴 s -->
+ <div class="d-flex jc-center title_wrap">
+ <div class="zuojuxing"></div>
+ <div class="youjuxing"></div>
+ <div class="guang"></div>
+ <div class="d-flex jc-center">
+ <div class="title">
+ <span class="title-text">杞鍘嬭鏅鸿兘閫夐厤绯荤粺</span>
+ </div>
+ </div>
+ <div class="timers">
+ {{ dateYear }} {{ dateWeek }} {{ dateDay }}
+ <i
+ class="blq-icon-shezhi02"
+ style="margin-left: 10px"
+ @click="showSetting"
+ ></i>
+ </div>
+ </div>
+ <!-- 澶撮儴 e-->
+ <!-- 鍐呭 s-->
+ <router-view></router-view>
+ <!-- 鍐呭 e -->
+ </div>
+ </div>
+ <Setting ref="setting" />
+ </ScaleScreen>
+ <!-- </div> -->
+</template>
+
+<script>
+import { formatTime } from "../utils/index.js";
+import Setting from "./setting.vue";
+import ScaleScreen from "@/components/scale-screen/scale-screen.vue";
+export default {
+ components: { Setting, ScaleScreen },
+ data() {
+ return {
+ timing: null,
+ loading: true,
+ dateDay: null,
+ dateYear: null,
+ dateWeek: null,
+ weekday: ["鍛ㄦ棩", "鍛ㄤ竴", "鍛ㄤ簩", "鍛ㄤ笁", "鍛ㄥ洓", "鍛ㄤ簲", "鍛ㄥ叚"],
+ };
+ },
+ filters: {
+ numsFilter(msg) {
+ return msg || 0;
+ },
+ },
+ computed: {},
+ created() {},
+ mounted() {
+ this.timeFn();
+ this.cancelLoading();
+ },
+ beforeDestroy() {
+ clearInterval(this.timing);
+ },
+ methods: {
+ showSetting() {
+ this.$refs.setting.init();
+ },
+ timeFn() {
+ this.timing = setInterval(() => {
+ this.dateDay = formatTime(new Date(), "HH: mm: ss");
+ this.dateYear = formatTime(new Date(), "yyyy-MM-dd");
+ this.dateWeek = this.weekday[new Date().getDay()];
+ }, 1000);
+ },
+ cancelLoading() {
+ let timer = setTimeout(() => {
+ this.loading = false;
+ clearTimeout(timer);
+ }, 500);
+ },
+ },
+};
+</script>
+
+<style lang="scss">
+@import "./home.scss";
+</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-bottom.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-bottom.vue"
new file mode 100644
index 0000000..d38b9d9
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-bottom.vue"
@@ -0,0 +1,264 @@
+<template>
+ <div class="center_bottom">
+ <Echart
+ :options="options"
+ id="bottomLeftChart"
+ class="echarts_bottom"
+ ></Echart>
+ </div>
+</template>
+
+<script>
+// import { currentGET } from "api/modules";
+import { graphic } from "echarts";
+import {Timefault} from "@/api/http.js"
+import axios from 'axios'
+export default {
+ data() {
+ return {
+ options: {
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ formatter: function (params) {
+ // 娣诲姞鍗曚綅
+ var result = params[0].name + "<br>";
+ params.forEach(function (item) {
+ if (item.value) {
+ result +=
+ item.marker +
+ " " +
+ "鍚堟牸浜ч噺" +
+ " : " +
+ item.value +
+ "鎵�</br>";
+ } else {
+ result += item.marker + " " + item.seriesName + " : - </br>";
+ }
+ });
+ return result;
+ },
+ },
+ legend: {
+ data: ["鍗曚綅锛氭墭"],
+ textStyle: {
+ color: "#B4B4B4",
+ },
+ top: "-5",
+ },
+ grid: {
+ left: "50px",
+ right: "40px",
+ bottom: "30px",
+ top: "20px",
+ },
+ xAxis: {
+ data: ['8/12','8/13','8/14','8/15','8/16','8/17','8/18'],
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ yAxis: [
+ {
+ splitLine: { show: true },
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ axisLabel: {
+ formatter: "{value}",
+ },
+ },
+ ],
+ series: [
+ {
+ name: "鍗曚綅锛氭墭",
+ type: "bar",
+ barWidth: 20,
+ itemStyle: {
+ normal: {
+ borderRadius: 5,
+ color: new graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: "#956FD4" },
+ { offset: 1, color: "#3EACE5" },
+ ]),
+ // label: {
+ // show: true, //寮�鍚樉绀�
+ // position: 'top', //鍦ㄤ笂鏂规樉绀�
+ // textStyle: { //鏁板�兼牱寮�
+ // color: '#bdbae2',
+ // fontSize: 10
+ // }
+ // }
+ }
+ },
+ data: ['200','180','190','185','190','188','195'],
+ },
+ ],
+ },
+ };
+ },
+ props: {},
+ mounted() {
+ this.getData();
+ this.changeTiming();
+ },
+ beforeDestroy() {
+ this.clearData()
+ },
+ methods: {
+ clearData() {
+ if (this.timer) {
+ clearInterval(this.timer)
+ this.timer = null
+ }
+ },
+ changeTiming() {
+ this.timer=setInterval(() => {
+ this.getData();
+ }, 30000);
+ },
+ getData() {
+ // this.numberData.forEach((item, index) => {
+ // item.number.number[0] += ++index
+ // item.number = { ...item.number }
+ // })
+ axios.post("http://192.168.12.189:8098/api/Dt_taskinfo/GetDateTimeData", null)
+ .then((res) => {
+ this.init(res);
+ }).catch((res) => {
+ })
+ },
+ // async getData() {
+ // this.pageflag = true;
+ // let rep = await Timefault((a)=>{
+ // console.log(a);
+ // });
+
+ // this.init(rep);
+ // currentGET("big6", { companyName: this.companyName }).then((res) => {
+ // console.log("鏁呴殰鏃堕暱缁熻", res);
+
+ // // if (res.success) {
+ // // this.init(res.data);
+ // // console.log("娴嬭瘯2",res.data);
+ // // } else {
+ // // this.pageflag = false;
+ // // this.$Message({
+ // // text: res.msg,
+ // // type: "warning",
+ // // });
+ // // }
+ // });
+ // },
+ init(val) {
+
+ this.options = {
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ formatter: function (params) {
+ // 娣诲姞鍗曚綅
+ var result = params[0].name + "<br>";
+ params.forEach(function (item) {
+ if (item.value) {
+ result +=
+ item.marker +
+ " " +
+ "鍚堟牸浜ч噺" +
+ " : " +
+ item.value +
+ "鎵�</br>";
+ } else {
+ result += item.marker + " " + item.seriesName + " : - </br>";
+ }
+ });
+ return result;
+ },
+ },
+ legend: {
+ data: ["鍗曚綅锛氭墭"],
+ textStyle: {
+ color: "#B4B4B4",
+ },
+ top: "-5",
+ },
+ grid: {
+ left: "50px",
+ right: "40px",
+ bottom: "30px",
+ top: "20px",
+ },
+ xAxis: {
+ data: [val[6].datetime,val[5].datetime,val[4].datetime,val[3].datetime,
+ val[2].datetime,val[1].datetime,val[0].datetime],
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ axisTick: {
+ show: false,
+ },
+ },
+ yAxis: [
+ {
+ min: 0, // 鍒诲害鏈�灏忓��
+
+ splitLine: { show: true },
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ axisLabel: {
+ formatter: "{value}",
+ },
+ }
+ ],
+ series: [
+ {
+ name: "鍗曚綅锛氭墭",
+ type: "bar",
+ barWidth: 20,
+ itemStyle: {
+ borderRadius: 5,
+ color: new graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: "#956FD4" },
+ { offset: 1, color: "#3EACE5" },
+ ]),
+ },
+ data: [val[6].qty,val[5].qty,val[4].qty,val[3].qty,
+ val[2].qty,val[1].qty,val[0].qty],
+ },
+ ],
+ };
+ },
+ },
+};
+</script>
+<style lang="scss" scoped>
+.center_bottom {
+ width: 100%;
+ height: 100%;
+
+ .echarts_bottom {
+ width: 100%;
+ height: 100%;
+ }
+}
+</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue"
new file mode 100644
index 0000000..3b3a7e8
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/center-map.vue"
@@ -0,0 +1,123 @@
+<template>
+ <div class="centermap">
+ <div class="mapwrap">
+ <dv-border-box-13>
+ <video
+ ref="videoPlayer"
+ class="screen-video"
+ src="../../assets/img/2.mp4"
+ loop
+ autoplay
+ preload="auto"
+ muted
+ @click="unmuteVideo"
+ >
+ 鎮ㄧ殑娴忚鍣ㄤ笉鏀寔瑙嗛鎾斁銆�
+ </video>
+ <div v-if="isMuted" class="mute-hint" @click="unmuteVideo">
+ <span>鐐瑰嚮鍙栨秷闈欓煶锛�5绉掑悗鑷姩鎾斁澹伴煶锛�</span>
+ </div>
+ </dv-border-box-13>
+ </div>
+ </div>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ isMuted: false,
+ unmuteTimeout: null // 瀛樺偍瀹氭椂鍣ㄤ互渚挎竻鐞�
+ };
+ },
+ mounted() {
+ this.initVideo();
+ this.adjustVideoSize();
+ window.addEventListener('resize', this.adjustVideoSize);
+
+ // 5绉掑悗鑷姩鍙栨秷闈欓煶
+ this.unmuteTimeout = setTimeout(() => {
+ this.unmuteVideo();
+ }, 5000);
+ },
+ beforeDestroy() {
+ window.removeEventListener('resize', this.adjustVideoSize);
+ if (this.unmuteTimeout) {
+ clearTimeout(this.unmuteTimeout); // 娓呴櫎瀹氭椂鍣ㄩ伩鍏嶅唴瀛樻硠婕�
+ }
+ },
+ methods: {
+ initVideo() {
+ const video = this.$refs.videoPlayer;
+ if (video) {
+ video.addEventListener('ended', () => {
+ video.currentTime = 0;
+ video.play();
+ });
+ }
+ document.addEventListener('click', this.unmuteVideo, { once: true });
+ },
+ unmuteVideo() {
+ const video = this.$refs.videoPlayer;
+ if (video) {
+ video.muted = false;
+ video.volume = 1.0;
+ this.isMuted = false;
+ }
+ },
+ adjustVideoSize() {
+ const video = this.$refs.videoPlayer;
+ if (video) {
+ video.style.width = '100%';
+ video.style.height = '100%';
+ video.style.objectFit = 'cover';
+ }
+ }
+ }
+};
+</script>
+
+<style scoped>
+/* 鏍峰紡淇濇寔涓嶅彉 */
+.centermap {
+ width: 100%;
+ height: 100%;
+
+ .mapwrap {
+ height: 960px;
+ width: 100%;
+ box-sizing: border-box;
+ position: relative;
+ margin-top: 10px;
+
+ & > dv-border-box-13 {
+ width: 100%;
+ height: 100%;
+ position: relative;
+ overflow: hidden;
+ }
+ }
+}
+
+.screen-video {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+}
+
+.mute-hint {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background: rgba(0,0,0,0.7);
+ color: white;
+ padding: 10px 20px;
+ border-radius: 5px;
+ cursor: pointer;
+ z-index: 10;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/index.vue"
new file mode 100644
index 0000000..d7c334c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/index.vue"
@@ -0,0 +1,182 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-04 09:23:59
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-05-07 11:05:02
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\index.vue
+-->
+<template>
+ <div class="contents">
+ <div class="contetn_center">
+ <CenterMap class="contetn_center_top" />
+
+
+ </div>
+ <div class="contetn_left">
+ <div class="pagetab">
+ <!-- <div class="item">瀹炴椂鐩戞祴</div> -->
+
+ </div>
+ <!-- <ItemWrap class="contetn_left-top contetn_lr-item" title="鏁呴殰--绉嶇被棰戠巼">
+ <LeftCenter />
+ </ItemWrap> -->
+
+ <ItemWrap
+ class="contetn_left-bottom contetn_lr-item"
+ title="搴撲綅淇℃伅"
+ >
+ <stationone/>
+ </ItemWrap>
+
+ <ItemWrap
+ class="contetn_left-bottom contetn_lr-item2"
+ title="搴撳瓨淇℃伅"
+ >
+ <stationtwo/>
+ </ItemWrap>
+
+ <!-- <ItemWrap
+ class="contetn_left-bottom contetn_lr-item"
+ title="鎬讳綋鍑哄叆搴撲俊鎭�"
+ >
+ <stationthree/>
+
+ </ItemWrap> -->
+
+
+ </div>
+
+
+ </div>
+</template>
+
+<script>
+import LeftTop from './left-top.vue'
+import LeftCenter from "./left-center.vue";
+import LeftBottom from "./left-bottom.vue";
+import CenterMap from "./center-map.vue";
+import CenterBottom from "./center-bottom.vue";
+import RightTop from "./right-top.vue";
+import RightCenter from "./right-center.vue";
+import RightBottom from "./right-bottom.vue";
+import LeftCenterRight from "./left-center-right.vue";
+import stationone from './station-one.vue'
+import stationtwo from './station-two.vue'
+import stationthree from './station-three.vue'
+import passtwo from './pass-two.vue'
+import plan from './plan.vue'
+export default {
+ components: {
+ LeftTop,
+ LeftCenter,
+ LeftCenterRight,
+ LeftBottom,
+ CenterMap,
+ RightTop,
+ RightCenter,
+ RightBottom,
+ CenterBottom,
+ stationone,
+ stationtwo,
+ stationthree,
+ passtwo,
+ plan
+ },
+ data() {
+ return {
+
+ };
+ },
+ filters: {
+ numsFilter(msg) {
+ return msg || 0;
+ },
+ },
+ created() {
+ },
+
+ mounted() {},
+ methods: {
+
+ },
+};
+</script>
+<style lang="scss" scoped>
+// 鍐呭
+.contents {
+ .contetn_left,
+ .contetn_right {
+ width: 475px;
+ box-sizing: border-box;
+ // padding: 16px 0;
+ }
+
+ .contetn_center {
+ width: 1400px;
+ }
+
+ //宸﹀彸涓や晶 涓変釜鍧�
+ .contetn_lr-item {
+ height: 310px;
+ }
+
+ .contetn_lr-item2 {
+ height: 620px;
+ }
+
+ .contetn_center_top {
+ width: 100%;
+ }
+
+ // 涓棿
+ .contetn_center {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ }
+
+ .contetn_center-bottom {
+ height: 315px;
+ }
+
+ //宸﹁竟 鍙宠竟 缁撴瀯涓�鏍�
+ .contetn_left,
+ .contetn_right {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+ position: relative;
+
+
+ }
+}
+.labels {
+ flex-shrink: 0;
+ font-size: 24px;
+ color: rgba(255, 255, 255, 0.6);
+ float: left;
+ margin-right: 11.5%;
+ }
+ .labelsd {
+ flex-shrink: 0;
+ font-size: 24px;
+ color: rgba(255, 255, 255, 0.6);
+ float: left;
+ margin-left: 6%;
+ }
+
+@keyframes rotating {
+ 0% {
+ -webkit-transform: rotate(0) scale(1);
+ transform: rotate(0) scale(1);
+ }
+ 50% {
+ -webkit-transform: rotate(180deg) scale(1.1);
+ transform: rotate(180deg) scale(1.1);
+ }
+ 100% {
+ -webkit-transform: rotate(360deg) scale(1);
+ transform: rotate(360deg) scale(1);
+ }
+}
+</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-bottom.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-bottom.vue"
new file mode 100644
index 0000000..181cd31
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-bottom.vue"
@@ -0,0 +1,278 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-01 09:43:37
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-09 11:40:22
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\left-bottom.vue
+-->
+<template>
+ <div
+ v-if="pageflag"
+ class="left_boottom_wrap beautify-scroll-def"
+ :class="{ 'overflow-y-auto': !sbtxSwiperFlag }"
+ >
+ <component :is="components" :data="list" :class-option="defaultOption">
+ <ul class="left_boottom">
+ <li class="left_boottom_item" v-for="(item, i) in list" :key="i">
+ <div class="inner_right">
+ <div class="dibu"></div>
+ <div class="flex" style="width: 100%;">
+ <div class="info">
+ <!-- <span class="labels">璁惧ID锛�</span> -->
+ <span class="contents zhuyao doudong wangguan">
+ {{ item.alarmposition }}</span
+ >
+ </div>
+ <div class="info" style="margin-left: 8%;">
+ <!-- <span class="labels">鍦板潃锛�</span> -->
+ <span class="contents ciyao" style="font-size: 10px;width: 30px;">
+ {{ item.devicename }}</span
+ >
+ </div>
+ <div class="info" style="margin-left: 7%;">
+ <!-- <span class="labels">鍦板潃锛�</span> -->
+ <span class="contents ciyao" style="font-size: 10px;width: 180px;">
+ {{ item.alarmname }}</span
+ >
+ </div>
+ <div class="info">
+ <!-- <span class="labels">鏃堕棿锛�</span> -->
+ <span class="contents " style="font-size: 10px;width: 180px;">
+ {{ item.starttime }}</span
+ >
+ </div>
+ </div>
+
+ <!-- <span
+ class="types doudong"
+ :class="{
+ typeRed: item.onlineState == 0,
+ typeGreen: item.onlineState == 1,
+ }"
+ >{{ item.onlineState == 1 ? "涓婄嚎" : "涓嬬嚎" }}</span
+ > -->
+
+
+ </div>
+ </li>
+ </ul>
+ </component>
+ </div>
+
+ <Reacquire v-else @onclick="getData" style="line-height: 200px" />
+</template>
+
+<script>
+// import { currentGET } from "api";
+import {FaultInformation} from "@/api/http.js"
+import vueSeamlessScroll from "vue-seamless-scroll"; // vue2寮曞叆鏂瑰紡
+import Kong from "../../components/kong.vue";
+export default {
+ components: { vueSeamlessScroll, Kong },
+ data() {
+ return {
+ list: [],
+ pageflag: true,
+ components: vueSeamlessScroll,
+ defaultOption: {
+ ...this.$store.state.setting.defaultOption,
+ singleHeight: 240,
+ limitMoveNum: 5,
+ step: 0,
+ },
+ };
+ },
+ computed: {
+ sbtxSwiperFlag() {
+ let sbtxSwiper = this.$store.state.setting.sbtxSwiper;
+ if (sbtxSwiper) {
+ this.components = vueSeamlessScroll;
+ } else {
+ this.components = Kong;
+ }
+ return sbtxSwiper;
+ },
+ },
+ created() {
+
+ },
+
+ mounted() {
+ this.getData();
+ this.changeTiming();
+ },
+ methods: {
+ changeTiming() {
+ setInterval(() => {
+ this.getData();
+ }, 5000);
+ },
+ addressHandle(item) {
+ let name = item.provinceName;
+ if (item.cityName) {
+ name += "/" + item.cityName;
+ if (item.countyName) {
+ name += "/" + item.countyName;
+ }
+ }
+ return name;
+ },
+ async getData() {
+ this.pageflag = true;
+ // this.pageflag =false
+ // currentGET("big3", { limitNum: 20 }).then((res) => {
+ // console.log("璁惧鎻愰啋", res);
+ // if (res.success) {
+ // this.countUserNumData = res.data;
+ // this.list = res.data.list;
+
+ // let timer = setTimeout(() => {
+ // clearTimeout(timer);
+ // this.defaultOption.step =
+ // this.$store.state.setting.defaultOption.step;
+ // }, this.$store.state.setting.defaultOption.waitTime);
+ // } else {
+ // this.pageflag = false;
+ // this.$Message({
+ // text: res.msg,
+ // type: "warning",
+ // });
+ // }
+ // });
+ let rep = await FaultInformation((a)=>{
+ console.log(a);
+ });
+
+ this.list=rep;
+ let timer = setTimeout(() => {
+ clearTimeout(timer);
+ this.defaultOption.step =
+ this.$store.state.setting.defaultOption.step;
+ }, this.$store.state.setting.defaultOption.waitTime);
+ },
+ },
+};
+</script>
+<style lang='scss' scoped>
+.left_boottom_wrap {
+ overflow: hidden;
+ width: 100%;
+ height: 230px;
+}
+
+.doudong {
+ // vertical-align:middle;
+ overflow: hidden;
+ -webkit-backface-visibility: hidden;
+ -moz-backface-visibility: hidden;
+ -ms-backface-visibility: hidden;
+ backface-visibility: hidden;
+}
+
+.overflow-y-auto {
+ overflow-y: auto;
+}
+
+.left_boottom {
+ width: 100%;
+ height: 100%;
+
+ .left_boottom_item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ padding: 8px;
+ font-size: 14px;
+ margin: 10px 0;
+ .orderNum {
+ margin: 0 16px 0 -20px;
+ }
+
+ .info {
+ margin-right: 8%;
+ display: flex;
+ align-items: center;
+ color: #fff;
+ .labels {
+ flex-shrink: 0;
+ font-size: 12px;
+ color: rgba(255, 255, 255, 0.6);
+ }
+
+ .zhuyao {
+ color: $primary-color;
+ font-size: 15px;
+ }
+
+ .ciyao {
+ color: rgba(255, 255, 255, 0.8);
+ }
+
+ .warning {
+ color: #e6a23c;
+ font-size: 15px;
+ }
+ }
+
+ .inner_right {
+ position: relative;
+ height: 100%;
+ width: 650px;
+ flex-shrink: 0;
+ line-height: 1;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ .dibu {
+ position: absolute;
+ height: 2px;
+ width: 104%;
+ background-image: url("../../assets/img/zuo_xuxian.png");
+ bottom: -10px;
+ left: -2%;
+ background-size: cover;
+ }
+ .addresswrap {
+ width: 200px;
+ display: flex;
+ margin-top: 8px;
+ }
+ }
+
+ .wangguan {
+ color: #1890ff;
+ font-weight: 900;
+ font-size: 15px;
+ width: 80px;
+ flex-shrink: 0;
+ }
+
+
+ .time {
+ font-size: 12px;
+ // color: rgba(211, 210, 210,.8);
+ color: #fff;
+ }
+
+ .address {
+ font-size: 12px;
+ cursor: pointer;
+ // @include text-overflow(1);
+ }
+
+ .types {
+ width: 30px;
+ flex-shrink: 0;
+ }
+
+ .typeRed {
+ color: #fc1a1a;
+ }
+
+ .typeGreen {
+ color: #29fc29;
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-center-right.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-center-right.vue"
new file mode 100644
index 0000000..79b6ad3
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-center-right.vue"
@@ -0,0 +1,257 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-02-28 16:16:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-10-25 09:18:22
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\left-center.vue
+-->
+<template>
+ <Echart id="leftcenterright" :options="options" class="left_center_inner" v-if="pageflag" ref="charts" />
+ <Reacquire v-else @onclick="getData" style="line-height:200px">
+ 閲嶆柊鑾峰彇
+ </Reacquire>
+ </template>
+
+ <script>
+ import { currentPOST } from 'api/modules'
+ import {Equipmentfault} from "@/api/http.js"
+ export default {
+ data() {
+ return {
+ options: {},
+ countUserNumData: {
+ HoistNum: 0,
+ decoderNum: 0,
+ uncoderNum: 0,
+ elevatorNum:0,
+ TransmissionlineNum:0,
+ totalNum: 0
+ },
+ pageflag: true,
+ timer: null
+ };
+ },
+ created() {
+ this.getData()
+ },
+ mounted() {
+ this.changeTiming();
+ },
+ beforeDestroy() {
+ // this.clearData()
+
+ },
+ methods: {
+ changeTiming() {
+ setInterval(() => {
+ this.getData();
+ }, 5000);
+ },
+ // clearData() {
+ // if (this.timer) {
+ // clearInterval(this.timer)
+ // this.timer = null
+ // }
+ // },
+ async getData() {
+ this.pageflag = true
+ // this.pageflag =false
+
+ // currentPOST('big1').then(res => {
+
+ // //鍙墦鍗颁竴娆�
+ // if (!this.timer) {
+ // console.log("璁惧鎬昏", res);
+ // }
+ // if (res.success) {
+ // // this.countUserNumData = res.data
+ // this.$nextTick(() => {
+ // this.init()
+ // })
+
+ // } else {
+ // this.pageflag = false
+ // this.$Message({
+ // text: res.msg,
+ // type: 'warning'
+ // })
+ // }
+ // })
+
+
+ let rep = await Equipmentfault((a)=>{
+ console.log(a);
+ });
+
+ this.countUserNumData = rep;
+ this.$nextTick(() => {
+ this.init()
+ })
+ },
+ //杞
+ switper() {
+ if (this.timer) {
+ return
+ }
+ let looper = (a) => {
+ this.getData()
+ };
+ this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime);
+ let myChart = this.$refs.charts.chart
+ myChart.on('mouseover', params => {
+ this.clearData()
+ });
+ myChart.on('mouseout', params => {
+ this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime);
+ });
+ },
+ init() {
+ let total = this.countUserNumData.total;
+ let colors = ["#ECA444", "#33A1DB", "#56B557","#ffb8c6","#FF21FA"];
+ let piedata = {
+ name: "鏁呴殰璁惧棰戠巼",
+ type: "pie",
+ radius: ["40%", "70%"],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 4,
+ borderColor: "rgba(0,0,0,0)",
+ borderWidth: 2,
+ },
+
+ color: colors,
+ data: [
+ // {
+ // value: 0,
+ // name: "鍛婅",
+ // label: {
+ // shadowColor: colors[0],
+ // },
+ // },
+ {
+ value: this.countUserNumData.elevator,
+ name: "鎻愬崌鏈烘晠闅�",
+ label: {
+ shadowColor: colors[0],
+ },
+ },
+ {
+ value: this.countUserNumData.discremover,
+ name: "鎷嗙爜鏈烘晠闅�",
+ label: {
+ shadowColor: colors[2],
+ },
+ },
+ {
+ value: this.countUserNumData.rgVcCar,
+ name: "鍥涘悜杞︽晠闅�",
+ label: {
+ shadowColor: colors[1],
+ },
+ },
+ {
+ value: this.countUserNumData.pipeline,
+ name: "杈撻�佺嚎鏁呴殰",
+ label: {
+ shadowColor: colors[4],
+ },
+ }
+ ],
+ };
+ this.options = {
+ title: {
+ // zlevel: 0,
+ text: ["{value|" + total + "}", "{name|鎬绘暟}"].join("\n"),
+ top: "center",
+ left: "center",
+ textStyle: {
+ rich: {
+ value: {
+ color: "#ffffff",
+ fontSize: 24,
+ fontWeight: "bold",
+ lineHeight: 20,
+ },
+ name: {
+ color: "#ffffff",
+ lineHeight: 20,
+ },
+ },
+ },
+ },
+ tooltip: {
+ trigger: "item",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ },
+ legend: {
+ show: false,
+ top: "5%",
+ left: "center",
+ },
+ series: [
+ //灞曠ず鍦嗙偣
+ {
+ ...piedata,
+ tooltip: { show: true },
+ label: {
+ formatter: " {b|{b}}",
+ // formatter: " {b|{b}} \n {c|{c}涓獇 {per|{d}%} ",
+ // position: "outside",
+ rich: {
+ b: {
+ color: "#fff",
+ fontSize: 12,
+ lineHeight: 26,
+ },
+ c: {
+ color: "#31ABE3",
+ fontSize: 14,
+ },
+ per: {
+ color: "#31ABE3",
+ fontSize: 14,
+ },
+ },
+ },
+ labelLine: {
+ length: 30, // 绗竴娈电嚎 闀垮害
+ length2: 46, // 绗簩娈电嚎 闀垮害
+ show: true,
+
+ },
+ emphasis: {
+ show: true,
+ },
+ },
+ {
+ ...piedata,
+ tooltip: { show: true },
+ itemStyle: {},
+ label: {
+ backgroundColor: "inherit", //鍦嗙偣棰滆壊锛宎uto锛氭槧灏勭殑绯诲垪鑹�
+ height: 0,
+ width: 0,
+ lineHeight: 0,
+ borderRadius: 2.5,
+ shadowBlur: 8,
+ shadowColor: "auto",
+ padding: [2.5, -2.5, 2.5, -2.5],
+ },
+ labelLine: {
+ length: 30, // 绗竴娈电嚎 闀垮害
+ length2: 46, // 绗簩娈电嚎 闀垮害
+ show: false,
+ },
+ },
+ ],
+ };
+ },
+ },
+ };
+ </script>
+ <style lang='scss' scoped>
+ </style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-center.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-center.vue"
new file mode 100644
index 0000000..a6bf8da
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-center.vue"
@@ -0,0 +1,256 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-02-28 16:16:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-10-25 09:18:22
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\left-center.vue
+-->
+<template>
+ <Echart id="leftCenter" :options="options" class="left_center_inner" v-if="pageflag" ref="charts" />
+ <Reacquire v-else @onclick="getData" style="line-height:200px">
+ 閲嶆柊鑾峰彇
+ </Reacquire>
+</template>
+
+<script>
+import { currentGET } from 'api/modules'
+import {Failuremode} from "@/api/http.js"
+export default {
+ data() {
+ return {
+ options: {},
+ countUserNumData: {
+ lockNum: 0,
+ onlineNum: 0,
+ offlineNum: 0,
+ totalNum: 0
+ },
+ pageflag: true,
+ timer: null
+ };
+ },
+ created() {
+ this.getData()
+ },
+ mounted() {
+ this.changeTiming();
+
+ },
+ beforeDestroy() {
+ // this.clearData()
+ },
+ methods: {
+ changeTiming() {
+ setInterval(() => {
+ this.getData();
+ }, 5000);
+ },
+ // clearData() {
+ // if (this.timer) {
+ // clearInterval(this.timer)
+ // this.timer = null
+ // }
+ // },
+ async getData() {
+ // this.pageflag = true
+ let rep = await Failuremode((a)=>{
+ console.log(a);
+ });
+ this.countUserNumData = {
+ offlineNum: rep.overtime,
+ onlineNum: rep.sensitization,
+ lockNum: rep.rgVcCar,
+ totalNum: rep.total
+ },
+ this.$nextTick(() => {
+ this.init()
+ })
+ // this.pageflag =false
+
+ // currentGET('big1').then(res => {
+ // //鍙墦鍗颁竴娆�
+ // if (!this.timer) {
+ // console.log("璁惧鎬昏", res);
+ // }
+ // if (res.success) {
+ // this.countUserNumData = res.data
+ // this.$nextTick(() => {
+ // this.init()
+ // })
+
+ // } else {
+ // this.pageflag = false
+ // this.$Message({
+ // text: res.msg,
+ // type: 'warning'
+ // })
+ // }
+ // })
+
+ },
+ //杞
+ switper() {
+ if (this.timer) {
+ return
+ }
+ let looper = (a) => {
+ this.getData()
+ };
+ this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime);
+ let myChart = this.$refs.charts.chart
+ myChart.on('mouseover', params => {
+ this.clearData()
+ });
+ myChart.on('mouseout', params => {
+ this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime);
+ });
+ },
+ init() {
+ let total = this.countUserNumData.totalNum;
+ let colors = ["#ECA444", "#33A1DB", "#56B557","#ffb8c6"];
+ let piedata = {
+ name: "鏁呴殰绉嶇被棰戠巼",
+ type: "pie",
+ radius: ["42%", "65%"],
+ avoidLabelOverlap: false,
+ itemStyle: {
+ borderRadius: 4,
+ borderColor: "rgba(0,0,0,0)",
+ borderWidth: 2,
+ },
+
+ color: colors,
+ data: [
+ // {
+ // value: 0,
+ // name: "鍛婅",
+ // label: {
+ // shadowColor: colors[0],
+ // },
+ // },
+ {
+ value: this.countUserNumData.onlineNum,
+ name: "鍏夌數鏁呴殰",
+ label: {
+ shadowColor: colors[0],
+ },
+ },
+ {
+ value: this.countUserNumData.lockNum,
+ name: "鍥涘悜杞︽晠闅�",
+ label: {
+ shadowColor: colors[2],
+ },
+ },
+ // {
+ // value: this.countUserNumData.onlineNum,
+ // name: "瓒呴檺浣嶆晠闅�",
+ // label: {
+ // shadowColor: colors[1],
+ // },
+ // },
+ {
+ value: this.countUserNumData.offlineNum,
+ name: "瓒呮椂鏁呴殰",
+ label: {
+ shadowColor: colors[3],
+ },
+ },
+ ],
+ };
+ this.options = {
+ title: {
+ // zlevel: 0,
+ text: ["{value|" + total + "}", "{name|鎬绘暟}"].join("\n"),
+ top: "center",
+ left: "center",
+ textStyle: {
+ rich: {
+ value: {
+ color: "#ffffff",
+ fontSize: 24,
+ fontWeight: "bold",
+ lineHeight: 20,
+ },
+ name: {
+ color: "#ffffff",
+ lineHeight: 20,
+ },
+ },
+ },
+ },
+ tooltip: {
+ trigger: "item",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ },
+ legend: {
+ show: false,
+ top: "5%",
+ left: "center",
+ },
+ series: [
+ //灞曠ず鍦嗙偣
+ {
+ ...piedata,
+ tooltip: { show: true },
+ label: {
+ formatter: " {b|{b}}",
+ // position: "outside",
+ rich: {
+ b: {
+ color: "#fff",
+ fontSize: 12,
+ lineHeight: 26,
+ },
+ c: {
+ color: "#31ABE3",
+ fontSize: 14,
+ },
+ per: {
+ color: "#31ABE3",
+ fontSize: 14,
+ },
+ },
+ },
+ labelLine: {
+ length: 30, // 绗竴娈电嚎 闀垮害
+ length2: 46, // 绗簩娈电嚎 闀垮害
+ show: true,
+
+ },
+ emphasis: {
+ show: true,
+ },
+ },
+ {
+ ...piedata,
+ tooltip: { show: true },
+ itemStyle: {},
+ label: {
+ backgroundColor: "inherit", //鍦嗙偣棰滆壊锛宎uto锛氭槧灏勭殑绯诲垪鑹�
+ height: 0,
+ width: 0,
+ lineHeight: 0,
+ borderRadius: 2.5,
+ shadowBlur: 8,
+ shadowColor: "auto",
+ padding: [2.5, -2.5, 2.5, -2.5],
+ },
+ labelLine: {
+ length: 30, // 绗竴娈电嚎 闀垮害
+ length2: 46, // 绗簩娈电嚎 闀垮害
+ show: false,
+ },
+ },
+ ],
+ };
+ },
+ },
+};
+</script>
+<style lang='scss' scoped>
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-top.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-top.vue"
new file mode 100644
index 0000000..4f7f439
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/left-top.vue"
@@ -0,0 +1,250 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-02-28 16:16:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-07-20 17:57:11
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\left-center.vue
+-->
+<template>
+ <ul class="user_Overview flex" v-if="pageflag">
+ <li class="user_Overview-item" style="color: #00fdfa">
+ <div class="user_Overview_nums allnum ">
+ <dv-digital-flop :config="onlineconfig" style="width:100%;height:100%;" />
+ </div>
+ <p>涓夋ゼ璐ф灦</p>
+ </li>
+ <li class="user_Overview-item" style="color: #07f7a8">
+ <div class="user_Overview_nums online">
+ <dv-digital-flop :config="config" style="width:100%;height:100%;" />
+ </div>
+ <p>浜旀ゼ璐ф灦</p>
+ </li>
+ <li class="user_Overview-item" style="color: #e3b337">
+ <div class="user_Overview_nums offline">
+ <dv-digital-flop :config="offlineconfig" style="width:100%;height:100%;" />
+
+ </div>
+ <p>鍏ゼ璐ф灦</p>
+ </li>
+ <li class="user_Overview-item" style="color: #f5023d">
+ <div class="user_Overview_nums laramnum">
+ <dv-digital-flop :config="laramnumconfig" style="width:100%;height:100%;" />
+ </div>
+ <p>涓冩ゼ璐ф灦</p>
+ </li>
+ </ul>
+ <Reacquire v-else @onclick="getData" line-height="200px">
+ 閲嶆柊鑾峰彇
+ </Reacquire>
+</template>
+
+<script>
+import { currentGET } from 'api/modules'
+import {Floorfault} from "@/api/http.js"
+let style = {
+ fontSize: 24
+}
+export default {
+ data() {
+ return {
+ options: {},
+ userOverview: {
+ alarmNum: 2,
+ offlineNum: 3,
+ onlineNum: 5,
+ totalNum: 10,
+ },
+ pageflag: true,
+ timer: null,
+ config: {
+ number: [100],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#00fdfa",
+ fill: "#00fdfa",
+ },
+ },
+ onlineconfig: {
+ number: [0],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#07f7a8",
+ fill: "#07f7a8",
+ },
+ },
+ offlineconfig: {
+ number: [0],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#e3b337",
+ fill: "#e3b337",
+ },
+ },
+ laramnumconfig: {
+ number: [0],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#f5023d",
+ fill: "#f5023d",
+ },
+ }
+
+ };
+ },
+ filters: {
+ numsFilter(msg) {
+ return msg || 0;
+ },
+ },
+ created() {
+ this.getData()
+ },
+ mounted() {
+ },
+ beforeDestroy() {
+ this.clearData()
+
+ },
+ methods: {
+ clearData() {
+ if (this.timer) {
+ clearInterval(this.timer)
+ this.timer = null
+ }
+ },
+ async getData() {
+ this.pageflag = true;
+ // currentGET("big2").then((res) => {
+ // if (!this.timer) {
+ // console.log("璁惧鎬昏2", res);
+ // }
+ // if (res.success) {
+ // this.userOverview = res.data;
+ // this.onlineconfig = {
+ // ...this.onlineconfig,
+ // number: [1]
+ // }
+ // this.config = {
+ // ...this.config,
+ // number: [7]
+ // }
+ // this.offlineconfig = {
+ // ...this.offlineconfig,
+ // number: [4]
+ // }
+ // this.laramnumconfig = {
+ // ...this.laramnumconfig,
+ // number: [10]
+ // }
+ // this.switper();
+ // } else {
+ // this.pageflag = false;
+ // this.$Message.warning(res.msg);
+ // }
+ // });
+ let rep = await Floorfault((a)=>{
+ console.log(a);
+ });
+ this.onlineconfig = {
+ ...this.onlineconfig,
+ number: [rep.threefloor]
+ }
+ this.config = {
+ ...this.config,
+ number: [rep.fivefloor]
+ }
+ this.offlineconfig = {
+ ...this.offlineconfig,
+ number: [rep.sixfloor]
+ }
+ this.laramnumconfig = {
+ ...this.laramnumconfig,
+ number: [rep.sevenfloor]
+ }
+ this.switper();
+ },
+ //杞
+ switper() {
+ if (this.timer) {
+ return
+ }
+ let looper = (a) => {
+ this.getData()
+ };
+ this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime);
+ },
+ },
+};
+</script>
+<style lang='scss' scoped>
+.user_Overview {
+ li {
+ flex: 1;
+
+ p {
+ text-align: center;
+ height: 16px;
+ font-size: 16px;
+ }
+
+ .user_Overview_nums {
+ width: 100px;
+ height: 100px;
+ text-align: center;
+ line-height: 100px;
+ font-size: 22px;
+ margin: 50px auto 30px;
+ background-size: cover;
+ background-position: center center;
+ position: relative;
+
+ &::before {
+ content: '';
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ }
+
+ &.bgdonghua::before {
+ animation: rotating 14s linear infinite;
+ }
+ }
+
+ .allnum {
+
+ // background-image: url("../../assets/img/left_top_lan.png");
+ &::before {
+ background-image: url("../../assets/img/left_top_lan.png");
+
+ }
+ }
+
+ .online {
+ &::before {
+ background-image: url("../../assets/img/left_top_lv.png");
+
+ }
+ }
+
+ .offline {
+ &::before {
+ background-image: url("../../assets/img/left_top_huang.png");
+
+ }
+ }
+
+ .laramnum {
+ &::before {
+ background-image: url("../../assets/img/left_top_hong.png");
+
+ }
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/pass-two.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/pass-two.vue"
new file mode 100644
index 0000000..c0694fb
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/pass-two.vue"
@@ -0,0 +1,314 @@
+<template>
+ <div class="echart" id="mychart" :style="myChartStyle">
+ <Echart
+ :options="options"
+ id="bottomLeftChart"
+ class="echarts_bottom"
+ ></Echart>
+ </div>
+</template>
+
+<script>
+import * as echarts from "echarts";
+import axios from "axios";
+export default {
+ data() {
+ return {
+ myChart: {},
+ xData: [
+ "1鏈�",
+ "2鏈�",
+ "3鏈�",
+ "4鏈�",
+ "5鏈�",
+ "6鏈�",
+ "7鏈�",
+ "8鏈�",
+ "9鏈�",
+ "10鏈�",
+ "11鏈�",
+ "12鏈�",
+ ], //妯潗鏍�
+ qualified: [], //鍚堟牸
+ unqualified: [], //涓嶅悎鏍�
+ myChartStyle: { float: "left", width: "100%", height: "250px" }, //鍥捐〃鏍峰紡
+ options:{
+ xAxis: {
+ name:'鍗曚綅:鏈�',
+ nameTextStyle:{
+ color: ["#B4B4B4"],
+ padding:[0,0,0,-10],
+ fontSize:14
+ },
+ min:0,
+ max:11,
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ data: [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ ],
+ },
+ legend: {
+ // 鍥句緥
+ data: ["鍚堟牸鐜�", "涓嶅悎鏍肩巼"],
+ bottom: "0%",
+ textStyle: {
+ color: "#ffffff",
+ fontSize: 18,
+ },
+ },
+ yAxis: [{
+ type:"value",
+ min: 0, // 鍒诲害鏈�灏忓��
+ max: 100, // 鍒诲害鏈�澶у�硷紙闇�瑕佸姩鎬佽幏鍙栨渶澶у��,骞朵笖鑳借3鏁撮櫎锛堝悜涓嬪彇鏁村啀涔樺洖鏉ワ級锛�
+ splitNumber: 5, // 妯嚎鏁�
+ name: "鍗曚綅:%",
+ nameTextStyle: {
+ color: "#B4B4B4",
+ nameLocation: "start",
+ padding:[0,0,12,-20],
+ fontSize:14
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ }
+ ],
+ series: [
+ {
+ name: "鍚堟牸鐜�",
+ data: [50, 80, 50, 72, 75, 78, 72, 70, 80, 76, 78, 74],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ {
+ name: "涓嶅悎鏍肩巼",
+ data: [0, 11, 9, 17, 14, 13, 14, 9, 17, 14, 13, 14],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ ],
+ }
+ };
+ },
+ mounted() {
+ // this.initEcharts();
+ this.getData();
+ this.changeTiming();
+ },
+ beforeDestroy() {
+ this.clearData()
+ },
+ methods: {
+ clearData() {
+ if (this.timer) {
+ clearInterval(this.timer)
+ this.timer = null
+ }
+ },
+ changeTiming() {
+ this.timer = setInterval(() => {
+ this.getData();
+ }, 60000);
+ },
+ getData() {
+ // this.numberData.forEach((item, index) => {
+ // item.number.number[0] += ++index
+ // item.number = { ...item.number }
+ // })
+ axios.post("http://192.168.12.189:8098/api/Dt_CheckResult/GetPassRate",null)
+ .then((res) => {
+ this.init(res);
+ })
+ .catch((res) => {
+ });
+ },
+ init(val){
+ this.options={
+ xAxis: {
+ name:'鍗曚綅:鏈�',
+ nameTextStyle:{
+ color: ["#B4B4B4"],
+ padding:[0,0,0,-10],
+ fontSize:14
+ },
+ min:0,
+ max:11,
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ data: [
+ "1",
+ "2",
+ "3",
+ "4",
+ "5",
+ "6",
+ "7",
+ "8",
+ "9",
+ "10",
+ "11",
+ "12",
+ ],
+ },
+ legend: {
+ // 鍥句緥
+ data: ["鍚堟牸鐜�", "涓嶅悎鏍肩巼"],
+ bottom: "0%",
+ textStyle: {
+ color: "#ffffff",
+ fontSize: 18,
+ },
+ },
+ yAxis: [{
+ type:"value",
+ min: 0, // 鍒诲害鏈�灏忓��
+ max: 100, // 鍒诲害鏈�澶у�硷紙闇�瑕佸姩鎬佽幏鍙栨渶澶у��,骞朵笖鑳借3鏁撮櫎锛堝悜涓嬪彇鏁村啀涔樺洖鏉ワ級锛�
+ splitNumber: 5, // 妯嚎鏁�
+ name: "鍗曚綅:%",
+ nameTextStyle: {
+ color: "#B4B4B4",
+ nameLocation: "start",
+ padding:[0,0,12,-20],
+ fontSize:14
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ }
+ ],
+ series: [
+ {
+ name: "鍚堟牸鐜�",
+ data:[val[0].qualified,val[1].qualified,val[2].qualified,val[3].qualified,val[4].qualified,val[5].qualified,
+ val[6].qualified,val[7].qualified,val[8].qualified,val[9].qualified,val[10].qualified,val[11].qualified],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ {
+ name: "涓嶅悎鏍肩巼",
+ data:[val[0].unqualified,val[1].unqualified,val[2].unqualified,val[3].unqualified,val[4].unqualified,val[5].unqualified,
+ val[6].unqualified,val[7].unqualified,val[8].unqualified,val[9].unqualified,val[10].unqualified,val[11].unqualified],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ show: true,
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ ],
+ }
+ },
+ // initEcharts() {
+ // const option = {
+ // xAxis: {
+ // axisLine: {
+ // lineStyle: {
+ // color: "#B4B4B4",
+ // },
+ // },
+ // data: this.xData,
+ // },
+ // legend: {
+ // // 鍥句緥
+ // data: ["鍚堟牸鐜�", "涓嶅悎鏍肩巼"],
+ // bottom: "0%",
+ // textStyle: {
+ // color: "#ffffff",
+ // fontSize: 18,
+ // },
+ // },
+ // yAxis: [{
+ // name: "鍗曚綅:%",
+ // nameTextStyle: {
+ // color: "#B4B4B4",
+ // nameLocation: "start",
+ // padding:[0,0,12,-20],
+ // fontSize:14
+ // },
+ // axisLine: {
+ // lineStyle: {
+ // color: "#B4B4B4",
+ // },
+ // },
+ // }
+ // ],
+ // series: [
+ // {
+ // name: "鍚堟牸鐜�",
+ // data: this.qualified,
+ // type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ // label: {
+ // show: true,
+ // position: "top",
+ // textStyle: {
+ // fontSize: 14,
+ // },
+ // },
+ // },
+ // {
+ // name: "涓嶅悎鏍肩巼",
+ // data: this.unqualified,
+ // type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ // label: {
+ // show: true,
+ // position: "top",
+ // textStyle: {
+ // fontSize: 14,
+ // },
+ // },
+ // },
+ // ],
+ // };
+ // this.myChart = echarts.init(document.getElementById("mychart"));
+ // this.myChart.setOption(option);
+ // //闅忕潃灞忓箷澶у皬璋冭妭鍥捐〃
+ // window.addEventListener("resize", () => {
+ // this.myChart.resize();
+ // });
+ // },
+ },
+};
+</script>
+
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/plan.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/plan.vue"
new file mode 100644
index 0000000..0d81aec
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/plan.vue"
@@ -0,0 +1,247 @@
+<template>
+ <div class="container_plan echart" id="mychart" :style="myChartStyle">
+ <Echart
+ :options="option"
+ id="bottomLeftChart"
+ class="echarts_bottom"
+ ></Echart>
+ </div>
+</template>
+
+ <script>
+import { currentGET } from "api/modules";
+import { Floorfault } from "@/api/http.js";
+import axios from "axios";
+export default {
+ data() {
+ return {
+ isInterval: false,
+ myChartStyle: { float: "left", width: "100%", height: "250px" },
+ option: {
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ },
+ xAxis: {
+ name: "鍗曚綅:澶�",
+ nameTextStyle: {
+ color: ["#B4B4B4"],
+ padding: [0, 0, 0, -10],
+ fontSize: 14,
+ },
+ min: 0,
+ max: 30,
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ data: [
+
+ ],
+ },
+ legend: {
+ // 鍥句緥
+ data: ["鍏ュ簱閲�", "鍑哄簱閲�"],
+ bottom: "0%",
+ textStyle: {
+ color: "#ffffff",
+ fontSize: 18,
+ },
+ },
+ yAxis: [
+ {
+ name: "鍗曚綅:涓�",
+ nameTextStyle: {
+ color: "#B4B4B4",
+ nameLocation: "start",
+ padding: [0, 0, 12, -20],
+ fontSize: 14,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ },
+ ],
+ series: [
+ {
+ name: "鍏ュ簱閲�",
+ data: [
+ 50, 80, 50, 72, 75, 78, 72, 70, 80, 76, 78, 74, 50, 80, 50, 72,
+ 75, 78, 72, 70, 80, 76, 78, 74, 50, 80, 50, 72, 75, 78,
+ ],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ {
+ name: "鍑哄簱閲�",
+ data: [
+ 0, 11, 9, 17, 14, 13, 14, 9, 17, 14, 13, 14, 0, 11, 9, 17, 14, 13,
+ 14, 9, 17, 14, 13, 14, 0, 11, 9, 17, 14, 13,
+ ],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ ],
+ },
+ };
+ },
+ mounted() {
+ this.$nextTick((x) => {
+ this.getData();
+ });
+ },
+ beforeDestroy() {
+ this.clearData();
+ },
+ methods: {
+ clearData() {
+ if (this.timer) {
+ clearInterval(this.timer);
+ this.timer = null;
+ }
+ },
+ getData() {
+ axios.post("http://192.168.12.189:8098/api/Dt_taskinfo/GetPlanRealData",null)
+ .then((res) => {
+ this.init(res);
+ })
+ .catch((res) => {
+ });
+ if (!this.isInterval) {
+ this.isInterval = true;
+ this.timer = setInterval(() => {
+ this.$nextTick((x) => {
+ this.getData();
+ });
+ }, 10000);
+ }
+ },
+ init(val) {
+ console.log('123')
+ console.log(val);
+ this.option={
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ },
+ xAxis: {
+ name: "鍗曚綅:澶�",
+ nameTextStyle: {
+ color: ["#B4B4B4"],
+ padding: [0, 0, 0, -10],
+ fontSize: 14,
+ },
+ min: 0,
+ max: 6,
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ data: [
+ val[0].datetime,
+ val[1].datetime,
+ val[2].datetime,
+ val[3].datetime,
+ val[4].datetime,
+ val[5].datetime,
+ val[6].datetime,
+ ], //鑾峰彇璇ユ湀鐨勫ぉ鏁�
+ },
+ legend: {
+ // 鍥句緥
+ data: ["鍏ュ簱閲�", "鍑哄簱閲�"],
+ bottom: "0%",
+ textStyle: {
+ color: "#ffffff",
+ fontSize: 18,
+ },
+ },
+ yAxis: [
+ {
+ name: "鍗曚綅:涓�",
+ nameTextStyle: {
+ color: "#B4B4B4",
+ nameLocation: "start",
+ padding: [0, 0, 12, -20],
+ fontSize: 14,
+ },
+ axisLine: {
+ lineStyle: {
+ color: "#B4B4B4",
+ },
+ },
+ },
+ ],
+ series: [
+ {
+ name: "鍏ュ簱閲�", //鑾峰彇璁″垝浜ч噺
+ data: [
+ val[0].qty,
+ val[1].qty,
+ val[2].qty,
+ val[3].qty,
+ val[4].qty,
+ val[5].qty,
+ val[6].qty,
+ ],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ {
+ name: "鍑哄簱閲�",
+ data: [
+ val[0].qty2,
+ val[1].qty2,
+ val[2].qty2,
+ val[3].qty2,
+ val[4].qty2,
+ val[5].qty2,
+ val[6].qty2,
+ ],
+ type: "line", // 绫诲瀷璁剧疆涓烘姌绾垮浘
+ label: {
+ position: "top",
+ textStyle: {
+ fontSize: 14,
+ },
+ },
+ },
+ ],
+ }
+ },
+ },
+};
+</script>
+ <style lang='scss' scoped>
+.container_plan {
+ width: 100%;
+ height: 100%;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-bottom.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-bottom.vue"
new file mode 100644
index 0000000..b1fb54d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-bottom.vue"
@@ -0,0 +1,194 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-01 15:27:58
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-05-07 11:24:14
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\right-center.vue
+-->
+<template>
+ <div v-if="pageflag" class="right_center_wrap beautify-scroll-def" :class="{ 'overflow-y-auto': !sbtxSwiperFlag }">
+ <component :is="components" :data="list" :class-option="defaultOption">
+ <ul class="right_center ">
+ <li class="right_center_item" v-for="(item, i) in list" :key="i">
+ <span class="orderNum">{{ i + 1 }}</span>
+ <div class="inner_right">
+ <div class="dibu"></div>
+ <div class="flex">
+ <div class="info">
+ <span class="labels ">璁惧ID锛�</span>
+ <span class="contents zhuyao"> {{ item.gatewayno }}</span>
+ </div>
+ <div class="info">
+ <span class="labels">鍨嬪彿锛�</span>
+ <span class="contents "> {{ item.terminalno }}</span>
+ </div>
+ <div class="info">
+ <span class="labels">鍛婅鍊硷細</span>
+ <span class="contents warning"> {{ item.alertvalue | montionFilter }}</span>
+ </div>
+ </div>
+
+
+ <div class="flex">
+
+ <div class="info">
+ <span class="labels"> 鍦板潃锛�</span>
+ <span class="contents ciyao" style="font-size:12px"> {{ item.provinceName }}/{{ item.cityName }}/{{ item.countyName }}</span>
+ </div>
+ <div class="info time">
+ <span class="labels">鏃堕棿锛�</span>
+ <span class="contents" style="font-size:12px"> {{ item.createtime }}</span>
+ </div>
+
+ </div>
+ <div class="flex">
+
+ <div class="info">
+ <span class="labels">鎶ヨ鍐呭锛�</span>
+ <span class="contents ciyao" :class="{ warning: item.alertdetail }"> {{ item.alertdetail || '鏃�'
+ }}</span>
+ </div>
+ </div>
+ </div>
+ </li>
+ </ul>
+ </component>
+ </div>
+ <Reacquire v-else @onclick="getData" style="line-height:200px" />
+
+</template>
+
+<script>
+import { currentGET } from 'api/modules'
+import vueSeamlessScroll from 'vue-seamless-scroll' // vue2寮曞叆鏂瑰紡
+import Kong from '../../components/kong.vue'
+export default {
+ components: { vueSeamlessScroll, Kong },
+
+ data() {
+ return {
+ list: [],
+ pageflag: true,
+ defaultOption: {
+ ...this.$store.state.setting.defaultOption,
+ limitMoveNum: 3,
+ singleHeight: 250,
+ step:0,
+ }
+
+ };
+ },
+ computed: {
+ sbtxSwiperFlag() {
+ let ssyjSwiper = this.$store.state.setting.ssyjSwiper
+ if (ssyjSwiper) {
+ this.components = vueSeamlessScroll
+ } else {
+ this.components = Kong
+ }
+ return ssyjSwiper
+ }
+ },
+ created() {
+ this.getData()
+ },
+
+ mounted() { },
+ methods: {
+ getData() {
+ this.pageflag = true
+ // this.pageflag =false
+ currentGET('big5', { limitNum: 50 }).then(res => {
+ console.log('瀹炴椂棰勮', res);
+ if (res.success) {
+ this.list = res.data.list
+ let timer = setTimeout(() => {
+ clearTimeout(timer)
+ this.defaultOption.step=this.$store.state.setting.defaultOption.step
+ }, this.$store.state.setting.defaultOption.waitTime);
+ } else {
+ this.pageflag = false
+ this.$Message.warning(res.msg)
+ }
+ })
+ },
+
+ },
+};
+</script>
+<style lang='scss' scoped>
+.right_center {
+ width: 100%;
+ height: 100%;
+
+ .right_center_item {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: auto;
+ padding: 10px;
+ font-size: 14px;
+ color: #fff;
+
+ .orderNum {
+ margin: 0 20px 0 -20px;
+ }
+
+
+ .inner_right {
+ position: relative;
+ height: 100%;
+ width: 400px;
+ flex-shrink: 0;
+ line-height: 1.5;
+
+ .dibu {
+ position: absolute;
+ height: 2px;
+ width: 104%;
+ background-image: url("../../assets/img/zuo_xuxian.png");
+ bottom: -12px;
+ left: -2%;
+ background-size: cover;
+ }
+ }
+
+ .info {
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+
+ .labels {
+ flex-shrink: 0;
+ font-size: 12px;
+ color: rgba(255, 255, 255, 0.6);
+ }
+
+ .zhuyao {
+ color: $primary-color;
+ font-size: 15px;
+ }
+
+ .ciyao {
+ color: rgba(255, 255, 255, 0.8);
+ }
+
+ .warning {
+ color: #E6A23C;
+ font-size: 15px;
+ }
+ }
+
+ }
+}
+
+.right_center_wrap {
+ overflow: hidden;
+ width: 100%;
+ height: 250px;
+}
+
+.overflow-y-auto {
+ overflow-y: auto;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-center.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-center.vue"
new file mode 100644
index 0000000..843e7be
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-center.vue"
@@ -0,0 +1,238 @@
+<template>
+ <div id="centerLeft1">
+ <div class="bg-color-black">
+ <div class="d-flex pt-2 pl-2">
+ <span>
+ <ul>
+ <li>鍚堟牸锛歿{container_data.qualified}}</li>
+ <li>寰呮锛歿{container_data.waitCheck}}</li>
+ <li>妫�淇腑锛歿{container_data.checkIng}}</li>
+ <li>绌烘墭锛歿{container_data.empty}}</li>
+ <li>瀹炴墭锛歿{container_data.full}}</li>
+ </ul>
+ </span>
+ </div>
+ <div class="d-flex jc-center" style="margin-left: 23%;">
+ <CenterLeft1Chart />
+ </div>
+ <!-- 4涓富瑕佺殑鏁版嵁 -->
+ <!-- <div class="bottom-data">
+ <div
+ class="item-box mt-2"
+ v-for="(item, index) in numberData"
+ :key="index"
+ >
+ <div class="d-flex" style="margin-left:60px">
+ <span class="coin">#</span>
+ <dv-digital-flop class="dv-digital-flop" :config="item.number" />
+ </div>
+ <p class="text" style="text-align: center;">
+ {{ item.text }}
+ <span class="colorYellow">(涓�)</span>
+ </p>
+ </div>
+ </div> -->
+ </div>
+ </div>
+</template>
+
+<script>
+import CenterLeft1Chart from '@/components/echart/centerLeft1Chart'
+import axios from 'axios'
+export default {
+ data() {
+ return {
+ container_data:{},
+ // numberData: [
+ // {
+ // number: {
+ // number: [15],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '浠婃棩鏋勫缓鎬婚噺'
+ // },
+ // {
+ // number: {
+ // number: [1144],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '鎬诲叡瀹屾垚鏁伴噺'
+ // },
+ // {
+ // number: {
+ // number: [361],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '姝ｅ湪缂栬瘧鏁伴噺'
+ // },
+ // {
+ // number: {
+ // number: [157],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '鏈�氳繃鏁伴噺'
+ // }
+ // ]
+ }
+ },
+ components: {
+ CenterLeft1Chart
+ },
+ mounted() {
+ this.changeTiming()
+ },
+ methods: {
+ changeTiming() {
+ this.changeNumber()
+ setInterval(() => {
+ this.changeNumber()
+ }, 3000)
+ },
+ changeNumber() {
+ // this.numberData.forEach((item, index) => {
+ // item.number.number[0] += ++index
+ // item.number = { ...item.number }
+ // })
+ axios.post("http://192.168.12.189:8098/api/VV_Container/GetContainerMessage",null)
+ .then((res) => {
+ this.container_data = res;
+
+ // this.numberData = [
+ // {
+ // number: {
+ // number: [agvs.emptyNum],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '鎬诲叡绌鸿揣浣�'
+ // },
+ // {
+ // number: {
+ // number: [agvs.storedNum],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '鎬诲叡鏈夎揣璐т綅'
+ // },
+ // {
+ // number: {
+ // number: [agvs.num],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '鎬诲叡缂撳瓨鏋�'
+ // },
+ // {
+ // number: {
+ // number: [agvs.ngNum],
+ // toFixed: 1,
+ // textAlign: 'left',
+ // content: '{nt}',
+ // style: {
+ // fontSize: 24
+ // }
+ // },
+ // text: '鎺夌嚎缂撳瓨鏋舵暟閲�'
+ // }
+ // ]
+ // this.numberData = GetLocationData
+ }).catch((res) => {
+ console.log(res)
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+$box-width: 610px;
+$box-height: 410px;
+
+#centerLeft1 {
+ padding: 16px;
+ height: $box-height;
+ width: $box-width;
+ border-radius: 10px;
+ .bg-color-black {
+ height: $box-height - 30px;
+ border-radius: 10px;
+ }
+ .text {
+ color: #c3cbde;
+ }
+ .dv-dec-3 {
+ position: relative;
+ width: 100px;
+ height: 20px;
+ top: -3px;
+ }
+
+ .bottom-data {
+ .item-box {
+ & > div {
+ padding-right: 5px;
+ }
+ font-size: 14px;
+ float: right;
+ position: relative;
+ width: 50%;
+ color: #d3d6dd;
+ .dv-digital-flop {
+ width: 120px;
+ height: 30px;
+ }
+ // 閲戝竵
+ .coin {
+ position: relative;
+ top: 6px;
+ font-size: 20px;
+ color: #ffc107;
+ }
+ .colorYellow {
+ color: yellowgreen;
+ }
+ p {
+ text-align: center;
+ }
+ }
+ }
+}
+
+ul li{
+ float: left;
+ list-style-type: none;
+ margin-left: 8%;
+}
+</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-top.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-top.vue"
new file mode 100644
index 0000000..dc9d271
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/right-top.vue"
@@ -0,0 +1,299 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-01 14:13:04
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-09-27 15:04:49
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\right-top.vue
+-->
+<template>
+ <Echart
+ id="rightTop"
+ :options="option"
+ class="right_top_inner"
+ v-if="pageflag"
+ ref="charts"
+ />
+ <Reacquire v-else @onclick="getData" style="line-height: 200px">
+ 閲嶆柊鑾峰彇
+ </Reacquire>
+</template>
+
+<script>
+import { currentGET } from "api/modules";
+import {graphic} from "echarts"
+export default {
+ data() {
+ return {
+ option: {},
+ pageflag: false,
+ timer: null,
+ };
+ },
+ created() {
+
+ },
+
+ mounted() {
+ this.getData();
+ },
+ beforeDestroy() {
+ this.clearData();
+ },
+ methods: {
+ clearData() {
+ if (this.timer) {
+ clearInterval(this.timer);
+ this.timer = null;
+ }
+ },
+ getData() {
+ this.pageflag = true;
+ // this.pageflag =false
+ currentGET("big4").then((res) => {
+ if (!this.timer) {
+ console.log("鎶ヨ娆℃暟", res);
+ }
+ if (res.success) {
+ this.countUserNumData = res.data;
+ this.$nextTick(() => {
+ this.init(res.data.dateList, res.data.numList, res.data.numList2),
+ this.switper();
+ });
+ } else {
+ this.pageflag = false;
+ this.$Message({
+ text: res.msg,
+ type: "warning",
+ });
+ }
+ });
+ },
+ //杞
+ switper() {
+ if (this.timer) {
+ return;
+ }
+ let looper = (a) => {
+ this.getData();
+ };
+ this.timer = setInterval(
+ looper,
+ this.$store.state.setting.echartsAutoTime
+ );
+ let myChart = this.$refs.charts.chart;
+ myChart.on("mouseover", (params) => {
+ this.clearData();
+ });
+ myChart.on("mouseout", (params) => {
+ this.timer = setInterval(
+ looper,
+ this.$store.state.setting.echartsAutoTime
+ );
+ });
+ },
+ init(xData, yData, yData2) {
+ this.option = {
+ xAxis: {
+ type: "category",
+ data: xData,
+ boundaryGap: false, // 涓嶇暀鐧斤紝浠庡師鐐瑰紑濮�
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "rgba(31,99,163,.2)",
+ },
+ },
+ axisLine: {
+ // show:false,
+ lineStyle: {
+ color: "rgba(31,99,163,.1)",
+ },
+ },
+ axisLabel: {
+ color: "#7EB7FD",
+ fontWeight: "500",
+ },
+ },
+ yAxis: {
+ type: "value",
+ splitLine: {
+ show: true,
+ lineStyle: {
+ color: "rgba(31,99,163,.2)",
+ },
+ },
+ axisLine: {
+ lineStyle: {
+ color: "rgba(31,99,163,.1)",
+ },
+ },
+ axisLabel: {
+ color: "#7EB7FD",
+ fontWeight: "500",
+ },
+ },
+ tooltip: {
+ trigger: "axis",
+ backgroundColor: "rgba(0,0,0,.6)",
+ borderColor: "rgba(147, 235, 248, .8)",
+ textStyle: {
+ color: "#FFF",
+ },
+ },
+ grid: {
+ //甯冨眬
+ show: true,
+ left: "10px",
+ right: "30px",
+ bottom: "10px",
+ top: "28px",
+ containLabel: true,
+ borderColor: "#1F63A3",
+ },
+ series: [
+ {
+ data: yData,
+ type: "line",
+ smooth: true,
+ symbol: "none", //鍘婚櫎鐐�
+ name: "鎶ヨ1娆℃暟",
+ color: "rgba(252,144,16,.7)",
+ areaStyle: {
+ //鍙筹紝涓嬶紝宸︼紝涓�
+ color: new graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(252,144,16,.7)",
+ },
+ {
+ offset: 1,
+ color: "rgba(252,144,16,.0)",
+ },
+ ],
+ false
+ ),
+ },
+ markPoint: {
+ data: [
+ {
+ name: "鏈�澶у��",
+ type: "max",
+ valueDim: "y",
+ symbol: "rect",
+ symbolSize: [60, 26],
+ symbolOffset: [0, -20],
+ itemStyle: {
+ color: "rgba(0,0,0,0)",
+ },
+ label: {
+ color: "#FC9010",
+ backgroundColor: "rgba(252,144,16,0.1)",
+ borderRadius: 6,
+ padding: [7, 14],
+ borderWidth: 0.5,
+ borderColor: "rgba(252,144,16,.5)",
+ formatter: "鎶ヨ1锛歿c}",
+ },
+ },
+ {
+ name: "鏈�澶у��",
+ type: "max",
+ valueDim: "y",
+ symbol: "circle",
+ symbolSize: 6,
+ itemStyle: {
+ color: "#FC9010",
+ shadowColor: "#FC9010",
+ shadowBlur: 8,
+ },
+ label: {
+ formatter: "",
+ },
+ },
+ ],
+ },
+ },
+ {
+ data: yData2,
+ type: "line",
+ smooth: true,
+ symbol: "none", //鍘婚櫎鐐�
+ name: "鎶ヨ2娆℃暟",
+ color: "rgba(9,202,243,.7)",
+ areaStyle: {
+ //鍙筹紝涓嬶紝宸︼紝涓�
+ color: new graphic.LinearGradient(
+ 0,
+ 0,
+ 0,
+ 1,
+ [
+ {
+ offset: 0,
+ color: "rgba(9,202,243,.7)",
+ },
+ {
+ offset: 1,
+ color: "rgba(9,202,243,.0)",
+ },
+ ],
+ false
+ ),
+ },
+ markPoint: {
+ data: [
+ {
+ name: "鏈�澶у��",
+ type: "max",
+ valueDim: "y",
+ symbol: "rect",
+ symbolSize: [60, 26],
+ symbolOffset: [0, -20],
+ itemStyle: {
+ color: "rgba(0,0,0,0)",
+ },
+ label: {
+ color: "#09CAF3",
+ backgroundColor: "rgba(9,202,243,0.1)",
+
+ borderRadius: 6,
+ borderColor: "rgba(9,202,243,.5)",
+ padding: [7, 14],
+ formatter: "鎶ヨ2锛歿c}",
+ borderWidth: 0.5,
+ },
+ },
+ {
+ name: "鏈�澶у��",
+ type: "max",
+ valueDim: "y",
+ symbol: "circle",
+ symbolSize: 6,
+ itemStyle: {
+ color: "#09CAF3",
+ shadowColor: "#09CAF3",
+ shadowBlur: 8,
+ },
+ label: {
+ formatter: "",
+ },
+ },
+ ],
+ },
+ },
+ ],
+ };
+ },
+ },
+};
+</script>
+<style lang='scss' scoped>
+.right_top_inner {
+ margin-top: -8px;
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-four.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-four.vue"
new file mode 100644
index 0000000..768bd05
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-four.vue"
@@ -0,0 +1,237 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-02-28 16:16:42
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-07-20 17:57:11
+ * @FilePath: \web-pc\src\pages\big-screen\view\indexs\left-center.vue
+-->
+<template>
+ <ul class="user_Overview flex" v-if="pageflag">
+ <li class="user_Overview-item" style="color: #00fdfa">
+ <div class="user_Overview_nums allnum ">
+ <dv-digital-flop :config="onlineconfig" style="width:100%;height:100%;" />
+ </div>
+ <p>10鍙锋淇彴</p>
+ <br>
+ <p>{{stationstate[9].station_state}}</p>
+ </li>
+ <li class="user_Overview-item" style="color: #07f7a8">
+ <div class="user_Overview_nums online">
+ <dv-digital-flop :config="config" style="width:100%;height:100%;" />
+ </div>
+ <p>11鍙锋淇彴</p>
+ <br>
+ <p>{{stationstate[10].station_state}}</p>
+ </li>
+ <li class="user_Overview-item" style="color: #e3b337">
+ <div class="user_Overview_nums offline">
+ <dv-digital-flop :config="offlineconfig" style="width:100%;height:100%;" />
+
+ </div>
+ <p>12鍙锋淇彴</p>
+ <br>
+ <p>{{stationstate[11].station_state}}</p>
+ </li>
+ </ul>
+ <Reacquire v-else @onclick="getData" line-height="200px">
+ 閲嶆柊鑾峰彇
+ </Reacquire>
+</template>
+
+<script>
+import { currentGET } from 'api/modules'
+import {Floorfault} from "@/api/http.js"
+let style = {
+ fontSize: 24
+}
+export default {
+ data() {
+ return {
+ options: {},
+ stationstate:[],
+ userOverview: {
+ alarmNum: 2,
+ offlineNum: 3,
+ onlineNum: 5,
+ totalNum: 10,
+ },
+ pageflag: true,
+ timer: null,
+ config: {
+ number: [100],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#00fdfa",
+ fill: "#00fdfa",
+ },
+ },
+ onlineconfig: {
+ number: [0],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#07f7a8",
+ fill: "#07f7a8",
+ },
+ },
+ offlineconfig: {
+ number: [0],
+ content: '{nt}',
+ style: {
+ ...style,
+ // stroke: "#e3b337",
+ fill: "#e3b337",
+ },
+ },
+ };
+ },
+ filters: {
+ numsFilter(msg) {
+ return msg || 0;
+ },
+ },
+ created() {
+ this.getData()
+ },
+ mounted() {
+ },
+ beforeDestroy() {
+ this.clearData()
+
+ },
+ methods: {
+ clearData() {
+ if (this.timer) {
+ clearInterval(this.timer)
+ this.timer = null
+ }
+ },
+ async getData() {
+ this.pageflag = true;
+ // currentGET("big2").then((res) => {
+ // if (!this.timer) {
+ // console.log("璁惧鎬昏2", res);
+ // }
+ // if (res.success) {
+ // this.userOverview = res.data;
+ // this.onlineconfig = {
+ // ...this.onlineconfig,
+ // number: [1]
+ // }
+ // this.config = {
+ // ...this.config,
+ // number: [7]
+ // }
+ // this.offlineconfig = {
+ // ...this.offlineconfig,
+ // number: [4]
+ // }
+ // this.laramnumconfig = {
+ // ...this.laramnumconfig,
+ // number: [10]
+ // }
+ // this.switper();
+ // } else {
+ // this.pageflag = false;
+ // this.$Message.warning(res.msg);
+ // }
+ // });
+ let rep = await Floorfault((a)=>{
+ });
+ this.stationstate=rep;
+ this.onlineconfig = {
+ ...this.onlineconfig,
+ number: [rep[9].station_qty]
+ }
+ this.config = {
+ ...this.config,
+ number: [rep[10].station_qty]
+ }
+ this.offlineconfig = {
+ ...this.offlineconfig,
+ number: [rep[11].station_qty]
+ }
+ this.switper();
+ },
+ //杞
+ switper() {
+ if (this.timer) {
+ return
+ }
+ let looper = (a) => {
+ this.getData()
+ };
+ this.timer = setInterval(looper, this.$store.state.setting.echartsAutoTime);
+ },
+ },
+};
+</script>
+<style lang='scss' scoped>
+.user_Overview {
+ li {
+ flex: 1;
+
+ p {
+ text-align: center;
+ height: 16px;
+ font-size: 16px;
+ }
+
+ .user_Overview_nums {
+ width: 100px;
+ height: 100px;
+ text-align: center;
+ line-height: 100px;
+ font-size: 22px;
+ margin: 50px auto 30px;
+ background-size: cover;
+ background-position: center center;
+ position: relative;
+
+ &::before {
+ content: '';
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ }
+
+ &.bgdonghua::before {
+ animation: rotating 14s linear infinite;
+ }
+ }
+
+ .allnum {
+
+ // background-image: url("../../assets/img/left_top_lan.png");
+ &::before {
+ background-image: url("../../assets/img/left_top_lan.png");
+
+ }
+ }
+
+ .online {
+ &::before {
+ background-image: url("../../assets/img/left_top_lv.png");
+
+ }
+ }
+
+ .offline {
+ &::before {
+ background-image: url("../../assets/img/left_top_huang.png");
+
+ }
+ }
+
+ .laramnum {
+ &::before {
+ background-image: url("../../assets/img/left_top_hong.png");
+
+ }
+ }
+ }
+}
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue"
new file mode 100644
index 0000000..f4936a2
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-one.vue"
@@ -0,0 +1,84 @@
+<template>
+ <div class="table-container">
+ <table class="data-table">
+ <thead>
+ <tr>
+ <th v-for="(header, index) in headers" :key="index">
+ {{ header }}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="(row, rowIndex) in tableData" :key="rowIndex">
+ <td v-for="(cell, cellIndex) in row" :key="cellIndex">
+ {{ cell }}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </template>
+
+ <script>
+import axios from 'axios';
+
+export default {
+ data() {
+ return {
+ headers: ['璐т綅淇℃伅', '鏁伴噺'],
+ tableData: []
+ };
+ },
+ created() {
+ this.fetchData();
+ },
+ methods: {
+ fetchData() {
+ axios.post("http://127.0.0.1:5000/api/LocationInfo/LocationStatus", null)
+ .then((response) => {
+ this.tableData = [];
+ response.forEach(item => {
+ this.tableData.push([
+ item.status,
+ item.count
+ ]);
+ });
+ })
+ .catch((error) => {
+ console.error("璇锋眰澶辫触:", error);
+ this.tableData = [
+ ['绌鸿揣浣�', 0],
+ ['鏈夎揣', 0],
+ ['鍗犵敤', 0]
+ ];
+ });
+ }
+ }
+};
+</script>
+
+ <style scoped>
+ .table-container {
+ width: 100%;
+ overflow-x: auto;
+ }
+
+ .data-table {
+ width: 100%;
+ border-collapse: collapse;
+ margin: 20px 0;
+ font-family: Arial, sans-serif;
+ }
+
+ .data-table th {
+ font-weight: bold;
+ padding: 12px 15px;
+ text-align: left;
+ border-bottom: 2px solid #c9aeae;
+ }
+
+ .data-table td {
+ padding: 10px 15px;
+ border-bottom: 1px solid #ddd;
+ }
+ </style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-three.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-three.vue"
new file mode 100644
index 0000000..bacda7b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-three.vue"
@@ -0,0 +1,148 @@
+<template>
+ <ul class="user_Overview flex">
+ <li class="user_Overview-item" style="color: #00fdfa">
+ <div class="user_Overview_nums allnum ">
+ <dv-digital-flop :config="onlineconfig" style="width:100%;height:100%;" />
+ </div>
+ <br>
+ <p>{{stationstate[0].station_state}}</p>
+ <p v-if="stationstate[0].station_state == '妫�淇腑'">{{stationstate[0].station_checkName}}</p>
+ </li>
+ <li class="user_Overview-item" style="color: #07f7a8">
+ <div class="user_Overview_nums online">
+ <dv-digital-flop :config="config" style="width:100%;height:100%;" />
+ </div>
+ <br>
+ <p>{{stationstate[1].station_state}}</p>
+ <p v-if="stationstate[1].station_state == '妫�淇腑'">{{stationstate[1].station_checkName}}</p>
+ </li>
+ <!-- <li class="user_Overview-item" style="color: #e3b337">
+ <div class="user_Overview_nums offline">
+ <dv-digital-flop :config="offlineconfig" style="width:100%;height:100%;" />
+ </div>
+ <p>7鍙锋淇彴</p>
+ <br>
+ <p>{{stationstate[2].station_state}}</p>
+ <p v-if="stationstate[2].station_state == '妫�淇腑'">{{stationstate[2].station_checkName}}</p>
+ </li>
+ <li class="user_Overview-item" style="color: #e3b337">
+ <div class="user_Overview_nums offline">
+ <dv-digital-flop :config="offlineconfig" style="width:100%;height:100%;" />
+ </div>
+ <p>8鍙锋淇彴</p>
+ <br>
+ <p>{{stationstate[3].station_state}}</p>
+ <p v-if="stationstate[3].station_state == '妫�淇腑'">{{stationstate[3].station_checkName}}</p>
+ </li> -->
+ </ul>
+ </template>
+
+ <script>
+ let style = {
+ fontSize: 24
+ }
+ export default {
+ data() {
+ return {
+ stationstate: [
+ { station_state: '鍏ュ簱閲�', station_checkName: '' },
+ { station_state: '鍑哄簱閲�', station_checkName: '' },
+ { station_state: '寰呮満涓�', station_checkName: '' },
+ { station_state: '鏁呴殰涓�', station_checkName: '' }
+ ],
+ config: {
+ number: [7],
+ content: '{nt}',
+ style: {
+ ...style,
+ fill: "#00fdfa",
+ },
+ },
+ onlineconfig: {
+ number: [1],
+ content: '{nt}',
+ style: {
+ ...style,
+ fill: "#07f7a8",
+ },
+ },
+ offlineconfig: {
+ number: [4],
+ content: '{nt}',
+ style: {
+ ...style,
+ fill: "#e3b337",
+ },
+ },
+ };
+ },
+ filters: {
+ numsFilter(msg) {
+ return msg || 0;
+ },
+ },
+ };
+ </script>
+
+ <style lang='scss' scoped>
+ .user_Overview {
+ li {
+ flex: 1;
+
+ p {
+ text-align: center;
+ height: 16px;
+ font-size: 16px;
+ }
+
+ .user_Overview_nums {
+ width: 100px;
+ height: 100px;
+ text-align: center;
+ line-height: 100px;
+ font-size: 22px;
+ margin: 50px auto 30px;
+ background-size: cover;
+ background-position: center center;
+ position: relative;
+
+ &::before {
+ content: '';
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ left: 0;
+ }
+
+ &.bgdonghua::before {
+ animation: rotating 14s linear infinite;
+ }
+ }
+
+ .allnum {
+ &::before {
+ background-image: url("../../assets/img/left_top_lan.png");
+ }
+ }
+
+ .online {
+ &::before {
+ background-image: url("../../assets/img/left_top_lv.png");
+ }
+ }
+
+ .offline {
+ &::before {
+ background-image: url("../../assets/img/left_top_huang.png");
+ }
+ }
+
+ .laramnum {
+ &::before {
+ background-image: url("../../assets/img/left_top_hong.png");
+ }
+ }
+ }
+ }
+ </style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue"
new file mode 100644
index 0000000..1f5a1f1
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/indexs/station-two.vue"
@@ -0,0 +1,99 @@
+<template>
+ <div class="table-container">
+ <table class="data-table">
+ <thead>
+ <tr>
+ <th v-for="(header, index) in headers" :key="index">
+ {{ header }}
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr v-for="(row, rowIndex) in tableData" :key="rowIndex">
+ <td v-for="(cell, cellIndex) in row" :key="cellIndex">
+ {{ cell }}
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div v-if="loading" class="loading">鍔犺浇涓�...</div>
+ <div v-if="error" class="error">{{ error }}</div>
+ </div>
+ </template>
+
+ <script>
+ import axios from 'axios';
+
+ export default {
+ data() {
+ return {
+ headers: ['杞﹀瀷','杞瀷', '鏁伴噺'],
+ tableData: [], // 瀛樺偍API杩斿洖鐨勬暟鎹�
+ loading: false,
+ error: null
+ }
+ },
+ created() {
+ this.fetchData();
+ },
+ methods: {
+ fetchData() {
+ axios.post("http://127.0.0.1:5000/api/Dt_WheelsStock/InventoryStatistics", null)
+ .then((response) => {
+ this.tableData = [];
+ response.forEach(item => {
+ this.tableData.push([
+ item.wheels_CarType,
+ item.wheels_ldxh,
+ item.count
+ ]);
+ });
+ })
+ .catch((error) => {
+ console.error("璇锋眰澶辫触:", error);
+ this.tableData = [
+ ['鏆傛棤鏁版嵁', '鏆傛棤鏁版嵁', '鏆傛棤鏁版嵁'],
+ ];
+ });
+ }
+ }
+ }
+ </script>
+
+ <style scoped>
+ .table-container {
+ width: 100%;
+ overflow-x: auto;
+ position: relative;
+ min-height: 200px;
+ }
+
+ .data-table {
+ width: 100%;
+ border-collapse: collapse;
+ margin: 20px 0;
+ font-family: Arial, sans-serif;
+ }
+
+ .data-table th {
+ font-weight: bold;
+ padding: 12px 15px;
+ text-align: left;
+ border-bottom: 2px solid #c9aeae;
+ }
+
+ .data-table td {
+ padding: 10px 15px;
+ border-bottom: 1px solid #ddd;
+ }
+
+ .loading, .error {
+ padding: 20px;
+ text-align: center;
+ color: #666;
+ }
+
+ .error {
+ color: #f56c6c;
+ }
+ </style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/setting.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/setting.vue"
new file mode 100644
index 0000000..91ec7e8
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/setting.vue"
@@ -0,0 +1,106 @@
+<template>
+ <transition name="yh-setting-fade">
+ <div class="setting" :class="{ settingShow: settingShow }" v-show="settingShow">
+ <div class="setting_dislog" @click="settingShow = false">
+
+ </div>
+ <div class="setting_inner">
+ <div class="setting_header">
+ 璁剧疆
+ </div>
+ <div class="setting_body">
+ <!-- <div class="left_shu"> 瀹炴椂鐩戞祴</div> -->
+ <div class="left_shu"> 鍏ㄥ眬璁剧疆</div>
+ <div class="setting_item">
+ <span class="setting_label">
+ 鏄惁杩涜鑷姩閫傞厤<span class="setting_label_tip">(榛樿鍒嗚鲸鐜�1920*1080)</span>:
+ </span>
+ <div class="setting_content">
+ <el-radio-group v-model="isScaleradio" @change="(val) => radiochange(val, 'isScale')">
+ <el-radio :label="true">鏄�</el-radio>
+ <el-radio :label="false">鍚�</el-radio>
+ </el-radio-group>
+
+ </div>
+ </div>
+ <!-- <div class="left_shu"> 瀹炴椂鐩戞祴</div>
+ <div class="setting_item">
+ <span class="setting_label">
+ 璁惧鎻愰啋鑷姩杞: <span class="setting_label_tip"></span>
+ </span>
+ <div class="setting_content">
+ <el-radio-group v-model="sbtxradio" @change="(val) => radiochange(val, 'sbtxSwiper')">
+ <el-radio :label="true">鏄�</el-radio>
+ <el-radio :label="false">鍚�</el-radio>
+ </el-radio-group>
+
+ </div>
+ </div>
+ <div class="setting_item">
+ <span class="setting_label">
+ 瀹炴椂棰勮杞挱:
+ </span>
+ <div class="setting_content">
+ <el-radio-group v-model="ssyjradio" @change="(val) => radiochange(val, 'ssyjSwiper')">
+ <el-radio :label="true">鏄�</el-radio>
+ <el-radio :label="false">鍚�</el-radio>
+ </el-radio-group>
+ </div>
+ </div> -->
+ <div class="flex justify-center">
+ <!-- <el-button type="primary" round size="mini">纭畾</el-button> -->
+ </div>
+ </div>
+ </div>
+ </div>
+ </transition>
+</template>
+
+<script>
+
+export default {
+ components: {},
+ data() {
+ return {
+ settingShow: false,
+ sbtxradio:true,
+ ssyjradio: true,
+ isScaleradio:true,
+ echartsAutoTime:3000
+ };
+ },
+ computed: {},
+ methods: {
+ init() {
+ this.settingShow = true
+ },
+ radiochange(val, type) {
+ this.$store.commit('setting/updateSwiper', { val, type })
+ if(type==='isScale'){
+ // this.$router.go(0)
+ // location.reload()
+ // window.location.href=window.location.href+"?t="+Date.now()
+ }
+ },
+ },
+ created() {
+ this.$store.commit('setting/initSwipers')
+ this.sbtxradio = this.$store.state.setting.sbtxSwiper,
+ this.ssyjradio = this.$store.state.setting.ssyjSwiper,
+ this.isScaleradio = this.$store.state.setting.isScale;
+ },
+ mounted() {
+ document.body.appendChild(this.$el);
+ },
+ beforeDestroy() {
+ },
+ destroyed() {
+ if (this.$el && this.$el.parentNode) {
+ this.$el.parentNode.removeChild(this.$el);
+ }
+ }
+}
+</script>
+
+<style lang='scss' scoped>
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/tjfx/tjfx.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/tjfx/tjfx.vue"
new file mode 100644
index 0000000..87c5b1b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/DP/src/views/tjfx/tjfx.vue"
@@ -0,0 +1,37 @@
+<!--
+ * @Author: daidai
+ * @Date: 2022-03-04 09:52:25
+ * @LastEditors: daidai
+ * @LastEditTime: 2022-03-04 11:03:40
+ * @FilePath: \web-pc\src\pages\big-screen\view\tjfx\tjfx.vue
+-->
+<template>
+ <div>
+
+ </div>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ created(){
+
+ },
+
+ mounted() {
+
+ },
+ methods: {
+
+
+ },
+ }
+</script>
+<style lang='scss' scoped>
+
+
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/App.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/App.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/App.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/App.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/return.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/return.png"
deleted file mode 100644
index 9cb3ae0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/return.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/__UNI__6F62323_cm.apk" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/__UNI__6F62323_cm.apk"
deleted file mode 100644
index 6ce0a6f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/__UNI__6F62323_cm.apk"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/__UNI__C94AE9A_cm.apk" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/__UNI__C94AE9A_cm.apk"
deleted file mode 100644
index 0ad98de..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/__UNI__C94AE9A_cm.apk"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/apkurl" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/apkurl"
deleted file mode 100644
index 36383e7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/apk/apkurl"
+++ /dev/null
@@ -1 +0,0 @@
-https://app.liuyingyong.cn/build/download/93f86260-0ea2-11f0-bea9-6ba8b4d2509a
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/certdata" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/certdata"
deleted file mode 100644
index 6c48c10..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/certdata"
+++ /dev/null
@@ -1,3 +0,0 @@
-andrCertfile=F:/HBuilderX/HBuilderX/plugins/app-safe-pack/Test.keystore
-andrCertAlias=android
-andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/cloudcertificate/certini" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/cloudcertificate/certini"
deleted file mode 100644
index 813a2c4..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/cloudcertificate/certini"
+++ /dev/null
@@ -1,4 +0,0 @@
-[General]
-andrCertfile=package.keystore
-andrCertAlias=__UNI__C94AE9A
-andrCertPass="gEW/mAVVlXjviUCu0ifeKQ=="
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/cloudcertificate/package.keystore" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/cloudcertificate/package.keystore"
deleted file mode 100644
index 273b453..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/cloudcertificate/package.keystore"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/__uniapperror.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/__uniapperror.png"
deleted file mode 100644
index 4743b25..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/__uniapperror.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/__uniappsuccess.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/__uniappsuccess.png"
deleted file mode 100644
index c1f5bd7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/__uniappsuccess.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsA.png"
deleted file mode 100644
index 6aefe64..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsA.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsB.png"
deleted file mode 100644
index 4b5c38d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsB.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsC.png"
deleted file mode 100644
index 606bf51..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsC.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsD.png"
deleted file mode 100644
index 7174745..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsD.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsE.png"
deleted file mode 100644
index dea1f79..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ReceivingGoodsE.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/Test.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/Test.png"
deleted file mode 100644
index 4b5f1af..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/Test.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/appoint.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/appoint.png"
deleted file mode 100644
index 448e802..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/appoint.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/binding.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/binding.png"
deleted file mode 100644
index b1841db..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/binding.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/boxing1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/boxing1.png"
deleted file mode 100644
index 7143295..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/boxing1.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/boxing2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/boxing2.png"
deleted file mode 100644
index b9510ce..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/boxing2.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callA.png"
deleted file mode 100644
index 73ed380..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callA.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callB.png"
deleted file mode 100644
index 96f861f..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callB.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callC.png"
deleted file mode 100644
index 45a5ebb..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callC.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callD.png"
deleted file mode 100644
index f39b1b5..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callD.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callE.png"
deleted file mode 100644
index 63f20b9..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/callE.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/cancel.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/cancel.png"
deleted file mode 100644
index 9161b42..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/cancel.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/changebox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/changebox.png"
deleted file mode 100644
index 47530b7..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/changebox.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/changebox1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/changebox1.png"
deleted file mode 100644
index e328a33..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/changebox1.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/check1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/check1.png"
deleted file mode 100644
index 7f5ea86..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/check1.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/check2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/check2.png"
deleted file mode 100644
index b699579..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/check2.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/exp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/exp.png"
deleted file mode 100644
index d99077e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/exp.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/forklift.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/forklift.png"
deleted file mode 100644
index 3c92dfa..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/forklift.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/forkliftB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/forkliftB.png"
deleted file mode 100644
index 057cb17..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/forkliftB.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/in1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/in1.png"
deleted file mode 100644
index ae22843..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/in1.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/inorder.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/inorder.png"
deleted file mode 100644
index 9c138e6..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/inorder.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/lend.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/lend.png"
deleted file mode 100644
index d07e51e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/lend.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/login.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/login.png"
deleted file mode 100644
index f4249f0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/login.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/logo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/logo.png"
deleted file mode 100644
index 4907a4e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/logo.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ortherbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ortherbox.png"
deleted file mode 100644
index 0e22c04..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/ortherbox.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out1.png"
deleted file mode 100644
index db68b71..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out1.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out2.png"
deleted file mode 100644
index f3b0e4d..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out2.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out3.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out3.png"
deleted file mode 100644
index c4e71c3..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out3.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out4.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out4.png"
deleted file mode 100644
index fed0f4e..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out4.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out5.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out5.png"
deleted file mode 100644
index 6523746..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/out5.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/qualityIn.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/qualityIn.png"
deleted file mode 100644
index 2958cdd..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/qualityIn.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/qualityOut.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/qualityOut.png"
deleted file mode 100644
index d34c790..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/qualityOut.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/return.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/return.png"
deleted file mode 100644
index 9cb3ae0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/return.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/returnbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/returnbox.png"
deleted file mode 100644
index e960507..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/returnbox.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/zj.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/zj.png"
deleted file mode 100644
index 128164b..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/zj.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/zjjg.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/zjjg.png"
deleted file mode 100644
index 88dd84c..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/image/zjjg.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/uni.ttf" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/uni.ttf"
deleted file mode 100644
index 60a1968..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/cache/wgt/__UNI__C94AE9A/static/uni.ttf"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/return.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/return.png"
deleted file mode 100644
index 9cb3ae0..0000000
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/return.png"
+++ /dev/null
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/common/demo.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/common/demo.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/common/demo.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/common/demo.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/tki-qrcode/tki-qrcode.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/tki-qrcode/tki-qrcode.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/tki-qrcode/tki-qrcode.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/tki-qrcode/tki-qrcode.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-badge/uni-badge.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-badge/uni-badge.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-badge/uni-badge.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-badge/uni-badge.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-calendar/uni-calendar-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-calendar/uni-calendar-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-calendar/uni-calendar-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-calendar/uni-calendar-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-calendar/uni-calendar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-calendar/uni-calendar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-calendar/uni-calendar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-calendar/uni-calendar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-card/uni-card.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-card/uni-card.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-card/uni-card.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-card/uni-card.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-collapse-item/uni-collapse-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-collapse-item/uni-collapse-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-collapse-item/uni-collapse-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-collapse-item/uni-collapse-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-collapse/uni-collapse.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-collapse/uni-collapse.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-collapse/uni-collapse.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-collapse/uni-collapse.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-combox/uni-combox.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-combox/uni-combox.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-combox/uni-combox.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-combox/uni-combox.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-countdown/uni-countdown.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-countdown/uni-countdown.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-countdown/uni-countdown.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-countdown/uni-countdown.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-drawer/uni-drawer.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-drawer/uni-drawer.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-drawer/uni-drawer.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-drawer/uni-drawer.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-fab/uni-fab.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-fab/uni-fab.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-fab/uni-fab.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-fab/uni-fab.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-fav/uni-fav.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-fav/uni-fav.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-fav/uni-fav.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-fav/uni-fav.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-goods-nav/uni-goods-nav.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-goods-nav/uni-goods-nav.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-goods-nav/uni-goods-nav.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-goods-nav/uni-goods-nav.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-grid-item/uni-grid-item copy.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-grid-item/uni-grid-item copy.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-grid-item/uni-grid-item copy.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-grid-item/uni-grid-item copy.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-grid-item/uni-grid-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-grid-item/uni-grid-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-grid-item/uni-grid-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-grid-item/uni-grid-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-grid/uni-grid.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-grid/uni-grid.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-grid/uni-grid.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-grid/uni-grid.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-icons/uni-icons.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-icons/uni-icons.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-icons/uni-icons.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-icons/uni-icons.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-indexed-list/uni-indexed-list-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-indexed-list/uni-indexed-list-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-indexed-list/uni-indexed-list-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-indexed-list/uni-indexed-list-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-indexed-list/uni-indexed-list.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-indexed-list/uni-indexed-list.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-indexed-list/uni-indexed-list.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-indexed-list/uni-indexed-list.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-link/uni-link.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-link/uni-link.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-link/uni-link.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-link/uni-link.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list-item/uni-list-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list-item/uni-list-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list-item/uni-list-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list-item/uni-list-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list/uni-list.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list/uni-list.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list/uni-list.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list/uni-list.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list/uni-refresh.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list/uni-refresh.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list/uni-refresh.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list/uni-refresh.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list/uni-refresh.wxs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list/uni-refresh.wxs"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-list/uni-refresh.wxs"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-list/uni-refresh.wxs"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-load-more/uni-load-more.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-load-more/uni-load-more.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-load-more/uni-load-more.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-load-more/uni-load-more.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-nav-bar/uni-nav-bar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-nav-bar/uni-nav-bar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-nav-bar/uni-nav-bar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-nav-bar/uni-nav-bar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-notice-bar/uni-notice-bar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-notice-bar/uni-notice-bar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-notice-bar/uni-notice-bar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-notice-bar/uni-notice-bar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-number-box/uni-number-box.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-number-box/uni-number-box.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-number-box/uni-number-box.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-number-box/uni-number-box.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-pagination/uni-pagination.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-pagination/uni-pagination.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-pagination/uni-pagination.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-pagination/uni-pagination.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup-dialog.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup-dialog.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup-dialog.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup-dialog.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup-message.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup-message.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup-message.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup-message.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup-share.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup-share.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup-share.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup-share.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-popup/uni-popup.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-popup/uni-popup.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-rate/uni-rate.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-rate/uni-rate.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-rate/uni-rate.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-rate/uni-rate.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-search-bar/uni-search-bar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-search-bar/uni-search-bar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-search-bar/uni-search-bar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-search-bar/uni-search-bar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-section/uni-section.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-section/uni-section.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-section/uni-section.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-section/uni-section.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-segmented-control/uni-segmented-control.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-segmented-control/uni-segmented-control.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-segmented-control/uni-segmented-control.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-segmented-control/uni-segmented-control.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-status-bar/uni-status-bar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-status-bar/uni-status-bar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-status-bar/uni-status-bar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-status-bar/uni-status-bar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-steps/uni-steps.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-steps/uni-steps.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-steps/uni-steps.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-steps/uni-steps.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swipe-action-item/index.wxs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swipe-action-item/index.wxs"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swipe-action-item/index.wxs"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swipe-action-item/index.wxs"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swipe-action-item/uni-swipe-action-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swipe-action-item/uni-swipe-action-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swipe-action-item/uni-swipe-action-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swipe-action-item/uni-swipe-action-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swipe-action/uni-swipe-action.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swipe-action/uni-swipe-action.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swipe-action/uni-swipe-action.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swipe-action/uni-swipe-action.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swiper-dot/uni-swiper-dot.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swiper-dot/uni-swiper-dot.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-swiper-dot/uni-swiper-dot.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-swiper-dot/uni-swiper-dot.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-tag/uni-tag.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-tag/uni-tag.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-tag/uni-tag.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-tag/uni-tag.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-title/uni-title.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-title/uni-title.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-title/uni-title.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-title/uni-title.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-transition/uni-transition.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-transition/uni-transition.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/uni-transition/uni-transition.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/uni-transition/uni-transition.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/watch-login/watch-button.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/watch-login/watch-button.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/watch-login/watch-button.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/watch-login/watch-button.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/watch-login/watch-input.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/watch-login/watch-input.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/watch-login/watch-input.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/watch-login/watch-input.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/wyb-popup/wyb-popup.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/wyb-popup/wyb-popup.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/wyb-popup/wyb-popup.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/wyb-popup/wyb-popup.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/xfl-select/xfl-select.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/xfl-select/xfl-select.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/components/xfl-select/xfl-select.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/components/xfl-select/xfl-select.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Check/Check.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Check/Check.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Check/Check.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Check/Check.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/ClboundInfo.vue"
similarity index 87%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundInfo.vue"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/ClboundInfo.vue"
index dd5a642..a9895f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/ClboundInfo.vue"
@@ -16,13 +16,13 @@
<view style="padding: 20rpx 0rpx">
<u-table>
- <u-tr>
+ <!-- <u-tr>
<u-td width="30%">鎿嶄綔鏂瑰紡</u-td>
<u-td>
<xfl-select :list="OperationList" :initValue="'璇烽�夋嫨'" :clearable="false" @change="OperationChange">
</xfl-select>
</u-td>
- </u-tr>
+ </u-tr> -->
<u-tr>
<u-td width="30%">杞﹁酱鏉＄爜</u-td>
<u-td>
@@ -60,20 +60,20 @@
CurrentUser: '', //褰撳墠鐢ㄦ埛
cztm: '',
machine: '',
- operateType:'',
- OperationList: [{
- label: '1',
- value: '缁戝畾'
- }, {
- label: '2',
- value: '瑙ｇ粦'
- }, ],
+ //operateType:'',
+ // OperationList: [{
+ // label: '1',
+ // value: '缁戝畾'
+ // }, {
+ // label: '2',
+ // value: '瑙ｇ粦'
+ // }, ],
MachineArray: [{
- label: '1000',
+ label: '2033',
value: '1鍙峰帇瑁呬綅'
}, {
- label: '2000',
+ label: '2043',
value: '2鍙峰帇瑁呬綅'
}, ],
}
@@ -92,9 +92,9 @@
MachineChange(value) {
this.machine = value.orignItem.label;
},
- OperationChange(value) {
- this.operateType = value.orignItem.label;
- },
+ // OperationChange(value) {
+ // this.operateType = value.orignItem.label;
+ // },
SaveInfomation() {
if (_this.cztm.length == 0) {
uni.showToast({
@@ -110,12 +110,12 @@
if (res.confirm) {
let data = {
MainData: {
- operateType:_this.operateType,
- cztm: _this.cztm,
- machine: _this.machine,
+ //operateType:_this.operateType,
+ CZTM: _this.cztm,
+ TargetAddress: _this.machine,
},
};
- _this.$AjaxRequest.Params('post', 'Dt_CacheInfo/AddCacheInfoByAPP',
+ _this.$AjaxRequest.Params('post', 'Task/UpWheelsFlow',
data, _user.token);
_this.$AjaxRequest.Request().then(function(result) {
if (result.data.status) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundBoxing.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundBoxing.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundBoxing.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundBoxing.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundEmpty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundEmpty.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundEmpty.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundEmpty.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundInfo.vue"
similarity index 87%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundInfo.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundInfo.vue"
index dd5a642..678ce89 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundInfo.vue"
@@ -16,13 +16,13 @@
<view style="padding: 20rpx 0rpx">
<u-table>
- <u-tr>
+ <!-- <u-tr>
<u-td width="30%">鎿嶄綔鏂瑰紡</u-td>
<u-td>
<xfl-select :list="OperationList" :initValue="'璇烽�夋嫨'" :clearable="false" @change="OperationChange">
</xfl-select>
</u-td>
- </u-tr>
+ </u-tr> -->
<u-tr>
<u-td width="30%">杞﹁酱鏉＄爜</u-td>
<u-td>
@@ -60,20 +60,20 @@
CurrentUser: '', //褰撳墠鐢ㄦ埛
cztm: '',
machine: '',
- operateType:'',
- OperationList: [{
- label: '1',
- value: '缁戝畾'
- }, {
- label: '2',
- value: '瑙ｇ粦'
- }, ],
+ //operateType:'',
+ // OperationList: [{
+ // label: '1',
+ // value: '缁戝畾'
+ // }, {
+ // label: '2',
+ // value: '瑙ｇ粦'
+ // }, ],
MachineArray: [{
- label: '1000',
+ label: '2033',
value: '1鍙峰帇瑁呬綅'
}, {
- label: '2000',
+ label: '2043',
value: '2鍙峰帇瑁呬綅'
}, ],
}
@@ -92,9 +92,9 @@
MachineChange(value) {
this.machine = value.orignItem.label;
},
- OperationChange(value) {
- this.operateType = value.orignItem.label;
- },
+ // OperationChange(value) {
+ // this.operateType = value.orignItem.label;
+ // },
SaveInfomation() {
if (_this.cztm.length == 0) {
uni.showToast({
@@ -110,12 +110,12 @@
if (res.confirm) {
let data = {
MainData: {
- operateType:_this.operateType,
- cztm: _this.cztm,
- machine: _this.machine,
+ //operateType:_this.operateType,
+ CZTM: _this.cztm,
+ TargetAddress: _this.machine,
},
};
- _this.$AjaxRequest.Params('post', 'Dt_CacheInfo/AddCacheInfoByAPP',
+ _this.$AjaxRequest.Params('post', 'ToAgv/UntieStation',
data, _user.token);
_this.$AjaxRequest.Request().then(function(result) {
if (result.data.status) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundOrderBoxing.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundOrderBoxing.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/InboundOrderBoxing.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InboundOrderBoxing.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InoutboundBoxing.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InoutboundBoxing.vue"
new file mode 100644
index 0000000..5ed6fb4
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/InoutboundBoxing.vue"
@@ -0,0 +1,479 @@
+<template>
+ <view>
+ <view>
+ <u-table font-size="25">
+ <u-tr>
+ <u-td>
+ <xfl-select :list="UserArray" :initValue="this.$UserTool.UserInfo.userName" :clearable="false"
+ :disabled="true">
+ </xfl-select>
+ </u-td>
+ <u-td width="25%">鐜板湪鏃堕棿:</u-td>
+ <u-td width="25%">{{date}}</u-td>
+ </u-tr>
+ </u-table>
+ </view>
+
+ <view style="padding: 20rpx 0rpx">
+ <u-table>
+ <u-tr>
+ <u-td width="30%">杞﹁疆鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="value_cltm" :border="true" :focus="qrcodeFocus" @input="barcodeChange"
+ placeholder="杞﹁疆鏉＄爜" />
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">搴忓垪鍙�</u-td>
+ <u-td>
+ <u-input v-model="xlh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr> -->
+ <u-tr>
+ <u-td width="30%">杞﹁疆鍙�</u-td>
+ <u-td>
+ <u-input v-model="clh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="ldtm" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鍔ㄦ嫋灞炴��(鍔�/鎷�)</u-td>
+ <u-td>
+ <u-input v-model="mttype" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞鍙�</u-td>
+ <u-td>
+ <u-input v-model="ldh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹀瀷</u-td>
+ <u-td>
+ <u-input v-model="chexing" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞瀷</u-td>
+ <u-td>
+ <u-input v-model="ldxh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鏂�/鏃�</u-td>
+ <u-td>
+ <u-input v-model="neworold" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">姣傚瓟绛夌骇</u-td>
+ <u-td>
+ <u-input v-model="gkdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">姣傚瓟a鐣岄潰鍧囧��</u-td>
+ <u-td>
+ <u-input v-model="gkzja" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">姣傚瓟b鐣岄潰鍧囧��</u-td>
+ <u-td>
+ <u-input v-model="gkzjb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">姣傚瓟c鐣岄潰鍧囧��</u-td>
+ <u-td>
+ <u-input v-model="gkzjc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">姣傚瓟鍧囧��</u-td>
+ <u-td>
+ <u-input v-model="gkcc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞緞鍊�</u-td>
+ <u-td>
+ <u-input v-model="ljz" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">棰勪及杞緞鍊�</u-td>
+ <u-td>
+ <u-input v-model="yglj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">灞炴��</u-td>
+ <u-td>
+ <u-input v-model="clsx" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鍏ュ簱鏃ユ湡</u-td>
+ <u-td>
+ <u-input v-model="rksj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">閰嶅睘灞�</u-td>
+ <u-td>
+ <u-input v-model="psj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞︾粍鍙�</u-td>
+ <u-td>
+ <u-input v-model="lcch" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞紭</u-td>
+ <u-td>
+ <u-input v-model="lyh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鍘嬭鏈哄彿</u-td>
+ <u-td>
+ <xfl-select :list="MachineArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="MachineChange">
+ </xfl-select>
+ </u-td>
+ </u-tr>
+ </u-table>
+ </view>
+ <view style="padding: 0rpx 0rpx;">
+ <u-table>
+ <u-tr>
+ <u-td>
+ <u-button style="width:100px" type="primary" @click="SaveInfomation">杞﹁疆鐩磋蛋纭</u-button>
+ </u-td>
+ </u-tr>
+ </u-table>
+ </view>
+ </view>
+</template>
+
+<script>
+ var _this;
+ var _user;
+ export default {
+ data() {
+ return {
+ date: '',
+ CurrentUser: '', //褰撳墠鐢ㄦ埛
+
+ //杞﹁疆鐮�
+ value_cltm: '',
+
+ //搴忓垪鍙�
+ //xlh: '',
+ //杞﹁疆鍙�
+ clh: '',
+ //杞︾被鍒�
+ mttype: '',
+ //杞鏉＄爜
+ ldtm: '',
+ //杞被鍨�
+ ldh: '',
+ //杞﹀瀷
+ chexing: '',
+ //杞瀷
+ ldxh: '',
+ //灞炴��
+ clsx: '',
+ //杞︾粍鍙�
+ lcch: '',
+ //杞紭
+ lyh:'',
+ //绛夌骇
+ gkdj: '',
+ //姣傚瓟鐩村緞鍧囧��
+ ljz: '',
+ //棰勪及杞緞鍊�
+ yglj: '',
+ //姣傚瓟a鐣岄潰鍧囧��
+ gkzja: '',
+ //姣傚瓟b鐣岄潰鍧囧��
+ gkzjb: '',
+ //姣傚瓟c鐣岄潰鍧囧��
+ gkzjc: '',
+ //鍏ュ簱鏃ユ湡
+ rksj: '',
+ //閰嶅睘灞�
+ psj: '',
+ //鏂�/鏃�
+ neworold: '',
+ //姣傚瓟鍧囧��
+ gkcc:'',
+ machine: '',
+ qrcodeFocus: true,
+ MachineArray: [{
+ label: '2032',
+ value: '1鍙峰帇瑁呬綅'
+ }, {
+ label: '2042',
+ value: '2鍙峰帇瑁呬綅'
+ }, ],
+ }
+ },
+ methods: {
+ UserChange(value) {
+
+ },
+ MachineChange(value) {
+ this.machine = value.orignItem.label;
+ },
+ setTimer() {
+ if (this.timer == null) {
+ this.timer = setInterval(() => {
+ this.date = this.$DateTool.getDate();
+ }, 1000)
+ }
+
+ },
+ barcodeChange() {
+ if (_this.value_cltm == '') {
+ _this.initInfo();
+ return;
+ }
+ let data = {
+ MainData: {
+ cltm: _this.value_cltm
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToZY/ZY_GetCLInfo', data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ console.log(result);
+ if (result.data.status) {
+ let obj = JSON.parse(JSON.stringify(result.data.data));
+ //搴忓垪鍙�
+ //_this.xlh = obj.xlh;
+ //杞﹁疆鍙�
+ _this.clh = obj.clh;
+ //杞鏉＄爜
+ _this.ldtm = obj.ldtm;
+ //杞︾被鍒�
+ _this.mttype = obj.mttype;
+ //杞被鍨�
+ _this.ldh = obj.ldh;
+ //杞﹀瀷
+ _this.chexing = obj.chexing;
+ //杞瀷
+ _this.ldxh = obj.ldxh;
+ //鏂�/鏃�
+ _this.neworold = obj.newold;
+ //棰勪及杞緞鍊�
+ _this.yglj = obj.yglj;
+ //姣傚瓟a鐣岄潰鍧囧��
+ _this.gkzja = obj.gkzja;
+ //姣傚瓟b鐣岄潰鍧囧��
+ _this.gkzjb = obj.gkzjb;
+ //姣傚瓟c鐣岄潰鍧囧��
+ _this.gkzjc = obj.gkzjc;
+ //杞緞鍊�
+ _this.ljz = obj.ljz;
+ //灞炴��
+ _this.clsx = obj.clsx;
+ //鍏ュ簱鏃ユ湡
+ _this.rksj = obj.rksj;
+ //閰嶅睘灞�
+ _this.psj = obj.psj;
+ //杞︾粍鍙�
+ _this.lcch = obj.lcch;
+ //杞紭
+ _this.lyh=obj.lyh;
+ //绛夌骇
+ _this.gkdj = obj.gkdj;
+ //姣傚瓟鍧囧��
+ _this.gkcc=obj.gkcc;
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 2000
+ });
+ _this.initInfo();
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 2000
+ });
+ _this.initInfo();
+ });
+ },
+ initInfo() {
+ //搴忓垪鍙�
+ //_this.xlh = '';
+ //杞﹁疆鍙�
+ _this.clh = '';
+ _this.ldtm = '';
+ //杞︾被鍒�
+ _this.mttype = '';
+ //杞被鍨�
+ _this.ldh = '';
+ //杞﹀瀷
+ _this.chexing = '';
+ //杞瀷
+ _this.ldxh = '';
+ //鏂�/鏃�
+ _this.neworold = '';
+ //棰勪及杞緞鍊�
+ _this.yglj = '';
+ //姣傚瓟a鐣岄潰鍧囧��
+ _this.gkzja = '';
+ //姣傚瓟b鐣岄潰鍧囧��
+ _this.gkzjb = '';
+ //姣傚瓟c鐣岄潰鍧囧��
+ _this.gkzjc = '';
+ //杞緞鍊�
+ _this.ljz = '';
+ //灞炴��
+ _this.clsx = '';
+ //鍏ュ簱鏃ユ湡
+ _this.rksj = '';
+ //閰嶅睘灞�
+ _this.psj = '';
+ //杞︾粍鍙�
+ _this.lcch = '';
+ _this.lyh='';
+ //绛夌骇
+ _this.gkdj = '';
+
+ _this.gkcc='';
+
+ },
+ SaveInfomation() {
+ //_this.LotNumber == '' || _this.value_rfid.length == 0 ||
+
+ if (_this.value_cltm.length == 0 ) {
+
+ uni.showToast({
+ title: "杞﹁疆淇℃伅涓嶈兘涓虹┖",
+ duration: 2000,
+ icon: 'none',
+ });
+ return;
+ }
+
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '鏄惁纭缁勭洏?',
+ success: function(res) {
+ if (res.confirm) {
+ let data = {
+ MainData: {
+ code: _this.value_cltm,
+ //xlh: _this.xlh,
+ clh: _this.clh,
+ ldtm: _this.ldtm,
+ mttype: _this.mttype,
+ ldh: _this.ldh,
+ chexing: _this.chexing,
+ ldxh: _this.ldxh,
+ neworold: _this.neworold,
+ yglj: _this.yglj,
+ gkzja: _this.gkzja,
+ gkzjb: _this.gkzjb,
+ gkzjc: _this.gkzjc,
+ clsx: _this.clsx,
+ rksj: _this.rksj,
+ psj: _this.psj,
+ lcch: _this.lcch,
+ lyh:_this.lyh,
+ gkdj: _this.gkdj,
+ ljz:_this.ljz,
+ gkcc:_this.gkcc,
+ machine:_this.machine,
+ user: _this.$UserTool.UserInfo.userName
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToAPP/SaveCLStraight',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ if (result.data.status) {
+ uni.showToast({
+ title: "淇濆瓨鎴愬姛!",
+ duration: 2000
+ });
+ _this.value_cltm = "";
+ _this.initInfo();
+ _this.qrcodeFocus = true;
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 2000
+ });
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅:" + err.errMsg,
+ duration: 2000
+ });
+ });
+ } else if (res.cancel) {}
+ }
+ });
+ },
+ },
+ created: function() {
+ // 姣忔杩涘叆鐣岄潰鏃讹紝鍏堟竻闄や箣鍓嶇殑鎵�鏈夊畾鏃跺櫒锛岀劧鍚庡惎鍔ㄦ柊鐨勫畾鏃跺櫒
+ clearInterval(this.timer)
+ this.timer = null;
+ this.setTimer();
+ _user = this.$UserTool.UserInfo;
+ this.CurrentUser = _user.userName;
+ this.UserArray = [this.$UserTool.AllUserInfo];
+ },
+ destroyed: function() {
+ // 姣忔绂诲紑褰撳墠鐣岄潰鏃讹紝娓呴櫎瀹氭椂鍣�
+ clearInterval(this.timer);
+ this.timer = null;
+ },
+ mounted() {
+ _this = this;
+ _this.rfidFocus = true;
+ },
+
+
+ }
+</script>
+
+<style scoped lang="scss">
+ .tdHeight {
+ height: 80rpx;
+ }
+
+ .loopView {
+ height: 160px;
+ background-color: #f0f0f0;
+ margin-top: 10px;
+ }
+
+ .loopItem {
+ margin-top: 5px;
+ margin-left: 15px;
+
+ }
+
+ .deleteBtn {
+ margin-top: 25px;
+ margin-left: 10px;
+ width: 120px;
+ background-color: orangered;
+ }
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/ZDPInbound.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/ZDPInbound.vue"
similarity index 93%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/ZDPInbound.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/ZDPInbound.vue"
index c443f4f..dd7a06f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/ZDPInbound.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Inbound/ZDPInbound.vue"
@@ -244,31 +244,31 @@
if (result.data.status) {
let obj = JSON.parse(JSON.stringify(result.data.data));
//杞﹁疆鍙�
- _this.ZPH = obj.ZPH;
- _this.POS = obj.POS;
- _this.LSXH = obj.LSXH;
- _this.MAT = obj.MAT;
+ _this.ZPH = obj.zph;
+ _this.POS = obj.pos;
+ _this.LSXH = obj.lsxh;
+ _this.MAT = obj.mat;
_this.chexing = obj.chexing;
- _this.SITE = obj.SITE;
+ _this.SITE = obj.site;
//鏂�/鏃�
_this.neworold = obj.newold;
- _this.GKA1 = obj.GKA1;
- _this.GKA2 = obj.GKA2;
- _this.GKA3 = obj.GKA3;
- _this.GKA = obj.GKA;
- _this.GKB1 = obj.GKB1;
- _this.GKB2 = obj.GKB2;
- _this.GKB3 = obj.GKB3;
- _this.GKB = obj.GKB;
- _this.GKC1 = obj.GKC1;
- _this.GKC2 = obj.GKC2;
- _this.GKC3 = obj.GKC3;
- _this.GKC = obj.GKC;
- _this.GKJZ = obj.GKJZ;
- _this.LMCSYMH = obj.LMCSYMH;
+ _this.GKA1 = obj.gkA1;
+ _this.GKA2 = obj.gkA2;
+ _this.GKA3 = obj.gkA3;
+ _this.GKA = obj.gka;
+ _this.GKB1 = obj.gkB1;
+ _this.GKB2 = obj.gkB2;
+ _this.GKB3 = obj.gkB2;
+ _this.GKB = obj.gkb;
+ _this.GKC1 = obj.gkC1;
+ _this.GKC2 = obj.gkC2;
+ _this.GKC3 = obj.gkC2;
+ _this.GKC = obj.gkc;
+ _this.GKJZ = obj.gkjz;
+ _this.LMCSYMH = obj.lmcsymh;
//鍏ュ簱鏃ユ湡
_this.rksj = obj.rksj;
- _this.LSCSYMH=obj.LSCSYMH;
+ _this.LSCSYMH=obj.lscsymh;
} else {
uni.showToast({
icon: 'none',
@@ -360,13 +360,13 @@
GKC3: _this.GKC3,
GKC: _this.GKC,
GKJZ: _this.GKJZ,
- clsx: _this.clsx,
+ //clsx: _this.clsx,
rksj: _this.rksj,
LMCSYMH:_this.LMCSYMH,
LSCSYMH:_this.LSCSYMH,
},
};
- _this.$AjaxRequest.Params('post', 'ToAPP/SaveCLinfo',
+ _this.$AjaxRequest.Params('post', 'ToAPP/SaveZDPInfo',
data, _user.token);
_this.$AjaxRequest.Request().then(function(result) {
if (result.data.status) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Outbound/OutboundCall.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutboundCall.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Outbound/OutboundCall.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutboundCall.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Outbound/OutboundCheck.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutboundCheck.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Outbound/OutboundCheck.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutboundCheck.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Outbound/OutboundCompleted.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutboundCompleted.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Outbound/OutboundCompleted.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutboundCompleted.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutbundCZStraight.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutbundCZStraight.vue"
new file mode 100644
index 0000000..4f4e5c0
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutbundCZStraight.vue"
@@ -0,0 +1,620 @@
+<template>
+ <view>
+ <view>
+ <u-table font-size="25">
+ <u-tr>
+ <u-td>
+ <xfl-select :list="UserArray" :initValue="this.$UserTool.UserInfo.userName" :clearable="false"
+ :disabled="true">
+ </xfl-select>
+ </u-td>
+ <u-td width="25%">鐜板湪鏃堕棿:</u-td>
+ <u-td width="25%">{{date}}</u-td>
+ </u-tr>
+ </u-table>
+ </view>
+
+ <view style="padding: 0rpx 0rpx">
+ <u-table>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="cztm" :focus="qrcodeFocus" :border="true" placeholder="璇锋壂鎻忚溅杞存潯鐮�"
+ @input="cztmChange" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鍙�</u-td>
+ <u-td>
+ <u-input v-model="czh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="ldtm" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹀瀷</u-td>
+ <u-td>
+ <u-input v-model="chexing" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍔ㄦ嫋灞炴��</u-td>
+ <u-td>
+ <u-input v-model="mttype" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鍨嬪彿</u-td>
+ <u-td>
+ <u-input v-model="czxh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х瓑绾�</u-td>
+ <u-td>
+ <u-input v-model="zlzdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鍙宠疆搴х瓑绾�</u-td>
+ <u-td>
+ <u-input v-model="ylzdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">缁翠慨浠诲姟</u-td>
+ <u-td>
+ <u-input v-model="wxrw" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰�</u-td>
+ <u-td>
+ <u-input v-model="zlzzj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰�</u-td>
+ <u-td>
+ <u-input v-model="ylzzj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙1</u-td>
+ <u-td>
+ <u-input v-model="zlzA1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙1</u-td>
+ <u-td>
+ <u-input v-model="ylzA1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙2</u-td>
+ <u-td>
+ <u-input v-model="zlzA2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙2</u-td>
+ <u-td>
+ <u-input v-model="ylzA2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙3</u-td>
+ <u-td>
+ <u-input v-model="zlzA3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙3</u-td>
+ <u-td>
+ <u-input v-model="ylzA3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙</u-td>
+ <u-td>
+ <u-input v-model="zlza" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙</u-td>
+ <u-td>
+ <u-input v-model="ylza" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚1</u-td>
+ <u-td>
+ <u-input v-model="zlzB1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚1</u-td>
+ <u-td>
+ <u-input v-model="ylzB1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚2</u-td>
+ <u-td>
+ <u-input v-model="zlzB2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚2</u-td>
+ <u-td>
+ <u-input v-model="ylzB2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚3</u-td>
+ <u-td>
+ <u-input v-model="zlzB3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚3</u-td>
+ <u-td>
+ <u-input v-model="ylzB3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚</u-td>
+ <u-td>
+ <u-input v-model="zlzb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚</u-td>
+ <u-td>
+ <u-input v-model="ylzb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜1</u-td>
+ <u-td>
+ <u-input v-model="zlzC1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜1</u-td>
+ <u-td>
+ <u-input v-model="ylzC1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜2</u-td>
+ <u-td>
+ <u-input v-model="zlzC2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜2</u-td>
+ <u-td>
+ <u-input v-model="ylzC2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜3</u-td>
+ <u-td>
+ <u-input v-model="zlzC3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜3</u-td>
+ <u-td>
+ <u-input v-model="ylzC3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜</u-td>
+ <u-td>
+ <u-input v-model="zlzc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜</u-td>
+ <u-td>
+ <u-input v-model="ylzc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">杞﹁疆杞瀷</u-td>
+ <u-td>
+ <u-input v-model="x" :border="true" placeholder="璇疯緭鍏ヨ溅杞疆鍨�" />
+ </u-td>
+ </u-tr> -->
+
+ <!-- <u-tr>
+ <u-td width="30%">杞存壙绫诲埆:</u-td>
+ <u-td>
+ <xfl-select :list="StateArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="StateChange"
+ ref="StateSelect">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ <!-- <u-tr>
+ <u-td width="30%">鍘傚:</u-td>
+ <u-td>
+ <xfl-select :list="ManufacturerArray" :initValue="'璇烽�夋嫨'" :clearable="false"
+ @change="ManufacturerChange" ref="ManufacturerSelect">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ <!-- <u-tr>
+ <u-td width="30%">宸ヤ綅:</u-td>
+ <u-td>
+ <xfl-select :list="StationArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="StationChange">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ </u-table>
+ </view>
+ <view style="padding: 0rpx 0rpx;">
+ <u-table>
+ <u-tr>
+ <u-td>
+ <u-button style="width:100px" type="primary" @click="SaveInfomation">棰勯�夌‘璁�</u-button>
+ </u-td>
+ </u-tr>
+ </u-table>
+ </view>
+ </view>
+</template>
+
+<script>
+ var _this;
+ var _user;
+ export default {
+ data() {
+ return {
+ date: '',
+ CurrentUser: '', //褰撳墠鐢ㄦ埛
+ cztm: '',
+ czh: '',
+ chexing: '',
+ czxh: '',
+ zlzdj: '',
+ ylzdj: '',
+ wxrw:'',
+ ldtm: '',
+ mttype: '',
+ zlzzj: '',
+ ylzzj: '',
+ zlzA1: '',
+ ylzA1: '',
+ zlzA2: '',
+ ylzA2: '',
+ zlzA3: '',
+ ylzA3: '',
+ zlzB1: '',
+ ylzB1: '',
+ zlzB2: '',
+ ylzB2: '',
+ zlzB3: '',
+ ylzB3: '',
+ zlzC1: '',
+ ylzC1: '',
+ zlzC2: '',
+ ylzC2: '',
+ zlzC3: '',
+ ylzC3: '',
+ zlza: '',
+ ylza: '',
+ zlzb: '',
+ ylzb: '',
+ zlzc: '',
+ ylzc: '',
+ // zzjAVG: '',
+ // yzjAVG: '',
+ // zfcbAVG: '',
+ // yfcbAVG: '',
+ // zydAVG: '',
+ // yydAVG: '',
+ //StateArray: [],
+ //ManufacturerArray: [],
+ StationArray: [{
+ label: '宸︿晶鍘嬭浣�',
+ value: '1宸︿晶鍘嬭浣�'
+ },
+ {
+ label: '鍙充晶鍘嬭浣�',
+ value: '2鍙充晶鍘嬭浣�'
+ }
+ ],
+
+
+ //zcState: '',
+ //Manufacturer: '',
+ //targetStation: '',
+
+ //杞存壙鏂瑰悜
+ //杞存壙鍙�
+ //ldCode: '',
+ //ortherData: '',
+ qrcodeFocus: false,
+ }
+ },
+ methods: {
+ setTimer() {
+ if (this.timer == null) {
+ this.timer = setInterval(() => {
+ this.date = this.$DateTool.getDate();
+ }, 1000)
+ }
+ },
+ // ManufacturerChange(value) {
+ // this.Manufacturer = value.orignItem.label;
+ // },
+ // StateChange(value) {
+ // this.zcState = value.orignItem.label;
+ // },
+ // StationChange(value) {
+ // this.targetStation = value.orignItem.label;
+ // },
+ cztmChange() {
+ if (_this.cztm == '' || _this.cztm == null) {
+ return;
+ }
+ let data = {
+ MainData: {
+ cztm: _this.cztm
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToZY/getCZInfo',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ //console.log(result);
+ if (result.data.status) {
+ let obj = JSON.parse(JSON.stringify(result.data.data));
+ // _this.yfcbAVG = obj.yfcbAVG;
+ // _this.zfcbAVG = obj.zfcbAVG;
+ // _this.zydAVG = obj.zydAVG;
+ // _this.yydAVG = obj.yydAVG;
+ // _this.zzjAVG = obj.zzjAVG;
+ // _this.yzjAVG = obj.yzjAVG;
+ _this.chexing = obj.chexing;
+ _this.czh = obj.czh;
+ _this.czxh = obj.czxh;
+ _this.zlzdj = obj.zlzdj;
+ _this.ylzdj = obj.ylzdj;
+ _this.wxrw=obj.wxrw;
+ _this.ldtm = obj.ldtm;
+ _this.zlzzj = obj.zlzzj;
+ _this.ylzzj = obj.ylzzj;
+ _this.zlzA1 = obj.zlzA1;
+ _this.ylzA1 = obj.ylzA1;
+ _this.zlzA2 = obj.zlzA2;
+ _this.ylzA2 = obj.ylzA2;
+ _this.zlzA3 = obj.zlzA3;
+ _this.ylzA3 = obj.ylzA3;
+ _this.zlzB1 = obj.zlzB1;
+ _this.ylzB1 = obj.ylzB1;
+ _this.zlzB2 = obj.zlzB2;
+ _this.ylzB2 = obj.ylzB2;
+ _this.zlzB3 = obj.zlzB3;
+ _this.ylzB3 = obj.ylzB3;
+ _this.zlzC1 = obj.zlzC1;
+ _this.ylzC1 = obj.ylzC1;
+ _this.zlzC2 = obj.zlzC2;
+ _this.ylzC2 = obj.ylzC2;
+ _this.zlzC3 = obj.zlzC3;
+ _this.ylzC3 = obj.ylzC3;
+ _this.zlza = obj.zlza;
+ _this.ylza = obj.ylza;
+ _this.zlzb = obj.zlzb;
+ _this.ylzb = obj.ylzb;
+ _this.zlzc = obj.zlzc;
+ _this.ylzc = obj.ylzc;
+ _this.mttype = obj.mttype;
+ //_this.ldCode = obj.ldCode;
+ //_this.ortherData = obj.ortherData;
+ // if (null != obj.manufacturerArray)
+ // obj.manufacturerArray.forEach(function(item, index, arr) {
+ // _this.ManufacturerArray.push({
+ // label: item,
+ // value: item
+ // })
+ // });
+ // if (null != obj.neworold)
+ // obj.neworold.forEach(function(item, index, arr) {
+ // let name = '妫�淇�';
+ // if (item.indexOf('0') > -1) {
+ // name = '鏂板搧';
+ // }
+
+ // if (null == _this.StateArray.find(r => r.value == name)) {
+ // _this.StateArray.push({
+ // label: item,
+ // value: name
+ // })
+ // }
+ // });
+ //console.log(obj);
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 5000
+ });
+ _this.initInfo();
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 5000
+ });
+ _this.initInfo();
+ });
+ },
+ initInfo() {
+ // _this.yfcbAVG = '';
+ // _this.zfcbAVG = '';
+ // _this.zydAVG = '';
+ // _this.yydAVG = '';
+ // _this.zzjAVG = '';
+ // _this.yzjAVG = '';
+ _this.cztm = '';
+ _this.czh = '';
+ _this.chexing = '';
+ _this.czxh = '';
+ _this.zlzdj = '';
+ _this.ylzdj = '';
+ _this.wxrw='';
+ _this.ldtm = '';
+ _this.zlzzj = '';
+ _this.ylzzj = '';
+ _this.zlzA1 = '';
+ _this.ylzA1 = '';
+ _this.zlzA2 = '';
+ _this.ylzA2 = '';
+ _this.zlzA3 = '';
+ _this.ylzA3 = '';
+ _this.zlzB1 = '';
+ _this.ylzB1 = '';
+ _this.zlzB2 = '';
+ _this.ylzB2 = '';
+ _this.zlzB3 = '';
+ _this.ylzB3 = '';
+ _this.zlzC1 = '';
+ _this.ylzC1 = '';
+ _this.zlzC2 = '';
+ _this.ylzC2 = '';
+ _this.zlzC3 = '';
+ _this.ylzC3 = '';
+ _this.zlza = '';
+ _this.ylza = '';
+ _this.zlzb = '';
+ _this.ylzb = '';
+ _this.zlzc = '';
+ _this.ylzc = '';
+ _this.mttype = '';
+ //_this.wheelsPosition = '';
+ //_this.NOdirection = ''
+ //_this.Manufacturer = '';
+ //_this.zcState = '';
+ //_this.StateArray = [];
+ //_this.ldCode = '';
+ //_this.ortherData = '';
+ //_this.ManufacturerArray = [];
+ //_this.$refs.StateSelect.setInput("璇烽�夋嫨");
+ //_this.$refs.StateSelect.clearItemActive();
+ //_this.$refs.ManufacturerSelect.setInput("璇烽�夋嫨");
+ //_this.$refs.ManufacturerSelect.clearItemActive();
+ },
+ SaveInfomation() {
+ if (_this.cztm == '') {
+ uni.showToast({
+ title: "璇锋壂鎻忚溅杞翠俊鎭�.",
+ duration: 5000
+ });
+ return;
+ }
+
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '璇锋牳瀵硅溅杞存潯鐮佹槸鍚︽纭�?',
+ success: function(res) {
+ if (res.confirm) {
+ let data = {
+ MainData: {
+ czh: _this.czh,
+ chexing: _this.chexing,
+ cztm: _this.cztm,
+ czxh: _this.czxh,
+ zlzdj: _this.zlzdj,
+ ylzdj: _this.ylzdj,
+ wxrw:_this.wxrw,
+ ldtm: _this.ldtm,
+ zlzzj: _this.zlzzj,
+ ylzzj: _this.ylzzj,
+ zlzA1: _this.zlzA1,
+ ylzA1: _this.ylzA1,
+ zlzA2: _this.zlzA2,
+ ylzA2: _this.ylzA2,
+ zlzA3: _this.zlzA3,
+ ylzA3: _this.ylzA3,
+ zlzB1: _this.zlzB1,
+ ylzB1: _this.ylzB1,
+ zlzB2: _this.zlzB2,
+ ylzB2: _this.ylzB2,
+ zlzB3: _this.zlzB3,
+ ylzB3: _this.ylzB3,
+ zlzC1: _this.zlzC1,
+ ylzC1: _this.ylzC1,
+ zlzC2: _this.zlzC2,
+ ylzC2: _this.ylzC2,
+ zlzC3: _this.zlzC3,
+ ylzC3: _this.ylzC3,
+ zlza: _this.zlza,
+ ylza: _this.ylza,
+ zlzb: _this.zlzb,
+ ylzb: _this.ylzb,
+ zlzc: _this.zlzc,
+ ylzc: _this.ylzc,
+ mttype: _this.mttype,
+ //targetStation: _this.targetStation,
+
+ //ldCode: _this.ldCode,
+ //ortherData: _this.ortherData
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToAPP/SaveCZStraight',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ if (result.data.status) {
+ uni.showToast({
+ title: "杞﹁酱鐩磋蛋淇℃伅娣诲姞鎴愬姛!",
+ duration: 5000
+ });
+ _this.initInfo();
+ _this.qrcodeFocus = true;
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 5000
+ });
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 5000
+ });
+ });
+ } else if (res.cancel) {}
+ }
+ });
+ },
+ },
+ created: function() {
+ // 姣忔杩涘叆鐣岄潰鏃讹紝鍏堟竻闄や箣鍓嶇殑鎵�鏈夊畾鏃跺櫒锛岀劧鍚庡惎鍔ㄦ柊鐨勫畾鏃跺櫒
+ clearInterval(this.timer)
+ this.timer = null;
+ this.setTimer();
+ _user = this.$UserTool.UserInfo;
+ this.CurrentUser = _user.userName;
+ this.UserArray = [this.$UserTool.AllUserInfo];
+ },
+ destroyed: function() {
+ // 姣忔绂诲紑褰撳墠鐣岄潰鏃讹紝娓呴櫎瀹氭椂鍣�
+ clearInterval(this.timer);
+ this.timer = null;
+ },
+ mounted() {
+ _this = this;
+ _this.qrcodeFocus = true;
+ //_this.queryOrder();
+ },
+
+
+ }
+</script>
+
+<style scoped lang="scss">
+ .tdHeight {
+ height: 80rpx;
+ }
+
+ .loopView {
+ height: 160px;
+ background-color: #f0f0f0;
+ margin-top: 10px;
+ }
+
+ .loopItem {
+ margin-top: 5px;
+ margin-left: 15px;
+
+ }
+
+ .deleteBtn {
+ margin-top: 25px;
+ margin-left: 10px;
+ width: 120px;
+ background-color: orangered;
+ }
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/ZDPInbound.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutbundZdpStraight.vue"
similarity index 88%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/ZDPInbound.vue"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutbundZdpStraight.vue"
index c443f4f..1e1d307 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/Inbound/ZDPInbound.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/OutbundZdpStraight.vue"
@@ -162,6 +162,13 @@
<u-input v-model="rksj" :border="false" :disabled="true" placeholder="" />
</u-td>
</u-tr>
+ <u-tr>
+ <u-td width="30%">鍘嬭鏈哄彿</u-td>
+ <u-td>
+ <xfl-select :list="MachineArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="MachineChange">
+ </xfl-select>
+ </u-td>
+ </u-tr>
</u-table>
</view>
<view style="padding: 0rpx 0rpx;">
@@ -214,11 +221,22 @@
neworold: '',
LSCSYMH:'',
qrcodeFocus: true,
+ MachineArray: [{
+ label: '2032',
+ value: '1鍙峰帇瑁呬綅'
+ }, {
+ label: '2042',
+ value: '2鍙峰帇瑁呬綅'
+ }, ],
+ machine: '',
}
},
methods: {
UserChange(value) {
+ },
+ MachineChange(value) {
+ this.machine = value.orignItem.label;
},
setTimer() {
if (this.timer == null) {
@@ -244,31 +262,31 @@
if (result.data.status) {
let obj = JSON.parse(JSON.stringify(result.data.data));
//杞﹁疆鍙�
- _this.ZPH = obj.ZPH;
- _this.POS = obj.POS;
- _this.LSXH = obj.LSXH;
- _this.MAT = obj.MAT;
+ _this.ZPH = obj.zph;
+ _this.POS = obj.pos;
+ _this.LSXH = obj.lsxh;
+ _this.MAT = obj.mat;
_this.chexing = obj.chexing;
- _this.SITE = obj.SITE;
+ _this.SITE = obj.site;
//鏂�/鏃�
_this.neworold = obj.newold;
- _this.GKA1 = obj.GKA1;
- _this.GKA2 = obj.GKA2;
- _this.GKA3 = obj.GKA3;
- _this.GKA = obj.GKA;
- _this.GKB1 = obj.GKB1;
- _this.GKB2 = obj.GKB2;
- _this.GKB3 = obj.GKB3;
- _this.GKB = obj.GKB;
- _this.GKC1 = obj.GKC1;
- _this.GKC2 = obj.GKC2;
- _this.GKC3 = obj.GKC3;
- _this.GKC = obj.GKC;
- _this.GKJZ = obj.GKJZ;
- _this.LMCSYMH = obj.LMCSYMH;
+ _this.GKA1 = obj.gkA1;
+ _this.GKA2 = obj.gkA2;
+ _this.GKA3 = obj.gkA3;
+ _this.GKA = obj.gka;
+ _this.GKB1 = obj.gkB1;
+ _this.GKB2 = obj.gkB2;
+ _this.GKB3 = obj.gkB2;
+ _this.GKB = obj.gkb;
+ _this.GKC1 = obj.gkC1;
+ _this.GKC2 = obj.gkC2;
+ _this.GKC3 = obj.gkC2;
+ _this.GKC = obj.gkc;
+ _this.GKJZ = obj.gkjz;
+ _this.LMCSYMH = obj.lmcsymh;
//鍏ュ簱鏃ユ湡
_this.rksj = obj.rksj;
- _this.LSCSYMH=obj.LSCSYMH;
+ _this.LSCSYMH=obj.lscsymh;
} else {
uni.showToast({
icon: 'none',
@@ -315,7 +333,7 @@
_this.GKJZ = '';
_this.LMCSYMH = '';
_this.rksj = '';
-
+ _this.machine='';
_this.LSCSYMH='';
},
@@ -360,13 +378,14 @@
GKC3: _this.GKC3,
GKC: _this.GKC,
GKJZ: _this.GKJZ,
- clsx: _this.clsx,
+ //clsx: _this.clsx,
rksj: _this.rksj,
LMCSYMH:_this.LMCSYMH,
LSCSYMH:_this.LSCSYMH,
+ machine:_this.machine,
},
};
- _this.$AjaxRequest.Params('post', 'ToAPP/SaveCLinfo',
+ _this.$AjaxRequest.Params('post', 'ToAPP/SaveZDPStraight',
data, _user.token);
_this.$AjaxRequest.Request().then(function(result) {
if (result.data.status) {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/YxOutboundCall.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/YxOutboundCall.vue"
new file mode 100644
index 0000000..de2f27c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/YxOutboundCall.vue"
@@ -0,0 +1,688 @@
+<template>
+ <view>
+ <view>
+ <u-table font-size="25">
+ <u-tr>
+ <u-td>
+ <xfl-select :list="UserArray" :initValue="this.$UserTool.UserInfo.userName" :clearable="false"
+ :disabled="true">
+ </xfl-select>
+ </u-td>
+ <u-td width="25%">鐜板湪鏃堕棿:</u-td>
+ <u-td width="25%">{{date}}</u-td>
+ </u-tr>
+ </u-table>
+ </view>
+
+ <view style="padding: 0rpx 0rpx">
+ <u-table>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="cztm" :focus="qrcodeFocus" :border="true" placeholder="璇锋壂鎻忚溅杞存潯鐮�"
+ @input="cztmChange" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鍙�</u-td>
+ <u-td>
+ <u-input v-model="czh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="ldtm" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹀瀷</u-td>
+ <u-td>
+ <u-input v-model="chexing" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍔ㄦ嫋灞炴��</u-td>
+ <u-td>
+ <u-input v-model="mttype" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鍨嬪彿</u-td>
+ <u-td>
+ <u-input v-model="czxh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">閫夐厤杞瀷(*)</u-td>
+ <u-td>
+ <u-input v-model="clxh" :border="false" :focus="clxhFocus" placeholder="璇疯緭鍏ラ�夐厤杞瀷" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х瓑绾�</u-td>
+ <u-td>
+ <u-input v-model="zlzdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鍙宠疆搴х瓑绾�</u-td>
+ <u-td>
+ <u-input v-model="ylzdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">缁翠慨浠诲姟</u-td>
+ <u-td>
+ <u-input v-model="wxrw" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰�</u-td>
+ <u-td>
+ <u-input v-model="zlzzj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰�</u-td>
+ <u-td>
+ <u-input v-model="ylzzj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙1</u-td>
+ <u-td>
+ <u-input v-model="zlzA1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙1</u-td>
+ <u-td>
+ <u-input v-model="ylzA1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙2</u-td>
+ <u-td>
+ <u-input v-model="zlzA2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙2</u-td>
+ <u-td>
+ <u-input v-model="ylzA2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙3</u-td>
+ <u-td>
+ <u-input v-model="zlzA3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙3</u-td>
+ <u-td>
+ <u-input v-model="ylzA3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙</u-td>
+ <u-td>
+ <u-input v-model="zlza" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙</u-td>
+ <u-td>
+ <u-input v-model="ylza" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚1</u-td>
+ <u-td>
+ <u-input v-model="zlzB1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚1</u-td>
+ <u-td>
+ <u-input v-model="ylzB1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚2</u-td>
+ <u-td>
+ <u-input v-model="zlzB2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚2</u-td>
+ <u-td>
+ <u-input v-model="ylzB2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚3</u-td>
+ <u-td>
+ <u-input v-model="zlzB3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚3</u-td>
+ <u-td>
+ <u-input v-model="ylzB3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚</u-td>
+ <u-td>
+ <u-input v-model="zlzb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚</u-td>
+ <u-td>
+ <u-input v-model="ylzb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜1</u-td>
+ <u-td>
+ <u-input v-model="zlzC1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜1</u-td>
+ <u-td>
+ <u-input v-model="ylzC1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜2</u-td>
+ <u-td>
+ <u-input v-model="zlzC2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜2</u-td>
+ <u-td>
+ <u-input v-model="ylzC2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜3</u-td>
+ <u-td>
+ <u-input v-model="zlzC3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜3</u-td>
+ <u-td>
+ <u-input v-model="ylzC3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜</u-td>
+ <u-td>
+ <u-input v-model="zlzc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜</u-td>
+ <u-td>
+ <u-input v-model="ylzc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁疆鏂瑰悜:</u-td>
+ <u-td>
+ <xfl-select :list="wheelsPositionArray" :initValue="'璇烽�夋嫨'" :clearable="false"
+ @change="wheelsPositionChange">
+ </xfl-select>
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">杞﹁疆杞瀷</u-td>
+ <u-td>
+ <u-input v-model="x" :border="true" placeholder="璇疯緭鍏ヨ溅杞疆鍨�" />
+ </u-td>
+ </u-tr> -->
+ <u-tr>
+ <u-td width="30%">鏂版棫绫诲埆:</u-td>
+ <u-td>
+ <xfl-select :list="NOdirectionArray" :initValue="'璇烽�夋嫨'" :clearable="false"
+ @change="NOdirectionChange">
+ </xfl-select>
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">杞存壙绫诲埆:</u-td>
+ <u-td>
+ <xfl-select :list="StateArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="StateChange"
+ ref="StateSelect">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ <!-- <u-tr>
+ <u-td width="30%">鍘傚:</u-td>
+ <u-td>
+ <xfl-select :list="ManufacturerArray" :initValue="'璇烽�夋嫨'" :clearable="false"
+ @change="ManufacturerChange" ref="ManufacturerSelect">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ <!-- <u-tr>
+ <u-td width="30%">宸ヤ綅:</u-td>
+ <u-td>
+ <xfl-select :list="StationArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="StationChange">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ </u-table>
+ </view>
+ <view style="padding: 0rpx 0rpx;">
+ <u-table>
+ <u-tr>
+ <u-td>
+ <u-button style="width:100px" type="primary" @click="SaveInfomation">棰勯�夌‘璁�</u-button>
+ </u-td>
+ </u-tr>
+ </u-table>
+ </view>
+ </view>
+</template>
+
+<script>
+ var _this;
+ var _user;
+ export default {
+ data() {
+ return {
+ date: '',
+ CurrentUser: '', //褰撳墠鐢ㄦ埛
+ cztm: '',
+ czh: '',
+ chexing: '',
+ czxh: '',
+ clxh: '',
+ zlzdj: '',
+ ylzdj: '',
+ wxrw:'',
+ ldtm: '',
+ mttype: '',
+ zlzzj: '',
+ ylzzj: '',
+ zlzA1: '',
+ ylzA1: '',
+ zlzA2: '',
+ ylzA2: '',
+ zlzA3: '',
+ ylzA3: '',
+ zlzB1: '',
+ ylzB1: '',
+ zlzB2: '',
+ ylzB2: '',
+ zlzB3: '',
+ ylzB3: '',
+ zlzC1: '',
+ ylzC1: '',
+ zlzC2: '',
+ ylzC2: '',
+ zlzC3: '',
+ ylzC3: '',
+ zlza: '',
+ ylza: '',
+ zlzb: '',
+ ylzb: '',
+ zlzc: '',
+ ylzc: '',
+ // zzjAVG: '',
+ // yzjAVG: '',
+ // zfcbAVG: '',
+ // yfcbAVG: '',
+ // zydAVG: '',
+ // yydAVG: '',
+ //StateArray: [],
+ //ManufacturerArray: [],
+ StationArray: [{
+ label: '宸︿晶鍘嬭浣�',
+ value: '1宸︿晶鍘嬭浣�'
+ },
+ {
+ label: '鍙充晶鍘嬭浣�',
+ value: '2鍙充晶鍘嬭浣�'
+ }
+ ],
+ wheelsPositionArray: [{
+ label: 'all',
+ value: '涓や晶'
+ }, {
+ label: 'left',
+ value: '宸︿晶'
+ },
+ {
+ label: 'right',
+ value: '鍙充晶'
+ }
+ ],
+ NOdirectionArray: [{
+ label: '0',
+ value: '鏂伴��'
+ }, {
+ label: '1',
+ value: '妫�淇�'
+ }, ],
+ //zcState: '',
+ //Manufacturer: '',
+ //targetStation: '',
+
+ //杞存壙鏂瑰悜
+ wheelsPosition: '',
+ //杞存壙鍙�
+ //ldCode: '',
+ //ortherData: '',
+ qrcodeFocus: false,
+ clxhFocus: false
+ }
+ },
+ methods: {
+ setTimer() {
+ if (this.timer == null) {
+ this.timer = setInterval(() => {
+ this.date = this.$DateTool.getDate();
+ }, 1000)
+ }
+ },
+ // ManufacturerChange(value) {
+ // this.Manufacturer = value.orignItem.label;
+ // },
+ // StateChange(value) {
+ // this.zcState = value.orignItem.label;
+ // },
+ // StationChange(value) {
+ // this.targetStation = value.orignItem.label;
+ // },
+ wheelsPositionChange(value) {
+ this.wheelsPosition = value.orignItem.label;
+ },
+ NOdirectionChange(value) {
+ this.NOdirection = value.orignItem.label;
+ },
+ cztmChange() {
+ if (_this.cztm == '' || _this.cztm == null) {
+ return;
+ }
+ let data = {
+ MainData: {
+ cztm: _this.cztm
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToZY/getCZInfo',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ //console.log(result);
+ if (result.data.status) {
+ let obj = JSON.parse(JSON.stringify(result.data.data));
+ // _this.yfcbAVG = obj.yfcbAVG;
+ // _this.zfcbAVG = obj.zfcbAVG;
+ // _this.zydAVG = obj.zydAVG;
+ // _this.yydAVG = obj.yydAVG;
+ // _this.zzjAVG = obj.zzjAVG;
+ // _this.yzjAVG = obj.yzjAVG;
+ _this.chexing = obj.chexing;
+ _this.czh = obj.czh;
+ _this.czxh = obj.czxh;
+ _this.clxhFocus = true;
+ _this.zlzdj = obj.zlzdj;
+ _this.ylzdj = obj.ylzdj;
+ _this.wxrw=obj.wxrw;
+ _this.ldtm = obj.ldtm;
+ _this.zlzzj = obj.zlzzj;
+ _this.ylzzj = obj.ylzzj;
+ _this.zlzA1 = obj.zlzA1;
+ _this.ylzA1 = obj.ylzA1;
+ _this.zlzA2 = obj.zlzA2;
+ _this.ylzA2 = obj.ylzA2;
+ _this.zlzA3 = obj.zlzA3;
+ _this.ylzA3 = obj.ylzA3;
+ _this.zlzB1 = obj.zlzB1;
+ _this.ylzB1 = obj.ylzB1;
+ _this.zlzB2 = obj.zlzB2;
+ _this.ylzB2 = obj.ylzB2;
+ _this.zlzB3 = obj.zlzB3;
+ _this.ylzB3 = obj.ylzB3;
+ _this.zlzC1 = obj.zlzC1;
+ _this.ylzC1 = obj.ylzC1;
+ _this.zlzC2 = obj.zlzC2;
+ _this.ylzC2 = obj.ylzC2;
+ _this.zlzC3 = obj.zlzC3;
+ _this.ylzC3 = obj.ylzC3;
+ _this.zlza = obj.zlza;
+ _this.ylza = obj.ylza;
+ _this.zlzb = obj.zlzb;
+ _this.ylzb = obj.ylzb;
+ _this.zlzc = obj.zlzc;
+ _this.ylzc = obj.ylzc;
+ _this.mttype = obj.mttype;
+ //_this.ldCode = obj.ldCode;
+ //_this.ortherData = obj.ortherData;
+ // if (null != obj.manufacturerArray)
+ // obj.manufacturerArray.forEach(function(item, index, arr) {
+ // _this.ManufacturerArray.push({
+ // label: item,
+ // value: item
+ // })
+ // });
+ // if (null != obj.neworold)
+ // obj.neworold.forEach(function(item, index, arr) {
+ // let name = '妫�淇�';
+ // if (item.indexOf('0') > -1) {
+ // name = '鏂板搧';
+ // }
+
+ // if (null == _this.StateArray.find(r => r.value == name)) {
+ // _this.StateArray.push({
+ // label: item,
+ // value: name
+ // })
+ // }
+ // });
+ //console.log(obj);
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 5000
+ });
+ _this.initInfo();
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 5000
+ });
+ _this.initInfo();
+ });
+ },
+ initInfo() {
+ // _this.yfcbAVG = '';
+ // _this.zfcbAVG = '';
+ // _this.zydAVG = '';
+ // _this.yydAVG = '';
+ // _this.zzjAVG = '';
+ // _this.yzjAVG = '';
+ _this.cztm = '';
+ _this.czh = '';
+ _this.chexing = '';
+ _this.czxh = '';
+ _this.clxh = '';
+ _this.zlzdj = '';
+ _this.ylzdj = '';
+ _this.wxrw='';
+ _this.ldtm = '';
+ _this.zlzzj = '';
+ _this.ylzzj = '';
+ _this.zlzA1 = '';
+ _this.ylzA1 = '';
+ _this.zlzA2 = '';
+ _this.ylzA2 = '';
+ _this.zlzA3 = '';
+ _this.ylzA3 = '';
+ _this.zlzB1 = '';
+ _this.ylzB1 = '';
+ _this.zlzB2 = '';
+ _this.ylzB2 = '';
+ _this.zlzB3 = '';
+ _this.ylzB3 = '';
+ _this.zlzC1 = '';
+ _this.ylzC1 = '';
+ _this.zlzC2 = '';
+ _this.ylzC2 = '';
+ _this.zlzC3 = '';
+ _this.ylzC3 = '';
+ _this.zlza = '';
+ _this.ylza = '';
+ _this.zlzb = '';
+ _this.ylzb = '';
+ _this.zlzc = '';
+ _this.ylzc = '';
+ _this.mttype = '';
+ //_this.wheelsPosition = '';
+ //_this.NOdirection = ''
+ //_this.Manufacturer = '';
+ //_this.zcState = '';
+ //_this.StateArray = [];
+ //_this.ldCode = '';
+ //_this.ortherData = '';
+ //_this.ManufacturerArray = [];
+ //_this.$refs.StateSelect.setInput("璇烽�夋嫨");
+ //_this.$refs.StateSelect.clearItemActive();
+ //_this.$refs.ManufacturerSelect.setInput("璇烽�夋嫨");
+ //_this.$refs.ManufacturerSelect.clearItemActive();
+ },
+ SaveInfomation() {
+ if (_this.cztm == '') {
+ uni.showToast({
+ title: "璇锋壂鎻忚溅杞翠俊鎭�.",
+ duration: 5000
+ });
+ return;
+ }
+ if (_this.clxh == '') {
+ uni.showToast({
+ title: "璇疯緭鍏ラ�夐厤杞瀷.",
+ duration: 5000
+ });
+ return;
+ }
+ // if (_this.yfcbAVG == '' && _this.zfcbAVG == '' &&
+ // _this.zydAVG == '' && _this.yydAVG == '' && _this.zzjAVG == '' &&
+ // _this.yzjAVG == '') {
+ // uni.showToast({
+ // title: "璇烽噸鏂拌幏鍙栬疆瀵归�夐厤淇℃伅.",
+ // duration: 5000
+ // });
+ // return;
+ // }
+
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '璇锋牳瀵硅溅杞存潯鐮佹槸鍚︽纭�?',
+ success: function(res) {
+ if (res.confirm) {
+ let data = {
+ MainData: {
+ czh: _this.czh,
+ chexing: _this.chexing,
+ cztm: _this.cztm,
+ czxh: _this.czxh,
+ clxh: _this.clxh,
+ zlzdj: _this.zlzdj,
+ ylzdj: _this.ylzdj,
+ wxrw:_this.wxrw,
+ ldtm: _this.ldtm,
+ zlzzj: _this.zlzzj,
+ ylzzj: _this.ylzzj,
+ zlzA1: _this.zlzA1,
+ ylzA1: _this.ylzA1,
+ zlzA2: _this.zlzA2,
+ ylzA2: _this.ylzA2,
+ zlzA3: _this.zlzA3,
+ ylzA3: _this.ylzA3,
+ zlzB1: _this.zlzB1,
+ ylzB1: _this.ylzB1,
+ zlzB2: _this.zlzB2,
+ ylzB2: _this.ylzB2,
+ zlzB3: _this.zlzB3,
+ ylzB3: _this.ylzB3,
+ zlzC1: _this.zlzC1,
+ ylzC1: _this.ylzC1,
+ zlzC2: _this.zlzC2,
+ ylzC2: _this.ylzC2,
+ zlzC3: _this.zlzC3,
+ ylzC3: _this.ylzC3,
+ zlza: _this.zlza,
+ ylza: _this.ylza,
+ zlzb: _this.zlzb,
+ ylzb: _this.ylzb,
+ zlzc: _this.zlzc,
+ ylzc: _this.ylzc,
+ mttype: _this.mttype,
+ //targetStation: _this.targetStation,
+ wheelsPosition: _this.wheelsPosition,
+ NOdirection: _this.NOdirection,
+ //ldCode: _this.ldCode,
+ //ortherData: _this.ortherData
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToAPP/SaveCZInfo2',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ if (result.data.status) {
+ uni.showToast({
+ title: "棰勯�夐厤鎴愬姛!",
+ duration: 5000
+ });
+ _this.initInfo();
+ _this.qrcodeFocus = true;
+ _this.clxhFocus = false;
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 5000
+ });
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 5000
+ });
+ });
+ } else if (res.cancel) {}
+ }
+ });
+ },
+ },
+ created: function() {
+ // 姣忔杩涘叆鐣岄潰鏃讹紝鍏堟竻闄や箣鍓嶇殑鎵�鏈夊畾鏃跺櫒锛岀劧鍚庡惎鍔ㄦ柊鐨勫畾鏃跺櫒
+ clearInterval(this.timer)
+ this.timer = null;
+ this.setTimer();
+ _user = this.$UserTool.UserInfo;
+ this.CurrentUser = _user.userName;
+ this.UserArray = [this.$UserTool.AllUserInfo];
+ },
+ destroyed: function() {
+ // 姣忔绂诲紑褰撳墠鐣岄潰鏃讹紝娓呴櫎瀹氭椂鍣�
+ clearInterval(this.timer);
+ this.timer = null;
+ },
+ mounted() {
+ _this = this;
+ _this.qrcodeFocus = true;
+ //_this.queryOrder();
+ },
+
+
+ }
+</script>
+
+<style scoped lang="scss">
+ .tdHeight {
+ height: 80rpx;
+ }
+
+ .loopView {
+ height: 160px;
+ background-color: #f0f0f0;
+ margin-top: 10px;
+ }
+
+ .loopItem {
+ margin-top: 5px;
+ margin-left: 15px;
+
+ }
+
+ .deleteBtn {
+ margin-top: 25px;
+ margin-left: 10px;
+ width: 120px;
+ background-color: orangered;
+ }
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/ZDPxp.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/ZDPxp.vue"
new file mode 100644
index 0000000..d4c5d04
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/Outbound/ZDPxp.vue"
@@ -0,0 +1,694 @@
+<template>
+ <view>
+ <view>
+ <u-table font-size="25">
+ <u-tr>
+ <u-td>
+ <xfl-select :list="UserArray" :initValue="this.$UserTool.UserInfo.userName" :clearable="false"
+ :disabled="true">
+ </xfl-select>
+ </u-td>
+ <u-td width="25%">鐜板湪鏃堕棿:</u-td>
+ <u-td width="25%">{{date}}</u-td>
+ </u-tr>
+ </u-table>
+ </view>
+
+ <view style="padding: 0rpx 0rpx">
+ <u-table>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="cztm" :focus="qrcodeFocus" :border="true" placeholder="璇锋壂鎻忚溅杞存潯鐮�"
+ @input="cztmChange" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鍙�</u-td>
+ <u-td>
+ <u-input v-model="czh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">杞鏉＄爜</u-td>
+ <u-td>
+ <u-input v-model="ldtm" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr> -->
+ <u-tr>
+ <u-td width="30%">杞﹀瀷</u-td>
+ <u-td>
+ <u-input v-model="chexing" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍔ㄦ嫋灞炴��</u-td>
+ <u-td>
+ <u-input v-model="mttype" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">杞﹁酱鍨嬪彿</u-td>
+ <u-td>
+ <u-input v-model="czxh" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">閫夐厤杞瀷(*)</u-td>
+ <u-td>
+ <u-input v-model="clxh" :border="false" :focus="clxhFocus" placeholder="璇疯緭鍏ラ�夐厤杞瀷" />
+ </u-td>
+ </u-tr> -->
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х瓑绾�</u-td>
+ <u-td>
+ <u-input v-model="zlzdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">鍙宠疆搴х瓑绾�</u-td>
+ <u-td>
+ <u-input v-model="ylzdj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">缁翠慨浠诲姟</u-td>
+ <u-td>
+ <u-input v-model="wxrw" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰�</u-td>
+ <u-td>
+ <u-input v-model="zlzzj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰�</u-td>
+ <u-td>
+ <u-input v-model="ylzzj" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙1</u-td>
+ <u-td>
+ <u-input v-model="zlzA1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙1</u-td>
+ <u-td>
+ <u-input v-model="ylzA1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙2</u-td>
+ <u-td>
+ <u-input v-model="zlzA2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙2</u-td>
+ <u-td>
+ <u-input v-model="ylzA2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙3</u-td>
+ <u-td>
+ <u-input v-model="zlzA3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙3</u-td>
+ <u-td>
+ <u-input v-model="ylzA3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凙</u-td>
+ <u-td>
+ <u-input v-model="zlza" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凙</u-td>
+ <u-td>
+ <u-input v-model="ylza" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚1</u-td>
+ <u-td>
+ <u-input v-model="zlzB1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚1</u-td>
+ <u-td>
+ <u-input v-model="ylzB1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚2</u-td>
+ <u-td>
+ <u-input v-model="zlzB2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚2</u-td>
+ <u-td>
+ <u-input v-model="ylzB2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚3</u-td>
+ <u-td>
+ <u-input v-model="zlzB3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚3</u-td>
+ <u-td>
+ <u-input v-model="ylzB3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凚</u-td>
+ <u-td>
+ <u-input v-model="zlzb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凚</u-td>
+ <u-td>
+ <u-input v-model="ylzb" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜1</u-td>
+ <u-td>
+ <u-input v-model="zlzC1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜1</u-td>
+ <u-td>
+ <u-input v-model="ylzC1" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜2</u-td>
+ <u-td>
+ <u-input v-model="zlzC2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜2</u-td>
+ <u-td>
+ <u-input v-model="ylzC2" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜3</u-td>
+ <u-td>
+ <u-input v-model="zlzC3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜3</u-td>
+ <u-td>
+ <u-input v-model="ylzC3" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr>
+ <u-td width="30%">宸﹁疆搴х洿寰凜</u-td>
+ <u-td>
+ <u-input v-model="zlzc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ <u-td width="30%">鍙宠疆搴х洿寰凜</u-td>
+ <u-td>
+ <u-input v-model="ylzc" :border="false" :disabled="true" placeholder="" />
+ </u-td>
+ </u-tr>
+ <u-tr style="height: 50px;">
+ <u-td width="30%">鍒跺姩鐩樻柟鍚�:</u-td>
+ <u-td>
+ <u-checkbox-group @change="wheelsPositionChange">
+ <u-checkbox v-model="item.checked" :size="48"
+ v-for="(item, index) in list" :key="index" :name="item.name">{{item.name}}</u-checkbox>
+ </u-checkbox-group>
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">杞﹁疆杞瀷</u-td>
+ <u-td>
+ <u-input v-model="x" :border="true" placeholder="璇疯緭鍏ヨ溅杞疆鍨�" />
+ </u-td>
+ </u-tr> -->
+ <u-tr>
+ <u-td width="30%">鏂版棫绫诲埆:</u-td>
+ <u-td>
+ <xfl-select :list="NOdirectionArray" :initValue="'璇烽�夋嫨'" :clearable="false"
+ @change="NOdirectionChange">
+ </xfl-select>
+ </u-td>
+ </u-tr>
+ <!-- <u-tr>
+ <u-td width="30%">杞存壙绫诲埆:</u-td>
+ <u-td>
+ <xfl-select :list="StateArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="StateChange"
+ ref="StateSelect">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ <!-- <u-tr>
+ <u-td width="30%">鍘傚:</u-td>
+ <u-td>
+ <xfl-select :list="ManufacturerArray" :initValue="'璇烽�夋嫨'" :clearable="false"
+ @change="ManufacturerChange" ref="ManufacturerSelect">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ <!-- <u-tr>
+ <u-td width="30%">宸ヤ綅:</u-td>
+ <u-td>
+ <xfl-select :list="StationArray" :initValue="'璇烽�夋嫨'" :clearable="false" @change="StationChange">
+ </xfl-select>
+ </u-td>
+ </u-tr> -->
+ </u-table>
+ </view>
+ <view style="padding: 0rpx 0rpx;">
+ <u-table>
+ <u-tr>
+ <u-td>
+ <u-button style="width:100px" type="primary" @click="SaveInfomation">纭</u-button>
+ </u-td>
+ </u-tr>
+ </u-table>
+ </view>
+ </view>
+</template>
+
+<script>
+ var _this;
+ var _user;
+ export default {
+ data() {
+ return {
+ date: '',
+ CurrentUser: '', //褰撳墠鐢ㄦ埛
+ cztm: '',
+ czh: '',
+ chexing: '',
+ czxh: '',
+ //clxh: '',
+ zlzdj: '',
+ ylzdj: '',
+ wxrw: '',
+ //ldtm: '',
+ mttype: '',
+ zlzzj: '',
+ ylzzj: '',
+ zlzA1: '',
+ ylzA1: '',
+ zlzA2: '',
+ ylzA2: '',
+ zlzA3: '',
+ ylzA3: '',
+ zlzB1: '',
+ ylzB1: '',
+ zlzB2: '',
+ ylzB2: '',
+ zlzB3: '',
+ ylzB3: '',
+ zlzC1: '',
+ ylzC1: '',
+ zlzC2: '',
+ ylzC2: '',
+ zlzC3: '',
+ ylzC3: '',
+ zlza: '',
+ ylza: '',
+ zlzb: '',
+ ylzb: '',
+ zlzc: '',
+ ylzc: '',
+ // zzjAVG: '',
+ // yzjAVG: '',
+ // zfcbAVG: '',
+ // yfcbAVG: '',
+ // zydAVG: '',
+ // yydAVG: '',
+ //StateArray: [],
+ //ManufacturerArray: [],
+ StationArray: [{
+ label: '宸︿晶鍘嬭浣�',
+ value: '1宸︿晶鍘嬭浣�'
+ },
+ {
+ label: '鍙充晶鍘嬭浣�',
+ value: '2鍙充晶鍘嬭浣�'
+ }
+ ],
+ list: [
+ {
+ name: '宸︿晶',
+ checked: false,
+ disabled: false
+ },
+ {
+ name: '涓棿',
+ checked: false,
+ disabled: false
+ },
+ {
+ name: '鍙充晶',
+ checked: false,
+ disabled: false
+ }
+ ],
+ NOdirectionArray: [{
+ label: '0',
+ value: '鏂伴��'
+ }, {
+ label: '1',
+ value: '妫�淇�'
+ }, ],
+ //zcState: '',
+ //Manufacturer: '',
+ //targetStation: '',
+
+ //杞存壙鏂瑰悜
+ wheelsPosition: [],
+ //杞存壙鍙�
+ //ldCode: '',
+ //ortherData: '',
+ qrcodeFocus: false,
+ //clxhFocus: false
+ }
+ },
+ methods: {
+ setTimer() {
+ if (this.timer == null) {
+ this.timer = setInterval(() => {
+ this.date = this.$DateTool.getDate();
+ }, 1000)
+ }
+ },
+ // ManufacturerChange(value) {
+ // this.Manufacturer = value.orignItem.label;
+ // },
+ // StateChange(value) {
+ // this.zcState = value.orignItem.label;
+ // },
+ // StationChange(value) {
+ // this.targetStation = value.orignItem.label;
+ // },
+ wheelsPositionChange(value) {
+ this.wheelsPosition = value;
+ },
+ NOdirectionChange(value) {
+ this.NOdirection = value.orignItem.label;
+ },
+ cztmChange() {
+ if (_this.cztm == '' || _this.cztm == null) {
+ return;
+ }
+ let data = {
+ MainData: {
+ cztm: _this.cztm
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToZY/getCZInfo',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ //console.log(result);
+ if (result.data.status) {
+ let obj = JSON.parse(JSON.stringify(result.data.data));
+ // _this.yfcbAVG = obj.yfcbAVG;
+ // _this.zfcbAVG = obj.zfcbAVG;
+ // _this.zydAVG = obj.zydAVG;
+ // _this.yydAVG = obj.yydAVG;
+ // _this.zzjAVG = obj.zzjAVG;
+ // _this.yzjAVG = obj.yzjAVG;
+ _this.chexing = obj.chexing;
+ _this.czh = obj.czh;
+ _this.czxh = obj.czxh;
+ //_this.clxhFocus = true;
+ _this.zlzdj = obj.zlzdj;
+ _this.ylzdj = obj.ylzdj;
+ _this.wxrw = obj.wxrw;
+ //_this.ldtm = obj.ldtm;
+ _this.zlzzj = obj.zlzzj;
+ _this.ylzzj = obj.ylzzj;
+ _this.zlzA1 = obj.zlzA1;
+ _this.ylzA1 = obj.ylzA1;
+ _this.zlzA2 = obj.zlzA2;
+ _this.ylzA2 = obj.ylzA2;
+ _this.zlzA3 = obj.zlzA3;
+ _this.ylzA3 = obj.ylzA3;
+ _this.zlzB1 = obj.zlzB1;
+ _this.ylzB1 = obj.ylzB1;
+ _this.zlzB2 = obj.zlzB2;
+ _this.ylzB2 = obj.ylzB2;
+ _this.zlzB3 = obj.zlzB3;
+ _this.ylzB3 = obj.ylzB3;
+ _this.zlzC1 = obj.zlzC1;
+ _this.ylzC1 = obj.ylzC1;
+ _this.zlzC2 = obj.zlzC2;
+ _this.ylzC2 = obj.ylzC2;
+ _this.zlzC3 = obj.zlzC3;
+ _this.ylzC3 = obj.ylzC3;
+ _this.zlza = obj.zlza;
+ _this.ylza = obj.ylza;
+ _this.zlzb = obj.zlzb;
+ _this.ylzb = obj.ylzb;
+ _this.zlzc = obj.zlzc;
+ _this.ylzc = obj.ylzc;
+ _this.mttype = obj.mttype;
+ //_this.ldCode = obj.ldCode;
+ //_this.ortherData = obj.ortherData;
+ // if (null != obj.manufacturerArray)
+ // obj.manufacturerArray.forEach(function(item, index, arr) {
+ // _this.ManufacturerArray.push({
+ // label: item,
+ // value: item
+ // })
+ // });
+ // if (null != obj.neworold)
+ // obj.neworold.forEach(function(item, index, arr) {
+ // let name = '妫�淇�';
+ // if (item.indexOf('0') > -1) {
+ // name = '鏂板搧';
+ // }
+
+ // if (null == _this.StateArray.find(r => r.value == name)) {
+ // _this.StateArray.push({
+ // label: item,
+ // value: name
+ // })
+ // }
+ // });
+ //console.log(obj);
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 5000
+ });
+ _this.initInfo();
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 5000
+ });
+ _this.initInfo();
+ });
+ },
+ initInfo() {
+ // _this.yfcbAVG = '';
+ // _this.zfcbAVG = '';
+ // _this.zydAVG = '';
+ // _this.yydAVG = '';
+ // _this.zzjAVG = '';
+ // _this.yzjAVG = '';
+ _this.cztm = '';
+ _this.czh = '';
+ _this.chexing = '';
+ _this.czxh = '';
+ //_this.clxh = '';
+ _this.zlzdj = '';
+ _this.ylzdj = '';
+ _this.wxrw = '';
+ //_this.ldtm = '';
+ _this.zlzzj = '';
+ _this.ylzzj = '';
+ _this.zlzA1 = '';
+ _this.ylzA1 = '';
+ _this.zlzA2 = '';
+ _this.ylzA2 = '';
+ _this.zlzA3 = '';
+ _this.ylzA3 = '';
+ _this.zlzB1 = '';
+ _this.ylzB1 = '';
+ _this.zlzB2 = '';
+ _this.ylzB2 = '';
+ _this.zlzB3 = '';
+ _this.ylzB3 = '';
+ _this.zlzC1 = '';
+ _this.ylzC1 = '';
+ _this.zlzC2 = '';
+ _this.ylzC2 = '';
+ _this.zlzC3 = '';
+ _this.ylzC3 = '';
+ _this.zlza = '';
+ _this.ylza = '';
+ _this.zlzb = '';
+ _this.ylzb = '';
+ _this.zlzc = '';
+ _this.ylzc = '';
+ _this.mttype = '';
+ //_this.wheelsPosition = '';
+ //_this.NOdirection = ''
+ //_this.Manufacturer = '';
+ //_this.zcState = '';
+ //_this.StateArray = [];
+ //_this.ldCode = '';
+ //_this.ortherData = '';
+ //_this.ManufacturerArray = [];
+ //_this.$refs.StateSelect.setInput("璇烽�夋嫨");
+ //_this.$refs.StateSelect.clearItemActive();
+ //_this.$refs.ManufacturerSelect.setInput("璇烽�夋嫨");
+ //_this.$refs.ManufacturerSelect.clearItemActive();
+ },
+ SaveInfomation() {
+ // if (_this.cztm == '') {
+ // uni.showToast({
+ // title: "璇锋壂鎻忚溅杞翠俊鎭�.",
+ // duration: 5000
+ // });
+ // return;
+ // }
+ // if (_this.clxh == '') {
+ // uni.showToast({
+ // title: "璇疯緭鍏ラ�夐厤杞瀷.",
+ // duration: 5000
+ // });
+ // return;
+ // }
+ // if (_this.yfcbAVG == '' && _this.zfcbAVG == '' &&
+ // _this.zydAVG == '' && _this.yydAVG == '' && _this.zzjAVG == '' &&
+ // _this.yzjAVG == '') {
+ // uni.showToast({
+ // title: "璇烽噸鏂拌幏鍙栬疆瀵归�夐厤淇℃伅.",
+ // duration: 5000
+ // });
+ // return;
+ // }
+
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '璇锋牳瀵硅溅杞存潯鐮佹槸鍚︽纭�?',
+ success: function(res) {
+ if (res.confirm) {
+ let data = {
+ MainData: {
+ czh: _this.czh,
+ chexing: _this.chexing,
+ cztm: _this.cztm,
+ czxh: _this.czxh,
+ //clxh: _this.clxh,
+ zlzdj: _this.zlzdj,
+ ylzdj: _this.ylzdj,
+ wxrw: _this.wxrw,
+ //ldtm: _this.ldtm,
+ zlzzj: _this.zlzzj,
+ ylzzj: _this.ylzzj,
+ zlzA1: _this.zlzA1,
+ ylzA1: _this.ylzA1,
+ zlzA2: _this.zlzA2,
+ ylzA2: _this.ylzA2,
+ zlzA3: _this.zlzA3,
+ ylzA3: _this.ylzA3,
+ zlzB1: _this.zlzB1,
+ ylzB1: _this.ylzB1,
+ zlzB2: _this.zlzB2,
+ ylzB2: _this.ylzB2,
+ zlzB3: _this.zlzB3,
+ ylzB3: _this.ylzB3,
+ zlzC1: _this.zlzC1,
+ ylzC1: _this.ylzC1,
+ zlzC2: _this.zlzC2,
+ ylzC2: _this.ylzC2,
+ zlzC3: _this.zlzC3,
+ ylzC3: _this.ylzC3,
+ zlza: _this.zlza,
+ ylza: _this.ylza,
+ zlzb: _this.zlzb,
+ ylzb: _this.ylzb,
+ zlzc: _this.zlzc,
+ ylzc: _this.ylzc,
+ mttype: _this.mttype,
+ //targetStation: _this.targetStation,
+ wheelsPosition: _this.wheelsPosition,
+ NOdirection: _this.NOdirection,
+ //ldCode: _this.ldCode,
+ //ortherData: _this.ortherData
+ },
+ };
+ _this.$AjaxRequest.Params('post', 'ToAPP/SaveZDPXPInfo',
+ data, _user.token);
+ _this.$AjaxRequest.Request().then(function(result) {
+ if (result.data.status) {
+ uni.showToast({
+ title: "棰勯�夐厤鎴愬姛!",
+ duration: 5000
+ });
+ _this.initInfo();
+ _this.qrcodeFocus = true;
+ //_this.clxhFocus = false;
+ } else {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰閿欒:" + result.data.message,
+ duration: 5000
+ });
+ }
+ }).catch(function(err) {
+ uni.showToast({
+ icon: 'none',
+ title: "璇锋眰鍚庡彴寮傚父,閿欒淇℃伅." + err.errMsg,
+ duration: 5000
+ });
+ });
+ } else if (res.cancel) {}
+ }
+ });
+ },
+ },
+ created: function() {
+ // 姣忔杩涘叆鐣岄潰鏃讹紝鍏堟竻闄や箣鍓嶇殑鎵�鏈夊畾鏃跺櫒锛岀劧鍚庡惎鍔ㄦ柊鐨勫畾鏃跺櫒
+ clearInterval(this.timer)
+ this.timer = null;
+ this.setTimer();
+ _user = this.$UserTool.UserInfo;
+ this.CurrentUser = _user.userName;
+ this.UserArray = [this.$UserTool.AllUserInfo];
+ },
+ destroyed: function() {
+ // 姣忔绂诲紑褰撳墠鐣岄潰鏃讹紝娓呴櫎瀹氭椂鍣�
+ clearInterval(this.timer);
+ this.timer = null;
+ },
+ mounted() {
+ _this = this;
+ _this.qrcodeFocus = true;
+ //_this.queryOrder();
+ },
+
+
+ }
+</script>
+
+<style scoped lang="scss">
+ .tdHeight {
+ height: 80rpx;
+ }
+
+ .loopView {
+ height: 160px;
+ background-color: #f0f0f0;
+ margin-top: 10px;
+ }
+
+ .loopItem {
+ margin-top: 5px;
+ margin-left: 15px;
+
+ }
+
+ .deleteBtn {
+ margin-top: 25px;
+ margin-left: 10px;
+ width: 120px;
+ background-color: orangered;
+ }
+</style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/index/index.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/index/index.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/index/index.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/index/index.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/index/main.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/index/main.vue"
similarity index 99%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/index/main.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/index/main.vue"
index 9218b2d..6328129 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/pages/index/main.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/pages/index/main.vue"
@@ -130,7 +130,7 @@
}
.swiper {
- height: 710rpx;
+ height: 810rpx;
}
.indicator-dots {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsA.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsA.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsA.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsB.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsB.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsC.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsC.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsC.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsD.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsD.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsD.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsE.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsE.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ReceivingGoodsE.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/Test.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/Test.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/Test.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/Test.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/appoint.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/appoint.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/appoint.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/appoint.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/binding.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/binding.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/binding.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/binding.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/boxing1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/boxing1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/boxing2.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing2.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/boxing2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callA.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callA.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callA.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callB.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callB.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callC.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callC.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callC.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callD.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callD.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callD.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callE.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callE.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/callE.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/cancel.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/cancel.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/cancel.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/cancel.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/changebox.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/changebox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/changebox1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/changebox1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/check1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/check1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/check2.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check2.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/check2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/exp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/exp.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/exp.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/exp.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forklift.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/forklift.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forklift.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/forklift.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forkliftB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/forkliftB.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forkliftB.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/forkliftB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/in1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/in1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/in1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/in1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/inorder.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/inorder.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/inorder.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/inorder.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/lend.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/lend.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/lend.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/lend.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/login.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/login.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/login.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/login.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/logo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/logo.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/logo.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/logo.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ortherbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ortherbox.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ortherbox.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/ortherbox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out2.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out2.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out3.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out3.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out3.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out3.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out4.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out4.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out4.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out4.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out5.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out5.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out5.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/out5.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityIn.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/qualityIn.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityIn.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/qualityIn.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityOut.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/qualityOut.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityOut.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/qualityOut.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/return.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/return.png"
new file mode 100644
index 0000000..2ef8a0d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/return.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/returnbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/returnbox.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/returnbox.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/returnbox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zdp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zdp.png"
new file mode 100644
index 0000000..9caf501
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zdp.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zj.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zj.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zj.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zj.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zjjg.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zjjg.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zjjg.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/image/zjjg.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/uni.ttf" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/uni.ttf"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/uni.ttf"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/static/uni.ttf"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uni.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uni.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uni.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uni.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/apk/apkurl" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/apk/apkurl"
new file mode 100644
index 0000000..19b7956
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/apk/apkurl"
@@ -0,0 +1 @@
+https://app.liuyingyong.cn/build/download/19d6de30-2e33-11f0-87be-e330f97cc722
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/certdata" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/certdata"
new file mode 100644
index 0000000..a65c373
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/certdata"
@@ -0,0 +1,3 @@
+andrCertfile=D:/HBuilderX/plugins/app-safe-pack/Test.keystore
+andrCertAlias=android
+andrCertPass=ep/Tdjka4Y7WYqDB6/S7dw==
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/cloudcertificate/certini" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/cloudcertificate/certini"
new file mode 100644
index 0000000..fd47988
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/cloudcertificate/certini"
@@ -0,0 +1,4 @@
+[General]
+andrCertfile=package.keystore
+andrCertAlias=__UNI__C823906
+andrCertPass="rCgK0GIWGVNfjdvaee2ZkA=="
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/cloudcertificate/package.keystore" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/cloudcertificate/package.keystore"
new file mode 100644
index 0000000..8925910
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/cloudcertificate/package.keystore"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniapperror.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/__uniapperror.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniapperror.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/__uniapperror.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniappsuccess.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/__uniappsuccess.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniappsuccess.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/__uniappsuccess.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsA.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsA.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsA.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsB.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsB.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsC.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsC.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsC.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsD.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsD.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsD.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsE.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ReceivingGoodsE.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ReceivingGoodsE.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/Test.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/Test.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/Test.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/Test.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/appoint.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/appoint.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/appoint.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/appoint.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/binding.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/binding.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/binding.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/binding.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/boxing1.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing1.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/boxing1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/boxing2.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/boxing2.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/boxing2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callA.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callA.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callA.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callB.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callB.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callC.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callC.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callC.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callD.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callD.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callD.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callE.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/callE.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/callE.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/cancel.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/cancel.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/cancel.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/cancel.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/changebox.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/changebox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/changebox1.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/changebox1.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/changebox1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/check1.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check1.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/check1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/check2.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/check2.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/check2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/exp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/exp.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/exp.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/exp.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forklift.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/forklift.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forklift.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/forklift.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forkliftB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/forkliftB.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/forkliftB.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/forkliftB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/in1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/in1.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/in1.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/in1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/inorder.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/inorder.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/inorder.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/inorder.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/lend.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/lend.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/lend.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/lend.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/login.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/login.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/login.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/login.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/logo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/logo.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/logo.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/logo.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ortherbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ortherbox.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/ortherbox.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/ortherbox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out1.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out1.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out2.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out2.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out3.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out3.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out3.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out3.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out4.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out4.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out4.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out4.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out5.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out5.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/out5.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/out5.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityIn.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/qualityIn.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityIn.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/qualityIn.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityOut.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/qualityOut.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/qualityOut.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/qualityOut.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/return.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/return.png"
new file mode 100644
index 0000000..2ef8a0d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/return.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/returnbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/returnbox.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/returnbox.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/returnbox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zdp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zdp.png"
new file mode 100644
index 0000000..9caf501
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zdp.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zj.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zj.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zj.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zj.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zjjg.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zjjg.png"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/image/zjjg.png"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/image/zjjg.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/uni.ttf" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/uni.ttf"
similarity index 100%
copy from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/static/uni.ttf"
copy to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/cache/wgt/__UNI__C823906/static/uni.ttf"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniapperror.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/__uniapperror.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniapperror.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/__uniapperror.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniappsuccess.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/__uniappsuccess.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/__uniappsuccess.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/__uniappsuccess.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsA.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsA.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsA.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsB.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsB.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsC.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsC.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsC.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsD.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsD.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsD.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsE.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsE.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ReceivingGoodsE.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/Test.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/Test.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/Test.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/Test.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/appoint.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/appoint.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/appoint.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/appoint.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/binding.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/binding.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/binding.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/binding.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/boxing1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/boxing1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/boxing1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/boxing1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/boxing2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/boxing2.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/boxing2.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/boxing2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callA.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callA.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callA.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callA.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callB.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callB.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callC.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callC.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callC.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callC.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callD.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callD.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callD.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callD.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callE.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callE.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/callE.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/callE.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/cancel.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/cancel.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/cancel.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/cancel.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/changebox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/changebox.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/changebox.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/changebox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/changebox1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/changebox1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/changebox1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/changebox1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/check1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/check1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/check1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/check1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/check2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/check2.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/check2.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/check2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/exp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/exp.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/exp.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/exp.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/forklift.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/forklift.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/forklift.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/forklift.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/forkliftB.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/forkliftB.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/forkliftB.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/forkliftB.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/in1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/in1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/in1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/in1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/inorder.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/inorder.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/inorder.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/inorder.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/lend.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/lend.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/lend.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/lend.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/login.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/login.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/login.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/login.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/logo.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/logo.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/logo.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/logo.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ortherbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ortherbox.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/ortherbox.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/ortherbox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out1.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out1.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out1.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out1.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out2.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out2.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out2.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out2.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out3.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out3.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out3.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out3.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out4.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out4.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out4.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out4.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out5.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out5.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/out5.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/out5.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/qualityIn.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/qualityIn.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/qualityIn.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/qualityIn.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/qualityOut.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/qualityOut.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/qualityOut.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/qualityOut.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/return.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/return.png"
new file mode 100644
index 0000000..2ef8a0d
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/return.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/returnbox.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/returnbox.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/returnbox.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/returnbox.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zdp.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zdp.png"
new file mode 100644
index 0000000..9caf501
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zdp.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/zj.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zj.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/zj.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zj.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/zjjg.png" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zjjg.png"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/image/zjjg.png"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/image/zjjg.png"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/uni.ttf" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/uni.ttf"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/dist/build/app-plus/static/uni.ttf"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/dist/build/app-plus/static/uni.ttf"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/release/__UNI__6F62323.wgt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/release/__UNI__6F62323.wgt"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/unpackage/release/__UNI__6F62323.wgt"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/unpackage/release/__UNI__6F62323.wgt"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/LICENSE" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/LICENSE"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/LICENSE"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/LICENSE"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/README.md" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/README.md"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/README.md"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/README.md"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-action-sheet/u-action-sheet.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-action-sheet/u-action-sheet.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-action-sheet/u-action-sheet.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-action-sheet/u-action-sheet.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-alert-tips/u-alert-tips.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-alert-tips/u-alert-tips.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-alert-tips/u-alert-tips.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-alert-tips/u-alert-tips.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-avatar-cropper/u-avatar-cropper.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-avatar/u-avatar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-avatar/u-avatar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-avatar/u-avatar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-avatar/u-avatar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-back-top/u-back-top.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-back-top/u-back-top.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-back-top/u-back-top.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-back-top/u-back-top.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-badge/u-badge.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-badge/u-badge.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-badge/u-badge.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-badge/u-badge.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-button/u-button.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-button/u-button.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-button/u-button.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-button/u-button.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-calendar/u-calendar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-calendar/u-calendar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-calendar/u-calendar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-calendar/u-calendar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-car-keyboard/u-car-keyboard.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-car-keyboard/u-car-keyboard.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-car-keyboard/u-car-keyboard.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-car-keyboard/u-car-keyboard.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-card/u-card.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-card/u-card.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-card/u-card.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-card/u-card.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-cell-group/u-cell-group.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-cell-group/u-cell-group.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-cell-group/u-cell-group.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-cell-group/u-cell-group.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-cell-item/u-cell-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-cell-item/u-cell-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-cell-item/u-cell-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-cell-item/u-cell-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-checkbox-group/u-checkbox-group.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-checkbox-group/u-checkbox-group.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-checkbox-group/u-checkbox-group.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-checkbox-group/u-checkbox-group.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-checkbox/u-checkbox.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-checkbox/u-checkbox.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-checkbox/u-checkbox.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-checkbox/u-checkbox.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-circle-progress/u-circle-progress.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-circle-progress/u-circle-progress.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-circle-progress/u-circle-progress.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-circle-progress/u-circle-progress.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-col/u-col.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-col/u-col.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-col/u-col.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-col/u-col.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-collapse-item/u-collapse-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-collapse-item/u-collapse-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-collapse-item/u-collapse-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-collapse-item/u-collapse-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-collapse/u-collapse.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-collapse/u-collapse.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-collapse/u-collapse.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-collapse/u-collapse.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-column-notice/u-column-notice.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-column-notice/u-column-notice.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-column-notice/u-column-notice.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-column-notice/u-column-notice.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-count-down/u-count-down.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-count-down/u-count-down.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-count-down/u-count-down.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-count-down/u-count-down.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-count-to/u-count-to.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-count-to/u-count-to.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-count-to/u-count-to.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-count-to/u-count-to.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-divider/u-divider.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-divider/u-divider.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-divider/u-divider.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-divider/u-divider.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-dropdown-item/u-dropdown-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-dropdown-item/u-dropdown-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-dropdown-item/u-dropdown-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-dropdown-item/u-dropdown-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-dropdown/u-dropdown.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-dropdown/u-dropdown.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-dropdown/u-dropdown.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-dropdown/u-dropdown.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-empty/u-empty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-empty/u-empty.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-empty/u-empty.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-empty/u-empty.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-field/u-field.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-field/u-field.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-field/u-field.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-field/u-field.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-form-item/u-form-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-form-item/u-form-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-form-item/u-form-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-form-item/u-form-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-form/u-form.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-form/u-form.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-form/u-form.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-form/u-form.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-full-screen/u-full-screen.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-full-screen/u-full-screen.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-full-screen/u-full-screen.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-full-screen/u-full-screen.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-gap/u-gap.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-gap/u-gap.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-gap/u-gap.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-gap/u-gap.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-grid-item/u-grid-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-grid-item/u-grid-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-grid-item/u-grid-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-grid-item/u-grid-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-grid/u-grid.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-grid/u-grid.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-grid/u-grid.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-grid/u-grid.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-icon/u-icon.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-icon/u-icon.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-icon/u-icon.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-icon/u-icon.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-image/u-image.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-image/u-image.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-image/u-image.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-image/u-image.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-index-anchor/u-index-anchor.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-index-anchor/u-index-anchor.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-index-anchor/u-index-anchor.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-index-anchor/u-index-anchor.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-index-list/u-index-list.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-index-list/u-index-list.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-index-list/u-index-list.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-index-list/u-index-list.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-input/u-input.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-input/u-input.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-input/u-input.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-input/u-input.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-keyboard/u-keyboard.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-keyboard/u-keyboard.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-keyboard/u-keyboard.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-keyboard/u-keyboard.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-lazy-load/u-lazy-load.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-lazy-load/u-lazy-load.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-lazy-load/u-lazy-load.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-lazy-load/u-lazy-load.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-line-progress/u-line-progress.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-line-progress/u-line-progress.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-line-progress/u-line-progress.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-line-progress/u-line-progress.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-line/u-line.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-line/u-line.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-line/u-line.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-line/u-line.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-link/u-link.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-link/u-link.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-link/u-link.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-link/u-link.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-loading-page/u-loading-page.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-loading-page/u-loading-page.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-loading-page/u-loading-page.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-loading-page/u-loading-page.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-loading/u-loading.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-loading/u-loading.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-loading/u-loading.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-loading/u-loading.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-loadmore/u-loadmore.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-loadmore/u-loadmore.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-loadmore/u-loadmore.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-loadmore/u-loadmore.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-mask/u-mask.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-mask/u-mask.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-mask/u-mask.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-mask/u-mask.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-message-input/u-message-input.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-message-input/u-message-input.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-message-input/u-message-input.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-message-input/u-message-input.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-modal/u-modal.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-modal/u-modal.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-modal/u-modal.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-modal/u-modal.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-navbar/u-navbar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-navbar/u-navbar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-navbar/u-navbar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-navbar/u-navbar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-no-network/u-no-network.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-no-network/u-no-network.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-no-network/u-no-network.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-no-network/u-no-network.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-notice-bar/u-notice-bar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-notice-bar/u-notice-bar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-notice-bar/u-notice-bar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-notice-bar/u-notice-bar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-number-box/u-number-box.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-number-box/u-number-box.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-number-box/u-number-box.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-number-box/u-number-box.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-number-keyboard/u-number-keyboard.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-number-keyboard/u-number-keyboard.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-number-keyboard/u-number-keyboard.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-number-keyboard/u-number-keyboard.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-parse/libs/handler.wxs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-parse/libs/handler.wxs"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-parse/libs/handler.wxs"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-parse/libs/handler.wxs"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-parse/libs/trees.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-parse/libs/trees.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-parse/libs/trees.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-parse/libs/trees.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-parse/u-parse.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-parse/u-parse.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-parse/u-parse.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-parse/u-parse.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-picker/u-picker.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-picker/u-picker.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-picker/u-picker.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-picker/u-picker.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-popup/u-popup.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-popup/u-popup.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-popup/u-popup.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-popup/u-popup.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-radio-group/u-radio-group.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-radio-group/u-radio-group.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-radio-group/u-radio-group.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-radio-group/u-radio-group.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-radio/u-radio.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-radio/u-radio.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-radio/u-radio.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-radio/u-radio.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-rate/u-rate.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-rate/u-rate.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-rate/u-rate.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-rate/u-rate.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-read-more/u-read-more.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-read-more/u-read-more.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-read-more/u-read-more.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-read-more/u-read-more.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-row-notice/u-row-notice.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-row-notice/u-row-notice.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-row-notice/u-row-notice.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-row-notice/u-row-notice.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-row/u-row.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-row/u-row.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-row/u-row.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-row/u-row.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-search/u-search.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-search/u-search.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-search/u-search.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-search/u-search.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-section/u-section.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-section/u-section.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-section/u-section.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-section/u-section.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-select/u-select.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-select/u-select.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-select/u-select.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-select/u-select.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-skeleton/u-skeleton.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-skeleton/u-skeleton.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-skeleton/u-skeleton.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-skeleton/u-skeleton.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-slider/u-slider.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-slider/u-slider.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-slider/u-slider.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-slider/u-slider.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-steps/u-steps.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-steps/u-steps.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-steps/u-steps.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-steps/u-steps.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-sticky/u-sticky.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-sticky/u-sticky.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-sticky/u-sticky.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-sticky/u-sticky.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-subsection/u-subsection.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-subsection/u-subsection.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-subsection/u-subsection.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-subsection/u-subsection.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-swipe-action/u-swipe-action.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-swipe-action/u-swipe-action.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-swipe-action/u-swipe-action.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-swipe-action/u-swipe-action.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-swiper/u-swiper.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-swiper/u-swiper.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-swiper/u-swiper.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-swiper/u-swiper.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-switch/u-switch.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-switch/u-switch.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-switch/u-switch.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-switch/u-switch.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tabbar/u-tabbar.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tabbar/u-tabbar.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tabbar/u-tabbar.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tabbar/u-tabbar.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-table/u-table.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-table/u-table.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-table/u-table.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-table/u-table.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tabs-swiper/u-tabs-swiper.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tabs/u-tabs.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tabs/u-tabs.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tabs/u-tabs.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tabs/u-tabs.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tag/u-tag.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tag/u-tag.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tag/u-tag.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tag/u-tag.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-td/u-td.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-td/u-td.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-td/u-td.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-td/u-td.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-th/u-th.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-th/u-th.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-th/u-th.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-th/u-th.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-time-line-item/u-time-line-item.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-time-line-item/u-time-line-item.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-time-line-item/u-time-line-item.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-time-line-item/u-time-line-item.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-time-line/u-time-line.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-time-line/u-time-line.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-time-line/u-time-line.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-time-line/u-time-line.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-toast/u-toast.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-toast/u-toast.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-toast/u-toast.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-toast/u-toast.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-top-tips/u-top-tips.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-top-tips/u-top-tips.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-top-tips/u-top-tips.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-top-tips/u-top-tips.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tr/u-tr.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tr/u-tr.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-tr/u-tr.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-tr/u-tr.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-upload/u-upload.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-upload/u-upload.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-upload/u-upload.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-upload/u-upload.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-verification-code/u-verification-code.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-verification-code/u-verification-code.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-verification-code/u-verification-code.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-verification-code/u-verification-code.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-waterfall/u-waterfall.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-waterfall/u-waterfall.vue"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/components/u-waterfall/u-waterfall.vue"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/components/u-waterfall/u-waterfall.vue"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/index.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/index.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/index.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/index.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/color.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/color.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/color.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/color.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/common.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/common.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/common.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/common.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.components.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.components.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.components.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.components.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.h5.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.h5.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.h5.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.h5.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.mp.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.mp.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.mp.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.mp.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.nvue.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.nvue.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.nvue.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.nvue.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.vue.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.vue.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/libs/css/style.vue.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/libs/css/style.vue.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/theme.scss" "b/\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/theme.scss"
similarity index 100%
rename from "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/LDY_PDA/uview-ui/theme.scss"
rename to "\351\241\271\347\233\256\344\273\243\347\240\201/PDA/uview-ui/theme.scss"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
index bd373e8..927dc46 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
index 1d4f224..c528554 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
index a239a0c..1f0fd16 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
index 6e311fa..13165d3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
index 586cff5..76d2d1d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_StationManagerService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_StationManagerService.cs"
index bcc92e3..2b2ad62 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_StationManagerService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_StationManagerService.cs"
@@ -1,4 +1,5 @@
锘縰sing WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_Model.Models;
@@ -13,5 +14,39 @@
{
_sys_ConfigService = sys_ConfigService;
}
+
+ public WebResponseContent GetStation()
+ {
+ return WebResponseContent.Instance.OK(data: BaseDal.QueryData(x => x.stationRemark == "AGV鏀捐揣绔欏彴").ToList());
+ }
+
+ public WebResponseContent UpdateStation(SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
+
+ try
+ {
+ string stationid = saveModel.MainData["stationid"].ToString();
+
+ string stationLoc = stationid == "1" ? "2033" : "2043";
+ Dt_StationManager dt_Station = BaseDal.QueryFirst(x => x.stationLocation == stationLoc);
+
+ if (dt_Station.stationStatus == "0")
+ {
+ dt_Station.stationStatus = "1";
+ }
+ else
+ {
+ dt_Station.stationStatus = "0";
+ }
+ BaseDal.UpdateData(dt_Station);
+ return content.OK();
+ }
+ catch (Exception ex)
+ {
+ return content.Error("閿欒淇℃伅锛�" + ex);
+ throw;
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs"
index 9000e31..6b0a440 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_Core;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.DeviceBase;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Release/net6.0/WIDESEAWCS_BasicInfoService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Release/net6.0/WIDESEAWCS_BasicInfoService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Release/net6.0/WIDESEAWCS_BasicInfoService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs"
index 5fdfc19..a51eeb8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs"
@@ -46,6 +46,10 @@
/// 绉诲簱妫�娴�
/// </summary>
public const string TransferCheck = "TransferCheck";
+ /// <summary>
+ /// 鍏ュ簱绉诲簱妫�娴�
+ /// </summary>
+ public const string InTransferCheck = "InTransferCheck";
/// <summary>
/// 鏇存柊娴嬮噺浠诲姟
@@ -53,5 +57,20 @@
public const string UpdateCheckTask = "UpdateCheckTask";
public const string RequestWheelsFlow = "RequestWheelsFlow";
+
+ /// <summary>
+ /// 杞﹁酱涓婃枡鐢宠
+ /// </summary>
+ public const string RequestAxleloading = "RequestAxleloading";
+
+ /// <summary>
+ /// 杞﹁酱涓嬫枡鐘舵�侊紝agv鐘舵��
+ /// </summary>
+ public const string UpdateAxleCurrentStatue = "UpdateAxleCurrentStatue";
+
+ /// <summary>
+ /// 鐢宠agv浠诲姟
+ /// </summary>
+ public const string genAgvSchedulingTask = "genAgvSchedulingTask";
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Release/net6.0/WIDESEAWCS_DTO.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Release/net6.0/WIDESEAWCS_DTO.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Release/net6.0/WIDESEAWCS_DTO.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Release/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs"
index 423e7d1..e6016c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs"
@@ -17,6 +17,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
+using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;
@@ -39,5 +40,18 @@
/// <param name="area"></param>
/// <returns></returns>
Dt_StationManager GetStationInfoByChildCode(string ChildCode, string area);
+
+
+ /// <summary>
+ /// 鑾峰彇agv缂撳瓨鍙颁俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent GetStation();
+
+ /// <summary>
+ /// 淇敼AGV绔欏彴淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent UpdateStation(SaveModel saveModel);
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Release/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Release/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Release/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Release/net6.0/WIDESEAWCS_IProcessService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Release/net6.0/WIDESEAWCS_IProcessService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IProcessService/obj/Release/net6.0/WIDESEAWCS_IProcessService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Release/net6.0/WIDESEAWCS_ISystemRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Release/net6.0/WIDESEAWCS_ISystemRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Release/net6.0/WIDESEAWCS_ISystemRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Release/net6.0/WIDESEAWCS_ISystemServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Release/net6.0/WIDESEAWCS_ISystemServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Release/net6.0/WIDESEAWCS_ISystemServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index 4246add..d806635 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -96,6 +96,13 @@
Dt_Task? OutBeforeCheck(int taskNum);
/// <summary>
+ /// 鍏ュ簱鍓� 绉诲簱妫�娴�
+ /// </summary>
+ /// <param name="taskNum"></param>
+ /// <returns></returns>
+ Dt_Task? InBeforeCheck(int taskNum);
+
+ /// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
@@ -290,5 +297,39 @@
/// <param name="deviceNo"></param>
/// <returns></returns>
Dt_Task QueryExcutingTask(string deviceNo);
+
+
+ /// <summary>
+ /// 杞﹁酱涓婃枡鐢宠锛屽弽棣堟潯鐮佽嚦杈撻�佺嚎
+ /// </summary>
+ /// <returns></returns>
+ WebResponseContent GetFeedbackAxleloading();
+ /// <summary>
+ /// 杞﹁酱绾夸笅鏂欏彛锛岃溅杞村埌浣嶅悗杈撻�佺嚎鐢宠
+ /// </summary>
+ /// <param name="CZTM"></param>
+ /// <returns></returns>
+ WebResponseContent UpdateAxleCurrentStatue(string CZTM);
+ /// <summary>
+ /// 鐢宠agv浠诲姟
+ /// </summary>
+ /// <param name="TargetAddress"></param>
+ /// <returns></returns>
+ WebResponseContent GetAGVTaskdistribution(string TargetAddress);
+
+ /// <summary>
+ /// 鍐欏叆杈撻�佺嚎鍙嶉淇℃伅
+ /// </summary>
+ /// <param name="TargetAddress"></param>
+ /// <returns></returns>
+ WebResponseContent SetPlcResponState(string TargetAddress);
+
+ /// <summary>
+ /// 鍐欏叆杈撻�佺嚎鍙嶉淇℃伅
+ /// </summary>
+ /// <param name="TargetAddress"></param>
+ /// <returns></returns>
+ WebResponseContent GetPlcState(string TargetAddress);
+
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Release/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Release/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Release/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_ITaskInfo_HtyService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
index 278e659..9000da9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
@@ -199,5 +199,11 @@
///</summary>
[SugarColumn(ColumnName = "WheelsLX", Length = 255, ColumnDescription = "杞瀷")]
public string WheelsLX { get; set; }
+
+ /// <summary>
+ /// 杞﹁疆鍘诲悜鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName = "Towhereabouts", Length = 20, ColumnDescription = "杞﹁疆鍘诲悜鍦板潃")]
+ public string Towhereabouts { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs"
index 06d590e..8954a28 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs"
@@ -187,5 +187,11 @@
///</summary>
[SugarColumn(ColumnName = "wheels_mttype", Length = 255, ColumnDescription = "鍔ㄦ嫋灞炴��")]
public string wheels_mttype { get; set; }
+
+ /// <summary>
+ /// 杞﹁疆鍘诲悜鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName = "Towhereabouts", Length = 20, ColumnDescription = "杞﹁疆鍘诲悜鍦板潃")]
+ public string Towhereabouts { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Release/net6.0/WIDESEAWCS_Model.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Release/net6.0/WIDESEAWCS_Model.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Release/net6.0/WIDESEAWCS_Model.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Release/net6.0/WIDESEAWCS_IProcessRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Release/net6.0/WIDESEAWCS_IProcessRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessParameters/obj/Release/net6.0/WIDESEAWCS_IProcessRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Release/net6.0/WIDESEAWCS_ProcessRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Release/net6.0/WIDESEAWCS_ProcessRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessRepository/obj/Release/net6.0/WIDESEAWCS_ProcessRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Release/net6.0/WIDESEAWCS_ProcessService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Release/net6.0/WIDESEAWCS_ProcessService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ProcessService/obj/Release/net6.0/WIDESEAWCS_ProcessService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/JobBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/JobBase.cs"
index 4416c09..ce91b8e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/JobBase.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/JobBase.cs"
@@ -67,10 +67,9 @@
QuartzLogger.WriteLogToFile($"Info_{fileName}", builder.ToString());
}
- public void WriteError(string fileName, string msg, Exception ex)
+ public void WriteError(string fileName,Exception ex)
{
- StringBuilder builder = new StringBuilder(msg);
- builder.Append(Environment.NewLine);
+ StringBuilder builder = new StringBuilder();
builder.Append(StringResources.Language.ExceptionMessage);
builder.Append(ex.Message);
builder.Append(Environment.NewLine);
@@ -85,9 +84,7 @@
builder.Append(Environment.NewLine);
builder.Append(StringResources.Language.ExceptionTargetSite);
builder.Append(ex.TargetSite?.ToString());
- builder.Append(Environment.NewLine);
- builder.Append(Environment.NewLine);
- QuartzLogger.WriteLogToFile($"Error_{fileName}", builder.ToString());
+ string log = builder.ToString();
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Release/net6.0/WIDESEAWCS_QuartzJob.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Release/net6.0/WIDESEAWCS_QuartzJob.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Release/net6.0/WIDESEAWCS_QuartzJob.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index dbb14d3..0acfc2a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -54,5 +54,28 @@
{
return Service.RollbackTaskStatusToLast(taskNum);
}
+
+
+ /// <summary>
+ /// 鍐欏叆杈撻�佺嚎鍙嶉
+ /// </summary>
+ /// <param name="TargetAddress"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SetPlcResponState"), AllowAnonymous]
+ public WebResponseContent SetPlcResponState([FromBody] string TargetAddress)
+ {
+ return Service.SetPlcResponState(TargetAddress);
+ }
+
+ /// <summary>
+ /// 璇诲彇杈撻�佺嚎杈撻�佺嚎鍙嶉
+ /// </summary>
+ /// <param name="TargetAddress"></param>
+ /// <returns></returns>
+ [HttpPost, Route("GetPlcState"), AllowAnonymous]
+ public WebResponseContent GetPlcState([FromBody] string TargetAddress)
+ {
+ return Service.GetPlcState(TargetAddress);
+ }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/\345\205\250\345\261\200\345\274\202\345\270\270\351\224\231\350\257\257\346\227\245\345\277\227_1743004371.log" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/\345\205\250\345\261\200\345\274\202\345\270\270\351\224\231\350\257\257\346\227\245\345\277\227_1743004371.log"
index 5aa3dc4..38bfd90 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/\345\205\250\345\261\200\345\274\202\345\270\270\351\224\231\350\257\257\346\227\245\345\277\227_1743004371.log"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/\345\205\250\345\261\200\345\274\202\345\270\270\351\224\231\350\257\257\346\227\245\345\277\227_1743004371.log"
@@ -18,3 +18,23 @@
at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeInnerFilterAsync()
--- End of stack trace from previous location ---
at Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.<InvokeNextExceptionFilterAsync>g__Awaited|26_0(ResourceInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)
+--------------------------------
+2025/5/29 10:16:38|
+Unable to cast object of type 'WIDESEAWCS_QuartzJob.CommonConveyorLine' to type 'WIDESEAWCS_QuartzJob.CommonStackerCrane'.
+銆愯嚜瀹氫箟閿欒銆戯細Unable to cast object of type 'WIDESEAWCS_QuartzJob.CommonConveyorLine' to type 'WIDESEAWCS_QuartzJob.CommonStackerCrane'.
+銆愬紓甯哥被鍨嬨�戯細InvalidCastException
+銆愬紓甯镐俊鎭�戯細Unable to cast object of type 'WIDESEAWCS_QuartzJob.CommonConveyorLine' to type 'WIDESEAWCS_QuartzJob.CommonStackerCrane'.
+銆愬爢鏍堣皟鐢ㄣ�戯細 at WIDESEAWCS_TaskInfoService.TaskService.GetPlcState(String TargetAddress) in F:\澶栧嚭椤圭洰\骞垮窞鍔ㄨ溅娈碉紙杞鍘嬮」鐩級\LunDuiYa\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\TaskService.cs:line 969
+ at Castle.Proxies.Invocations.ITaskService_GetPlcState.InvokeMethodOnTarget()
+ at Castle.DynamicProxy.AbstractInvocation.Proceed()
+ at Castle.Proxies.IService`1Proxy_3.GetPlcState(String TargetAddress)
+ at WIDESEAWCS_WCSServer.Controllers.Task.TaskController.GetPlcState(String TargetAddress) in F:\澶栧嚭椤圭洰\骞垮窞鍔ㄨ溅娈碉紙杞鍘嬮」鐩級\LunDuiYa\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\Controllers\Task\TaskController.cs:line 78
+ at lambda_method792(Closure , Object , Object[] )
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeActionMethodAsync>g__Logged|12_1(ControllerActionInvoker invoker)
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.<InvokeNextActionFilterAsync>g__Awaited|10_0(ControllerActionInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Rethrow(ActionExecutedContextSealed context)
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeInnerFilterAsync()
+--- End of stack trace from previous location ---
+ at Microsoft.AspNetCore.Mvc.Infrastructure.ResourceInvoker.<InvokeNextExceptionFilterAsync>g__Awaited|26_0(ResourceInvoker invoker, Task lastTask, State next, Scope scope, Object state, Boolean isCompleted)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index 78a40d1..b91dc40 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -19,6 +19,7 @@
//"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
//"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=172.21.1.139;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=Admin123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SignalR/obj/Release/net6.0/WIDESEAWCS_SignalR.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SignalR/obj/Release/net6.0/WIDESEAWCS_SignalR.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SignalR/obj/Release/net6.0/WIDESEAWCS_SignalR.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Release/net6.0/WIDESEAWCS_SystemRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Release/net6.0/WIDESEAWCS_SystemRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Release/net6.0/WIDESEAWCS_SystemRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Release/net6.0/WIDESEAWCS_SystemServices.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Release/net6.0/WIDESEAWCS_SystemServices.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Release/net6.0/WIDESEAWCS_SystemServices.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
index 43a9f6d..07715d9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
@@ -74,6 +74,66 @@
}
}
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟锛堝叆搴撶増鏈�)
+ /// </summary>
+ /// <param name="palletCode">鎵樼洏鍙�</param>
+ /// <param name="sourceAddress">璧峰鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task? InBeforeCheck(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.InTransferCheck)?.ConfigValue;
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = wmsBase + requestTask;
+
+ var result = HttpHelper.Post(wmsIpAddrss, new { taskNum = taskNum }.ToJsonString());
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+
+ if (!content.Status)
+ {
+ // wms澶辫触
+ throw new Exception();
+ }
+
+
+ //todo 浼樺寲 濡傛湭鏌ヨ鍒颁换鍔″垯澶勭悊
+ //if (content.Data != null)
+ //{
+ var task = JsonConvert.DeserializeObject<Dt_Task>(content.Data.ToString());
+
+ Dt_Task? Relocationtask = null;
+ if (task.TaskNum != taskNum)
+ {
+
+ BaseDal.AddData(task);
+ Relocationtask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum);
+ }
+ //}
+
+ if (Relocationtask != null)
+ {
+ return task;
+ }
+ else
+ {
+ return null;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"璇锋眰寮傚父锛歿ex.Message}");
+ }
+ }
+
#region 鏍规嵁鎵樼洏鍙枫�佺珯鍙板悜WMS璇锋眰浠诲姟
/// <summary>
/// 鏍规嵁鎵樼洏鍙枫�佺珯鍙板悜WMS璇锋眰浠诲姟
@@ -213,7 +273,13 @@
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationLocation == taskDTO.TargetAddress && x.Roadway == taskDTO.RoadWay);
+
task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ if (task.SourceAddress == "2009")
+ {
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
+ }
+
task.CurrentAddress = taskDTO.RoadWay;
task.NextAddress = stationinfo.stationChildCode;
task.SourceAddress = taskDTO.SourceAddress;
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 219d861..a32ff9a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -4,6 +4,7 @@
using Newtonsoft.Json;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
@@ -18,9 +19,12 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
+using WIDESEAWCS_QuartzJob.DeviceBase;
+using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_QuartzJob.DTO;
namespace WIDESEAWCS_TaskInfoService
{
@@ -95,6 +99,7 @@
task.wheels_mttype = item.wheels_mttype;
task.WheelsNewOrOld = item.WheelsNewOrOld;
task.WheelsLX = item.WheelsLX;
+
// 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄嚭搴撲换鍔�
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
@@ -103,12 +108,23 @@
List<Dt_Router> routers = _routerService.QueryNextRoutes(item.RoadWay, item.TargetAddress);
if (routers.Count > 0)
{
+
// 璁剧疆浠诲姟鐘舵�佷负鍑哄簱鏂板缓
- task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ task.TaskState =(int)TaskOutStatusEnum.OutNew;
// 璁剧疆褰撳墠鍦板潃涓烘簮鍦板潃
task.CurrentAddress = item.SourceAddress;
// 璁剧疆涓嬩竴涓湴鍧�涓虹涓�涓瓙浣嶇疆
task.NextAddress = routers.FirstOrDefault().ChildPosi;
+
+ if (item.SourceAddress == "2009")
+ {
+ task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
+ // 璁剧疆涓嬩竴涓湴鍧�涓虹涓�涓瓙浣嶇疆
+ task.NextAddress = "2015";
+ }
+
+
+
}
else
{
@@ -825,5 +841,156 @@
}
#endregion 閲嶅啓鏂规硶
+
+
+
+
+
+ //===========================杞﹁酱涓婃枡=====================
+ public WebResponseContent GetFeedbackAxleloading()
+ {
+
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestAxleloading)?.ConfigValue;
+ if (wmsBase == null || completeTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + completeTask;
+ var taskDto = new RequestTaskDto()
+ {
+ PalletCode = "1",
+ };
+ var result = HttpHelper.PostAsync(wmsIpAddress,taskDto.ToJsonString()).Result;
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error($"{ex.Message}");
+ }
+ }
+
+ public WebResponseContent UpdateAxleCurrentStatue(string CZTM)
+ {
+
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateAxleCurrentStatue)?.ConfigValue;
+ if (wmsBase == null || completeTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + completeTask;
+ var keys = new Dictionary<string, object>()
+ {
+ {"CZTM", CZTM}
+ };
+
+
+ var taskDto = new RequestTaskDto()
+ {
+ PalletCode = CZTM,
+ };
+
+
+ var result = HttpHelper.PostAsync(wmsIpAddress, taskDto.ToJsonString()).Result;
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error($"{ex.Message}");
+ }
+ }
+
+ public WebResponseContent GetAGVTaskdistribution(string TargetAddress)
+ {
+
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.genAgvSchedulingTask)?.ConfigValue;
+ if (wmsBase == null || completeTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + completeTask;
+ var taskDto = new RequestTaskDto()
+ {
+ Position = TargetAddress,
+ };
+
+
+ var result = HttpHelper.PostAsync(wmsIpAddress, taskDto.ToJsonString()).Result;
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ return content;
+ }
+ catch (Exception ex)
+ {
+ return content.Error($"{ex.Message}");
+ }
+ }
+
+
+ public WebResponseContent SetPlcResponState(string TargetAddress)
+ {
+ try
+ {
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1000");
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ DeviceProDTO? deviceProDTOt = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == TargetAddress && x.DeviceProParamName == "ResponState");
+ if (conveyorLine.Communicator.Write(deviceProDTOt.DeviceProAddress, (short)2))
+ {
+ Console.Out.WriteLine("鎴愬姛锛佸啓鍑鸿溅杞寸嚎鏈agv鍙栬揣瀹屾垚淇″彿锛�2");
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+
+ bool st= conveyorLine.Communicator.Write(deviceProDTOt.DeviceProAddress, (short)3);
+ Console.Out.WriteLine($"鍐欏嚭杞﹁酱绾挎湯绔痑gv鍙栬揣瀹屾垚淇″彿澶辫触淇℃伅锛屽啓鍏ワ細3,鏄惁鎴愬姛锛歿st}");
+ return WebResponseContent.Instance.Error();
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.Out.WriteLine($"鍐欏嚭杞﹁酱绾挎湯绔痑gv鍙栬揣瀹屾垚淇″彿澶辫触淇℃伅锛屾晠闅滀俊鎭細{ex.Message}");
+ return WebResponseContent.Instance.Error();
+ }
+ }
+
+ public WebResponseContent GetPlcState(string TargetAddress)
+ {
+ Dt_StationManager dt_Station=_stationManagerRepository.QueryFirst(x => x.stationLocation == TargetAddress);
+ if(dt_Station == null)
+ return WebResponseContent.Instance.Error("鏈壘鍒板帇瑁呬綅淇℃伅锛�");
+ if(dt_Station.stationStatus=="0")
+ return WebResponseContent.Instance.Error("璇ュ帇瑁呬綅宸茶绂佺敤锛佷笉鍙敓鎴恆gv浠诲姟");
+
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1000");
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ DeviceProDTO? deviceProDTOt = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == TargetAddress && x.DeviceProParamName == "ConveyorLineSingal");
+ DeviceProDTO? deviceProDTOt2 = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == TargetAddress && x.DeviceProParamName == "ResponState");
+ if (conveyorLine.Communicator.Read<short>(deviceProDTOt.DeviceProAddress)==1)
+ {
+ conveyorLine.Communicator.Write(deviceProDTOt2.DeviceProAddress,(short)1);
+ return WebResponseContent.Instance.OK();
+ }
+ else
+ {
+ conveyorLine.Communicator.Write(deviceProDTOt2.DeviceProAddress, (short)2);
+ return WebResponseContent.Instance.Error("璇诲彇鍒板帇瑁呬綅淇″彿鍙嶉涓嶅彲鏀捐揣锛佷笉鍙敓鎴恆gv浠诲姟");
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Release/net6.0/WIDESEAWCS_TaskInfoService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyRepository.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyRepository.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyRepository/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyRepository.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyService.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyService.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfo_HtyService/obj/Release/net6.0/WIDESEAWCS_TaskInfo_HtyService.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 7473a18..a10955a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -85,9 +85,12 @@
if (conveyorLine != null)
{
List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
+
+ ConveyorLineTaskCommand command2 = new ConveyorLineTaskCommand();
foreach (var station in stationManagers)
{
ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
+
DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == station.stationChildCode && x.ProtocalDetailValue == command.ConveyorLineSingal.ToString());
@@ -140,11 +143,12 @@
}
catch (Exception ex)
{
+ //WriteError("CommonConveyorLineJob", ex);
Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
}
finally
{
- //WriteDebug("CommonConveyorLineJob", "test");
+ WriteDebug("CommonConveyorLineJob", "test");
//Console.Out.WriteLine(DateTime.Now);
}
return;
@@ -174,7 +178,17 @@
if (task != null)
{
conveyorLine.SetValue(ConveyorLineDBName.Number, task.PalletCode, stationInfo.stationChildCode);
- conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.NextAddress, stationInfo.stationChildCode);
+
+ if ((task.TargetAddress == "2042" || task.TargetAddress == "2032") && task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.TargetAddress, stationInfo.stationChildCode);
+ }
+ else
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.NextAddress, stationInfo.stationChildCode);
+ }
+
+ //conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.NextAddress, stationInfo.stationChildCode);
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
_taskService.UpdateTaskStatusToNext(task);
@@ -189,7 +203,16 @@
else
{
conveyorLine.SetValue(ConveyorLineDBName.Number, taskNew.PalletCode, stationInfo.stationChildCode);
- conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskNew.NextAddress, stationInfo.stationChildCode);
+
+ if ((taskNew.TargetAddress == "2042" || taskNew.TargetAddress == "2032") && taskNew.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskNew.TargetAddress, stationInfo.stationChildCode);
+ }
+ else
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskNew.NextAddress, stationInfo.stationChildCode);
+ }
+ //conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taskNew.NextAddress, stationInfo.stationChildCode);
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
_taskService.UpdateTaskStatusToNext(taskNew);
@@ -321,30 +344,41 @@
//鏍规嵁杞﹁酱缂撳瓨浣嶇疆 鍐欏叆瀵瑰簲鐩爣鍦板潃
if (task.TargetAddress == stationInfo.stationChildCode)
{
- WebResponseContent content = _taskService.RequestWheelsFlow(task.task_CZInfo).Result;
+ //WebResponseContent content = _taskService.RequestWheelsFlow(task.task_CZInfo).Result;
+ WebResponseContent content = _taskService.RequestWheelsFlow(task.PalletCode).Result;
if (content.Status)
{
- string taraddress = content.Data.ToString(); // "2032";
+ string taraddress = content.Data.ToString(); // "2032";SourceAddress
- conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taraddress, stationInfo.stationChildCode);
- conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
- _taskService.UpdateTaskStatusToNext(task);
+ bool k1 = conveyorLine.SetValue(ConveyorLineDBName.SourceAddress, "2021", stationInfo.stationChildCode);
+
+ bool k2= conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, taraddress, stationInfo.stationChildCode);
+ bool k3= conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
+ WebResponseContent k4 = _taskService.UpdateTaskStatusToNext(task);
+
+ Console.Out.WriteLine($"璇诲彇鍒拌緭閫佺嚎鐢宠,鐢宠鏉＄爜锛歿command.Number}锛屽弽棣堣嚦杈撻�佺嚎淇℃伅====璧峰鍦板潃锛歿k1},鐩爣鍦板潃鈥渰k2},鍙嶉淇″彿锛歿k3},浠诲姟淇敼鐘舵�侊細{k4.Status}锛�)");
}
else
{
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 2, stationInfo.stationChildCode);
+
+ Console.Out.WriteLine($"璇诲彇鍒拌緭閫佺嚎鐢宠,鐢宠鏉＄爜锛歿command.Number}锛屽悜WMS鐢宠鍘诲悜澶辫触锛屽師鍥狅細{content.Message},鍐欏叆鐢宠瘔淇℃晠闅滐細2");
}
}
else
{
- conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.TargetAddress, stationInfo.stationChildCode);
- conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
- _taskService.UpdateTaskStatusToNext(task);
+ bool k1= conveyorLine.SetValue(ConveyorLineDBName.SourceAddress, "2021", stationInfo.stationChildCode);
+ bool k2 = conveyorLine.SetValue(ConveyorLineDBName.TargetAddress, task.TargetAddress, stationInfo.stationChildCode);
+ bool k3 = conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
+ WebResponseContent k4 = _taskService.UpdateTaskStatusToNext(task);
+
+ Console.Out.WriteLine($"璇诲彇鍒拌緭閫佺嚎鐢宠,鐢宠鏉＄爜锛歿command.Number}锛屽弽棣堣嚦杈撻�佺嚎淇℃伅====璧峰鍦板潃锛歿k1},鐩爣鍦板潃鈥渰k2},鍙嶉淇″彿锛歿k3},浠诲姟淇敼鐘舵�侊細{k4.Status}锛�)");
}
}
else
{
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 2, stationInfo.stationChildCode);
+ Console.Out.WriteLine($"璇诲彇鍒拌緭閫佺嚎鐢宠,鐢宠鏉＄爜锛歿command.Number}锛屾湭鎵惧埌,鍐欏叆鐢宠瘔淇℃晠闅滐細2");
}
//_taskService.UpdatePosition(task.TaskNum, stationInfo.stationChildCode);
}
@@ -359,15 +393,16 @@
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
public void RequestCZInfo(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationInfo)
{
- var task = _taskService.QueryExecutingTaskByBarcode(command.Number, stationInfo.stationChildCode);
- if (task == null)
+ WebResponseContent content = _taskService.GetFeedbackAxleloading();
+ if (content.Status)
{
- //todo 鏌ヨWMS杞﹁酱鏁版嵁杩斿洖
- Random random = new Random(20);
- string cztm = "CZ00" + random.Next();
- //conveyorLine
- //conveyorLine.SetValue(ConveyorLineDBName.Number, cztm, stationInfo.stationChildCode);
+ conveyorLine.SetValue(ConveyorLineDBName.Number, content.Data.ToString(), stationInfo.stationChildCode);
+ conveyorLine.SetValue(ConveyorLineDBName.CarType,"001", stationInfo.stationChildCode);
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
+ }
+ else
+ {
+ conveyorLine.SetValue(ConveyorLineDBName.ResponState, 2, stationInfo.stationChildCode);
}
}
@@ -380,11 +415,38 @@
/// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
public void RequestTakeCZ(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationInfo)
{
- var task = _taskService.QueryExecutingTaskByBarcode(command.Number, stationInfo.stationChildCode);
- if (task == null)
+
+ WebResponseContent content = _taskService.UpdateAxleCurrentStatue(command.Number);
+ if (content.Status)
{
- //conveyorLine
conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode);
+ Console.Out.WriteLine("鎴愬姛锛佸啓鍑鸿溅杞寸嚎鏈鐢熸垚agv鍙栬揣浠诲姟锛屽弽棣堣緭閫佺嚎淇″彿锛�1");
+ }
+ /*else
+ {
+ var log = $"銆恵conveyorLine.DeviceName}銆�,杞﹁酱鏉＄爜锛歿command.Number}锛屾洿鏂板け璐ュ師鍥狅細{content.Message}";
+ WriteInfo(conveyorLine.DeviceName, log);
+ conveyorLine.SetValue(ConveyorLineDBName.ResponState, 3, stationInfo.stationChildCode);
+ }*/
+ }
+
+
+ /// <summary>
+ /// agv绔欏彴鐢宠鍙栨枡
+ /// </summary>
+ /// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
+ /// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
+ /// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
+ /// <param name="ProtocalDetailValue">绾夸綋褰撳墠bool璇诲彇鍋忕Щ鍦板潃</param>
+ public void RequestagvStation(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationInfo)
+ {
+ DeviceProDTO? deviceProDTOt = conveyorLine.DeviceProDTOs.Find(x => x.DeviceChildCode == "3022" && x.DeviceProParamName == "Number");
+ string Number = conveyorLine.Communicator.Read<string>(deviceProDTOt.DeviceProAddress);
+ if (Number != "" && Number!=null)
+ {
+ //璋冨彇wms鎺ュ彛鐢宠agv浠诲姟
+ WebResponseContent content = _taskService.GetAGVTaskdistribution(stationInfo.stationLocation);
+
}
}
#endregion
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
index 38afc3b..bdc148a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
@@ -62,7 +62,7 @@
public string CarType { get; set; }
/// <summary>
- /// 杞﹁疆鍙�
+ /// 鏉＄爜
/// </summary>
[DataLength(40)]
public string Number { get; set; }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 6e2a310..e076178 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -140,7 +140,7 @@
}
catch (Exception ex)
{
- WriteError("CommonConveyorLineJob", "test", ex);
+ WriteError("CommonConveyorLineJob", ex);
ConsoleHelper.WriteErrorLine($"{ex.Message}");
//Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
}
@@ -264,6 +264,17 @@
{
task = _taskService.QueryStackerCraneInTask(commonStackerCrane.DeviceCode);
}
+
+ if (task != null && task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ {
+ var relocation = _taskService.InBeforeCheck(task.TaskNum);
+
+ if (relocation != null)
+ {
+ return relocation;
+ }
+ }
+
return task;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Release/net6.0/WIDESEAWCS_Tasks.csproj.CopyComplete" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Release/net6.0/WIDESEAWCS_Tasks.csproj.CopyComplete"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Release/net6.0/WIDESEAWCS_Tasks.csproj.CopyComplete"
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/HandTask/ManualOutboundTask.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/HandTask/ManualOutboundTask.vue"
index 6df9919..0e9f3d7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/HandTask/ManualOutboundTask.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/stock/HandTask/ManualOutboundTask.vue"
@@ -8,8 +8,8 @@
<el-form-item label="绔欏彴" prop="station">
<el-select v-model="form.station" placeholder="璇烽�夋嫨涓嬫枡鍙�">
<el-option label="涓婃枡鍙�(2009)" value="2009" />
- <el-option label="宸︿晶涓嬫枡鍙�(2032)" value="2032" />
- <el-option label="鍙充晶涓嬫枡鍙�(2042)" value="2042" />
+ <el-option label="1鍙峰帇瑁呮満(2032)" value="2032" />
+ <el-option label="2鍙峰帇瑁呮満(2042)" value="2042" />
</el-select>
</el-form-item>
</el-form>
@@ -41,15 +41,16 @@
form: {
palletCode: "",
station: "",
-
+ outtype:""
},
show: false,
};
},
methods: {
- open(palletCode) {
+ open(palletCode,outtype) {
this.show = true;
this.form.palletCode = palletCode;
+ this.form.outtype = outtype;
},
submit() {
this.$emit("parentCall", ($vue) => {
@@ -68,6 +69,7 @@
MainData: {
station: this.form.station,
palletCode: this.form.palletCode,
+ outtype:this.form.outtype,
},
};
this.http.post("/api/Task/CreateAndSendOutboundTask",parm, true).then((x) => {
@@ -77,6 +79,7 @@
this.$Message.success("鎴愬姛");
this.form.palletCode='';
this.form.station='';
+ this.form.outtype='';
this.show = false;
$vue.refresh();
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task_Hty.jsx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task_Hty.jsx"
index bffd61f..958a195 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task_Hty.jsx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task_Hty.jsx"
@@ -23,6 +23,30 @@
methods: {
//涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
onInit() {
+
+ var btnHandOutbound = this.buttons.find(x => x.value == "HandRollback");
+ if (btnHandOutbound != null) {
+ btnHandOutbound.onClick = function () {
+ let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
+ if (row <= 0) {
+ //濡傛灉娌℃湁閫変腑琛�
+ this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
+ return
+ }
+ let TaskId = row[0].taskId
+ this.http.get(`/api/Task_Hty/TaskRollback?input=${TaskId}`, {}, "姝ｅ湪鍥炴粴浠诲姟").then((res) => {
+ //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
+ if (res.status) {
+ this.$Message.success('浠诲姟瀹屾垚');
+ this.refresh();
+ } else {
+ this.$Message.error(res.message) //閿欒鎻愮ず
+ this.refresh();
+ }
+ })
+ }
+ }
+
//妗嗘灦鍒濆鍖栭厤缃墠锛�
// let TaskHandCompleteBtn=this.buttons.find(x=>x.value=='TaskHandComplete');
// if(TaskHandCompleteBtn){
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
index 89f5a59..17edbff 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
@@ -1,219 +1,90 @@
<template>
- <div class="home-contianer">
+ <div class="qhuan">
+ <div v-for="item in datalist">
+ <div v-if="item.stationLocation === '2033'">
+
+ <el-button class="bun1" type="success" v-if="item.stationStatus === '1'"
+ v-on:click="selectss(1)">1鍙峰帇瑁呮満</el-button>
+
+ <el-button class="bun1" type="danger" v-if="item.stationStatus === '0'"
+ v-on:click="selectss(1)">1鍙峰帇瑁呮満</el-button>
+ <p>
+ 2鍙峰帇瑁呮満 :
+ <el-tag type="success" v-if="item.stationStatus === '1'">鍚敤</el-tag>
+ <el-tag type="danger" v-if="item.stationStatus === '0'">绂佺敤</el-tag>
+ </p>
+ </div>
+
+
+ <div v-if="item.stationLocation === '2043'">
+ <el-button class="bun2" type="success" v-if="item.stationStatus === '1'"
+ v-on:click="selectss(2)">2鍙峰帇瑁呮満</el-button>
+ <el-button class="bun2" type="danger" v-if="item.stationStatus === '0'"
+ v-on:click="selectss(2)">2鍙峰帇瑁呮満</el-button>
+ <p>
+ 1鍙峰帇瑁呮満 :
+ <el-tag type="success" v-if="item.stationStatus === '1'">鍚敤</el-tag>
+ <el-tag type="danger" v-if="item.stationStatus === '0'">绂佺敤</el-tag>
+ </p>
+ </div>
+ </div>
</div>
+
</template>
<script>
-import { ref, onMounted, onUnmounted } from 'vue';
+import axios from 'axios';
export default {
- components: {},
data() {
return {
+ datalist: [],
+ url: "http://192.168.12.189/:8098/api/",
+
+ };
+ },
+ mounted() {
+ // setInterval(() => {
+ this.AddTask();
+ // }, 5000);
+
+ },
+ created() {
+ // this.AddTask();
+ // this.selList();
+ },
+
+ methods: {
+ //鍒囨崲
+ selectss(selvelue) {
- n: 90,
- value1: '1',
- };
+ axios.post("http://172.21.1.139:9291/api/StationManager/UpdateStation",{MainData: {
+ stationid: selvelue,
+ }})
+ .then(response => {
+ if(response.data.status){
+ this.AddTask();
+ }else{
+ alert(selvelue)
+ }
+
+
+ })
+ },
+ AddTask() {
+ axios.post("http://172.21.1.139:9291/api/StationManager/GetStation")
+ .then(response => {
+ if(response.status){
+ this.datalist = response.data.data;
+ }
+
+ })
+ }
+
},
- setup() {
- let open = (item) => {
- window.open(item.url, '_blank');
- };
- let interval;
- onMounted(() => {
- // interval = setInterval(() => {
- // chart2.xAxis[0].data.splice(0, 1);
- // let lastYear =
- // chart2.xAxis[0].data[chart2.xAxis[0].data.length - 1] * 1 + 1;
- // chart2.xAxis[0].data.push(lastYear);
-
- // chart2.series[0].data.splice(0, 1);
- // chart2.series[0].data.push(~~(Math.random() * 1000));
-
- // chart2.series[1].data.splice(0, 1);
- // chart2.series[1].data.push(~~(Math.random() * 1000));
- // $chart2.setOption(chart2);
- // }, 2000);
- });
- onUnmounted(() => {
-
- });
- return { open };
- },
- destroyed() {
+ props: {
+ value: String
}
-};
-// window.addEventListener("resize", function () {
-// $chart2.setOption(chart2);
-// });
+
+}
</script>
-<style lang="less" scoped>
-.home-contianer {
- padding: 6px;
- background: #eee;
- width: 100%;
- height: 100%;
- // max-width: 800px;
- // position: absolute;
- top: 0;
- right: 0;
- left: 0;
- margin: 0 auto;
-
- .h-top {
- display: flex;
- .h-top-left {
- height: 100%;
- width: 300px;
- background: white;
- }
- height: 300px;
- }
- .h-top > div {
- border: 1px solid #e8e7e7;
- border-radius: 5px;
- // margin: 6px;
- }
- .h-top-center {
- height: 100%;
- background: white;
- margin: 0 6px;
- display: flex;
- flex-direction: column;
- flex: 1;
- .item1 .num {
- padding-top: 28px;
- }
- .item2 .num {
- padding-bottom: 20px;
- }
-
- .n-item {
- width: 100%;
- height: 100%;
- text-align: center;
- cursor: pointer;
- // display: flex;
- .item {
- border-right: 1px solid #e5e5e5;
- width: 33.3333333%;
- float: left;
- height: 50%;
- border-bottom: 1px solid #e5e5e5;
- padding: 47px 0;
- font-size: 13px;
- }
- .item:hover {
- background: #f9f9f9;
- cursor: pointer;
- }
- .item:last-child {
- border-right: 0;
- }
- .item3,
- .item6 {
- border-right: 0;
- }
- .num {
- word-break: break-all;
- color: #282727;
- font-size: 30px;
- transition: transform 0.8s;
- }
- .num:hover {
- color: #55ce80;
- transform: scale(1.2);
- }
- .text {
- font-size: 13px;
- color: #777;
- }
- }
- }
- .h-top-right {
- // flex: 1;
-
- width: 400px;
- height: 100%;
- background: white;
- }
- .h3 {
- padding: 7px 15px;
- font-weight: 500;
- background: #fff;
- border-bottom: 1px dotted #d4d4d4;
- }
-}
-.task-table {
- table {
- width: 100%;
- .thead {
- font-weight: bold;
- }
- tr {
- cursor: pointer;
- td {
- border-bottom: 1px solid #f3f3f3;
- padding: 9px 8px;
- font-size: 12px;
- }
- }
- tr:hover {
- background: #eee;
- }
- }
-}
-.h-chart {
- height: 340px;
- margin: 6px 0px;
- display: flex;
- .h-left-grid {
- width: 300px;
- height: 100%;
- background: white;
- display: inline-block;
- .name {
- margin-left: 7px;
- }
- .item:hover {
- background: #f9f9f9;
- cursor: pointer;
- }
- .item {
- padding: 22px 14px;
- float: left;
- width: 50%;
- height: 33.33333%;
- border-bottom: 1px solid #eee;
- border-right: 1px solid #eee;
- i {
- font-size: 30px;
- }
- .desc {
- font-size: 12px;
- color: #c3c3c3;
- padding: 5px 0 0 4px;
- line-height: 1.5;
- }
- }
- }
-}
-#h-chart2 {
- border-radius: 3px;
- background: white;
- padding-top: 10px;
- height: 100%;
- width: 0;
- flex: 1;
- margin: 0 7px;
-}
-#h-chart3 {
- border-radius: 3px;
- padding: 10px 10px 0 10px;
- background: white;
- // padding-top: 10px;
- height: 100%;
-
- width: 400px;
-}
-</style>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_SelectionStandards.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_SelectionStandards.vue"
index 8a1f0fe..ef732a9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_SelectionStandards.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_SelectionStandards.vue"
@@ -24,6 +24,7 @@
sortName: "id"
});
const editFormFields = ref({
+ "id":"",
"carType": "",
"mttype": "",
"neworold": "",
@@ -58,7 +59,7 @@
]);
const searchFormFields = ref({
"carType":"",
- mttype:""
+ "mttype":""
});
const searchFormOptions = ref([
[
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes.vue"
index 669c35e..fbdbae4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes.vue"
@@ -16,7 +16,7 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'id',
+ key: 'ID',
footer: "Foots",
cnName: '杞﹁酱淇℃伅',
name: 'inbound/Dt_CZInfo_mes',
@@ -24,22 +24,24 @@
sortName: "id"
});
const editFormFields = ref({
- "Wheels_code": "",
- "Wheels_ldxh": "",
- "Wheels_mttype": "",
- "gkcc": "",
- wheels_NewOrOld:""
+ "id": "",
+ // "CHEXING": "",
+ // "MTTYPE": "",
+ "CZTM":"",
+ "CurrentStatue":'',
});
const editFormOptions = ref([
+ // [
+ // { "title": "杞﹁酱鏉＄爜", "field": "CZTM", type: "text" },
+ // { "title": "杞﹀瀷", "field": "CHEXING", type: "text" },
+ // { "title": "鍔ㄦ嫋灞炴��(M/T)", "field": "MTTYPE", type: "text" },
+ // ],
[
- { "title": "杞﹁酱鏉＄爜", "field": "CZTM", type: "text" },
- { "title": "杞﹀瀷", "field": "CHEXING", type: "text" },
- { "title": "鍔ㄦ嫋灞炴��(M/T)", "field": "MTTYPE", type: "text" },
+ { "title": "杞﹁酱鍙�", "field": "cztm", type: "string" },
],
[
- { "title": "杞﹁酱鍙�", "field": "czh", type: "text" },
- { "title": "杞鏉＄爜", "field": "LDTM", "type": "select",dataKey:"NewOld",data:[] },
- ]
+ { "title": "鐘舵��", "field": "currentStatue", "type": "select",dataKey:"InboundState",data:[] },
+ ],
]);
const searchFormFields = ref({
CZTM: ""
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes_hty.vue"
new file mode 100644
index 0000000..a2fc72f
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_CZInfo_mes_hty.vue"
@@ -0,0 +1,111 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/inbound/Dt_CZInfo_mes_hty.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: '杞﹁酱淇℃伅',
+ name: 'inbound/Dt_CZInfo_mes_hty',
+ url: "/Dt_CZInfo_mes_hty/",
+ sortName: "id"
+ });
+ const editFormFields = ref({
+ "Wheels_code": "",
+ "Wheels_ldxh": "",
+ "Wheels_mttype": "",
+ "gkcc": "",
+ wheels_NewOrOld:""
+ });
+ const editFormOptions = ref([
+ [
+ { "title": "杞﹁酱鏉＄爜", "field": "CZTM", type: "text" },
+ { "title": "杞﹀瀷", "field": "CHEXING", type: "text" },
+ { "title": "鍔ㄦ嫋灞炴��(M/T)", "field": "MTTYPE", type: "text" },
+ ],
+ [
+ { "title": "杞﹁酱鍙�", "field": "czh", type: "text" },
+ { "title": "杞鏉＄爜", "field": "LDTM", "type": "select",dataKey:"NewOld",data:[] },
+ ]
+ ]);
+ const searchFormFields = ref({
+ cztm:"",
+ chexing:"",
+ ldtm:"",
+ currentStatue:"",
+ mttype:"",
+ czxh:"",
+ createDate:"",
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "杞﹁酱鏉＄爜", "field": "cztm", type: "text" },
+ { "title": "杞﹀瀷", "field": "chexing", type: "select", dataKey: "traintype_names", data: [] },
+ //{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞鏉＄爜", "field": "ldtm", type: "text" },
+ ],
+ [
+ { "title": "鐘舵��", "field": "currentStatue", type: "select", dataKey: "InboundState", data: [] },
+ { "title": "鍔ㄦ嫋灞炴��", "field": "mttype", type: "text" },
+ { "title": "杞﹁酱鍨嬪彿", "field": "czxh", type: "text" },
+ ],
+ [
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
+ ]
+ ]);
+ const columns = ref([
+ { field: 'id', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'cztm', title: '杞﹁酱鏉＄爜', type: 'string', width: 110, align: 'left' },
+ { field: 'czh', title: '杞﹁酱鍙�', type: 'string', width: 110, align: 'left' },
+ { field: 'ldtm', title: '杞鏉＄爜', type: 'string', width: 110, align: 'left' },
+ { field: 'currentStatue', title: '鐘舵��', type: 'string', width: 75, align: 'left',bind: { key: "InboundState", data: [] } },
+ { field: 'chexing', title: '杞﹀瀷', type: 'string', width: 100, align: 'left' },
+ { field: 'czxh', title: '杞﹁酱鍨嬪彿', type: 'int', width: 110, align: 'left' },
+ { field: 'mttype', title: '鍔�/鎷�', type: 'string', width: 60, align: 'left' },
+ { field: 'zlzdj', title: '宸﹁疆搴х瓑绾�', type: 'string', width: 100, align: 'left' },
+ { field: 'ylzdj', title: '鍙宠疆搴х瓑绾�', type: 'string', width: 100, align: 'left' },
+ { field: 'zlzzj', title: '宸﹁疆搴х洿寰�', type: 'string', width: 100, align: 'left' },
+ { field: 'ylzzj', title: '鍙宠疆搴х洿寰�', type: 'string', width: 100, align: 'left' },
+ { field: 'zlza', title: '宸﹁疆搴х洿寰凙', type: 'string', width: 100, align: 'left' },
+ { field: 'zlzb', title: '宸﹁疆搴х洿寰凚', type: 'string', width: 100, align: 'left' },
+ { field: 'zlzc', title: '宸﹁疆搴х洿寰凜', type: 'string', width: 100, align: 'left' },
+ { field: 'ylza', title: '鍙宠疆搴х洿寰凙', type: 'string', width: 100, align: 'left' },
+ { field: 'ylzb', title: '鍙宠疆搴х洿寰凚', type: 'string', width: 100, align: 'left' },
+ { field: 'ylzc', title: '鍙宠疆搴х洿寰凜', type: 'string', width: 100, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 100, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue"
index a2971a6..013f3b6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InWheels_mes_hty.vue"
@@ -29,15 +29,32 @@
const editFormOptions = ref([
]);
- const searchFormFields = ref({});
+ const searchFormFields = ref({
+ Wheels_code:"",
+ Wheels_CarType:"",
+ wheels_ldxh:"",
+ wheels_NewOrOld:"",
+ wheels_mttype:"",
+ wheelsProps:"",
+ wheels_level:"",
+ creater:"",
+ });
const searchFormOptions = ref([
[
- { "title": "杞﹁疆鍙�", "field": "Wheels_Num", type: "text" },
+ { "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "text" },
+ { "title": "杞﹀瀷", "field": "Wheels_CarType", type: "select", dataKey: "traintype_names", data: [] },
+ //{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞瀷", "field": "wheels_ldxh", type: "text" },
],
- // [
- // { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
-
- // ]
+ [
+ { "title": "鏂�/鏃�", "field": "wheels_NewOrOld", type: "select", dataKey: "NewOld", data: [] },
+ { "title": "鍔ㄦ嫋灞炴��", "field": "wheels_mttype", type: "text" },
+ { "title": "灞炴��", "field": "wheelsProps", type: "text" },
+ ],
+ [
+ { "title": "绛夌骇", "field": "wheels_level", type: "text" },
+ { "title": "鍒涘缓鏃堕棿", "field": "creater", type: "datetime" },
+ ]
]);
const columns = ref([
{ field: 'wheels_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes.vue"
new file mode 100644
index 0000000..e3b9c73
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes.vue"
@@ -0,0 +1,106 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/inbound/Dt_InZdp_mes.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'zdp_ID',
+ footer: "Foots",
+ cnName: '鍒跺姩鐩樹俊鎭�',
+ name: 'inbound/Dt_InZdp_mes',
+ url: "/Dt_InZdp_mes/",
+ sortName: "zdp_ID"
+ });
+ const editFormFields = ref({
+ "Wheels_code": "",
+ "Wheels_ldxh": "",
+ "Wheels_mttype": "",
+ "gkcc": "",
+ "wheels_NewOrOld":""
+ });
+ const editFormOptions = ref([
+ [
+ { "title": "鍒跺姩鐩樺彿", "field": "Zdp_ZPH", type: "text" },
+ { "title": "杞﹀瀷", "field": "Zdp_chexing", type: "text" },
+ { "title": "鍔ㄦ嫋灞炴��(M/T)", "field": "Wheels_mttype", type: "text" },
+ ],
+ [
+ { "title": "姣傚瓟鍧囧��", "field": "gkcc", type: "text" },
+ { "title": "鏂�/鏃�", "field": "Zdp_neworold", "type": "select",dataKey:"NewOld",data:[] },
+ { "title": "绛夌骇", "field": "wheels_level", "type": "select",dataKey:"Level",data:[] }
+ ]
+ ]);
+ const searchFormFields = ref({
+ Zdp_ZPH: ""
+
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "鍒跺姩鐩樺彿", "field": "Zdp_ZPH", type: "text" },
+ ],
+ // [
+ // { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
+
+ // ]
+ ]);
+ const columns = ref([
+ { field: 'zdp_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'zdp_code', title: '鍒跺姩鐩樻潯鐮�', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_ZPH', title: '鍒跺姩鐩樺彿', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_CurrentStatue', title: '鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "whelInboundState", data: [] } },
+ { field: 'zdp_chexing', title: '杞﹀瀷', type: 'string', width: 70, align: 'left' },
+ { field: 'zdp_neworold', title: '鏂版棫', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_POS', title: '浣嶇疆(渚�/涓�)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSXH', title: '铻烘爴鍨嬪彿', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_MAT', title: '鏉愯川(閾搁挗)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_SITE', title: '浜у湴(杩涘彛/鍥戒骇)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA1', title: '姣傚瓟鐩村緞A1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA2', title: '姣傚瓟鐩村緞A2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA3', title: '姣傚瓟鐩村緞A3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA', title: '姣傚瓟鐩村緞A', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB1', title: '姣傚瓟鐩村緞B1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB2', title: '姣傚瓟鐩村緞B2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB3', title: '姣傚瓟鐩村緞B3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB', title: '姣傚瓟鐩村緞B', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC1', title: '姣傚瓟鐩村緞C1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC2', title: '姣傚瓟鐩村緞C2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC3', title: '姣傚瓟鐩村緞C3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC', title: '姣傚瓟鐩村緞C', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKJZ', title: '姣傚瓟鐩村緞', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSCSYMH', title: '铻烘爴渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_LMCSYMH', title: '铻烘瘝渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_rksj', title: '鍏ュ簱鏃ユ湡', type: 'string', width: 100, align: 'left' }
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes_hty.vue"
new file mode 100644
index 0000000..5b3bd50
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/inbound/Dt_InZdp_mes_hty.vue"
@@ -0,0 +1,109 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/inbound/Dt_InZdp_mes_hty.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'zdp_ID',
+ footer: "Foots",
+ cnName: '鍒跺姩鐩樺巻鍙蹭俊鎭�',
+ name: 'inbound/Dt_InZdp_mes_hty',
+ url: "/Dt_InZdp_mes_hty/",
+ sortName: "zdp_ID"
+ });
+ const editFormFields = ref({
+ "Wheels_code": "",
+ "Wheels_ldxh": "",
+ "Wheels_mttype": "",
+ "gkcc": "",
+ "wheels_NewOrOld":""
+ });
+ const editFormOptions = ref([
+ [
+ { "title": "鍒跺姩鐩樺彿", "field": "Zdp_ZPH", type: "text" },
+ { "title": "杞﹀瀷", "field": "Zdp_chexing", type: "text" },
+ { "title": "鍔ㄦ嫋灞炴��(M/T)", "field": "Wheels_mttype", type: "text" },
+ ],
+ [
+ { "title": "姣傚瓟鍧囧��", "field": "gkcc", type: "text" },
+ { "title": "鏂�/鏃�", "field": "Zdp_neworold", "type": "select",dataKey:"NewOld",data:[] },
+ { "title": "绛夌骇", "field": "wheels_level", "type": "select",dataKey:"Level",data:[] }
+ ]
+ ]);
+ const searchFormFields = ref({
+ Zdp_ZPH: ""
+
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "鍒跺姩鐩樺彿", "field": "Zdp_ZPH", type: "text" },
+ ],
+ // [
+ // { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
+
+ // ]
+ ]);
+ const columns = ref([
+ { field: 'zdp_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'zdp_ZPH', title: '鍒跺姩鐩樺彿', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_CurrentStatue', title: '鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "InboundState", data: [] } },
+ { field: 'zdp_chexing', title: '杞﹀瀷', type: 'string', width: 70, align: 'left' },
+ { field: 'zdp_neworold', title: '鏂版棫', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_POS', title: '浣嶇疆(渚�/涓�)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSXH', title: '铻烘爴鍨嬪彿', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_MAT', title: '鏉愯川(閾搁挗)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_SITE', title: '浜у湴(杩涘彛/鍥戒骇)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA1', title: '姣傚瓟鐩村緞A1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA2', title: '姣傚瓟鐩村緞A2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA3', title: '姣傚瓟鐩村緞A3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA', title: '姣傚瓟鐩村緞A', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB1', title: '姣傚瓟鐩村緞B1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB2', title: '姣傚瓟鐩村緞B2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB3', title: '姣傚瓟鐩村緞B3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB', title: '姣傚瓟鐩村緞B', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC1', title: '姣傚瓟鐩村緞C1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC2', title: '姣傚瓟鐩村緞C2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC3', title: '姣傚瓟鐩村緞C3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC', title: '姣傚瓟鐩村緞C', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKJZ', title: '姣傚瓟鐩村緞', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSCSYMH', title: '铻烘爴渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_LMCSYMH', title: '铻烘瘝渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_rksj', title: '鍏ュ簱鏃ユ湡', type: 'string', width: 100, align: 'left' },
+ { field: 'creater', title: '鍒涘缓鏃堕棿', type: 'string', width: 100, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ { field: 'finishDate', title: '瀹屾垚鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ { field: 'operateType', title: '瀹屾垚鏂瑰紡', type: 'int', width: 100, align: 'left',bind: { key: "OperateType", data: [] } },
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue"
new file mode 100644
index 0000000..c7cdde3
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutWheels_hty.vue"
@@ -0,0 +1,121 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/outbound/Dt_OutWheels_hty.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'wheels_ID',
+ footer: "Foots",
+ cnName: '杞﹁疆淇℃伅',
+ name: 'outbound/Dt_OutWheels_hty',
+ url: "/Dt_OutWheels_hty/",
+ sortName: "wheels_ID"
+ });
+ const editFormFields = ref({
+ "Wheels_code": "",
+ "Wheels_ldxh": "",
+ "Wheels_mttype": "",
+ "gkcc": "",
+ wheels_NewOrOld:""
+ });
+ const editFormOptions = ref([
+ [
+ { "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "text" },
+ { "title": "杞﹀瀷", "field": "Wheels_ldxh", type: "text" },
+ { "title": "鍔ㄦ嫋灞炴��(M/T)", "field": "Wheels_mttype", type: "text" },
+ ],
+ [
+ { "title": "姣傚瓟鍧囧��", "field": "gkcc", type: "text" },
+ { "title": "鏂�/鏃�", "field": "wheels_NewOrOld", "type": "select",dataKey:"NewOld",data:[] },
+ { "title": "绛夌骇", "field": "wheels_level", "type": "select",dataKey:"Level",data:[] }
+ ]
+ ]);
+ const searchFormFields = ref({
+ Wheels_code:"",
+ Wheels_CarType:"",
+ wheels_ldxh:"",
+ wheels_NewOrOld:"",
+ wheels_mttype:"",
+ wheelsProps:"",
+ wheels_level:"",
+ creater:"",
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "text" },
+ { "title": "杞﹀瀷", "field": "Wheels_CarType", type: "select", dataKey: "traintype_names", data: [] },
+ //{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞瀷", "field": "wheels_ldxh", type: "text" },
+ ],
+ [
+ { "title": "鏂�/鏃�", "field": "wheels_NewOrOld", type: "select", dataKey: "NewOld", data: [] },
+ { "title": "鍔ㄦ嫋灞炴��", "field": "wheels_mttype", type: "text" },
+ { "title": "灞炴��", "field": "wheelsProps", type: "text" },
+ ],
+ [
+ { "title": "绛夌骇", "field": "wheels_level", type: "text" },
+ { "title": "鍒涘缓鏃堕棿", "field": "creater", type: "datetime" },
+ ]
+ ]);
+ const columns = ref([
+ { field: 'wheels_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'wheels_code', title: '杞﹁疆鐮�', type: 'string', width: 110, align: 'left' },
+ //{ field: 'wheels_SequenceNum', title: '搴忓垪鍙�', type: 'string', width: 110, align: 'left', sort: true, link: true, },
+ { field: 'wheels_Num', title: '杞﹁疆鍙�', type: 'string', width: 110, align: 'left' },
+ { field: 'wheels_Type', title: '绫诲瀷(杞�/鐩�)', type: 'string', width: 110, align: 'left' },
+ { field: 'wheels_ldxh', title: '杞瀷', type: 'string', width: 110, align: 'left' },
+ { field: 'wheels_CurrentStatue', title: '鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "InboundState", data: [] } },
+ { field: 'wheels_ldtm', title: '杞鏉＄爜', type: 'string', width: 120, align: 'left' },
+ { field: 'wheels_CarType', title: '杞﹀瀷', type: 'string', width: 70, align: 'left' },
+ { field: 'wheels_psj', title: '閰嶅睘灞�', type: 'string', width: 100, align: 'left' },
+ { field: 'wheels_CarNo', title: '杞︾粍', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_ldh', title: '杞鍙�', type: 'string', sort: true, width: 100, align: 'left' },
+ //{ field: 'wheels_WheelsType', title: '杞瀷', type: 'string', width: 100, align: 'left' },
+ { field: 'wheels_mttype', title: '鍔ㄦ嫋灞炴��', type: 'string', width: 100, align: 'left' },
+ { field: 'wheels_NewOrOld', title: '鏂版棫绫诲瀷', type: 'string', width: 100, align: 'left',bind: { key: "NewOld", data: []} },
+ { field: 'wheelsProps', title: '灞炴��', type: 'string', width: 100, align: 'left' },
+ { field: 'wheels_level', title: '绛夌骇', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_gkzja', title: '姣傚瓟a鐣岄潰鍧囧��', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_gkzjb', title: '姣傚瓟b鐣岄潰鍧囧��', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_gkzjc', title: '姣傚瓟c鐣岄潰鍧囧��', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_gkcc', title: '姣傚瓟鍧囧��', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_ljz', title: '杞緞鍊�', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_ygljz', title: '棰勪及杞緞鍊�', type: 'string', sort: true, width: 100, align: 'left' },
+ { field: 'wheels_LYH', title: '杞紭', type: 'string', width: 100, align: 'left' },
+ { field: 'wheels_InDate', title: '鍏ュ簱鏃ユ湡', type: 'string', width: 100, align: 'left' },
+ { field: 'creater', title: '鍒涘缓鏃堕棿', type: 'string', width: 100, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutZdp_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutZdp_hty.vue"
new file mode 100644
index 0000000..60f9c61
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/outbound/Dt_OutZdp_hty.vue"
@@ -0,0 +1,93 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/outbound/Dt_OutZdp_hty.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'zdp_ID',
+ footer: "Foots",
+ cnName: '鍒跺姩鐩樹俊鎭�',
+ name: 'outbound/Dt_OutZdp_hty',
+ url: "/Dt_OutZdp_hty/",
+ sortName: "zdp_ID"
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ //Zdp_ZPH: ""
+
+ });
+ const searchFormOptions = ref([
+ // [
+ // { "title": "鍒跺姩鐩樺彿", "field": "Zdp_ZPH", type: "text" },
+ // ],
+ // [
+ // { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },Zdp_code
+
+ // ]
+ ]);
+ const columns = ref([
+ { field: 'zdp_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'zdp_code', title: '鍒跺姩鐩樻潯鐮�', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_ZPH', title: '鍒跺姩鐩樺彿', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_Location', title: '搴撲綅', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_chexing', title: '杞﹀瀷', type: 'string', width: 70, align: 'left' },
+ { field: 'zdp_neworold', title: '鏂版棫', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_POS', title: '浣嶇疆(渚�/涓�)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSXH', title: '铻烘爴鍨嬪彿', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_MAT', title: '鏉愯川(閾搁挗)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_SITE', title: '浜у湴(杩涘彛/鍥戒骇)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA1', title: '姣傚瓟鐩村緞A1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA2', title: '姣傚瓟鐩村緞A2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA3', title: '姣傚瓟鐩村緞A3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA', title: '姣傚瓟鐩村緞A', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB1', title: '姣傚瓟鐩村緞B1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB2', title: '姣傚瓟鐩村緞B2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB3', title: '姣傚瓟鐩村緞B3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB', title: '姣傚瓟鐩村緞B', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC1', title: '姣傚瓟鐩村緞C1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC2', title: '姣傚瓟鐩村緞C2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC3', title: '姣傚瓟鐩村緞C3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC', title: '姣傚瓟鐩村緞C', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKJZ', title: '姣傚瓟鐩村緞', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSCSYMH', title: '铻烘爴渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_LMCSYMH', title: '铻烘瘝渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_rksj', title: '鍏ュ簱鏃ユ湡', type: 'string', width: 100, align: 'left' }
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue"
index 8fd6e21..4cc1361 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock.vue"
@@ -28,18 +28,32 @@
const editFormOptions = ref([
]);
const searchFormFields = ref({
- wheels_Location:""
-
+ Wheels_code:"",
+ Wheels_CarType:"",
+ wheels_ldxh:"",
+ wheels_NewOrOld:"",
+ wheels_mttype:"",
+ wheelsProps:"",
+ wheels_level:"",
+ createDate:"",
+ wheels_Location:"",
});
const searchFormOptions = ref([
[
{ "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "text" },
{ "title": "杞﹀瀷", "field": "Wheels_CarType", type: "select", dataKey: "traintype_names", data: [] },
//{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞瀷", "field": "wheels_ldxh", type: "text" },
],
[
+ { "title": "鏂�/鏃�", "field": "wheels_NewOrOld", type: "select", dataKey: "NewOld", data: [] },
+ { "title": "鍔ㄦ嫋灞炴��", "field": "wheels_mttype", type: "text" },
+ { "title": "灞炴��", "field": "wheelsProps", type: "text" },
+ ],
+ [
+ { "title": "绛夌骇", "field": "wheels_level", type: "text" },
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
{ "title": "搴撲綅鍙�", "field": "wheels_Location", type: "text" },
-
]
]);
const columns = ref([
@@ -70,7 +84,7 @@
{ field: 'wheels_ljz', title: '杞緞鍊�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'wheels_ygljz', title: '棰勪及杞緞鍊�', type: 'string', sort: true, width: 100, align: 'left' },
{ field: 'wheels_InDate', title: '鍏ュ簱鏃ユ湡', type: 'string',width: 100, align: 'left' },
- { field: 'creater', title: '鍒涘缓鏃堕棿', type: 'string', width: 100, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 100, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
]);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue"
index 5fb504c..7a53827 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_Old.vue"
@@ -28,18 +28,29 @@
const editFormOptions = ref([
]);
const searchFormFields = ref({
- wheels_Location:""
-
+ wheel_code:"",
+ model:"",
+ axes_type:"",
+ repair_item:"",
+ wheels_mttype:"",
+ dqtz_state:"",
+ venderno:"",
+ wheels_Location:"",
});
const searchFormOptions = ref([
[
{ "title": "杞﹁疆鏉＄爜", "field": "wheel_code", type: "text" },
- { "title": "杞﹀瀷", "field": "model", type: "text" },
+ { "title": "杞﹀瀷", "field": "model", type: "select", dataKey: "traintype_names", data: [] },
//{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞瀷", "field": "axes_type", type: "text" },
],
[
- { "title": "搴撲綅鍙�", "field": "locate", type: "text" },
-
+ { "title": "鏂�/鏃�", "field": "repair_item", type: "select", dataKey: "NewOld", data: [] },
+ { "title": "鍔ㄦ嫋灞炴��", "field": "dqtz_state", type: "text" },
+ { "title": "绛夌骇", "field": "venderno", type: "text" },
+ ],
+ [
+ { "title": "搴撲綅鍙�", "field": "wheels_Location", type: "text" },
]
]);
const columns = ref([
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_hty.vue"
index e75e838..f2bf0dc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_WheelsStock_hty.vue"
@@ -29,16 +29,33 @@
const editFormOptions = ref([
]);
- const searchFormFields = ref({});
+ const searchFormFields = ref({
+ Wheels_code:"",
+ Wheels_CarType:"",
+ wheels_ldxh:"",
+ wheels_NewOrOld:"",
+ wheels_mttype:"",
+ wheelsProps:"",
+ wheels_level:"",
+ creater:"",
+ wheels_Location:"",
+ });
const searchFormOptions = ref([
[
{ "title": "杞﹁疆鏉＄爜", "field": "Wheels_code", type: "text" },
- { "title": "杞﹀瀷", "field": "Wheels_CarType", type: "select", dataKey: "StockState", data: [] },
- { "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞﹀瀷", "field": "Wheels_CarType", type: "select", dataKey: "traintype_names", data: [] },
+ //{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "杞瀷", "field": "wheels_ldxh", type: "text" },
],
[
- // { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },
-
+ { "title": "鏂�/鏃�", "field": "wheels_NewOrOld", type: "select", dataKey: "NewOld", data: [] },
+ { "title": "鍔ㄦ嫋灞炴��", "field": "wheels_mttype", type: "text" },
+ { "title": "灞炴��", "field": "wheelsProps", type: "text" },
+ ],
+ [
+ { "title": "绛夌骇", "field": "wheels_level", type: "text" },
+ { "title": "鍒涘缓鏃堕棿", "field": "creater", type: "datetime" },
+ { "title": "搴撲綅鍙�", "field": "wheels_Location", type: "text" },
]
]);
const columns = ref([
@@ -62,7 +79,8 @@
{ field: 'creater', title: '鍒涘缓鏃堕棿', type: 'string', width: 100, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
{ field: 'finishWheelDate', title: '瀹屾垚鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
- { field: 'operateType', title: '瀹屾垚鏂瑰紡', type: 'int', width: 100, align: 'left',bind: { key: "OperateType", data: [] } },
+ { field: 'operateType', title: '瀹屾垚鏂瑰紡', type: 'int', width: 100, align: 'left',bind: { key: "OperateType", data: [] }
+ },
]);
const detail = ref({
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock.vue"
new file mode 100644
index 0000000..1351c4c
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock.vue"
@@ -0,0 +1,105 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/stock/Dt_ZdpStock.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'zdp_ID',
+ footer: "Foots",
+ cnName: '鍒跺姩鐩樹俊鎭�',
+ name: 'stock/Dt_ZdpStock',
+ url: "/Dt_ZdpStock/",
+ sortName: "zdp_ID"
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ zdp_code:"",
+ zdp_chexing:"",
+ zdp_POS:"",
+ zdp_neworold:"",
+ createDate:"",
+ zdp_Location:"",
+
+ });
+ const searchFormOptions = ref([
+ [
+ { "title": "鍒跺姩鐩樻潯鐮�", "field": "zdp_code", type: "text" },
+ { "title": "杞﹀瀷", "field": "zdp_chexing", type: "select", dataKey: "traintype_names", data: [] },
+ //{ "title": "搴撳瓨绫诲瀷", "field": "StockType", type: "select", dataKey: "GroupType", data: [] },
+ { "title": "浣嶇疆(渚�/涓�)", "field": "zdp_POS", type: "text" },
+ ],
+ [
+ { "title": "鏂�/鏃�", "field": "zdp_neworold", type: "select", dataKey: "NewOld", data: [] },
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
+ { "title": "搴撲綅鍙�", "field": "zdp_Location", type: "text" },
+ ],
+ ]);
+ const columns = ref([
+ { field: 'zdp_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'zdp_code', title: '鍒跺姩鐩樻潯鐮�', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_ZPH', title: '鍒跺姩鐩樺彿', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_CurrentStatue', title: '鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "CurrentStatue", data: [] } },
+ { field: 'zdp_Location', title: '搴撲綅', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_chexing', title: '杞﹀瀷', type: 'string', width: 70, align: 'left' },
+ { field: 'zdp_neworold', title: '鏂版棫', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_POS', title: '浣嶇疆(渚�/涓�)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSXH', title: '铻烘爴鍨嬪彿', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_MAT', title: '鏉愯川(閾搁挗)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_SITE', title: '浜у湴(杩涘彛/鍥戒骇)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA1', title: '姣傚瓟鐩村緞A1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA2', title: '姣傚瓟鐩村緞A2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA3', title: '姣傚瓟鐩村緞A3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA', title: '姣傚瓟鐩村緞A', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB1', title: '姣傚瓟鐩村緞B1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB2', title: '姣傚瓟鐩村緞B2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB3', title: '姣傚瓟鐩村緞B3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB', title: '姣傚瓟鐩村緞B', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC1', title: '姣傚瓟鐩村緞C1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC2', title: '姣傚瓟鐩村緞C2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC3', title: '姣傚瓟鐩村緞C3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC', title: '姣傚瓟鐩村緞C', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKJZ', title: '姣傚瓟鐩村緞', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSCSYMH', title: '铻烘爴渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_LMCSYMH', title: '铻烘瘝渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_rksj', title: '鍏ュ簱鏃ユ湡', type: 'string', width: 100, align: 'left' },
+ { field: 'creater', title: '鍒涘缓浜�', type: 'string', width: 100, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock_hty.vue"
new file mode 100644
index 0000000..d30836b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_ZdpStock_hty.vue"
@@ -0,0 +1,98 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/invoices/Dt_InboundOrder.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+ :table="table" :extend="extend">
+ </view-grid>
+</template>
+<script>
+import extend from "@/extension/widesea_wms/stock/Dt_ZdpStock_hty.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'zdp_ID',
+ footer: "Foots",
+ cnName: '鍒跺姩鐩樺簱瀛樺巻鍙蹭俊鎭�',
+ name: 'stock/Dt_ZdpStock_hty',
+ url: "/Dt_ZdpStock_hty/",
+ sortName: "zdp_ID"
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({
+ //Zdp_ZPH: ""
+
+ });
+ const searchFormOptions = ref([
+ // [
+ // { "title": "鍒跺姩鐩樺彿", "field": "Zdp_ZPH", type: "text" },
+ // ],
+ // [
+ // { "title": "鐢熶骇浜х嚎", "field": "productionLine", type: "select", dataKey: "ProductionLine", data: [] },Zdp_code
+
+ // ]
+ ]);
+ const columns = ref([
+ { field: 'zdp_ID', title: '涓婚敭ID', type: 'int', width: 110, readonly: true, hidden: true, require: true, align: 'left' },
+ { field: 'zdp_code', title: '鍒跺姩鐩樻潯鐮�', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_ZPH', title: '鍒跺姩鐩樺彿', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_CurrentStatue', title: '鐘舵��', type: 'int', width: 110, align: 'left', bind: { key: "CurrentStatue", data: [] } },
+ { field: 'zdp_Location', title: '搴撲綅', type: 'string', width: 110, align: 'left', require: true },
+ { field: 'zdp_chexing', title: '杞﹀瀷', type: 'string', width: 70, align: 'left' },
+ { field: 'zdp_neworold', title: '鏂版棫', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_POS', title: '浣嶇疆(渚�/涓�)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSXH', title: '铻烘爴鍨嬪彿', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_MAT', title: '鏉愯川(閾搁挗)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_SITE', title: '浜у湴(杩涘彛/鍥戒骇)', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA1', title: '姣傚瓟鐩村緞A1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA2', title: '姣傚瓟鐩村緞A2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA3', title: '姣傚瓟鐩村緞A3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKA', title: '姣傚瓟鐩村緞A', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB1', title: '姣傚瓟鐩村緞B1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB2', title: '姣傚瓟鐩村緞B2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB3', title: '姣傚瓟鐩村緞B3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKB', title: '姣傚瓟鐩村緞B', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC1', title: '姣傚瓟鐩村緞C1', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC2', title: '姣傚瓟鐩村緞C2', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC3', title: '姣傚瓟鐩村緞C3', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKC', title: '姣傚瓟鐩村緞C', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_GKJZ', title: '姣傚瓟鐩村緞', type: 'string', width: 100, align: 'left' },
+ { field: 'zdp_LSCSYMH', title: '铻烘爴渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_LMCSYMH', title: '铻烘瘝渚у墿浣欑（鑰�', type: 'string', width: 120, align: 'left' },
+ { field: 'zdp_rksj', title: '鍏ュ簱鏃ユ湡', type: 'string', width: 100, align: 'left' },
+ { field: 'creater', title: '鍒涘缓鏃堕棿', type: 'string', width: 100, align: 'left' },
+ { field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ { field: 'finishDate', title: '瀹屾垚鏃堕棿', type: 'datetime', sort: true, width: 100, align: 'left' },
+ { field: 'operateType', title: '瀹屾垚鏂瑰紡', type: 'int', width: 100, align: 'left',bind: { key: "OperateType", data: [] } }
+ ]);
+
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue"
index 87dfab1..2d1b045 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/SelectionWheels.vue"
@@ -47,6 +47,7 @@
cltm:"",
cztm:"",
location:"",
+ createDate:""
});
const searchFormOptions = ref([
@@ -60,6 +61,9 @@
[
{ "title": "搴撲綅鍙�", "field": "location", type: "text" },
+ ],
+ [
+ { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
]
]);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
index be084f2..176341e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
@@ -23,10 +23,25 @@
sortName: "TaskId"
});
const editFormFields = ref({
+ taskState:""
});
const editFormOptions = ref([
+ [
+ { "title": "浠诲姟鐘舵��", "field": "taskState", type: "select", dataKey: "TaskStatus", data: [] },
+ ]
]);
const searchFormFields = ref({
+ taskNum:"",
+ palletCode:"",
+ taskType:"",
+ taskState:"",
+ sourceAddress:"",
+ currentAddress:"",
+ nextAddress:"",
+ targetAddress:"",
+ roadway:"",
+ creater:"",
+ createDate:"",
});
const searchFormOptions = ref([
[
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue"
index a5c4d05..ac87811 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/widesea_wms/taskinfo/Dt_Task_Hty.vue"
@@ -42,11 +42,22 @@
],
]);
const searchFormFields = ref({
+ taskNum:"",
+ palletCode:"",
+ taskType:"",
+ taskState:"",
+ sourceAddress:"",
+ currentAddress:"",
+ nextAddress:"",
+ targetAddress:"",
+ roadway:"",
+ creater:"",
+ CreateDate:"",
});
const searchFormOptions = ref([
[
- { "title": "浠诲姟鍙�", "field": "taskNum", "type": "text" },
- { "title": "鎵樼洏鍙�", "field": "palletCode", "type": "text" },
+ { "title": "浠诲姟鍙�", "field": "taskNum", "type": "like" },
+ { "title": "杞﹁疆鏉＄爜", "field": "palletCode", "type": "like" },
{ "title": "浠诲姟绫诲瀷", "field": "taskType", "type": "select", dataKey: "TaskType", data: [] },
{ "title": "浠诲姟鐘舵��", "field": "taskState", "type": "select", dataKey: "TaskStatus", data: [] },
@@ -59,14 +70,13 @@
],
[
{ "title": "宸烽亾", "field": "roadway", type: "text" },
- { "title": "task_CZInfo", "field": "杞﹁酱", type: "text" },
{ "title": "鍒涘缓浜�", "field": "creater", type: "text" },
- { "title": "鍒涘缓鏃堕棿", "field": "createDate", type: "datetime" },
+ { "title": "鍒涘缓鏃堕棿", "field": "CreateDate", type: "datetime" },
],
]);
const columns = ref([{ field: 'TaskId', title: '涓婚敭', type: 'string', width: 110, hidden: true, readonly: true, require: true, align: 'left' },
{ field: 'taskNum', title: '浠诲姟鍙�', type: 'int', width: 110, align: 'left', sort: true },
- { field: 'palletCode', title: '鏉＄爜', type: 'string', width: 150, align: 'left' },
+ { field: 'palletCode', title: '杞﹁疆鏉＄爜', type: 'string', width: 150, align: 'left' },
{ field: 'pnboundNo', title: '鍗曟嵁鍙�', type: 'string', width: 110, align: 'left' ,hidden: true},
{ field: 'groupID', title: '搴撳瓨ID', type: 'int', width: 110, hidden: true, align: 'left' },
{ field: 'groupDetailId', title: '缁勭洏鏄庣粏ID', type: 'int', width: 110, hidden: true, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
index 72d386e..6405797 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
index 113a5a4..83a2c96 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v7.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
index 1865f12..3d5019a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
index b4baac8..8376467 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
index b293fc1..2e7e270 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
index 2b54f3c..a3a9e87 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVInterface/Respon/AGVResponBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVInterface/Respon/AGVResponBase.cs"
index 8d0fd0c..6925b0c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVInterface/Respon/AGVResponBase.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVInterface/Respon/AGVResponBase.cs"
@@ -26,6 +26,6 @@
/// <summary>
/// 鍝嶅簲鏁版嵁
/// </summary>
- public object data { get; set; }
+ //public object data { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTask/agvTask.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTask/agvTask.cs"
index 3d98aa2..06ef0ea 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTask/agvTask.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTask/agvTask.cs"
@@ -125,4 +125,50 @@
/// </summary>
public string eqpCode { get; set; }
}
+
+ public class ContainerTask
+ {
+ public string action { get; set; }
+ public string areaCode { get; set; }
+ public string berthCode { get; set; }
+ public string callCode { get; set; }
+ public string callTyp { get; set; }
+ public string clientCode { get; set; }
+ public string cooX { get; set; } // 娉ㄦ剰杩欐槸double绫诲瀷
+ public string cooY { get; set; } // 娉ㄦ剰杩欐槸double绫诲瀷
+ public string ctnrCode { get; set; }
+ public string ctnrTyp { get; set; }
+ public string currentCallCode { get; set; }
+ public string currentPositionCode { get; set; }
+ public object data { get; set; } // 鏍规嵁JSON鍐呭锛宒ata鏄┖瀵硅薄
+ public string dstBinCode { get; set; }
+ public string eqpCode { get; set; }
+ public string indBind { get; set; }
+ public string layer { get; set; }
+ public string mapCode { get; set; }
+ public string mapDataCode { get; set; }
+ public string mapShortName { get; set; }
+ public string materialLot { get; set; }
+ public string materialType { get; set; }
+ public string method { get; set; }
+ public string orgCode { get; set; }
+ public string podCode { get; set; }
+ public string podDir { get; set; }
+ public string podNum { get; set; }
+ public string podTyp { get; set; }
+ public string relatedArea { get; set; }
+ public string reqCode { get; set; }
+ public string reqTime { get; set; } // 鍙�冭檻鏀逛负DateTime绫诲瀷
+ public string roadWayCode { get; set; }
+ public string robotCode { get; set; }
+ public string seq { get; set; }
+ public string stgBinCode { get; set; }
+ public string subTaskNum { get; set; }
+ public string taskCode { get; set; }
+ public string taskTyp { get; set; }
+ public string tokenCode { get; set; }
+ public string username { get; set; }
+ public string wbCode { get; set; }
+ public string whCode { get; set; }
+ }
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs"
index 6b08cf7..1adfa38 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/LevelChange/CheckTaskChangeHelper.cs"
@@ -20,9 +20,14 @@
{
wheelsNewOld = "1";
}
- if ((wxrw.Contains("鍥涚骇淇�") || wxrw.Contains("浜旂骇淇�")) && wxrw.Contains("鎹㈣疆(鏂�)"))
+ if ((wxrw.Contains("鍥涚骇淇�") || wxrw.Contains("浜旂骇淇�")) && (wxrw.Contains("鎹㈣疆(鏂�)") || wxrw.Contains("鎹㈣疆缁勬垚(鏂�)")))
{
wheelsNewOld = "0";
+ }
+
+ if ((wxrw.Contains("鍥涚骇淇�") || wxrw.Contains("浜旂骇淇�")) && (wxrw.Contains("鎹㈣疆(鏃�)") || wxrw.Contains("鎹㈣疆缁勬垚(鏃�)")))
+ {
+ wheelsNewOld = "1";
}
if (wxrw.Contains("涓夌骇淇�") && (wxrw.Contains("鎹㈣疆(鏂�)") || wxrw.Contains("鎹㈣疆缁勬垚(鏂�)")))
wheelsNewOld = "0";
@@ -30,5 +35,50 @@
wheelsNewOld = "1";
return wheelsNewOld;
}
+
+ /// <summary>
+ /// 缁翠慨浠诲姟杞崲鍑哄睘鎬�
+ /// </summary>
+ /// <param name="wxrw">缁翠慨浠诲姟</param>
+ /// <returns>閫夐厤杞柊鏃�(0-鏂� 1-鏃�)</returns>
+ public static string CheckTaskwheelsProps(string wxrw)
+ {
+ string wheelsNewOld = string.Empty;
+ if (wxrw.Contains("鎹㈣疆鐩�(鏃�)"))
+ {
+ wheelsNewOld = "鏂拌疆鏃х洏";
+ }else if (wxrw.Contains("鎹㈣疆缁勬垚(鏂�)"))
+ {
+ wheelsNewOld = "鏂拌疆鏂扮洏";
+ }
+ else
+ {
+ wheelsNewOld = "鏃ц疆鏃х洏";
+ }
+ return wheelsNewOld;
+ }
+
+ /// <summary>
+ /// 閫夊埗鍔ㄧ洏杞崲
+ /// </summary>
+ /// <param name="wxrw">閫夊埗鍔ㄧ洏杞崲</param>
+ /// <returns></returns>
+ public static string CheckZdpPost(string Posttype)
+ {
+ string PostContainer = string.Empty;
+ if (Posttype=="宸︿晶")
+ {
+ PostContainer = "left";
+ }
+ else if (Posttype == "鍙充晶")
+ {
+ PostContainer = "right";
+ }
+ else
+ {
+ PostContainer = "middle";
+ }
+ return PostContainer;
+ }
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
index bffe798..98959a1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseModels/PageDataOptions.cs"
@@ -1,8 +1,14 @@
-锘縰sing System;
+锘縰sing SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
+using WIDESEA_Core.Utilities;
namespace WIDESEA_Core
{
@@ -24,6 +30,132 @@
/// 鏌ヨ鏉′欢
/// </summary>
public List<SearchParameters> Filter { get; set; }
+
+ public string ValidatePageOptions(PropertyInfo[] entityProperties)
+ {
+ string where = string.Empty;
+ List<SearchParameters> searchParametersList = new List<SearchParameters>();
+ if (this.Filter != null && this.Filter.Count > 0)
+ {
+ searchParametersList.AddRange(Filter);
+ }
+ else if (!string.IsNullOrEmpty(Wheres))
+ {
+ try
+ {
+ searchParametersList = Wheres.DeserializeObject<List<SearchParameters>>();
+ Filter = searchParametersList;
+ }
+ catch { }
+ }
+ for (int i = 0; i < searchParametersList.Count; i++)
+ {
+ if (string.IsNullOrEmpty(searchParametersList[i].Value))
+ {
+ continue;
+ }
+
+ PropertyInfo? property = entityProperties.Where(c => c.Name.ToUpper() == searchParametersList[i].Name.ToUpper()).FirstOrDefault();
+
+ if (property == null) continue;
+
+ List<(bool, string, object)> results = property.ValidationValueForDbType(searchParametersList[i].Value.Split(',')).ToList();
+ if (results == null || results.Count() == 0)
+ {
+ continue;
+ }
+ for (int j = 0; j < results.Count(); j++)
+ {
+ if (j == 0)
+ {
+ where += "(";
+ }
+ LinqExpressionType expressionType = searchParametersList[i].DisplayType.GetLinqCondition();
+ if (expressionType == LinqExpressionType.Equal)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.Equal} '{results[j].Item3}'";
+ }
+ else if (expressionType == LinqExpressionType.ThanOrEqual)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.ThanOrEqual} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.LessThanOrEqual)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.LessOrequal} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.GreaterThan)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.GT} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.LessThan)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.LT} '{searchParametersList[i].Value}'";
+ }
+ else if (expressionType == LinqExpressionType.Contains)
+ {
+ where += $"{searchParametersList[i].Name} {HtmlElementType.like} '%{searchParametersList[i].Value}%'";
+ }
+ else
+ {
+ where += $"{searchParametersList[i].Name} {searchParametersList[i].DisplayType} '{results[j].Item3}'";
+ }
+
+ if (j == results.Count() - 1)
+ {
+ where += ")";
+ }
+ else
+ {
+ where += " or ";
+ }
+ }
+ if (i < searchParametersList.Count - 1)
+ where += " and ";
+ }
+ return where;
+ }
+
+
+ public Dictionary<string, OrderByType> GetPageDataSort(PropertyInfo[] propertyInfo)
+ {
+ try
+ {
+ if (!string.IsNullOrEmpty(Sort))
+ {
+ if (Sort.Contains(","))
+ {
+ List<string> sortArr = Sort.Split(",").Where(x => propertyInfo.Any(p => p.Name == x)).ToList();
+ Dictionary<string, OrderByType> sortDic = new Dictionary<string, OrderByType>();
+ foreach (var item in sortArr)
+ {
+ sortDic[item] = Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc;
+ }
+ return sortDic;
+ }
+ else if (propertyInfo.Any(x => x.Name == Sort.FirstLetterToLower() || x.Name == Sort.FirstLetterToUpper()))
+ {
+ Dictionary<string, OrderByType> result = new Dictionary<string, OrderByType>();
+
+ if (Order == "asc")
+ {
+ result.Add(Sort, OrderByType.Asc);
+ }
+ else
+ {
+ result.Add(Sort, OrderByType.Desc);
+ }
+
+ return result;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+
+ throw;
+ }
+ return new Dictionary<string, OrderByType> { { "CreateDate", Order?.ToLower() == OrderByType.Asc.ToString() ? OrderByType.Asc : OrderByType.Desc } };
+ }
}
public class SearchParameters
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
index e2fe74b..d92b182 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseServices/ServiceBase.cs"
@@ -46,44 +46,12 @@
public virtual PageGridData<TEntity> GetPageData(PageDataOptions options)
{
- string wheres = ValidatePageOptions(options);
+ string wheres = options.ValidatePageOptions(TProperties);
//鑾峰彇鎺掑簭瀛楁
- Dictionary<string, OrderByType> orderbyDic = GetPageDataSort(options, TProperties);
+ Dictionary<string, OrderByType> orderbyDic = options.GetPageDataSort(TProperties);
PageGridData<TEntity> pageGridData = new PageGridData<TEntity>();
- //if (QueryRelativeExpression != null)
- //{
- // queryable = QueryRelativeExpression.Invoke(queryable);
- //}
- //if (options.Export)
- //{
- // queryable = queryable.GetIQueryableOrderBy(orderbyDic);
- // if (Limit > 0)
- // {
- // queryable = queryable.Take(Limit);
- // }
- // pageGridData.rows = queryable.ToList();
- //}
- //else
- //{
- // pageGridData.rows = repository.IQueryablePage(queryable,
- // options.Page,
- // options.Rows,
- // out int rowCount,
- // orderbyDic).ToList();
- // pageGridData.total = rowCount;
- // //鏌ヨ鐣岄潰缁熻姹傜瓑瀛楁
- // if (SummaryExpress != null)
- // {
- // pageGridData.summary = SummaryExpress.Invoke(queryable);
- // //Func<T, T> groupExpress = x =>x;
- // //pageGridData.summary = queryable.GroupBy(groupExpress).Select(SummaryExpress).FirstOrDefault();
- // }
- //}
- //GetPageDataOnExecuted?.Invoke(pageGridData);
-
- pageGridData = BaseDal.QueryPage
- (wheres, options.Page, options.Rows, orderbyDic);
+ pageGridData = BaseDal.QueryPage(wheres, options.Page, options.Rows, orderbyDic);
return pageGridData;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs"
index 3e0e8e7..d7d28e8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs"
@@ -96,5 +96,16 @@
public const string TempHour = "TempHour";
+ /// <summary>
+ /// 璇锋眰wcs锛屽啓鍏ヨ緭閫佺嚎鍙嶉
+ /// </summary>
+
+ public const string SetPlcResponState = "SetPlcResponState";
+
+ /// <summary>
+ /// 璇诲彇agv缂撳瓨鍙拌姹�
+ /// </summary>
+
+ public const string GetPlcState = "GetPlcState";
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs"
index ae82614..ba7c957 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs"
@@ -945,10 +945,10 @@
case HtmlElementType.Contains:
linqExpression = LinqExpressionType.In;
break;
- case HtmlElementType.ThanOrEqual:
- linqExpression = LinqExpressionType.ThanOrEqual;
+ case HtmlElementType.thanorequal:
+ linqExpression = LinqExpressionType.ThanOrEqual;
break;
- case HtmlElementType.LessOrequal:
+ case HtmlElementType.lessorequal:
linqExpression = LinqExpressionType.LessThanOrEqual;
break;
case HtmlElementType.GT:
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
index 367eda1..e527db1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Utilities/EntityProperties.cs"
@@ -116,6 +116,16 @@
{ typeof(Guid),SqlDbTypeName.UniqueIdentifier}
};
+ public static List<(bool, string, object)> ValidationValueForDbType(this PropertyInfo propertyInfo, params object[] values)
+ {
+ List<(bool, string, object)> result = new List<(bool, string, object)>();
+ foreach (object value in values)
+ {
+ result.Add(propertyInfo.ValidationVal(value));
+ }
+ return result;
+ }
+
public static string GetProperWithDbType(this PropertyInfo propertyInfo)
{
bool result = ProperWithDbType.TryGetValue(propertyInfo.PropertyType, out string value);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs"
index eae8ca1..6529b98 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/ToAPP/IToAPPService.cs"
@@ -13,6 +13,17 @@
WebResponseContent SaveCLinfo(SaveModel saveModel);
WebResponseContent SaveCZInfo(SaveModel saveModel);
+
+ WebResponseContent SaveCZStraight(SaveModel saveModel);
WebResponseContent SaveCZInfo2(SaveModel saveModel);
+
+
+ WebResponseContent SaveCLStraight(SaveModel saveModel);
+ WebResponseContent SaveZDPStraight(SaveModel saveModel);
+
+ WebResponseContent SaveZDPInfo(SaveModel saveModel);
+ WebResponseContent SaveZDPXPInfo(SaveModel saveModel);
+
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs"
index 3857f3b..4047b0f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs"
@@ -9,6 +9,6 @@
{
public interface IWCSService : IDependency
{
-
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/\346\226\260\346\226\207\344\273\266\345\244\271/IToCheckService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/\346\226\260\346\226\207\344\273\266\345\244\271/IToCheckService.cs"
index a6b3c04..7fc78eb 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/\346\226\260\346\226\207\344\273\266\345\244\271/IToCheckService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/\346\226\260\346\226\207\344\273\266\345\244\271/IToCheckService.cs"
@@ -3,13 +3,35 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Comm;
+using WIDESEA_Comm.AGVTask;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_DTO;
namespace WIDESEA_IStoragIntegrationServices
{
public interface IToAGVService : IDependency
{
-
+ /// <summary>
+ /// wcs璇锋眰涓嬪彂agv浠诲姟
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent genAgvSchedulingTask(RequestTaskDto input);
+
+ /// <summary>
+ /// agv鐩磋蛋浠诲姟鐢熸垚
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent UntieStation(SaveModel saveModel);
+
+ /// <summary>
+ /// ag鍥炶皟鎺ュ彛
+ /// </summary>
+ /// <param name="taskRespon"></param>
+ /// <returns></returns>
+ AGVResponBase agvCallback(object taskRespon);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Boxing/IDt_CZInfo_mesService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Boxing/IDt_CZInfo_mesService.cs"
index 72d4dff..e3deee4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Boxing/IDt_CZInfo_mesService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Boxing/IDt_CZInfo_mesService.cs"
@@ -1,8 +1,10 @@
锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_DTO;
namespace WIDESEA_IStorageBasicService;
public interface IDt_CZInfo_mesService : IService<Dt_CZInfo_mes>
{
-
+ WebResponseContent RequestAxleloading(RequestTaskDto input);
+ WebResponseContent UpdateAxleCurrentStatue(RequestTaskDto input);
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Location/ILocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Location/ILocationInfoService.cs"
index 6424160..c65b580 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Location/ILocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Location/ILocationInfoService.cs"
@@ -10,10 +10,17 @@
/// <param name="locationID">浠诲姟鍙�</param>
/// <returns>浠诲姟瀵硅薄</returns>
Task<Dt_Task> TransferCheckAsync(RequestTaskDto input);
+ /// <summary>
+ /// 妫�娴嬪叆搴撲换鍔℃槸鍚﹂渶瑕佺Щ搴�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ Task<Dt_Task> InTransferCheckAsync(RequestTaskDto input);
Task<WebResponseContent> initializeLocation(int locationID);
WebResponseContent CreateLocation(int x, int y, int z, int locType, int areaId);
WebResponseContent LocationEnable(SaveModel saveModel);
+ WebResponseContent LocationStatus();
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs"
index 579b250..11bc677 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/Stock/IDt_WheelsStockService.cs"
@@ -5,5 +5,9 @@
Dt_WheelsStock GetSelectionWheelsStock(List<Dt_WheelsStock> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes,string wheelsPosition,string newOrOld);
- Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld);
+ Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld, string wheelsProps);
+
+ WebResponseContent InventoryStatistics();
+
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/Task/IDt_Task_HtyRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/Task/IDt_Task_HtyRepository.cs"
index ec500f9..6198d12 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/Task/IDt_Task_HtyRepository.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/Task/IDt_Task_HtyRepository.cs"
@@ -1,4 +1,7 @@
-锘縩amespace WIDESEA_IStorageTaskRepository;
+锘縰sing WIDESEA_Core;
+using WIDESEA_DTO;
+
+namespace WIDESEA_IStorageTaskRepository;
public interface IDt_Task_HtyRepository : IRepository<Dt_Task_Hty>
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs"
index a13890e..1034058 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs"
@@ -1,4 +1,5 @@
-锘縰sing WIDESEA_DTO;
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEA_DTO;
namespace WIDESEA_IStorageTaskServices;
@@ -143,6 +144,12 @@
/// <param name="input"></param>
/// <returns></returns>
Task<WebResponseContent> RequestWheelsFlow(RequestTaskDto input);
+ /// <summary>
+ /// 娴佸悜淇敼
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ WebResponseContent UpWheelsFlow(SaveModel saveModel);
/// <summary>
/// 璇锋眰浠诲姟璐т綅
@@ -170,5 +177,7 @@
/// <returns></returns>
WebResponseContent CreateAndSendOutboundTask(SaveModel saveModel);
+
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_Task_HtyService.cs"
index 6d622b8..0173bbc 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_Task_HtyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_Task_HtyService.cs"
@@ -1,4 +1,6 @@
-锘縩amespace WIDESEA_IStorageTaskServices;
+锘縰sing WIDESEA_DTO;
+
+namespace WIDESEA_IStorageTaskServices;
public interface IDt_Task_HtyService : IService<Dt_Task_Hty>
{
@@ -7,5 +9,7 @@
/// </summary>
/// <param name="task">鍘嗗彶浠诲姟Model</param>
/// <returns>鎴愬姛/澶辫触</returns>
- bool InsertTask(Dt_Task_Hty task);
+ //bool InsertTask(Dt_Task_Hty task);
+
+ WebResponseContent TaskRollback(int input);
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
index 12f48a2..53b81e4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
@@ -194,4 +194,10 @@
[SugarColumn(ColumnName = "WheelsLX", Length = 255, ColumnDescription = "杞瀷")]
public string WheelsLX { get; set; }
+ /// <summary>
+ /// 杞﹁疆鍘诲悜鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName = "Towhereabouts", Length = 20, ColumnDescription = "杞﹁疆鍘诲悜鍦板潃")]
+ public string Towhereabouts { get; set; }
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs"
index 005f178..2f4d727 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_Task_Hty.cs"
@@ -28,4 +28,10 @@
///</summary>
[SugarColumn(ColumnName = "SourceId", ColumnDescription = "婧愬崟ID")]
public int SourceId { get; set; }
+
+ /// <summary>
+ /// 杞﹁疆鍘诲悜鍦板潃
+ ///</summary>
+ [SugarColumn(ColumnName = "Towhereabouts", Length = 20, ColumnDescription = "杞﹁疆鍘诲悜鍦板潃")]
+ public string Towhereabouts { get; set; }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_CZInfo_mes.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_CZInfo_mes.cs"
index ac7a395..d737f35 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_CZInfo_mes.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_CZInfo_mes.cs"
@@ -19,10 +19,12 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int ID { get; set; }
+
+
/// <summary>
/// 杞﹁酱鏉＄爜
/// </summary>
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "杞﹁酱鏉＄爜")]
+ [SugarColumn(Length = 50, ColumnDescription = "杞﹁酱鏉＄爜")]
public string CZTM { get; set; }
/// <summary>
@@ -45,7 +47,8 @@
public string LDTM { get; set; }
/// <summary>
- /// 鐘舵�� 1-鍒涘缓 2-鍏ュ簱 3-瀹屾垚
+ /// 鐘舵�� 1-鍒涘缓 2-鍏ュ簱 3-杈撻�佺嚎瀹屾垚 锛堢珯鍙扮粰淇″彿鍚庯級 4-agv浠诲姟涓嬪彂 5-agv鍙栬揣瀹屾垚 6-agv瀹屾垚
+ /// 鐩磋蛋锛�11-鐩磋蛋鍒涘缓 12-鐩磋蛋涓� 13-鐩磋蛋瀹屾垚 锛�
/// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐘舵��")]
public string CurrentStatue { get; set; }
@@ -239,5 +242,11 @@
/// </summary>
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍙宠疆搴х瓑绾�")]
public string YLZDJ { get; set; }
+
+ /// <summary>
+ /// agv鍦板潃
+ /// </summary>
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "agv鐩爣鍦板潃")]
+ public string AGVaddres { get; set; }
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs"
index c62157e..4c923ba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/GZ_ZC/Dt_InWheels_mes_hty.cs"
@@ -8,9 +8,9 @@
namespace WIDESEA_Model.Models
{
- [SugarTable(nameof(Dt_InWheels_mes_hty), "MES杞﹁疆鍘嗗彶淇℃伅")]
+ [SugarTable(nameof(Dt_InZdp_mes_hty), "MES鍒跺姩鐩樺巻鍙蹭俊鎭�")]
- public class Dt_InWheels_mes_hty : Dt_InWheels_mes
+ public class Dt_InZdp_mes_hty : Dt_InZdp_mes
{
/// <summary>
/// 瀹屾垚鏃堕棿
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/UntieStation.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/UntieStation.cs"
index 34a9a0f..a98819f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/UntieStation.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/UntieStation.cs"
@@ -10,6 +10,9 @@
using WIDESEA_Comm.AGVInterface.Requset;
using WIDESEA_Common;
using WIDESEA_Core;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO;
using WIDESEA_Model.Models;
namespace WIDESEA_StoragIntegrationServices
@@ -17,37 +20,54 @@
public partial class ToAGVService
{
/// <summary>
- ///
+ /// PDA鎵цagv浠诲姟鐩磋蛋鍔熻兘
/// </summary>
/// <param name="taskinfo"></param>
/// <param name="operationType">鎿嶄綔绫诲瀷(1-缁戝畾 2-瑙ｇ粦)</param>
/// <returns></returns>
- public static WebResponseContent UntieStation(Dt_Task taskinfo, string operationType)
+ public WebResponseContent UntieStation(SaveModel saveModel)
{
+
WebResponseContent content = new WebResponseContent();
+
+ string CZTM = saveModel.MainData["CZTM"].ToString();
+ if (string.IsNullOrEmpty(CZTM)) throw new Exception("杞﹁酱鏉＄爜涓虹┖");
+
+ string TargetAddress = saveModel.MainData["TargetAddress"].ToString();
+ if (string.IsNullOrEmpty(TargetAddress)) return content.Error("鏈�夋嫨缂撳瓨鍙帮紝缂撳瓨鍙颁笉鍙负绌�");
try
{
- bindCtnrAndBin bind = new bindCtnrAndBin()
+ //璋冨彇wcs鎺ュ彛锛岃鍙栬绔欏彴鏄惁鍙斁
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.GetPlcState)?.ConfigValue;
+ if (ReceiveByWMSTask == null || ipAddress == null)
{
- reqCode = Guid.NewGuid().ToString().Replace("-", ""),
- clientCode = "WMS",
- ctnrTyp = "2",
- indBind = operationType, // 1-缁戝畾 2-瑙ｇ粦
- stgBinCode = taskinfo.SourceAddress,
- };
+ throw new Exception("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
- string ipaddress = AGV_Interface + "/getCLInfostring";
+ var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(TargetAddress)); //http://localhost:9291/api/Task/ReceiveTask,
- var requestBindInfo = bind.ToDictionary();
+ if (respon == null) return content.OK("鐢熸垚浠诲姟鎴愬姛");
- var strRespon = HttpsClient.PostAsync(ipaddress, requestBindInfo).Result;
+ WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
+ if (!respone.Status)
+ {
+ return content.Error(respone.Message);
+ }
- var responBase = JsonConvert.DeserializeObject<AGVResponBase>(strRespon);
- if (responBase.code != "0") throw new Exception(responBase.message);
-
- //todo
-
- return content.OK();
+ RequestTaskDto input=new RequestTaskDto();
+ input.Position = TargetAddress;
+ WebResponseContent agvtocon=genAgvSchedulingTask(input);
+ if(agvtocon.Status)
+ {
+ return content.OK("鐢熸垚浠诲姟鎴愬姛");
+ }
+ else
+ {
+ return content.Error("閿欒淇℃伅锛�"+agvtocon.Message);
+ }
}
catch (Exception ex)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/agvCallback.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/agvCallback.cs"
index 6f6cb00..e4d985d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/agvCallback.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/agvCallback.cs"
@@ -1,12 +1,20 @@
-锘縰sing Newtonsoft.Json;
+锘縰sing AngleSharp.Io;
+using Mapster;
+using Newtonsoft.Json;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Comm;
using WIDESEA_Comm.AGVTask;
using WIDESEA_Core;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
using WIDESEA_Model.Models;
+using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
namespace WIDESEA_StoragIntegrationServices
@@ -18,38 +26,126 @@
/// </summary>
/// <param name="taskRespon"></param>
/// <returns></returns>
- public WebResponseContent agvCallback(object taskRespon)
+ public AGVResponBase agvCallback(object taskRespon)
{
- WebResponseContent content = new WebResponseContent();
- agvTask task = new agvTask();
+
+ AGVResponBase response = null;
+
+ ContainerTask task = new ContainerTask();
try
{
- task = JsonConvert.DeserializeObject<agvTask>(taskRespon.ToString());
+ task = JsonConvert.DeserializeObject<ContainerTask>(taskRespon.ToString());
+
if (task == null)
{
- throw new Exception("AGV璋冪敤鎺ュ彛澶辫触锛氭棤璇锋眰鍙傛暟");
+ LogFactory.GetLog("AGV浠诲姟鍥炶皟").Info(true, $"鍥炶皟澶辫触锛屾湭鑳借鍙栧埌agv璋冨彇鍙傛暟");
}
- if (task.method.ToLower() == "apply") //AGV鏀炬枡鐢宠
+ if (task.method.ToString() == "outbin2") //AGV鍙栨枡瀹屾垚
{
- //todo
+ Dt_CZInfo_mes CZInfotlist = _task_CZInfoRepository.QueryFirst(x => x.CurrentStatue == "4");
+ if (CZInfotlist != null)
+ {
+ CZInfotlist.CurrentStatue = "5";
+ _task_CZInfoRepository.UpdateData(CZInfotlist);
+ }
+
+ WCS_Set("3022"); //涓嶇鏄惁鏈夊啓鍏ユ垚鍔燂紝閮藉畬鎴恆gv浠诲姟
+ return response = new AGVResponBase
+ {
+ code = "0",
+ message = "鎴愬姛",
+ reqCode = task.reqCode
+ };
+
}
- if (task.method.ToLower() == "end") //AGV浠诲姟缁撴潫
+ if (task.method.ToString() == "end") //AGV浠诲姟缁撴潫鍙嶉
{
+ //骞惰繘琛屼慨鏀逛换鍔′负瀹屾垚
+ Dt_CZInfo_mes CZInfotlist = _task_CZInfoRepository.QueryFirst(x => x.CurrentStatue == "5");
- //todo
- //_taskRepository.QueryFirst(x=>x.SourceAddress == task.)
+ //璋冨彇杈撻�佺嚎鎺ュ彛锛屽弽棣堣緭閫佺嚎瀹屾垚淇″彿
+ WCS_Set(CZInfotlist.AGVaddres);
+
+
+ if(CZInfotlist != null)
+ {
+ CZInfotlist.CurrentStatue = "6";
+ _task_CZInfoRepository.UpdateData(CZInfotlist);
+
+ Dt_CZInfo_mes_hty stockInfo_Hty = CZInfotlist.Adapt<Dt_CZInfo_mes_hty>();
+ _CZInfo_Mes_HtyRepository.AddData(stockInfo_Hty);
+ _task_CZInfoRepository.DeleteData(CZInfotlist);
+ }
+
+
+
+ //鍥炶皟
+ return response = new AGVResponBase
+ {
+ code = "0",
+ message = "鎴愬姛",
+ reqCode = task.reqCode
+ };
}
-
- return content.OK();
+ LogFactory.GetLog("AGV浠诲姟鍥炶皟").Info(true, $"鍥炶皟鎴愬姛");
+ return response;
}
catch (Exception ex)
{
- return content.Error($"AGV鍥炶皟寮傚父:{ex.Message}");
+ LogFactory.GetLog("AGV浠诲姟鍥炶皟").Info(true, $"鍥炶皟澶辫触锛岄敊璇俊鎭細{ex.Message}");
+ return response = new AGVResponBase
+ {
+ code = "1",
+ message = $"澶辫触,鍘熷洜锛歿ex.Message}",
+ reqCode = task.reqCode
+ };
}
}
+
+ public bool WCS_Set(string CutAddress)
+ {
+ try
+ {
+ //璋冨彇wcs鎺ュ彛锛屽啓鍏ヨ緭閫佺嚎淇″彿 SetPlcResponState
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.SetPlcResponState)?.ConfigValue;
+ if (ReceiveByWMSTask == null || ipAddress == null)
+ {
+ throw new Exception("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
+
+ var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(CutAddress)); //http://localhost:9291/api/Task/ReceiveTask,
+
+ if (respon != null)
+ {
+ WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
+ if (respone.Status)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ return false;
+ throw;
+ }
+ }
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs"
index 51d2775..6b5281c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/Partial/genAgvSchedulingTask.cs"
@@ -1,20 +1,16 @@
-锘縰sing MailKit;
-using Mapster;
-using Masuit.Tools;
-using Masuit.Tools.Security;
+锘縰sing Masuit.Tools;
using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using WIDESEA_Comm;
using WIDESEA_Comm.WCSInterface.Requst;
using WIDESEA_Common;
using WIDESEA_Core;
-using WIDESEA_Core.Enums;
-using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_Core.Const;
+using WIDESEA_Core.Helper;
+using WIDESEA_DTO;
using WIDESEA_Model.Models;
using WIDESEA_StorageTaskRepository;
+
namespace WIDESEA_StoragIntegrationServices
{
@@ -25,40 +21,93 @@
/// </summary>
/// <param name="jsondata"></param>
/// <returns></returns>
- public WebResponseContent genAgvSchedulingTask(Dt_Task taskinfo)
+ public WebResponseContent genAgvSchedulingTask(RequestTaskDto input)
{
WebResponseContent content = new WebResponseContent();
try
{
+ if (string.IsNullOrEmpty(input.Position)) { return content.Error($"agv浠诲姟涓嬪彂鐢宠鐩爣鍦板潃涓虹┖锛侊紒锛佽妫�鏌�"); }
+ //鏌ユ壘褰撳墠鍦ㄨ溅杞寸嚎鏈闇�瑕乤gv鎼繍鐨勮溅杞�
+
+ List<Dt_CZInfo_mes> CZInfotlist = _task_CZInfoRepository.QueryData(x => x.CurrentStatue == "3" || x.CurrentStatue == "4" || x.CurrentStatue == "5" || x.CurrentStatue == "13");
+
+ if (CZInfotlist.Count >= 2) { return content.Error($"宸叉湁agv浠诲姟姝ｅ湪杩涜涓紝涓嬪彂澶辫触锛侊紒锛�"); }
+
+ Dt_CZInfo_mes CZInfot = CZInfotlist.FirstOrDefault(x => x.CurrentStatue == "3" || x.CurrentStatue == "13");
+ if (CZInfot == null) { return content.Error($"鏈壘鍒扮幇鏈夎緭閫佺嚎瀹屾垚鐨勮溅杞翠俊鎭�"); }
+
+ CZInfot.CurrentStatue = "4";
+
+
+ //鏌ユ壘杞﹁酱瀵瑰簲鐨勮溅杞俊鎭�
+ List<Dt_Task> tasks=_taskRepository.QueryData(x => x.task_CZInfo == CZInfot.CZH).ToList();
+ if (tasks.Count > 0)
+ {
+ foreach (var task in tasks)
+ {
+ task.Towhereabouts = input.Position;
+ }
+ }
+
+ string agvtarget = "F1";
+ if (input.Position == "2033")
+ {
+ agvtarget = "F2";
+ }
+
+ //agv鍙傛暟璋冨彇
genAgvSchedulingTask schedulingTask = new genAgvSchedulingTask
{
reqCode = Guid.NewGuid().ToString().Replace("-", ""),
clientCode = "WMS",
- //taskTyp = tasktype,
- ctnrTyp = "2",
+ taskTyp = "BY",
+ ctnrTyp = "1",
//data = taskinfo.task_barcode,
positionCodePath = new List<position>
{
- new position { positionCode = taskinfo.SourceAddress, type = "05" },
- new position { positionCode = taskinfo.TargetAddress, type = "05" },
+ new position { positionCode = "Q", type = "00" },
+ new position { positionCode = agvtarget, type = "00" }, //鍦板潃寰呮洿鏀逛负 F1 宸﹁竟 F2 鍙宠竟
},
- priority = "1", //浼樺厛绾�
- agvCode = "",//agvcode,
- //taskCode = taskinfo.task_id.ToString(),
};
+ CZInfot.AGVaddres = input.Position;
- LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, taskinfo.ToJsonString());
+ //缂栧啓璋冨彇agv鎺ュ彛
+ string ipaddress = AGV_Interface;
- return content;
+ var requestBindInfo = schedulingTask.ToDictionary();
+
+ var respon = HttpHelper.Post(ipaddress, JsonConvert.SerializeObject(schedulingTask));
+
+
+ var responBase = JsonConvert.DeserializeObject<AGVResponBase>(respon);
+
+
+
+
+ if (responBase.code == "0")
+ {
+ _task_CZInfoRepository.UpdateData(CZInfot);
+ if (tasks.Count > 0)
+ {
+ _taskRepository.UpdateData(tasks);
+ }
+
+ LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, $"璋冨彇agv浠诲姟鎴愬姛锛屼慨鏀逛簡杞﹁酱鏉＄爜锛歿CZInfot.CZTM}鐨勭姸鎬佹敼鑷筹細{CZInfot.CurrentStatue}");
+ content.OK($"agv浠诲姟涓嬪彂鎴愬姛.");
+ return content;
+ }
+ else
+ {
+ LogFactory.GetLog("涓嬪彂AGV浠诲姟").Error(true, $"璋冨彇agv浠诲姟澶辫触锛岃繑鍥炰俊鎭細{responBase.message}");
+ return content.Error($"璇锋眰寮傚父锛歿responBase.message}");
+ }
}
catch (Exception ex)
{
- LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("涓嬪彂AGV浠诲姟").Info(true, ex.Message);
+ LogFactory.GetLog("涓嬪彂AGV浠诲姟").Error(true, ex.Message);
return content.Error($"璇锋眰寮傚父锛歿ex.Message}");
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/ToAGVService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/ToAGVService.cs"
index 2d67693..cdb8147 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/ToAGVService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/AGV/ToAGVService.cs"
@@ -25,11 +25,13 @@
private readonly IDt_CheckResultRepository _checkResultRepository;
private readonly IToZYService _toZYService;
private readonly IDt_Task_HtyRepository _task_HtyRepository;
+ private readonly IDt_CZInfo_mesRepository _task_CZInfoRepository;
+ private readonly IDt_CZInfo_mes_htyRepository _CZInfo_Mes_HtyRepository;
private readonly LogFactory LogFactory = new LogFactory();
- public static string AGV_Interface = "http://172.21.7.215:8182/rcms/services/rest/hikRpcService";
+ public static string AGV_Interface = "http://172.21.7.215:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask";
- public ToAGVService(ILocationInfoRepository locationRepository,IDt_TaskRepository taskRepository, IStockInfoRepository stockInfoRepository, ISys_ConfigService configService, IDt_StationManagerRepository stationManagerRepository, IDt_AreaInfoRepository dt_AreaInfoRepository, IDt_CheckResultRepository checkResultRepository, IToZYService toZYService , IDt_Task_HtyRepository task_HtyRepository)
+ public ToAGVService(ILocationInfoRepository locationRepository,IDt_TaskRepository taskRepository, IStockInfoRepository stockInfoRepository, ISys_ConfigService configService, IDt_StationManagerRepository stationManagerRepository, IDt_AreaInfoRepository dt_AreaInfoRepository, IDt_CheckResultRepository checkResultRepository, IToZYService toZYService , IDt_Task_HtyRepository task_HtyRepository, IDt_CZInfo_mesRepository dt_CZInfo_MesRepository, IDt_CZInfo_mes_htyRepository CZInfo_Mes_HtyRepository)
{
_locationRepository = locationRepository;
_taskRepository = taskRepository;
@@ -40,6 +42,8 @@
_checkResultRepository = checkResultRepository;
_toZYService = toZYService;
_task_HtyRepository = task_HtyRepository;
+ _task_CZInfoRepository = dt_CZInfo_MesRepository;
+ _CZInfo_Mes_HtyRepository = CZInfo_Mes_HtyRepository;
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
index 3d4d78a..135cf05 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveCZInfo.cs"
@@ -163,7 +163,9 @@
if (rw != newOrOld) throw new Exception("閫夐厤澶辫触:閫夐厤鏂版棫杞笌缁翠慨浠诲姟瑙ｆ瀽涓嶄竴鑷�");
- Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType.Contains(Cartype) && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
+ string wheelsProps = CheckTaskChangeHelper.CheckTaskwheelsProps(wxrw);
+
+ Dt_SelectionStandards selectionStandards = _SelectionStandardsRepository.QueryFirst(x => x.CarType== Cartype && x.mttype == mttype && x.neworold == newOrOld && level.Contains(x.gkdj));
if (selectionStandards == null) throw new Exception($"姝よ溅鍨媨Cartype}鐨勯�夐厤鏍囧噯寮傚父,璇锋牳瀵归�夐厤鏍囧噯淇℃伅!");
Dt_CZInfo_mes CZInfo_Mes = new Dt_CZInfo_mes
@@ -218,7 +220,7 @@
int hour = hourpara.ConfigValue.ObjToInt();
//鎵惧嚭鎵�鏈夌鍚堟潯浠剁殑搴撳瓨杞﹁疆
- var WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now);
+ var WheelsList = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1 && x.Wheels_mttype == CZInfo_Mes.MTTYPE && x.Wheels_ldxh == clxh && x.Wheels_NewOrOld == newOrOld && x.CreateDate.AddHours(hour) <= DateTime.Now && x.WheelsProps == wheelsProps);
//x.Wheels_CarType == CZInfo_Mes.CHEXING && x.Wheels_ldtm == CZInfo_Mes.LDTM && selectionStandards.CarType.Contains(x.Wheels_CarType)
if (null != WheelsList && WheelsList.Count > 0)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs"
index f4bd44e..522e8ab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/Partial/SaveZDPInfo.cs"
@@ -7,6 +7,7 @@
using WIDESEA_Common;
using WIDESEA_Common.ZY;
using WIDESEA_Core;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Model.Models;
@@ -26,92 +27,101 @@
{
//濡傚綋鍓嶅瓨鍦ㄦ湭寮�濮嬪叆搴撶殑杞﹁疆鎴栧埗鍔ㄧ洏鏁版嵁,鍒欑姝繚瀛樻柊鏁版嵁 浠ラ槻鏁版嵁娣蜂贡
var waitInbound = _InWheels_MesRepository.QueryFirst(x => x.Wheels_CurrentStatue == "0");
- if (waitInbound != null) throw new Exception("褰撳墠瀛樺湪鏈紑濮嬪叆搴撶殑杞﹁疆鎴栧埗鍔ㄧ洏,璇峰厛鍏ュ簱鍚庡啀淇濆瓨淇℃伅!");
+ if (waitInbound != null) throw new Exception("褰撳墠瀛樺湪鏈紑濮嬪叆搴撶殑鍒跺姩鐩�,璇峰厛鍏ュ簱鍚庡啀淇濆瓨淇℃伅!");
- //杞﹁疆鐮�
+ //鍒跺姩鐩樻潯鐮�
string clCode = saveModel.MainData["code"].ToString();
if (string.IsNullOrEmpty(clCode))
- throw new Exception($"杞﹁疆鏉＄爜涓嶈兘涓虹┖");
+ throw new Exception($"鍒跺姩鐩樻潯鐮佷笉鑳戒负绌�");
- var clinfo = _InWheels_MesRepository.QueryFirst(x => x.Wheels_code == clCode);
- if (clinfo != null) throw new Exception("杞﹁疆褰曞叆淇℃伅宸插瓨鍦�");
+ var clinfo = _InZdp_MesRepository.QueryFirst(x => x.Zdp_code == clCode);
+ if (clinfo != null) throw new Exception("鍒跺姩鐩樻潯鐮佸綍鍏ヤ俊鎭凡瀛樺湪");
//妫�娴嬪簱瀛樻槸鍚﹀凡瀛樺湪
- _WheelsStockRepository.QueryFirst(x => x.Wheels_code == clCode);
+ _ZdpStockRepository.QueryFirst(x => x.Zdp_code == clCode);
if (clinfo != null) throw new Exception("搴撳唴宸插瓨鍦�,璇锋鏌ュ簱瀛�");
//搴忓垪鍙�
//string madeUnit = saveModel.MainData["xlh"].ToString();
- //杞﹁疆鍙�
- string clh = saveModel.MainData["clh"].ToString();
- //杞鏉＄爜
- string ldtm = saveModel.MainData["ldtm"].ToString();
+ //鍒跺姩鐩樺彿
+ string ZPH = saveModel.MainData["ZPH"].ToString();
//杞﹀瀷
string Cartype = saveModel.MainData["chexing"].ToString();
- //閰嶅睘灞�
- string psj = saveModel.MainData["psj"].ToString();
- //杞︾粍鍙�
- string lcch = saveModel.MainData["lcch"].ToString();
//鏂版棫
string newOrOld = saveModel.MainData["neworold"].ToString();
- //杞鍙�
- string ldh = saveModel.MainData["ldh"].ToString();
- //杞鍨嬪彿
- string ldxh = saveModel.MainData["ldxh"].ToString();
- //姣傚瓟绛夌骇
- string gkdj = saveModel.MainData["gkdj"].ToString();
- //姣傚瓟a鐣岄潰鍧囧��
- string gkzja = saveModel.MainData["gkzja"].ToString();
- //姣傚瓟b鐣岄潰鍧囧��
- string gkzjb = saveModel.MainData["gkzjb"].ToString();
- //姣傚瓟c鐣岄潰鍧囧��
- string gkzjc = saveModel.MainData["gkzjc"].ToString();
- //杞緞鍊�
- string ljz = saveModel.MainData["ljz"].ToString();
- //棰勪及杞緞鍊�
- string yglj = saveModel.MainData["yglj"].ToString();
- //鍏ュ簱鏃堕棿
+ //浣嶇疆(渚�/涓�)
+ string POS = saveModel.MainData["POS"].ToString();
+ // 铻烘爴鍨嬪彿
+ string LSXH = saveModel.MainData["LSXH"].ToString();
+ //鏉愯川(閾搁挗)
+ string MAT = saveModel.MainData["MAT"].ToString();
+ //浜у湴(杩涘彛/鍥戒骇)
+ string SITE = saveModel.MainData["SITE"].ToString();
+ //姣傚瓟鐩村緞A1
+ string GKA1 = saveModel.MainData["GKA1"].ToString();
+ //姣傚瓟鐩村緞A2
+ string GKA2 = saveModel.MainData["GKA2"].ToString();
+ //姣傚瓟鐩村緞A3
+ string GKA3 = saveModel.MainData["GKA3"].ToString();
+ //姣傚瓟鐩村緞A
+ string GKA = saveModel.MainData["GKA"].ToString();
+ //姣傚瓟鐩村緞B1
+ string GKB1 = saveModel.MainData["GKB1"].ToString();
+ //姣傚瓟鐩村緞B2
+ string GKB2 = saveModel.MainData["GKB2"].ToString();
+ //姣傚瓟鐩村緞A3
+ string GKB3 = saveModel.MainData["GKB3"].ToString();
+ //姣傚瓟鐩村緞A
+ string GKB = saveModel.MainData["GKB"].ToString();
+ //姣傚瓟鐩村緞C1
+ string GKC1 = saveModel.MainData["GKC1"].ToString();
+ //姣傚瓟鐩村緞C2
+ string GKC2 = saveModel.MainData["GKC2"].ToString();
+ //姣傚瓟鐩村緞C3
+ string GKC3 = saveModel.MainData["GKC3"].ToString();
+ //姣傚瓟鐩村緞A
+ string GKC = saveModel.MainData["GKC"].ToString();
+ //姣傚瓟鐩村緞
+ string GKJZ = saveModel.MainData["GKJZ"].ToString();
+ //铻烘爴渚у墿浣欑（鑰�
+ string LSCSYMH = saveModel.MainData["LSCSYMH"].ToString();
+ //铻烘瘝渚у墿浣欑（鑰�
+ string LMCSYMH = saveModel.MainData["LMCSYMH"].ToString();
+ //鍏ュ簱鏃ユ湡
string rksj = saveModel.MainData["rksj"].ToString();
- //灞炴��
- string WheelsProps = saveModel.MainData["clsx"].ToString();
- //鍔ㄦ嫋灞炴��
- string mttype = saveModel.MainData["mttype"].ToString();
- //姣傚瓟鍧囧��
- string gkcc = saveModel.MainData["gkcc"].ToString();
- //鍒涘缓浜�
- //string user = saveModel.MainData["user"].ToString();
+ if (_locationRepository.QueryData(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).Count < 2) throw new Exception($"搴撲綅鏁伴噺涓嶈冻,涓嶅厑璁稿叆搴�");
-
- Dt_InWheels_mes wheels_Mes = new Dt_InWheels_mes
+ Dt_InZdp_mes dt_InZdp_ = new Dt_InZdp_mes
{
- Wheels_code = clCode,
- Wheels_Type = "1",
- Wheels_Num = clh,
- CreateDate = DateTime.Now,
- Creater = "admin",
- WheelsProps = WheelsProps,
- Wheels_CarNo = lcch,
- Wheels_CarType = Cartype,
- Wheels_ldxh = ldxh,
- Wheels_CurrentStatue = "0",
- Wheels_ldtm = ldtm,
- Wheels_InDate = rksj,
- Wheels_level = gkdj,
- Wheels_NewOrOld = newOrOld,
- Wheels_psj = psj,
- Wheels_gkcc = gkcc,
- Wheels_gkzja = gkzja,
- Wheels_gkzjb = gkzjb,
- Wheels_gkzjc = gkzjc,
- Wheels_ldh = ldh,
- Wheels_ljz = ljz,
- Wheels_mttype = mttype,
- //Wheels_SequenceNum = "",
- Wheels_ygljz = yglj,
+ Zdp_code = clCode, // 涓婚敭鎴栫紪鍙�
+ Zdp_ZPH = ZPH, // 鍒跺姩鐩樺彿
+ Zdp_chexing = Cartype, // 杞﹀瀷
+ Zdp_neworold = newOrOld, // 鏂版棫
+ Zdp_POS = POS, // 浣嶇疆锛堜晶/涓級
+ Zdp_LSXH = LSXH, // 铻烘爴鍨嬪彿
+ Zdp_MAT = MAT, // 鏉愯川锛堥摳閽級
+ Zdp_SITE = SITE, // 浜у湴锛堣繘鍙�/鍥戒骇锛�
+ Zdp_GKA1 = GKA1, // 姣傚瓟鐩村緞A1
+ Zdp_GKA2 = GKA2, // 姣傚瓟鐩村緞A2
+ Zdp_GKA3 = GKA3, // 姣傚瓟鐩村緞A3
+ Zdp_GKA = GKA, // 姣傚瓟鐩村緞A
+ Zdp_GKB1 = GKB1, // 姣傚瓟鐩村緞B1
+ Zdp_GKB2 = GKB2, // 姣傚瓟鐩村緞B2
+ Zdp_GKB3 = GKB3, // 姣傚瓟鐩村緞B3
+ Zdp_GKB = GKB, // 姣傚瓟鐩村緞B
+ Zdp_GKC1 = GKC1, // 姣傚瓟鐩村緞C1
+ Zdp_GKC2 = GKC2, // 姣傚瓟鐩村緞C2
+ Zdp_GKC3 = GKC3, // 姣傚瓟鐩村緞C3
+ Zdp_GKC = GKC, // 姣傚瓟鐩村緞C
+ Zdp_GKJZ = GKJZ, // 姣傚瓟鐩村緞鍩哄噯
+ Zdp_LSCSYMH = LSCSYMH, // 铻烘爴渚у墿浣欑（鑰�
+ Zdp_LMCSYMH = LMCSYMH, // 铻烘瘝渚у墿浣欑（鑰�
+ Zdp_rksj = rksj, // 鍏ュ簱鏃ユ湡
+ Zdp_CurrentStatue="0"
};
- if (_InWheels_MesRepository.AddData(wheels_Mes) > 0)
+ if (_InZdp_MesRepository.AddData(dt_InZdp_) > 0)
{
return content.OK("淇濆瓨鎴愬姛");
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs"
index 317d865..3277860 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ToAPP/ToAPPService.cs"
@@ -30,11 +30,13 @@
private readonly IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository;
private readonly ISelectionWheelsRepository _SelectionWheelsRepository;
private readonly IDt_AxleshelfService _AxleshelfService;
-
+ private readonly IDt_ZdpStockRepository _ZdpStockRepository;
+ private readonly IDt_ZdpStockService _ZdpStockService;
+ private readonly IDt_InZdp_mesRepository _InZdp_MesRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- public ToAPPService(ILocationInfoRepository locationRepository, IDt_TaskRepository taskRepository, ISys_ConfigService configService, IDt_InWheels_mesRepository inWheels_MesRepository, IDt_WheelsStockRepository wheelsStockRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IDt_WheelsStockService wheelsStockService, IDt_CZInfo_mesRepository cZInfo_MesRepository, IUnitOfWorkManage unitOfWorkManage, IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository, ISelectionWheelsRepository selectionWheelsRepository, IDt_AxleshelfService axleshelfService)
+ public ToAPPService(ILocationInfoRepository locationRepository, IDt_TaskRepository taskRepository, ISys_ConfigService configService, IDt_InWheels_mesRepository inWheels_MesRepository, IDt_WheelsStockRepository wheelsStockRepository, IDt_SelectionStandardsRepository selectionStandardsRepository, IDt_WheelsStockService wheelsStockService, IDt_CZInfo_mesRepository cZInfo_MesRepository, IUnitOfWorkManage unitOfWorkManage, IDt_WheelsStock_OldRepository dt_WheelsStock_OldRepository, ISelectionWheelsRepository selectionWheelsRepository, IDt_AxleshelfService axleshelfService, IDt_ZdpStockRepository zdpStockRepository, IDt_InZdp_mesRepository inZdp_MesRepository, IDt_ZdpStockService zdpStockService)
{
_InWheels_MesRepository = inWheels_MesRepository;
_locationRepository = locationRepository;
@@ -48,6 +50,9 @@
this.dt_WheelsStock_OldRepository = dt_WheelsStock_OldRepository;
_SelectionWheelsRepository = selectionWheelsRepository;
_AxleshelfService = axleshelfService;
+ _ZdpStockRepository = zdpStockRepository;
+ _InZdp_MesRepository = inZdp_MesRepository;
+ _ZdpStockService = zdpStockService;
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs"
index 91f3c1e..1a7560b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/ZY/Partial/getZDPInfo.cs"
@@ -1,11 +1,16 @@
锘�
using Masuit.Tools;
using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using System.Reflection.Emit;
+using System.Security.Policy;
+using System;
using WIDESEA.Common;
using WIDESEA_Common;
using WIDESEA_Common.ZY;
using WIDESEA_Core;
using WIDESEA_Core.Helper;
+using WIDESEA_Model.Models;
namespace WIDESEA_StoragIntegrationServices
{
@@ -38,7 +43,8 @@
ZDPInfo_ZY inf2o = XMLSerializationTool.DeserializeXmlToObject<ZDPInfo_ZY>(responStr);
- if (inf2o.FLAG != "S") throw new Exception($"鑾峰彇淇℃伅澶辫触:鎺ュ彛杩斿洖澶辫触:{inf2o.ERROR}");
+ if (inf2o.FLAG != "S")
+ throw new Exception($"鑾峰彇淇℃伅澶辫触:鎺ュ彛杩斿洖澶辫触:{inf2o.ERROR}");
//string info2 = XMLSerializationTool.SerializeObjectToXml<string>(responStr);
//CLInfo_ZY info_ZY = new CLInfo_ZY() //娴嬭瘯鏁版嵁
@@ -60,8 +66,35 @@
// //ygljz = "121"
//};
- //inf2o.CHEXING = "CRH1A";
- //inf2o.MTTYPE = "M";
+
+
+ inf2o.ZPH = "20231021-0019/25103295 0011";
+ inf2o.CHEXING = "CRH1A";
+ inf2o.NEWOLD = "鏃�";
+ inf2o.POS = "涓棿";
+ inf2o.LSXH = "XKDS";
+ inf2o.MAT = "閽�";
+ inf2o.SITE = "鍥戒骇";
+ inf2o.GKA1 = "0.53";
+ inf2o.GKA2 = "0.23";
+ inf2o.GKA3 = "0.133";
+ inf2o.GKA = "0.535";
+ inf2o.GKB1 = "0.533";
+ inf2o.GKB2 = "0.431";
+ inf2o.GKB3 = "0.532";
+ inf2o.GKB = "0.623";
+ inf2o.GKC1 = "0.123";
+ inf2o.GKC2 = "0.533";
+ inf2o.GKC3 = "0.222";
+ inf2o.GKC = "0.543";
+ inf2o.GKJZ = "0.22";
+ inf2o.LSCSYMH = "0.42";
+ inf2o.LMCSYMH = "0.031";
+ inf2o.RKSJ = DateTime.Now.ToString();
+
+
+
+
//CLInfo_ZY info_ZY = XmlToJson(responStr);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/BasicInfo/Dt_SelectionStandardsService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/BasicInfo/Dt_SelectionStandardsService.cs"
index 457eae1..981c914 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/BasicInfo/Dt_SelectionStandardsService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/BasicInfo/Dt_SelectionStandardsService.cs"
@@ -1,4 +1,7 @@
-锘縰sing WIDESEA_IServices;
+锘縰sing AngleSharp.Dom;
+using System.Reflection;
+using WIDESEA_Core.Utilities;
+using WIDESEA_IServices;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Model.Models;
@@ -62,5 +65,54 @@
return content.Error($"娣诲姞澶辫触:{ex.Message}");
}
}
+
+ /// <summary>
+ /// 淇敼鏁版嵁
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public virtual WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ try
+ {
+ int id = int.Parse(saveModel.MainData["id"].ToString());
+ string carType = saveModel.MainData["carType"].ToString();
+ string mttype = saveModel.MainData["mttype"].ToString();
+ string neworold = saveModel.MainData["neworold"].ToString();
+ string gkdj = saveModel.MainData["gkdj"].ToString();
+ decimal lowerValue = Convert.ToDecimal(saveModel.MainData["lowerValue"]);
+ decimal upperValue = Convert.ToDecimal(saveModel.MainData["upperValue"]);
+ int isCantainGK = saveModel.MainData["isCantainGK"].ObjToInt();
+ decimal lowerValue_gk = Convert.ToDecimal(saveModel.MainData["lowerValue_gk"]);
+ decimal upperValue_gk = Convert.ToDecimal(saveModel.MainData["upperValue_gk"]);
+
+ Dt_SelectionStandards dt_Selection = BaseDal.QueryFirst(x => x.ID == id);
+ dt_Selection.CarType=carType;
+ dt_Selection.mttype=mttype;
+ dt_Selection.neworold = neworold;
+ dt_Selection.gkdj = gkdj;
+ dt_Selection.lowerValue = lowerValue;
+ dt_Selection.upperValue = upperValue;
+ dt_Selection.isCantainGK = isCantainGK != 0 ? true : false;
+ dt_Selection.lowerValue_gk = lowerValue_gk;
+ dt_Selection.upperValue_gk = upperValue_gk;
+
+
+ if (BaseDal.UpdateData(dt_Selection))
+ {
+ return WebResponseContent.Instance.OK("娣诲姞鎴愬姛");
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("娣诲姞澶辫触");
+ }
+
+
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mesService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mesService.cs"
index d2caa3e..ef2c54d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mesService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mesService.cs"
@@ -3,6 +3,8 @@
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System.ComponentModel.DataAnnotations;
using WIDESEA_Core;
+using WIDESEA_DTO;
+using WIDESEA_IStoragIntegrationServices;
using WIDESEA_StorageBasicRepository;
namespace WIDESEA_StorageBasicService;
@@ -199,4 +201,100 @@
// 杩斿洖楠岃瘉缁撴灉鍒楄〃
return validationResults;
}
+
+
+ public WebResponseContent RequestAxleloading(RequestTaskDto input)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_CZInfo_mes CZInfot = BaseDal.QueryFirst(x => x.CurrentStatue == "1" || x.CurrentStatue == "11");
+
+ if (CZInfot != null)
+ {
+ CZInfot.CurrentStatue = CZInfot.CurrentStatue=="1"?"2":"12";
+ BaseDal.UpdateData(CZInfot);
+ return content.OK(data: CZInfot.CZTM);
+ }
+ else
+ {
+ return content.Error("鏈壘鍒伴渶瑕佷笂鏋剁殑杞﹁酱鏉＄爜");
+ }
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+ public WebResponseContent UpdateAxleCurrentStatue(RequestTaskDto input)
+ {
+
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_CZInfo_mes CZInfot = BaseDal.QueryFirst(x => x.CZTM == input.PalletCode);
+
+ if (CZInfot != null)
+ {
+ if (CZInfot.CurrentStatue == "2")
+ {
+ CZInfot.CurrentStatue = "3";
+ }
+ else if (CZInfot.CurrentStatue == "12")
+ {
+ CZInfot.CurrentStatue = "13";
+
+ }
+ else
+ {
+ return content.Error($"鏈壘鍒扮敵璇疯溅杞存潯鐮佷俊鎭紝鐘舵�佷笉涓鸿緭閫佺嚎杩愯涓紝鐢宠鏉＄爜锛歿input.PalletCode}");
+ }
+
+ BaseDal.UpdateData(CZInfot); //鍏堜慨鏀逛簡鐘舵��
+ return content.OK();
+ }
+ else
+ {
+ return content.Error($"鏈壘鍒扮敵璇疯溅杞存潯鐮佷俊鎭紝鐢宠鏉＄爜锛歿input.PalletCode}");
+ }
+ }
+ catch (Exception ex)
+ {
+ return content.Error($"鏇存柊杞﹁酱淇℃伅鐘舵�佸嚭閿欙紝鐢宠鏉＄爜锛歿input.PalletCode},閿欒淇℃伅锛歿ex.Message}");
+ }
+ }
+
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ try
+ {
+ int id = int.Parse(saveModel.MainData["id"]?.ToString());
+ string cztm = saveModel.MainData["cztm"]?.ToString();
+ if (string.IsNullOrEmpty(cztm))
+ throw new Exception($"杞﹁酱鍙蜂负绌�");
+ string currentStatue = saveModel.MainData["currentStatue"]?.ToString();
+ if (string.IsNullOrEmpty(currentStatue))
+ throw new Exception($"杞﹁酱鐘舵�佷负绌�");
+ Dt_CZInfo_mes CZInfot = BaseDal.QueryFirst(x => x.ID == id);
+ if (CZInfot != null)
+ {
+ CZInfot.CZTM = cztm;
+ CZInfot.CurrentStatue = currentStatue;
+ BaseDal.UpdateData(CZInfot); //鍏堜慨鏀逛簡鐘舵��
+ return webResponse.OK($"淇敼鎴愬姛");
+ }
+ else
+ {
+ return webResponse.Error($"淇敼澶辫触锛屾湭鎵惧埌杞﹁酱淇℃伅");
+ }
+ }
+ catch (Exception ex)
+ {
+ return webResponse.Error($"淇敼澶辫触锛岄敊璇俊鎭細{ex.Message}");
+ throw;
+ }
+ }
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mes_htyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mes_htyService.cs"
index e2b25e7..e0c63c9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mes_htyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Boxing/Dt_CZInfo_mes_htyService.cs"
@@ -1,7 +1,9 @@
-锘縰sing Mapster;
+锘縰sing AngleSharp.Dom;
+using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System.ComponentModel.DataAnnotations;
+using System.Reflection;
using WIDESEA_Core;
using WIDESEA_StorageBasicRepository;
@@ -157,6 +159,8 @@
}
}
+
+
public override WebResponseContent DeleteData(object key)
{
WebResponseContent content = new WebResponseContent();
@@ -197,4 +201,5 @@
// 杩斿洖楠岃瘉缁撴灉鍒楄〃
return validationResults;
}
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs"
index d8f37f8..e320f9d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs"
@@ -102,6 +102,62 @@
}
}
+
+ /// <summary>
+ /// 妫�鏌ュ苟鐢熸垚绉诲簱浠诲姟鎴栬繑鍥炲叆搴撲换鍔�
+ /// </summary>
+ /// <param name="locationID">浠诲姟鍙�</param>
+ /// <returns>浠诲姟瀵硅薄</returns>
+ public virtual async Task<Dt_Task> InTransferCheckAsync(RequestTaskDto input)
+ {
+ try
+ {
+ int taskNum = input.taskNum;
+
+ // 鏍规嵁浠诲姟鍙疯幏鍙栧叆搴撲换鍔�
+ var inboundTask = await _taskRepository.QueryFirstAsync(x => x.TaskNum == taskNum);
+ if (inboundTask == null)
+ return null;
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "鏍规嵁浠诲姟鍙疯幏鍙栦换鍔�", $"浠诲姟鍙凤細{taskNum}锛屼换鍔℃暟鎹細{inboundTask}");
+
+ var location = await BaseDal.QueryFirstAsync(x => x.LocationCode == inboundTask.TargetAddress);
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "鑾峰彇鎸囧畾搴撲綅鐨勮揣浣嶆暟鎹�", $"璐т綅鍙凤細{inboundTask.TargetAddress}锛岃揣浣嶆暟鎹細{location}");
+
+ // 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴�
+ if (CheckForInternalTransfer(location))
+ {
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�", $"璐т綅鍙凤細{inboundTask.TargetAddress}锛岃揣浣嶆暟鎹細{location}");
+ // 璁＄畻瀵瑰簲浣嶇疆鐨勭浉瀵瑰簱浣� 锛堝鏁拌鐨勪笅涓�琛屾垨鑰呭伓鏁拌鐨勪笂涓�琛岋級
+ var newLocationID = GetRelativeLocationID(location);
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,缁勫缓闇�瑕佺Щ搴撹揣浣嶅彿", $"鏂扮殑搴撲綅ID锛歿newLocationID}");
+
+ var relocationTask = await _taskRepository.QueryFirstAsync(x => x.TargetAddress == newLocationID && x.Roadway == inboundTask.Roadway && x.TaskType == (int)TaskTypeEnum.Relocation);
+ if (relocationTask != null) return relocationTask;
+
+ // 鑾峰彇鏂扮殑搴撲綅鐨勪换鍔�
+ var internalTransferTask = await _taskRepository.QueryFirstAsync(x => x.TargetAddress == newLocationID && x.Roadway == inboundTask.Roadway && x.TaskState == (int)TaskOutStatusEnum.OutNew);
+
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鑾峰彇鏂板簱浣嶇殑浠诲姟", $"鏂板簱浣嶄换鍔★細{internalTransferTask}");
+ // 濡傛灉鏂扮殑搴撲綅娌℃湁鎵惧埌瀵瑰簲鐨勪换鍔�
+ if (internalTransferTask == null)
+ {
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鏈幏鍙栧埌鏂板簱浣嶄换鍔�", $"");
+ return await InHandleLocation(inboundTask.TargetAddress, newLocationID, inboundTask);
+ }
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鑾峰彇鍒版柊搴撲綅浠诲姟鐩存帴杩斿洖", $"鏂板簱浣嶄换鍔★細{internalTransferTask}");
+ // 鐩存帴杩斿洖涓�娣变綅鍑哄簱浠诲姟
+ return internalTransferTask;
+ }
+
+ // 杩斿洖褰撳墠搴撲綅鐨勫嚭搴撲换鍔�
+ return inboundTask;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
public override WebResponseContent UpdateData(SaveModel saveModel)
{
int id = saveModel.MainData["id"].ObjToInt();
@@ -253,6 +309,32 @@
#endregion 鍚敤绂佺敤璐т綅
+ #region 澶у睆搴撲綅鐘舵�佽幏鍙�
+ public WebResponseContent LocationStatus()
+ {
+ WebResponseContent content = new WebResponseContent();
+
+ // 鑾峰彇鎵�鏈夊簱浣嶆暟鎹�
+ List<DtLocationInfo> locations = BaseDal.QueryData();
+
+ // 鎸塋ocationStatus鍒嗙粍缁熻
+ var statusGroups = locations
+ .GroupBy(l => l.LocationStatus)
+ .Select(g => new
+ {
+ Status = g.Key==0?"绌鸿揣浣�": g.Key == 1 ? "閿佸畾": g.Key == 2 ? "鏈夎揣": "鏈夎揣绂佺敤",
+ Count = g.Count(),
+ })
+ .ToList();
+
+ // 灏嗙粺璁＄粨鏋滄斁鍏ュ搷搴斿唴瀹�
+ content.Data = statusGroups;
+
+ return content;
+ }
+ #endregion
+
+
#region 鍐呴儴鏂规硶
#region 绉诲簱鏂规硶
@@ -331,6 +413,61 @@
}
/// <summary>
+ /// 澶勭悊鍏ュ簱娌℃湁浠诲姟鐨勫簱浣嶆儏鍐�
+ /// </summary>
+ /// <param name="originalLocationID">鍘熷搴撲綅ID</param>
+ /// <param name="newLocationID">鏂扮殑搴撲綅ID</param>
+ /// <param name="outboundTask">鍑哄簱浠诲姟</param>
+ /// <returns>鐢熸垚鐨勭Щ搴撲换鍔℃垨鍘熷鍑哄簱浠诲姟</returns>
+ private async Task<Dt_Task> InHandleLocation(string originalLocationID, string newLocationID, Dt_Task inboundTask)
+ {
+ // 鍒ゆ柇璇ヤ綅缃槸鍚︽湁搴撳瓨
+ var stockInfo = await _WheelsStockRepository.QueryFirstAsync(x => x.Wheels_Location == newLocationID);
+
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鏈幏鍙栧埌鏂板簱浣嶄换鍔�", $"璇ヤ綅缃槸鍚︽湁搴撳瓨锛歿stockInfo}");
+ if (stockInfo == null)
+ {
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鏈幏鍙栧埌搴撳瓨鏁版嵁", $"鐩存帴杩斿洖鍘熷厛鍑哄簱浠诲姟锛歿inboundTask}");
+ // 濡傛灉娌℃湁搴撳瓨锛岀洿鎺ヨ繑鍥炲綋鍓嶅嚭搴撲换鍔�
+ return inboundTask;
+ }
+ else
+ {
+ // 濡傛灉鏈夊簱瀛橈紝鐢熸垚绉诲簱浠诲姟
+ var emptyLocation = RequestLocation("SC1");
+ if (emptyLocation == null) throw new Exception("鏆傛棤绌哄簱");
+
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鏌ユ壘鑳界Щ搴撹揣浣�", $"璐т綅鏁版嵁锛歿emptyLocation}");
+ var taskNo = await _taskRepository.GetTaskNo();
+ Dt_Task newTransferTask = new Dt_Task()
+ {
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName == null ? "admin" : App.User.UserName,
+ CurrentAddress = stockInfo.Wheels_Location,
+ Grade = 99,
+ MaterialNo = stockInfo.Wheels_Type,
+ NextAddress = emptyLocation.LocationCode,
+ PalletCode = stockInfo.Wheels_Num,
+ Remark = "绉诲簱",
+ Roadway = "SC1",
+ SourceAddress = stockInfo.Wheels_Location,
+ TaskNum = taskNo,
+ TargetAddress = emptyLocation.LocationCode,
+ TaskState = (int)TaskStatus.Created,
+ TaskType = (int)TaskTypeEnum.Relocation,
+ Dispatchertime = DateTime.Now,
+ };
+ LogFactory.GetLog("妫�鏌ユ槸鍚﹂渶瑕佺Щ搴�").InfoFormat(true, "闇�瑕佺Щ搴�,鏂板缓绉诲簱浠诲姟", $"绉诲簱浠诲姟鏁版嵁锛歿newTransferTask}");
+
+ //淇敼搴撲綅鐘舵��
+ emptyLocation.LocationStatus = (int)LocationEnum.FreeDisable;
+ BaseDal.UpdateData(emptyLocation);
+
+ return await _taskRepository.Create(newTransferTask);
+ }
+ }
+
+ /// <summary>
/// 鏍规嵁璐т綅鏄惁闇�瑕佺Щ搴�
/// </summary>
/// <param name="locationID">璐т綅ID</param>
@@ -361,16 +498,19 @@
if (locationInfos == null || locationInfos.Count == 0)
{
locationInfos = BaseDal.QueryData(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == "SC1" && x.EnalbeStatus == 1 && x.LocationType == 1);
+
}
- var location = GetEmptyLocation(locationInfos);
+ var location = GetEmptyLocation(locationInfos); //鎵惧嚭璐т綅
if (location != null)
{
if (location.Depth == 2)
{
int row = location.Row;
- int relativeLine = row % 2 == 1 ? row + 1 : row - 1;
+ //int relativeLine = row % 2 == 1 ? row + 1 : row - 1;
+
+ int relativeLine = row == 1 ? row + 1 : row - 1;
var insideLocation = BaseDal.QueryFirst(x => x.Row == relativeLine && x.Layer == location.Layer && x.Column == location.Column);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
index 5b67789..e44767e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/Dt_WheelsStockService.cs"
@@ -71,17 +71,16 @@
//杩囩泩閲忎笅闄�
decimal selectionLowerValue = selectionStandards.lowerValue;
- decimal mesStand = 0;
string level = string.Empty;
if ("left".Equals(wheelsPosition)) //鍖归厤宸﹁疆搴ц疆瀛�
{
- mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
+ decimal mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.ZLZDJ);
WheelsList = WheelsList.Where(x => mesStand - (decimal.Parse(x.Wheels_gkcc)) >= selectionLowerValue && mesStand - (decimal.Parse(x.Wheels_gkcc)) <= selectionUpperValue && x.Wheels_level == level && x.Wheels_NewOrOld == newOrOld).ToList();
}
else //鍚﹀垯鍖归厤鍙宠疆搴ц疆瀛�
{
- mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
+ decimal mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
level = LevelChangeHelper.LevelChangeType(CZInfo_Mes.YLZDJ);
WheelsList = WheelsList.Where(x => mesStand - (decimal.Parse(x.Wheels_gkcc)) >= selectionLowerValue && mesStand - (decimal.Parse(x.Wheels_gkcc)) <= selectionUpperValue && x.Wheels_level == level && x.Wheels_NewOrOld == newOrOld).ToList();
}
@@ -131,7 +130,7 @@
- public Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld)
+ public Dt_WheelsStock_Old GetSelectionWheels(List<Dt_WheelsStock_Old> wheelsStocks, Dt_SelectionStandards selectionStandards, Dt_CZInfo_mes CZInfo_Mes, string wheelsPosition, string newOrOld, string wheelsProps)
{
try
{
@@ -148,14 +147,14 @@
{
mesStand = decimal.Parse(CZInfo_Mes.ZLZZJ);
level = LevelChangeHelper.JkChangeType(CZInfo_Mes.YLZDJ);
- wheelsStocks = wheelsStocks.Where(x => x.venderno== level && x.repair_item == newOrOld).ToList();
+ wheelsStocks = wheelsStocks.Where(x => x.venderno == level && x.repair_item == newOrOld).ToList();
}
else //鍚﹀垯鍖归厤鍙宠疆搴ц疆瀛�
{
mesStand = decimal.Parse(CZInfo_Mes.YLZZJ);
level = LevelChangeHelper.JkChangeType(CZInfo_Mes.YLZDJ);
- wheelsStocks = wheelsStocks.Where(x => x.venderno== level && x.repair_item == newOrOld).ToList();
+ wheelsStocks = wheelsStocks.Where(x => x.venderno == level && x.repair_item == newOrOld).ToList();
}
foreach (var item in wheelsStocks)
{
@@ -163,16 +162,23 @@
string Wheels_gkzja = "";
string Wheels_gkzjb = "";
string Wheels_gkzjc = "";
+ string clsx = "";
SaveModel saveModel = new SaveModel();
saveModel.MainData = new Dictionary<string, object>
- {
- { "cltm", item.wheel_code }
- };
+ {
+ { "cltm", item.wheel_code }
+ };
WebResponseContent webResponse = _toZYService.ZY_GetCLInfo(saveModel);
if (webResponse.Status)
{
CLInfo_ZY data = (CLInfo_ZY)webResponse.Data;
+
+ if(wheelsProps== data.CLSX)
+ {
+ wheelsStocks.Remove(item);
+ continue;
+ }
Wheels_gkcc = data.gkcc;
// 姣傚瓟a鐣岄潰鍧囧��
@@ -190,6 +196,7 @@
{
wheelsStocks.Remove(item);
+ continue;
}
if (selectionStandards.isCantainGK)
{
@@ -210,6 +217,7 @@
&& ZLZC - (decimal.Parse(Wheels_gkzjc)) < selectionLowerValue_gk && ZLZC - (decimal.Parse(Wheels_gkzjc)) > selectionUpperValue_gk)
{
wheelsStocks.Remove(item);
+ continue;
}
}
else
@@ -223,6 +231,7 @@
&& YLZC - (decimal.Parse(Wheels_gkzjc)) >= selectionLowerValue_gk && YLZC - (decimal.Parse(Wheels_gkzjc)) <= selectionUpperValue_gk)
{
wheelsStocks.Remove(item);
+ continue;
}
@@ -242,7 +251,29 @@
}
}
+ public WebResponseContent InventoryStatistics()
+ {
+ WebResponseContent content = new WebResponseContent();
+
+ List<Dt_WheelsStock> stockInfos = BaseDal.QueryData();
+
+ //鑾峰彇杞﹀瀷
+ List<string> Wheels_CarTypeList = stockInfos.Select(x => x.Wheels_CarType).Distinct().ToList();
+
+ foreach (var CarType in Wheels_CarTypeList)
+ {
+ content.Data = stockInfos.Where(x => x.Wheels_CarType == CarType).GroupBy(w => w.Wheels_ldxh)
+ .Select(typeGroup => new
+ {
+ Wheels_CarType = CarType, //杞﹀瀷
+ Wheels_ldxh = typeGroup.Key,
+ Count = typeGroup.Count(),
+
+ }).ToList();
+ }
+ return content;
+ }
-
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index ab8eec4..0bc4bf0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -2,13 +2,18 @@
using MailKit.Search;
using Mapster;
using Masuit.Tools;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using System.Diagnostics;
+using System.Reflection.Emit;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Core.Const;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_Model.Models;
+using WIDESEA_StorageBasicRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;
@@ -32,6 +37,11 @@
private readonly IDt_WheelsStock_htyRepository _WheelsStock_HtyRepository;
private readonly IDt_InWheels_mes_htyRepository _InWheels_Mes_HtyRepository;
private readonly IDt_CacheInfoRepository _CacheInfoRepository;
+ private readonly IDt_OutWheels_htyRepository _OutWheels_HtyRepository;
+ private readonly IDt_InZdp_mesRepository _InZdp_MesRepository;
+ private readonly IDt_InZdp_mes_htyRepository _InZdp_Mes_HtyRepository;
+ private readonly IDt_ZdpStockRepository _ZdpStockRepository;
+ private readonly IDt_ZdpStock_htyRepository _ZdpStock_HtyRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -49,7 +59,12 @@
IDt_WheelsStockRepository wheelsStockRepository,
IDt_WheelsStock_htyRepository wheelsStock_HtyRepository,
IDt_InWheels_mes_htyRepository inWheels_Mes_HtyRepository,
- IDt_CacheInfoRepository cacheInfoRepository) : base(BaseDal)
+ IDt_OutWheels_htyRepository dt_OutWheels_HtyRepository,
+ IDt_CacheInfoRepository cacheInfoRepository,
+ IDt_InZdp_mesRepository inZdp_MesRepository,
+ IDt_InZdp_mes_htyRepository inZdp_Mes_HtyRepository,
+ IDt_ZdpStockRepository zdpStockRepository,
+ IDt_ZdpStock_htyRepository dt_ZdpStock_HtyRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -64,7 +79,12 @@
_WheelsStockRepository = wheelsStockRepository;
_WheelsStock_HtyRepository = wheelsStock_HtyRepository;
_InWheels_Mes_HtyRepository = inWheels_Mes_HtyRepository;
+ _OutWheels_HtyRepository = dt_OutWheels_HtyRepository;
_CacheInfoRepository = cacheInfoRepository;
+ _InZdp_MesRepository = inZdp_MesRepository;
+ _InZdp_Mes_HtyRepository = inZdp_Mes_HtyRepository;
+ _ZdpStockRepository = zdpStockRepository;
+ _ZdpStock_HtyRepository = dt_ZdpStock_HtyRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -103,6 +123,39 @@
#endregion 绉诲簱浠诲姟瀹屾垚
+ #region 鍒跺姩鐩樼Щ搴撲换鍔″畬鎴�
+
+ /// <summary>
+ /// 绉诲簱浠诲姟瀹屾垚
+ /// </summary>
+ /// <param name="saveModel">浠诲姟鏁版嵁鍚堥泦</param>
+ /// <returns>杩斿洖缁撴灉闆�</returns>
+ public async Task<WebResponseContent> CompleteZdpTaskAsync(Dt_Task task, Dt_ZdpStock stock)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ // 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
+ (Dt_ZdpStock updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateZdpStockLocation(stock,task);
+ var taskHty = CreateHistoricalTask(task);
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInForm}");
+
+ // 鎵ц鏁版嵁搴撲簨鍔�
+ bool isResult = await ZdpExecuteTransaction(updateStock, taskHty, locationInForm, locationInfoTo, task.TaskId);
+ if (isResult)
+ content.OK("绉诲簱浠诲姟瀹屾垚鎴愬姛");
+ else
+ content.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
+ }
+ catch (Exception err)
+ {
+ Console.WriteLine(err.Message.ToString());
+ }
+ return content;
+ }
+
+ #endregion 绉诲簱浠诲姟瀹屾垚
+
#region 鍏ュ簱浠诲姟瀹屾垚
/// <summary>
@@ -118,7 +171,17 @@
{
// 鑾峰彇MES淇℃伅鍜岀洰鏍囦綅缃俊鎭�
- var mes_Wheels = await _InWheels_MesRepository.QueryFirstNavAsync(x => x.Wheels_Num == task.PalletCode);
+ Dt_InWheels_mes mes_Wheels = null;
+ Dt_InZdp_mes mes_Zdp = null;
+ Dt_WheelsStock wheelsStock = null;
+ Dt_ZdpStock zdpStock = null;
+
+ if (task.TaskType== (int)TaskInboundTypeEnum.InBrake)
+ mes_Zdp = await _InZdp_MesRepository.QueryFirstNavAsync(x => x.Zdp_code == task.PalletCode);
+ else
+ mes_Wheels = await _InWheels_MesRepository.QueryFirstNavAsync(x => x.Wheels_Num == task.PalletCode);
+
+
var locationInf = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
int lastStatus = locationInf.LocationStatus;
@@ -128,39 +191,85 @@
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
var taskHty = CreateHistoricalTask(task);
- // 鏍规嵁鍒涘缓搴撳瓨瀹炰緥妯″瀷
- Dt_WheelsStock wheelsStock = new Dt_WheelsStock
+ if(task.TaskType == (int)TaskInboundTypeEnum.InBrake)
{
- Wheels_ldtm = mes_Wheels.Wheels_ldtm,
- CreateDate = DateTime.Now,
- Creater = task.Creater,
- Wheels_Type = mes_Wheels.Wheels_Type,
- Wheels_gkcc = mes_Wheels.Wheels_gkcc,
- WheelsProps = mes_Wheels.WheelsProps,
- Wheels_CarNo = mes_Wheels.Wheels_CarNo,
- Wheels_CarType = mes_Wheels.Wheels_CarType,
- Wheels_ldxh = mes_Wheels.Wheels_ldxh,
- Wheels_code = mes_Wheels.Wheels_code,
- Wheels_InDate = mes_Wheels.Wheels_InDate,
- Wheels_level = mes_Wheels.Wheels_level,
- Wheels_Location = task.TargetAddress,
- Wheels_NewOrOld = mes_Wheels.Wheels_NewOrOld,
- Wheels_Num = mes_Wheels.Wheels_Num,
- Wheels_psj = mes_Wheels.Wheels_psj,
- Wheels_CurrentStatue = 1,
- Wheels_mttype = mes_Wheels.Wheels_mttype,
- Wheels_ljz = mes_Wheels.Wheels_ljz,
- Wheels_ldh = mes_Wheels.Wheels_ldh,
- //Wheels_SequenceNum = mes_Wheels.Wheels_SequenceNum,
- Wheels_ygljz = mes_Wheels.Wheels_ygljz,
- Wheels_gkzja = mes_Wheels.Wheels_gkzja,
- Wheels_gkzjb = mes_Wheels.Wheels_gkzjb,
- Wheels_gkzjc = mes_Wheels.Wheels_gkzjc,
+ // 鏍规嵁鍒涘缓搴撳瓨瀹炰緥妯″瀷
+ zdpStock = new Dt_ZdpStock
+ {
+ Zdp_code= mes_Zdp.Zdp_code,
+ Zdp_ZPH = mes_Zdp.Zdp_ZPH,
+ Zdp_CurrentStatue = 1,
+ Zdp_Location = task.TargetAddress,
+ Zdp_chexing= mes_Zdp.Zdp_chexing,
+ Zdp_neworold = mes_Zdp.Zdp_neworold,
+ Zdp_POS = mes_Zdp.Zdp_POS,
+ Zdp_LSXH = mes_Zdp.Zdp_LSXH,
+ Zdp_MAT = mes_Zdp.Zdp_MAT,
+ Zdp_SITE = mes_Zdp.Zdp_SITE,
+ Zdp_GKA1 = mes_Zdp.Zdp_GKA1,
+ Zdp_GKA2 = mes_Zdp.Zdp_GKA2,
+ Zdp_GKA3 = mes_Zdp.Zdp_GKA3,
+ Zdp_GKA = mes_Zdp.Zdp_GKA,
+ Zdp_GKB1 = mes_Zdp.Zdp_GKB1,
+ Zdp_GKB2 = mes_Zdp.Zdp_GKB2,
+ Zdp_GKB3 = mes_Zdp.Zdp_GKB3,
+ Zdp_GKB = mes_Zdp.Zdp_GKB,
+ Zdp_GKC1 = mes_Zdp.Zdp_GKC1,
+ Zdp_GKC2 = mes_Zdp.Zdp_GKC2,
+ Zdp_GKC3 = mes_Zdp.Zdp_GKC3,
+ Zdp_GKC = mes_Zdp.Zdp_GKC,
+ Zdp_GKJZ = mes_Zdp.Zdp_GKJZ,
+ Zdp_LSCSYMH = mes_Zdp.Zdp_LSCSYMH,
+ Zdp_LMCSYMH = mes_Zdp.Zdp_LMCSYMH,
+ Zdp_rksj = mes_Zdp.Zdp_rksj,
+ CreateDate = DateTime.Now,
+ Creater = task.Creater,
+ };
+ }
+ else
+ {
+ // 鏍规嵁鍒涘缓搴撳瓨瀹炰緥妯″瀷
+ wheelsStock = new Dt_WheelsStock
+ {
+ Wheels_ldtm = mes_Wheels.Wheels_ldtm,
+ CreateDate = DateTime.Now,
+ Creater = task.Creater,
+ Wheels_Type = mes_Wheels.Wheels_Type,
+ Wheels_gkcc = mes_Wheels.Wheels_gkcc,
+ WheelsProps = mes_Wheels.WheelsProps,
+ Wheels_CarNo = mes_Wheels.Wheels_CarNo,
+ Wheels_CarType = mes_Wheels.Wheels_CarType,
+ Wheels_ldxh = mes_Wheels.Wheels_ldxh,
+ Wheels_code = mes_Wheels.Wheels_code,
+ Wheels_InDate = mes_Wheels.Wheels_InDate,
+ Wheels_level = mes_Wheels.Wheels_level,
+ Wheels_Location = task.TargetAddress,
+ Wheels_NewOrOld = mes_Wheels.Wheels_NewOrOld,
+ Wheels_Num = mes_Wheels.Wheels_Num,
+ Wheels_psj = mes_Wheels.Wheels_psj,
+ Wheels_CurrentStatue = 1,
+ Wheels_mttype = mes_Wheels.Wheels_mttype,
+ Wheels_ljz = mes_Wheels.Wheels_ljz,
+ Wheels_ldh = mes_Wheels.Wheels_ldh,
+ //Wheels_SequenceNum = mes_Wheels.Wheels_SequenceNum,
+ Wheels_ygljz = mes_Wheels.Wheels_ygljz,
+ Wheels_gkzja = mes_Wheels.Wheels_gkzja,
+ Wheels_gkzjb = mes_Wheels.Wheels_gkzjb,
+ Wheels_gkzjc = mes_Wheels.Wheels_gkzjc,
+ };
+ }
- };
-
- // 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = await ExecuteTransaction(wheelsStock, taskHty, locationInf, task.TaskId, mes_Wheels);
+ // 鎵ц鏁版嵁搴撲簨鍔DPExecuteTransaction
+ bool isResult = false;
+ if (task.TaskType == (int)TaskInboundTypeEnum.InBrake)
+ {
+ isResult = await ZDPExecuteTransaction(zdpStock, taskHty, locationInf, task.TaskId, mes_Zdp);
+ }
+ else
+ {
+ isResult=await ExecuteTransaction(wheelsStock, taskHty, locationInf, task.TaskId, mes_Wheels);
+ }
+
if (isResult)
{
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
@@ -188,6 +297,8 @@
WebResponseContent content = new WebResponseContent();
try
{
+ if(stock ==null) return content.Error("浠诲姟瀹屾垚澶辫触锛屾湭鎵惧埌褰撳墠搴撳瓨淇℃伅锛屽垹闄ゅけ璐�");
+
// 鏇存柊搴撲綅鐘舵�佷笌浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -198,6 +309,35 @@
stockInfo_Hty.FinishWheelDate = DateTime.Now;
stockInfo_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ Dt_OutWheels_hty Outwheels_hty = new Dt_OutWheels_hty
+ {
+ Wheels_code = stock.Wheels_code,
+ Wheels_Type = stock.Wheels_Type == "1"?"杞�":"鐩�",
+ Wheels_Num = stock.Wheels_Num,
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName == null ? "admin" : App.User.UserName,
+ WheelsProps = stock.WheelsProps,
+ Wheels_CarNo = stock.Wheels_CarNo,
+ Wheels_CarType = stock.Wheels_CarType,
+ Wheels_ldxh = stock.Wheels_ldxh,
+ Wheels_ldtm = stock.Wheels_ldtm,
+ Wheels_InDate = stock.Wheels_InDate,
+ Wheels_level = stock.Wheels_level,
+ Wheels_NewOrOld = stock.Wheels_NewOrOld,
+ Wheels_psj = stock.Wheels_psj,
+ Wheels_gkcc = stock.Wheels_gkcc,
+ Wheels_gkzja = stock.Wheels_gkzja,
+ Wheels_gkzjb = stock.Wheels_gkzjb,
+ Wheels_gkzjc = stock.Wheels_gkzjc,
+ Wheels_ldh = stock.Wheels_ldh,
+ Wheels_ljz = stock.Wheels_ljz,
+ Wheels_mttype = stock.Wheels_mttype,
+ //Wheels_SequenceNum = "",
+ Wheels_ygljz = stock.Wheels_ygljz,
+ };
+
+
+
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
{
@@ -206,6 +346,89 @@
//var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
var isStockHtyAdd = await _WheelsStock_HtyRepository.AddDataAsync(stockInfo_Hty); //鍔犲叆鍘嗗彶搴撳瓨
+
+ var isoutWheelsHtyAdd = await _OutWheels_HtyRepository.AddDataAsync(Outwheels_hty); //娣诲姞杞﹁疆鍑哄簱淇℃伅
+ });
+
+ return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
+ }
+ catch (Exception err)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, $"绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}");
+ return content.Error(err.Message);
+ }
+ }
+
+ private (DtLocationInfo, Dt_Task) UpdateStockAndTaskStatus( Dt_Task task)
+ {
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+ int lastStatus = location.LocationStatus;
+ location.LocationStatus = (int)LocationEnum.Free;
+ task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ //task.CurrentAddress = task.NextAddress;
+ //task.NextAddress = task.TargetAddress;
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
+
+ LogFactory.GetLog("浠诲姟瀹屾垚").Info(true, "鏇存柊搴撲綅鐘舵�佷笌浠诲姟鐘舵��");
+ return (location, task);
+ }
+ #endregion
+
+ #region 鍒跺姩鐩樺嚭搴撲换鍔″畬鎴�
+ public async Task<WebResponseContent> CompleteOutZdpTaskAsync(Dt_Task task, Dt_ZdpStock stock)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ if (stock == null) return content.Error("浠诲姟瀹屾垚澶辫触锛屾湭鎵惧埌褰撳墠搴撳瓨淇℃伅锛屽垹闄ゅけ璐�");
+
+ // 鏇存柊搴撲綅鐘舵�佷笌浠诲姟鐘舵��
+ (var loc, var tas) = UpdateStockAndTaskStatus(task);
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+
+ Dt_ZdpStock_hty stockInfo_Hty = stock.Adapt<Dt_ZdpStock_hty>();
+ stockInfo_Hty.FinishDate = DateTime.Now;
+ stockInfo_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+
+ Dt_OutZdp_hty Outwheels_hty = new Dt_OutZdp_hty
+ {
+ Zdp_code = stock.Zdp_code,
+ Zdp_ZPH = stock.Zdp_ZPH,
+ Zdp_Location = stock.Zdp_Location,
+ Zdp_chexing = stock.Zdp_chexing,
+ Zdp_neworold = stock.Zdp_neworold,
+ Zdp_POS = stock.Zdp_POS,
+ Zdp_LSXH = stock.Zdp_LSXH,
+ Zdp_MAT = stock.Zdp_MAT,
+ Zdp_SITE = stock.Zdp_SITE,
+ Zdp_GKA1 = stock.Zdp_GKA1,
+ Zdp_GKA2 = stock.Zdp_GKA2,
+ Zdp_GKA3 = stock.Zdp_GKA3,
+ Zdp_GKA = stock.Zdp_GKA,
+ Zdp_GKB1 = stock.Zdp_GKB1,
+ Zdp_GKB2 = stock.Zdp_GKB2,
+ Zdp_GKB3 = stock.Zdp_GKB3,
+ Zdp_GKB = stock.Zdp_GKB,
+ Zdp_GKC1 = stock.Zdp_GKC1,
+ Zdp_GKC2 = stock.Zdp_GKC2,
+ Zdp_GKC3 = stock.Zdp_GKC3,
+ Zdp_GKC = stock.Zdp_GKC,
+ Zdp_GKJZ = stock.Zdp_GKJZ,
+ Zdp_LSCSYMH = stock.Zdp_LSCSYMH,
+ Zdp_rksj = stock.Zdp_rksj,
+ };
+
+ // 浜嬪姟澶勭悊
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ var isStockUpdated = await _ZdpStockRepository.DeleteDataByIdAsync(stock.Zdp_ID); //鍒犻櫎搴撳瓨
+ var isLocationUpdate = await _locationRepository.UpdateDataAsync(loc); //鏇存柊搴撲綅
+ //var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
+ var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
+ var isStockHtyAdd = await _ZdpStock_HtyRepository.AddDataAsync(stockInfo_Hty); //鍔犲叆鍘嗗彶搴撳瓨
});
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -258,7 +481,9 @@
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
- var stock = await _WheelsStockRepository.QueryFirstNavAsync(x => x.Wheels_Num == task.PalletCode);
+ var stock = await _WheelsStockRepository.QueryFirstNavAsync(x => x.Wheels_Num.Contains(task.PalletCode) && x.Wheels_Location==task.SourceAddress);
+ var ZdpStock = await _ZdpStockRepository.QueryFirstNavAsync(x => x.Zdp_code == task.PalletCode && x.Zdp_Location == task.SourceAddress);
+
// 鏍规嵁浠诲姟绫诲瀷璋冪敤鐩稿簲鐨勫畬鎴愪换鍔℃柟娉�
switch (task.TaskType)
@@ -270,13 +495,19 @@
return await CompleteInboundTaskAsync(task);
case (int)TaskOutboundTypeEnum.Outbound:
- case (int)TaskOutboundTypeEnum.OutBrake:
case (int)TaskOutboundTypeEnum.OutWheels:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task, stock);
+ case (int)TaskOutboundTypeEnum.OutBrake:
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍒跺姩鐩樺嚭搴撲换鍔�", "");
+ return await CompleteOutZdpTaskAsync(task, ZdpStock);
+
case (int)TaskRelocationTypeEnum.Relocation:
- return await CompleteTransferTaskAsync(task, stock);
+ if (stock != null)
+ return await CompleteTransferTaskAsync(task, stock);
+ else
+ return await CompleteZdpTaskAsync(task, ZdpStock);
default:
return content.Error("浠诲姟绫诲瀷涓嶅瓨鍦�");
@@ -402,75 +633,164 @@
WebResponseContent content = new WebResponseContent();
try
{
+ List<Dt_WheelsStock> WheelList = new List<Dt_WheelsStock>();
+ List<Dt_ZdpStock> ZdpStockList = new List<Dt_ZdpStock>();
+ List<Dt_Task> TaskList = new List<Dt_Task>();
+ List<DtLocationInfo> Locationslist = new List<DtLocationInfo>();
+ List<WMSTaskDTO> WMSTaskDTOdata = new List<WMSTaskDTO>();
+
+
string palletCode = saveModel.MainData["palletCode"].ToString();
string station = saveModel.MainData["station"].ToString();
+ string outtype = saveModel.MainData["outtype"].ToString(); //1涓烘寚瀹氳溅杞嚭搴擄紝2涓烘寚瀹氬埗鍔ㄧ洏鍑哄簱
- // 鏌ヨ搴撳瓨淇℃伅
- var stockInfo = _WheelsStockRepository.QueryFirst(x => x.Wheels_code == palletCode);
- if (stockInfo == null)
+ List<string> palletCodes = JsonConvert.DeserializeObject<List<string>>(palletCode); //鎶婃墭鐩樻潯鐮佹樉绀�
+
+ List<DtLocationInfo> locationinfoData = _locationRepository.QueryData(x => x.LocationStatus == 2); //鏌ユ壘鍏ㄩ儴搴撲綅
+ if (outtype == "2")
{
- return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+ List<Dt_ZdpStock> stocktData = _ZdpStockRepository.QueryData(x => x.Zdp_CurrentStatue == 1); //鏌ユ壘鍏ㄩ儴鍦ㄥ簱鐨勫簱瀛�
+ foreach (var item in palletCodes)
+ {
+ Dt_ZdpStock zdpInfo = _ZdpStockRepository.QueryFirst(x => x.Zdp_code == item);
+ if (zdpInfo == null) return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+ zdpInfo.Zdp_CurrentStatue = 4;
+ string Location = zdpInfo.Zdp_Location;
+
+ var locationst = locationinfoData.FirstOrDefault(x => x.LocationCode == Location);
+ if (locationst.LocationStatus != (int)LocationEnum.InStock && locationst.EnalbeStatus != 1) return content.Error($"搴撲綅寮傚父,璇锋鏌ヤ竴涓嬪簱浣�,搴撳瓨鏉＄爜锛歿item}锛屽簱浣嶅彿锛歿Location}");
+
+ locationst.LocationStatus = (int)LocationEnum.InStockDisable;
+
+ var task = BaseDal.QueryFirst(x => x.PalletCode == item);
+ if (task != null)
+ {
+ return content.Error($"銆恵item}銆戝凡瀛樺湪浠诲姟");
+ }
+
+
+ CheckInfo checkInfo = new CheckInfo()
+ {
+ CarType = zdpInfo.Zdp_chexing ,
+ MTType ="0" , //鍒跺姩鐩樻病鏈夊姩鎷栧睘鎬�
+
+ //CheckType = stockInfo.Wheels_Type == "1" ? "1" : "2",
+ CheckType = outtype,
+
+ HubLevel = "0" ,
+ CLTM =zdpInfo.Zdp_code,
+ IsCheck = true,
+ Standards = zdpInfo.Zdp_neworold
+ };
+
+ task = new Dt_Task
+ {
+ CarType = zdpInfo.Zdp_chexing,
+ wheels_gkcc = zdpInfo.Zdp_GKJZ,
+ WheelsNewOrOld = zdpInfo.Zdp_neworold,
+ WheelsLX = "",
+ Grade = 1,
+ Roadway = "SC1",
+ TargetAddress = station,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = "2010",
+ OrderNo = null,
+ PalletCode = zdpInfo.Zdp_code,
+ wheels_mttype = "" ,
+ SourceAddress = zdpInfo.Zdp_Location,
+ CurrentAddress =zdpInfo.Zdp_Location,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = outtype == "2" ? (int)TaskOutboundTypeEnum.OutBrake : (int)TaskOutboundTypeEnum.OutWheels,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Creater = "System",
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ task_bak1 = JsonConvert.SerializeObject(checkInfo),
+ Towhereabouts = station,
+ };
+
+ // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
+ var taskDTO = CreateTaskDTO(task);
+
+ WMSTaskDTOdata.Add(taskDTO);
+ Locationslist.Add(locationst);
+ TaskList.Add(task);
+ ZdpStockList.Add(zdpInfo);
+ }
+ }
+ else
+ {
+ List<Dt_WheelsStock> stocktData = _WheelsStockRepository.QueryData(x => x.Wheels_CurrentStatue == 1); //鏌ユ壘鍏ㄩ儴鍦ㄥ簱鐨勫簱瀛�
+ foreach (var item in palletCodes)
+ {
+ Dt_WheelsStock stockInfo = _WheelsStockRepository.QueryFirst(x => x.Wheels_code == item);
+ if (stockInfo == null) return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+ stockInfo.Wheels_CurrentStatue = 4;
+ string Location = stockInfo.Wheels_Location;
+ var locationst = locationinfoData.Where(x => x.LocationCode== stockInfo.Wheels_Location).FirstOrDefault();
+ if (locationst.LocationStatus == (int)LocationEnum.Lock) return content.Error("搴撲綅閿佸畾,璇峰厛瑙ｉ攣鍚庡啀鎸囧畾鍑哄簱");
+
+ locationst.LocationStatus = (int)LocationEnum.InStockDisable;
+
+ var task = BaseDal.QueryFirst(x => x.PalletCode == item);
+ if (task != null)
+ {
+ return content.Error($"銆恵item}銆戝凡瀛樺湪浠诲姟");
+ }
+
+ CheckInfo checkInfo = new CheckInfo()
+ {
+ CarType = stockInfo.Wheels_CarType,
+ MTType = stockInfo.Wheels_mttype, //鍒跺姩鐩樻病鏈夊姩鎷栧睘鎬�
+
+ //CheckType = stockInfo.Wheels_Type == "1" ? "1" : "2",
+ CheckType = outtype,
+
+ HubLevel = stockInfo.Wheels_level.Contains("绛夌骇") ? stockInfo.Wheels_level.Replace("绛夌骇", "") : "0",
+ CLTM = stockInfo.Wheels_Num,
+ IsCheck = true,
+ Standards = stockInfo.Wheels_NewOrOld
+ };
+
+
+ task = new Dt_Task
+ {
+ CarType = stockInfo.Wheels_CarType,
+ wheels_gkcc = stockInfo.Wheels_gkcc,
+ WheelsNewOrOld = stockInfo.Wheels_NewOrOld,
+ WheelsLX = outtype == "2" ? "" : stockInfo.Wheels_ldxh,
+ Grade = 1,
+ Roadway = "SC1",
+ TargetAddress = station,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = "2010",
+ OrderNo = null,
+ PalletCode = stockInfo.Wheels_Num,
+ wheels_mttype = stockInfo.Wheels_mttype,
+ SourceAddress =stockInfo.Wheels_Location,
+ CurrentAddress = stockInfo.Wheels_Location,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = outtype == "2" ? (int)TaskOutboundTypeEnum.OutBrake : (int)TaskOutboundTypeEnum.OutWheels,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Creater = "System",
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ task_bak1 = JsonConvert.SerializeObject(checkInfo),
+ Towhereabouts = station,
+ };
+
+ // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
+ var taskDTO = CreateTaskDTO(task);
+
+ WMSTaskDTOdata.Add(taskDTO);
+ Locationslist.Add(locationst);
+ TaskList.Add(task);
+ WheelList.Add(stockInfo);
+ }
}
- if (stockInfo.Wheels_CurrentStatue != 1) return content.Error("鎸囧畾澶辫触锛氬綋鍓嶇姸鎬佷笉鍏佽鎸囧畾鍑哄簱");
-
- stockInfo.Wheels_CurrentStatue = 4;
-
- //鏌ヨ搴撲綅鏄惁閿佸畾锛�
- var location = _locationRepository.QueryFirst(x => x.LocationCode == stockInfo.Wheels_Location);
-
- if (location.LocationStatus == (int)LocationEnum.Lock) return content.Error("搴撲綅閿佸畾,璇峰厛瑙ｉ攣鍚庡啀鎸囧畾鍑哄簱");
-
- location.LocationStatus = (int)LocationEnum.InStockDisable;
-
- var task = BaseDal.QueryFirst(x => x.PalletCode == palletCode);
- if (task != null)
- {
- return content.Error($"銆恵palletCode}銆戝凡瀛樺湪浠诲姟");
- }
-
- CheckInfo checkInfo = new CheckInfo()
- {
- CarType = stockInfo.Wheels_CarType,
- MTType = stockInfo.Wheels_mttype,
- CheckType = stockInfo.Wheels_Type == "1" ? "1" : "2",
- HubLevel = stockInfo.Wheels_level.Contains("绛夌骇") ? stockInfo.Wheels_level.Replace("绛夌骇", "") : "0",
- CLTM = stockInfo.Wheels_Num,
- IsCheck = true,
- Standards = stockInfo.Wheels_NewOrOld
- };
-
- // var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == station);
-
- // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
- task = new Dt_Task
- {
- CarType = stockInfo.Wheels_CarType,
- wheels_gkcc = stockInfo.Wheels_gkcc,
- WheelsNewOrOld = stockInfo.Wheels_NewOrOld,
- WheelsLX = stockInfo.Wheels_ldxh,
- Grade = 1,
- Roadway = "SC1",
- TargetAddress = station,
- Dispatchertime = DateTime.Now,
- MaterialNo = "",
- NextAddress = "2010",
- OrderNo = null,
- PalletCode = stockInfo.Wheels_Num,
- wheels_mttype = stockInfo.Wheels_mttype,
- SourceAddress = stockInfo.Wheels_Location,
- CurrentAddress = stockInfo.Wheels_Location,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = (int)TaskOutboundTypeEnum.OutWheels,
- TaskNum = BaseDal.GetTaskNo().Result,
- Creater = "System",
- CreateDate = DateTime.Now,
- TaskId = 0,
- task_bak1 = JsonConvert.SerializeObject(checkInfo)
- };
-
- // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
- var taskDTO = CreateTaskDTO(task);
// 鑾峰彇WMS IP鍦板潃鐢ㄤ簬鍙戦�佷换鍔¤姹�
var wmsIpAddress = GetWCSIpReceiveTask();
@@ -478,19 +798,25 @@
{
throw new InvalidOperationException("WMS IP 鏈厤缃�");
}
-
- var tasks = new List<WMSTaskDTO>() { taskDTO };
// 鍙戦�佷换鍔¤姹傚埌WMS
- var result = HttpHelper.Post(wmsIpAddress, tasks.ToJsonString());
+ var result = HttpHelper.Post(wmsIpAddress, WMSTaskDTOdata.ToJsonString());
content = JsonConvert.DeserializeObject<WebResponseContent>(result);
if (content.Status)
{
// 娣诲姞浠诲姟鍒版暟鎹簱
- BaseDal.AddData(task);
+ BaseDal.AddData(TaskList);
// 鏇存柊搴撲綅浣嶇疆鐘舵�佷负涓嶅彲鐢�
- _locationRepository.UpdateData(location);
- _WheelsStockRepository.UpdateData(stockInfo);
+ _locationRepository.UpdateData(Locationslist);
+ if (outtype == "2")
+ {
+ _ZdpStockRepository.UpdateData(ZdpStockList);
+ }
+ else
+ {
+ _WheelsStockRepository.UpdateData(WheelList);
+ }
}
+
}
catch (Exception ex)
{
@@ -747,9 +1073,32 @@
return (stock, fromLocation, toLocation);
}
- #region 鎵ц鏁版嵁搴撲簨鍔�
/// <summary>
- /// 鎵ц鏁版嵁搴撲簨鍔�
+ /// 鍒跺姩鐩樻洿鏂板簱瀛樹綅缃�
+ /// </summary>
+ /// <param name="stock"></param>
+ /// <param name="task"></param>
+ /// <returns></returns>
+ private (Dt_ZdpStock, DtLocationInfo, DtLocationInfo) UpdateZdpStockLocation(Dt_ZdpStock stock, Dt_Task task)
+ {
+ //淇敼鏉ユ簮搴撲綅鍜� 鐩爣搴撲綅鐘舵��
+ var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+ fromLocation.LocationStatus = (int)LocationEnum.Free;
+ var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.TargetAddress && x.RoadwayNo == task.Roadway);
+ toLocation.LocationStatus = (int)LocationEnum.InStock;
+
+ // 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
+ stock.Zdp_Location = task.TargetAddress;
+
+ // 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
+ return (stock, fromLocation, toLocation);
+ }
+
+
+
+ #region 杞﹁疆鎵ц鏁版嵁搴撲簨鍔�
+ /// <summary>
+ /// 杞﹁疆鎵ц鏁版嵁搴撲簨鍔�
/// </summary>
/// <param name="stock">搴撳瓨瀵硅薄</param>
/// <param name="taskHty">鍘嗗彶浠诲姟瀵硅薄</param>
@@ -812,6 +1161,71 @@
}
#endregion
+ #region 鍒跺姩鐩樻墽琛屾暟鎹簱浜嬪姟
+ /// <summary>
+ /// 鍒跺姩鐩樻墽琛屾暟鎹簱浜嬪姟
+ /// </summary>
+ /// <param name="stock">搴撳瓨瀵硅薄</param>
+ /// <param name="taskHty">鍘嗗彶浠诲姟瀵硅薄</param>
+ /// <param name="taskId">浠诲姟ID</param>
+ /// <returns></returns>
+ private async Task<bool> ZDPExecuteTransaction(Dt_ZdpStock stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId, Dt_InZdp_mes inZdp_Mes = null)
+ {
+ _unitOfWorkManage.BeginTran();
+ try
+ {
+ var isUpdateStock = false;
+ var isDeleteWheelsMes = false;
+
+
+ // 娣诲姞搴撳瓨
+ isUpdateStock = _ZdpStockRepository.AddData(stock) > 0;
+ if (inZdp_Mes != null)
+ {
+ isDeleteWheelsMes = _InZdp_MesRepository.DeleteData(inZdp_Mes);
+
+ var InZdp_mes_hty = inZdp_Mes.Adapt<Dt_InZdp_mes_hty>();
+
+ InZdp_mes_hty.Zdp_CurrentStatue = "2";
+ InZdp_mes_hty.FinishDate = DateTime.Now;
+ InZdp_mes_hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+
+ _InZdp_Mes_HtyRepository.AddData(InZdp_mes_hty);
+ }
+
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+
+ // 淇敼绉诲簱鍓嶈揣浣嶇姸鎬�
+ var isUpdateLoc = _locationRepository.UpdateData(locationInfo);
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = await Delete(taskId);
+
+ // 鎻愪氦鎴栧洖婊氫簨鍔�
+ if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc && isDeleteWheelsMes)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼鍏ュ簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ _unitOfWorkManage.CommitTran();
+ return true;
+ }
+ else
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼鍏ュ簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ _unitOfWorkManage.RollbackTran();
+ return false;
+ }
+ }
+ catch (Exception err)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ _unitOfWorkManage.RollbackTran();
+ throw; // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
+ }
+ }
+ #endregion
+
#region 绉诲簱浠诲姟浜嬪姟
private async Task<bool> ExecuteTransaction(Dt_WheelsStock stock, Dt_Task_Hty taskHty, DtLocationInfo fromLocation, DtLocationInfo toLocation, int taskId)
@@ -855,6 +1269,49 @@
#endregion MyRegion
+ #region 鍒跺姩鐩樼Щ搴撲换鍔′簨鍔�
+
+ private async Task<bool> ZdpExecuteTransaction(Dt_ZdpStock stock, Dt_Task_Hty taskHty, DtLocationInfo fromLocation, DtLocationInfo toLocation, int taskId)
+ {
+ _unitOfWorkManage.BeginTran();
+ try
+ {
+ var isUpdateStock = _ZdpStockRepository.UpdateData(stock);
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+
+ // 淇敼绉诲簱鍓嶈揣浣嶇姸鎬�
+ var isUpdateLocF = _locationRepository.UpdateData(fromLocation);
+ var isUpdateLocT = _locationRepository.UpdateData(toLocation);
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = await Delete(taskId);
+
+ // 鎻愪氦鎴栧洖婊氫簨鍔�
+ if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLocF && isUpdateLocT)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLocF}");
+ _unitOfWorkManage.CommitTran();
+ return true;
+ }
+ else
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLocF}");
+ _unitOfWorkManage.RollbackTran();
+ return false;
+ }
+ }
+ catch (Exception err)
+ {
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception(err.Message); // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
+ }
+ }
+
+ #endregion MyRegion
+
#region 浠诲姟璇锋眰鏂规硶
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_Task_HtyService.cs"
index 1b9ee8f..42cca4d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_Task_HtyService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_Task_HtyService.cs"
@@ -1,25 +1,71 @@
-锘縩amespace WIDESEA_StorageTaskServices;
+锘縰sing Autofac.Core;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_DTO.WMS;
+using WIDESEA_StorageBasicRepository;
+
+namespace WIDESEA_StorageTaskServices;
public class Dt_Task_HtyService : ServiceBase<Dt_Task_Hty, IDt_Task_HtyRepository>, IDt_Task_HtyService
{
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IDt_OutOrderService _outOrderService;
+ private readonly IDt_TaskService _taskService;
public Dt_Task_HtyService(IDt_Task_HtyRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
- IDt_OutOrderService outOrderService) : base(BaseDal)
+ IDt_OutOrderService outOrderService,
+ IDt_TaskService taskService) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_outOrderService = outOrderService;
+ _taskService = taskService;
}
- /// <summary>
- /// 娣诲姞鍘嗗彶浠诲姟
- /// </summary>
- /// <param name="task">鍘嗗彶浠诲姟Model</param>
- /// <returns>鎴愬姛/澶辫触</returns>
- public bool InsertTask(Dt_Task_Hty task)
+
+ public WebResponseContent TaskRollback(int input)
{
- return BaseDal.InsertTask(task);
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task_Hty dt_Task_ = BaseDal.QueryFirst(x => x.TaskId == input);
+
+ if(dt_Task_ == null)
+ {
+ return content.Error("鏈煡鎵惧埌鏁版嵁");
+ }
+ // 鍒涘缓WMS浠诲姟
+ Dt_Task taskDTO = new Dt_Task()
+ {
+ TaskNum = dt_Task_.TaskNum.Value,
+ Grade = dt_Task_.Grade.Value,
+ PalletCode = dt_Task_.PalletCode,
+ Roadway = dt_Task_.Roadway,
+ SourceAddress = dt_Task_.SourceAddress,
+ TargetAddress = dt_Task_.TargetAddress,
+ CurrentAddress=dt_Task_.CurrentAddress,
+ NextAddress = dt_Task_.NextAddress,
+ TaskState = 999,
+ TaskType = dt_Task_.TaskType,
+ wheels_mttype = dt_Task_.wheels_mttype,
+ CarType = dt_Task_.CarType,
+ wheels_gkcc = dt_Task_.wheels_gkcc,
+ WheelsNewOrOld = dt_Task_.WheelsNewOrOld,
+ IsCheck = dt_Task_.IsCheck,
+ WheelsLX = dt_Task_.WheelsLX,
+ CreateDate = DateTime.Now,
+ Dispatchertime=dt_Task_.Dispatchertime,
+ Creater ="浠诲姟鍥炴粴"
+ };
+ _taskService.AddData(taskDTO);
+
+ return content.OK("鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ throw;
+ }
}
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
index 2191322..f428eab 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
@@ -1,6 +1,7 @@
锘縰sing log4net.Core;
using Masuit.Tools;
using System.Collections.Generic;
+using System.Net;
using WIDESEA_Common;
using WIDESEA_Core.Const;
using WIDESEA_DTO.WMS;
@@ -39,10 +40,23 @@
var inWheelsInfo = _InWheels_MesRepository.QueryFirst(x => x.Wheels_CurrentStatue == "0");
//鏌ヨ鍒涘缓鐨勫埗鍔ㄧ洏淇℃伅
+ var inZDPInfo = _InZdp_MesRepository.QueryFirst(x => x.Zdp_CurrentStatue == "0");
+
+ //鏌ヨ鍒涘缓鐨勫埗鍔ㄧ洏淇℃伅
//var inBrakeInfo = _InWheels_MesRepository.QueryFirst(x => x.Wheels_CurrentStatue == "0");
//if (inBrakeInfo == null) throw new Exception("褰撳墠鏃犺溅杞垨鍒跺姩鐩樺叆搴撲俊鎭�");
- if (inWheelsInfo == null /*&& inBrakeInfo == null*/) throw new Exception("褰撳墠鏃犺溅杞垨鍒跺姩鐩樺叆搴撲俊鎭�");
+ //褰撹溅杞俊鎭笌鍒跺姩鐩樹俊鎭悓鏃跺嚭鐜伴渶瑕佸叆搴撶殑锛屽垯涓嶅彲鍏ュ簱
+ if(inWheelsInfo != null && inZDPInfo != null) throw new Exception("褰撳墠鍑虹幇鍒跺姩鐩樹笌杞﹁疆鍚屾椂鍏ュ簱鐢宠锛岀敵璇烽敊璇紝璇风‘淇濆彧鏈変竴涓墽琛屽叆搴�");
+
+ if (inWheelsInfo == null && inZDPInfo == null) throw new Exception("褰撳墠鏃犺溅杞垨鍒跺姩鐩樺叆搴撲俊鎭�");
+
+ //榛樿涓鸿溅杞叆搴擄紝浣嗘槸褰撹溅杞俊鎭负绌哄垯涓哄埗鍔ㄧ洏鍏ュ簱
+ int rktype = 1;
+ if(inWheelsInfo == null)
+ {
+ rktype = 2;
+ }
var newtask = new Dt_Task
{
@@ -54,16 +68,16 @@
MaterialNo = "",
NextAddress = input.Roadways,
OrderNo = null,
- PalletCode = inWheelsInfo.Wheels_Num,
+ PalletCode = rktype==1?inWheelsInfo.Wheels_Num: inZDPInfo.Zdp_code,
SourceAddress = input.Position,
TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = (int)TaskInboundTypeEnum.InWheels, //inWheelsInfo == null ? (int)TaskInboundTypeEnum.InBrake :
+ TaskType = rktype == 1 ? (int)TaskInboundTypeEnum.InWheels: (int)TaskInboundTypeEnum.InBrake, //inWheelsInfo == null ? (int)TaskInboundTypeEnum.InBrake :
TaskNum = await BaseDal.GetTaskNo(),
- CarType = inWheelsInfo.Wheels_CarType,
+ CarType = rktype == 1 ? inWheelsInfo.Wheels_CarType:inZDPInfo.Zdp_chexing,
IsCheck = true,
- wheels_mttype = inWheelsInfo.Wheels_mttype,
- wheels_gkcc = inWheelsInfo.Wheels_gkcc,
- WheelsNewOrOld = inWheelsInfo.Wheels_NewOrOld,
+ wheels_mttype = rktype == 1 ? inWheelsInfo.Wheels_mttype:"",
+ wheels_gkcc = rktype == 1 ? inWheelsInfo.Wheels_gkcc: inZDPInfo.Zdp_GKJZ,
+ WheelsNewOrOld = rktype == 1 ? inWheelsInfo.Wheels_NewOrOld : inZDPInfo.Zdp_neworold,
Creater = "Systeam"
};
@@ -93,8 +107,17 @@
WheelsLX = newtask.WheelsLX,
};
- inWheelsInfo.Wheels_CurrentStatue = "1";
- _InWheels_MesRepository.UpdateData(inWheelsInfo);
+ if (rktype == 2)
+ {
+ inZDPInfo.Zdp_CurrentStatue = "1";
+ _InZdp_MesRepository.UpdateData(inZDPInfo);
+ }
+ else
+ {
+ inWheelsInfo.Wheels_CurrentStatue = "1";
+ _InWheels_MesRepository.UpdateData(inWheelsInfo);
+ }
+
content.OK(data: taskDTO);
}
@@ -236,19 +259,52 @@
WebResponseContent content = new WebResponseContent();
try
{
- var cacheinfo = await _CacheInfoRepository.QueryFirstAsync(x => x.czh == input.PalletCode);
+ /*var cacheinfo = await BaseDal.QueryFirstAsync(x => x.task_CZInfo == input.PalletCode);
if (cacheinfo == null) throw new Exception($"鏈壘鍒皗input.PalletCode}杞﹁酱缂撳瓨浣嶄俊鎭�");
- return content.OK(data: cacheinfo.targetAddress);
+ if(cacheinfo.Towhereabouts =="" && cacheinfo.Towhereabouts == null) throw new Exception($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖");
+ return content.OK(data: cacheinfo.Towhereabouts);*/
+
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
+ if (task == null) throw new Exception($"鏈壘鍒皗input.PalletCode}鎵樼洏淇℃伅");
+ if (task.Towhereabouts == "" && task.Towhereabouts == null) throw new Exception($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖");
+ return content.OK(data: task.Towhereabouts);
+
+
}
catch (Exception err)
{
// 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
content.Error(err.Message);
- Console.WriteLine($"杞﹁疆娴佸悜鍒嗛厤澶辫触:{err.Message}");
+ Console.WriteLine($"杞﹁疆娴佸悜鍒嗛厤澶辫触:{err.Message}锛屾墭鐩樻潯鐮侊細{input.PalletCode}");
return content;
}
}
+
+ public WebResponseContent UpWheelsFlow(SaveModel saveModel)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ try
+ {
+ string CZTM = saveModel.MainData["CZTM"].ToString();
+ string TargetAddress = saveModel.MainData["TargetAddress"].ToString();
+ List<Dt_Task> taskt = BaseDal.QueryData(x => x.task_CZInfo == CZTM).ToList();
+ if (taskt.Count() == 0)
+ return webResponse.Error($"鏈壘鍒板搴旇溅杞达細{CZTM}鐨勮溅杞嚭搴撲俊鎭�");
+ foreach (var item in taskt)
+ {
+ item.Towhereabouts = TargetAddress;
+ }
+ BaseDal.UpdateData(taskt);
+ return webResponse.OK();
+ }
+ catch (Exception ex)
+ {
+ // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
+ webResponse.Error(ex.Message);
+ return webResponse;
+ }
+ }
#endregion
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs"
index b21a925..ce736c0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/APP/ToAPPController.cs"
@@ -19,7 +19,7 @@
_httpContextAccessor = httpContextAccessor;
_AppService = appervice;
}
-
+
/// <summary>
/// 淇濆瓨杞﹁疆淇℃伅
/// </summary>
@@ -32,6 +32,17 @@
}
/// <summary>
+ /// 杞﹁疆鐩磋蛋
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SaveCLStraight"), AllowAnonymous]
+ public WebResponseContent SaveCLStraight([FromBody] SaveModel saveModel)
+ {
+ return _AppService.SaveCLStraight(saveModel);
+ }
+
+ /// <summary>
/// 淇濆瓨杞﹁酱淇℃伅
/// </summary>
/// <param name="input"></param>
@@ -41,6 +52,18 @@
{
return _AppService.SaveCZInfo(input);
}
+
+ /// <summary>
+ /// 淇濆瓨杞﹁酱淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SaveCZStraight"), AllowAnonymous]
+ public WebResponseContent SaveCZStraight([FromBody] SaveModel input)
+ {
+ return _AppService.SaveCZStraight(input);
+ }
+
/// <summary>
/// 淇濆瓨棰勯�夎溅杞翠俊鎭�
/// </summary>
@@ -51,4 +74,36 @@
{
return _AppService.SaveCZInfo2(input);
}
+ /// <summary>
+ /// 鍒跺姩鐩樺叆搴�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SaveZDPInfo"), AllowAnonymous]
+ public WebResponseContent SaveZDPInfo([FromBody] SaveModel saveModel)
+ {
+ return _AppService.SaveZDPInfo(saveModel);
+ }
+
+ /// <summary>
+ /// 鍒跺姩鐩橀�夐厤
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SaveZDPXPInfo"), AllowAnonymous]
+ public WebResponseContent SaveZDPXPInfo([FromBody] SaveModel saveModel)
+ {
+ return _AppService.SaveZDPXPInfo(saveModel);
+ }
+
+ /// <summary>
+ /// 杞﹁疆鐩磋蛋
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("SaveZDPStraight"), AllowAnonymous]
+ public WebResponseContent SaveZDPStraight([FromBody] SaveModel saveModel)
+ {
+ return _AppService.SaveZDPStraight(saveModel);
+ }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/Dt_CZInfo_mesController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/Dt_CZInfo_mesController.cs"
index ef695e7..ccda0c4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/Dt_CZInfo_mesController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/Dt_CZInfo_mesController.cs"
@@ -1,4 +1,6 @@
-锘縩amespace WIDESEA_WMSServer.Controllers;
+锘縰sing WIDESEA_DTO;
+
+namespace WIDESEA_WMSServer.Controllers;
[Route("api/[controller]")]
[ApiController]
@@ -8,4 +10,25 @@
{
}
+ /// <summary>
+ /// 杞﹁酱涓婃枡锛屽弽棣堟潯鐮�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("RequestAxleloading")]
+ public WebResponseContent RequestAxleloading([FromBody] RequestTaskDto input)
+ {
+ return Service.RequestAxleloading(input);
+ }
+
+ /// <summary>
+ /// 杞﹁酱鐘舵�佹洿鏀�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("UpdateAxleCurrentStatue")]
+ public WebResponseContent UpdateAxleCurrentStatue([FromBody] RequestTaskDto input)
+ {
+ return Service.UpdateAxleCurrentStatue(input);
+ }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index 5d5dd64..38a9b6f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -36,4 +36,13 @@
{
return Service.LocationEnable(saveModel);
}
+
+
+ //鑾峰彇璐т綅鐘舵�佷俊鎭�
+ [HttpPost, AllowAnonymous, Route("LocationStatus")]
+ public WebResponseContent LocationStatus()
+ {
+ return Service.LocationStatus();
+ }
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs"
index df60da5..dd4e2d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Stock/Dt_WheelsStockController.cs"
@@ -10,4 +10,14 @@
{
}
+
+ /// <summary>
+ /// 搴撳瓨淇℃伅缁熻
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("InventoryStatistics")]
+ public WebResponseContent InventoryStatistics()
+ {
+ return Service.InventoryStatistics();
+ }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs"
index 3583d5a..f761a5d 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs"
@@ -1,5 +1,4 @@
锘縰sing WIDESEA_DTO;
-using static WIDESEA_DTO.RequestTaskDto;
namespace WIDESEA_WMSServer.Controllers;
@@ -56,6 +55,16 @@
return new WebResponseContent().OK(data: await _locationService.TransferCheckAsync(input));
}
+ /// <summary>
+ /// 妫�鏌ュ叆搴撴槸鍚﹂渶瑕佽繘琛岀Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns>浠诲姟</returns>
+ [HttpPost, Route("InTransferCheckAsync"), AllowAnonymous]
+ public async Task<WebResponseContent> InTransferCheckAsync([FromBody] RequestTaskDto input)
+ {
+ return new WebResponseContent().OK(data: await _locationService.InTransferCheckAsync(input));
+ }
/// <summary>
/// 璇锋眰浠诲姟宸烽亾
@@ -122,4 +131,15 @@
{
return Service.CreateAndSendOutboundTask(saveModel);
}
+
+ /// <summary>
+ /// 淇敼杞﹁疆鍘诲悜
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpPost, AllowAnonymous, Route("UpWheelsFlow")]
+ public WebResponseContent UpWheelsFlow([FromBody] SaveModel saveModel)
+ {
+ return Service.UpWheelsFlow(saveModel);
+ }
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task_HtyController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task_HtyController.cs"
index f09779a..52d7554 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task_HtyController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Task_HtyController.cs"
@@ -23,4 +23,39 @@
_locationService = locationService;
}
+
+ /// <summary>
+ /// 妫�鏌ユ槸鍚﹂渶瑕佽繘琛岀Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns>浠诲姟</returns>
+ [HttpPost, Route("TransferCheckAsync"), AllowAnonymous]
+ public async Task<WebResponseContent> TransferCheckAsync([FromBody] RequestTaskDto input)
+ {
+ return new WebResponseContent().OK(data: await _locationService.TransferCheckAsync(input));
+ }
+
+ /// <summary>
+ /// 妫�鏌ュ叆搴撲换鍔℃槸鍚﹂渶瑕佽繘琛岀Щ搴�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ /// <returns>浠诲姟</returns>
+ [HttpPost, Route("InTransferCheckAsync"), AllowAnonymous]
+ public async Task<WebResponseContent> InTransferCheckAsync([FromBody] RequestTaskDto input)
+ {
+ return new WebResponseContent().OK(data: await _locationService.InTransferCheckAsync(input));
+ }
+
+
+ /// <summary>
+ /// 鍘嗗彶浠诲姟鍥炴粴
+ /// </summary>
+ /// <param name="input">璇锋眰鏁版嵁</param>
+ /// <returns></returns>
+ [HttpGet, AllowAnonymous, Route("TaskRollback")]
+ public WebResponseContent TaskRollback(int input)
+ {
+ return _task_HtyService.TaskRollback(input);
+ }
+
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs"
index dc9483e..83110a4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs"
@@ -1,9 +1,11 @@
-锘縰sing AutoMapper.Configuration.Annotations;
+锘縰sing Autofac.Core;
+using AutoMapper.Configuration.Annotations;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_StoragIntegrationServices;
namespace WIDESEA_WMSServer.Controllers;
@@ -20,5 +22,5 @@
_WCSService = WCSService;
}
-
+
}
\ No newline at end of file
--
Gitblit v1.9.3