From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/service/BasErrLogService.java | 2
src/main/java/com/zy/asrs/service/RowLastnoTypeService.java | 2
src/main/java/com/zy/asrs/service/OrderService.java | 6
src/main/java/com/zy/asrs/controller/ApiLogController.java | 38
src/main/java/com/zy/asrs/controller/BasWhsController.java | 44
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 8
src/main/java/com/zy/common/properties/SystemProperties.java | 8
src/main/java/com/zy/asrs/task/core/WcsDispatcher.java | 4
src/main/java/com/zy/common/entity/Parameter.java | 20
src/main/java/com/zy/asrs/service/DocTypeService.java | 2
src/main/java/com/zy/system/mapper/LicenseInfosMapper.java | 2
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 11
src/main/java/com/zy/asrs/service/impl/BasQualityTestingServiceImpl.java | 6
src/main/java/com/zy/system/entity/UserLogin.java | 13
src/main/java/com/zy/asrs/controller/StaDescController.java | 74
src/main/java/com/zy/asrs/utils/Utils.java | 20
src/main/java/com/zy/asrs/task/ErrorStockScheduler.java | 2
src/main/java/com/zy/system/service/LicenseInfosService.java | 2
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 36
src/main/java/com/zy/asrs/entity/BasAreas.java | 57
src/main/java/com/zy/common/entity/NodeExcelListener.java | 6
src/main/java/com/zy/asrs/entity/result/Pakin.java | 89
src/main/java/com/zy/asrs/mapper/OrderDetlPakoutLogMapper.java | 13
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 35
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 48
src/main/java/com/zy/system/controller/UserController.java | 48
src/main/java/com/zy/asrs/service/impl/AppVersionServiceImpl.java | 6
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 10
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 65
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 4
src/main/java/com/zy/asrs/entity/param/ContainerParams.java | 2
src/main/java/com/zy/system/entity/license/LicenseVerify.java | 36
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 4
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 103
src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/BasErrLogController.java | 38
src/main/java/com/zy/system/controller/HostController.java | 34
src/main/java/com/zy/asrs/mapper/DocTypeMapper.java | 2
src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java | 48
src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java | 2
src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java | 2
src/main/java/com/zy/common/config/SwaggerConfig.java | 5
src/main/java/com/zy/asrs/entity/OrderPakoutLog.java | 494 +
src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java | 14
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 8
src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java | 2
src/main/java/com/zy/asrs/entity/BasProcessProcedures.java | 17
src/main/java/com/zy/asrs/service/impl/LocCacheServiceImpl.java | 9
src/main/java/com/zy/asrs/entity/OrderDetlLog.java | 648 ++
src/main/java/com/zy/asrs/entity/AdjDetl.java | 51
src/main/java/com/zy/asrs/controller/RowLastnoController.java | 46
src/main/java/com/zy/asrs/service/impl/OrderSettleServiceImpl.java | 6
src/main/java/com/zy/system/controller/LicenseCreatorController.java | 20
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 94
src/main/java/com/zy/system/controller/UserLoginController.java | 34
src/main/java/com/zy/asrs/entity/BasDevp.java | 116
src/main/java/com/zy/common/web/BaseController.java | 42
src/main/java/com/zy/asrs/mapper/TaskLogMapper.java | 2
src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java | 44
src/main/java/com/zy/system/entity/Permission.java | 21
pom.xml | 1
src/main/java/com/zy/asrs/service/AdjDetlService.java | 2
src/main/java/com/zy/asrs/controller/BasCrnpController.java | 46
src/main/java/com/zy/asrs/controller/OrderSettleController.java | 38
src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 116
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 42
src/main/java/com/zy/asrs/entity/AppVersion.java | 41
src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java | 26
src/main/java/com/zy/asrs/entity/RowLastnoType.java | 66
src/main/java/com/zy/asrs/entity/WrkLastno.java | 43
src/main/java/com/zy/common/utils/Synchro.java | 4
src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java | 30
src/main/java/com/zy/asrs/controller/AppVersionController.java | 42
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 241
src/main/java/com/zy/asrs/controller/BasCrnErrorController.java | 45
src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java | 6
src/main/java/com/zy/asrs/controller/BasCrnOptController.java | 40
src/main/java/com/zy/common/model/OutLocDto.java | 8
src/main/java/com/zy/common/web/RouterController.java | 24
src/main/java/com/zy/asrs/entity/Node.java | 81
src/main/java/com/zy/asrs/entity/ViewLocMapDto.java | 2
src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java | 33
src/main/java/com/zy/asrs/entity/BasPlcerror.java | 33
src/main/java/com/zy/asrs/task/OverYearLogScheduler.java | 2
src/main/java/com/zy/system/entity/OperateLog.java | 13
src/main/java/com/zy/asrs/entity/BasContainer.java | 13
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 44
src/main/java/com/zy/asrs/entity/Order.java | 192
src/main/java/com/zy/asrs/controller/BasQualityTestingController.java | 55
src/main/java/com/zy/system/service/SaasLogService.java | 2
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 92
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 6
src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/TrayCodeServiceImpl.java | 6
src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java | 56
src/main/java/com/zy/asrs/entity/WaitPakin.java | 141
src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java | 7
src/main/java/com/zy/asrs/controller/BasAreasController.java | 52
src/main/java/com/zy/asrs/entity/BasLocSts.java | 37
src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java | 48
src/main/java/com/zy/asrs/task/handler/OrderPakoutMoveHistoryHandler.java | 78
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 47
src/main/java/com/zy/system/entity/Resource.java | 31
src/main/java/com/zy/common/config/AdminInterceptor.java | 26
src/main/java/com/zy/asrs/controller/DocTypeController.java | 38
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 199
src/main/java/com/zy/asrs/entity/ViewInOutBean.java | 130
src/main/java/com/zy/asrs/service/BasCrnOptService.java | 2
src/main/java/com/zy/asrs/mapper/BasProcessProceduresMapper.java | 2
src/main/java/com/zy/system/controller/ConfigController.java | 54
src/main/java/com/zy/asrs/entity/Tag.java | 77
src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java | 32
src/main/java/com/zy/asrs/task/core/ReturnT.java | 2
src/main/java/com/zy/asrs/mapper/ApiLogMapper.java | 2
src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java | 6
src/main/java/com/zy/asrs/controller/TrayCodeController.java | 59
src/main/java/com/zy/asrs/entity/WrkDetl.java | 142
src/main/java/com/zy/asrs/mapper/TaskDetlLogMapper.java | 2
src/main/java/com/zy/asrs/service/TaskLogService.java | 2
src/main/java/com/zy/asrs/mapper/BasContainerMapper.java | 2
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 37
src/main/java/com/zy/asrs/task/NotifyLogScheduler.java | 2
src/main/java/com/zy/asrs/utils/SaasUtils.java | 3
src/main/java/com/zy/common/utils/BarcodeUtils.java | 9
src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java | 21
src/main/java/com/zy/asrs/entity/TaskDetlLog.java | 183
src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java | 6
src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java | 58
src/main/java/com/zy/asrs/service/impl/BasProcessProceduresServiceImpl.java | 6
src/main/java/com/zy/asrs/mapper/LocCheckMapper.java | 2
src/main/java/com/zy/common/model/TaskDto.java | 14
src/main/java/com/zy/asrs/entity/TaskDetl.java | 187
src/main/java/com/zy/common/model/LocDto.java | 13
src/main/java/com/zy/asrs/enums/MatTagType.java | 3
src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java | 580 ++
src/main/java/com/zy/common/CodeBuilder.java | 10
src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java | 2
src/main/java/com/zy/system/controller/OperateLogController.java | 34
src/main/java/com/zy/system/entity/license/CustomKeyStoreParam.java | 4
src/main/java/com/zy/system/entity/SaasLog.java | 46
src/main/java/com/zy/common/config/AspectConfig.java | 12
src/main/java/com/zy/common/model/PageParam.java | 4
src/main/java/com/zy/asrs/controller/NodeController.java | 88
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 12
src/main/java/com/zy/common/utils/TreeUtils.java | 8
src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java | 2
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 46
src/main/java/com/zy/asrs/mapper/OrderPakoutLogMapper.java | 13
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 20
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 145
src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java | 21
src/main/java/com/zy/asrs/service/OrderPakoutService.java | 4
src/main/java/com/zy/common/utils/Http.java | 4
src/main/java/com/zy/asrs/mapper/OrderDetlLogMapper.java | 13
src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java | 13
src/main/java/com/zy/common/model/WrkDto.java | 2
src/main/java/com/zy/asrs/entity/OrderPakout.java | 153
src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java | 4
src/main/java/com/zy/asrs/entity/DocType.java | 68
src/main/java/com/zy/asrs/enums/CommonEnum.java | 2
src/main/java/com/zy/asrs/task/CheckDeepScheduler.java | 9
src/main/java/com/zy/system/timer/LoadingConfigTimer.java | 4
src/main/java/com/zy/asrs/service/ApiLogService.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 84
src/main/java/com/zy/system/entity/license/LicenseVerifyParam.java | 1
src/main/java/com/zy/asrs/controller/OrderController.java | 288
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 54
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 42
src/main/java/com/zy/asrs/controller/OpenController.java | 11
src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java | 6
src/main/java/com/zy/common/utils/HttpHandler.java | 46
src/main/java/com/zy/common/model/MobileLocDetlVo.java | 2
src/main/java/com/zy/asrs/entity/LocOwner.java | 7
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 16
src/main/java/com/zy/asrs/service/TaskDetlService.java | 2
src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java | 6
src/main/java/com/zy/common/web/FileController.java | 12
src/main/java/com/zy/asrs/controller/LocOwnerController.java | 36
src/main/java/com/zy/asrs/service/OrderPakinService.java | 4
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 16
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 32
src/main/java/com/zy/asrs/service/BasProcessProceduresService.java | 2
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 11
src/main/java/com/zy/common/utils/RedisUtil.java | 1
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 27
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 10
src/main/java/com/zy/asrs/controller/TaskDetlLogController.java | 12
src/main/java/com/zy/asrs/entity/LocChartPie.java | 57
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2
src/main/java/com/zy/common/model/MesPakoutParam.java | 3
src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java | 44
src/main/java/com/zy/asrs/service/LocMastService.java | 17
src/main/java/com/zy/system/controller/SaasLogController.java | 52
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 404
src/main/java/com/zy/asrs/entity/StaDesc.java | 65
src/main/java/com/zy/asrs/controller/TaskDetlController.java | 52
src/main/java/com/zy/asrs/entity/DocLog.java | 37
src/main/java/com/zy/asrs/mapper/BasAreasMapper.java | 2
src/main/java/com/zy/asrs/entity/BasWhsType.java | 37
src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java | 2
src/main/java/com/zy/common/config/ControllerResAdvice.java | 4
src/main/java/com/zy/common/config/WebConfig.java | 7
src/main/java/com/zy/asrs/task/handler/OrderPakinMoveHistoryHandler.java | 76
src/main/java/com/zy/asrs/entity/BasCrnp.java | 93
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 6
src/main/java/com/zy/asrs/service/BasQualityTestingService.java | 2
src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java | 6
src/main/java/com/zy/common/web/AuthController.java | 8
src/main/java/com/zy/asrs/mapper/TaskDetlMapper.java | 2
src/main/java/com/zy/asrs/service/impl/RowLastnoTypeServiceImpl.java | 6
src/main/java/com/zy/asrs/mapper/TrayCodeMapper.java | 2
src/main/java/com/zy/asrs/service/LocCheckService.java | 2
src/main/java/com/zy/system/timer/LicenseTimer.java | 5
src/main/java/com/zy/asrs/entity/param/PickMatParam.java | 12
src/main/java/com/zy/asrs/service/LocCacheService.java | 2
src/main/java/com/zy/system/entity/Api.java | 33
src/main/java/com/zy/common/service/CommonService.java | 7
src/main/java/com/zy/system/controller/RoleController.java | 40
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 207
src/main/java/com/zy/asrs/entity/OrderDetl.java | 196
src/main/java/com/zy/asrs/service/LocDetlService.java | 12
src/main/java/com/zy/asrs/mapper/OrderLogMapper.java | 13
src/main/java/com/zy/asrs/entity/TrayCode.java | 41
src/main/java/com/zy/asrs/controller/LocCacheController.java | 55
src/main/java/com/zy/common/utils/QrCode.java | 3
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 223
src/main/java/com/zy/asrs/controller/TaskController.java | 7
src/main/java/com/zy/asrs/mapper/OrderPakinLogMapper.java | 13
src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java | 6
src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java | 2
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 39
src/main/java/com/zy/asrs/entity/OrderPakinLog.java | 494 +
src/main/java/com/zy/asrs/entity/LocDetl.java | 170
src/main/java/com/zy/asrs/service/impl/BasAreasServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 11
src/main/java/com/zy/system/entity/license/AbstractServerInfos.java | 20
src/main/java/com/zy/common/model/Shelves.java | 39
src/main/java/com/zy/system/mapper/SaasLogMapper.java | 2
src/main/java/com/zy/asrs/mapper/OrderDetlPakinLogMapper.java | 13
src/main/java/com/zy/asrs/service/TrayCodeService.java | 2
src/main/java/com/zy/asrs/mapper/LocCacheMapper.java | 2
src/main/java/com/zy/system/entity/license/CustomLicenseManager.java | 62
src/main/java/com/zy/asrs/entity/StkPlcm.java | 75
src/main/java/com/zy/asrs/service/BasDevpService.java | 6
src/main/java/com/zy/asrs/controller/RowLastnoTypeController.java | 52
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 70
src/main/java/com/zy/asrs/service/BasPlcerrorService.java | 2
src/main/java/com/zy/asrs/entity/BasErrLog.java | 89
src/main/java/com/zy/asrs/service/BasStationService.java | 2
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | 10
src/main/java/com/zy/asrs/service/WrkDetlLogService.java | 6
src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java | 20
src/main/java/com/zy/asrs/service/impl/TaskDetlServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/LocCheck.java | 66
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 4
src/main/java/com/zy/asrs/service/TaskDetlLogService.java | 2
src/main/java/com/zy/asrs/mapper/MatMapper.java | 11
src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java | 6
src/main/java/com/zy/common/model/DetlDto.java | 16
src/main/java/com/zy/asrs/controller/TaskLogController.java | 52
src/main/java/com/zy/asrs/entity/TaskLog.java | 298
src/main/java/com/zy/asrs/controller/OutController.java | 16
src/main/java/com/zy/system/entity/Config.java | 25
src/main/java/com/zy/asrs/mapper/PackMapper.java | 2
src/main/java/com/zy/asrs/service/MobileService.java | 6
src/main/java/com/zy/asrs/entity/Pack.java | 81
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 142
src/main/java/com/zy/asrs/entity/OrderSettle.java | 39
src/main/java/com/zy/system/entity/LicenseInfos.java | 34
src/main/java/com/zy/asrs/entity/BasCrnOpt.java | 59
src/main/java/com/zy/system/entity/Role.java | 31
src/main/java/com/zy/asrs/controller/BasPlcerrorController.java | 40
src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 13
src/main/java/com/zy/asrs/controller/PackController.java | 38
src/main/java/com/zy/asrs/entity/ChartBean.java | 34
src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/ApiLog.java | 84
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 95
src/main/java/com/zy/asrs/service/OrderDetlPakinService.java | 1
src/main/java/com/zy/asrs/controller/StkPlcmController.java | 36
src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java | 16
src/main/java/com/zy/asrs/mapper/AdjDetlMapper.java | 2
src/main/java/com/zy/asrs/enums/ContainerType.java | 2
src/main/java/com/zy/system/entity/license/WindowsServerInfos.java | 12
src/main/java/com/zy/common/properties/OSinfo.java | 82
src/main/java/com/zy/asrs/entity/WorkChartAxis.java | 46
src/main/java/com/zy/asrs/mapper/RowLastnoTypeMapper.java | 2
src/main/java/com/zy/asrs/service/TaskService.java | 2
src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java | 1
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/WaitPakinLogServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/ViewStockUseBean.java | 152
src/main/java/com/zy/asrs/entity/Task.java | 221
src/main/java/com/zy/system/entity/User.java | 26
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 37
src/main/java/com/zy/system/service/impl/SaasLogServiceImpl.java | 6
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 57
src/main/java/com/zy/common/model/enums/HtmlNavIconType.java | 7
src/main/java/com/zy/asrs/controller/BasStationController.java | 7
src/main/java/com/zy/asrs/mapper/BasStationMapper.java | 2
src/main/java/com/zy/asrs/controller/WaitPakinLogController.java | 41
src/main/java/com/zy/asrs/service/OrderDetlService.java | 1
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 69
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 42
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 22
src/main/java/com/zy/asrs/service/AppVersionService.java | 2
src/main/java/com/zy/asrs/service/OrderSettleService.java | 2
src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java | 19
src/main/java/com/zy/asrs/entity/Mat.java | 150
src/main/java/com/zy/asrs/controller/MatController.java | 3
src/main/java/com/zy/asrs/entity/LocMast.java | 132
src/main/java/com/zy/asrs/service/MatService.java | 2
src/main/java/com/zy/asrs/controller/BasDevpController.java | 52
src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java | 3
src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java | 581 ++
src/main/java/com/zy/asrs/entity/BasCrnError.java | 37
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 4
src/main/java/com/zy/system/entity/license/LicenseCreator.java | 26
src/main/java/com/zy/asrs/entity/PieChartsVo.java | 10
src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 8
src/main/java/com/zy/system/controller/HomeController.java | 40
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 140
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 46
src/main/java/com/zy/asrs/entity/BasQualityTesting.java | 17
src/main/java/com/zy/common/utils/NodeUtils.java | 12
src/main/java/com/zy/asrs/controller/BasContainerController.java | 55
src/main/java/com/zy/system/controller/ApiController.java | 34
src/main/java/com/zy/system/entity/Host.java | 23
src/main/java/com/zy/asrs/controller/TagController.java | 46
src/main/java/com/zy/asrs/mapper/BasQualityTestingMapper.java | 2
src/main/java/com/zy/asrs/service/impl/AdjDetlServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/result/LocDetlAll.java | 12
src/main/java/com/zy/asrs/controller/MapController.java | 53
src/main/java/com/zy/system/controller/PermissionController.java | 34
src/main/java/com/zy/asrs/utils/VersionUtils.java | 2
src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java | 14
src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java | 8
src/main/java/com/zy/system/controller/ResourceController.java | 54
src/main/java/com/zy/asrs/service/WaitPakinLogService.java | 2
src/main/java/com/zy/common/web/WcsController.java | 43
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java | 48
src/main/java/com/zy/asrs/controller/WorkController.java | 20
src/main/java/com/zy/asrs/controller/WrkMastController.java | 52
src/main/java/com/zy/asrs/mapper/AppVersionMapper.java | 2
src/main/java/com/zy/asrs/service/OpenService.java | 1
src/main/java/com/zy/asrs/task/PlcLogScheduler.java | 2
src/main/java/com/zy/asrs/task/AbstractHandler.java | 5
src/main/java/com/zy/asrs/entity/BasStation.java | 168
src/main/java/com/zy/asrs/entity/OrderLog.java | 570 ++
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 12
src/main/java/com/zy/asrs/service/BasContainerService.java | 4
src/main/java/com/zy/asrs/entity/AxisBean.java | 36
src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java | 48
src/main/java/com/zy/asrs/service/WorkService.java | 8
src/main/java/com/zy/asrs/mapper/TaskMapper.java | 2
src/main/java/com/zy/system/entity/RolePermission.java | 17
src/main/java/com/zy/asrs/mapper/TagMapper.java | 2
src/main/java/com/zy/asrs/controller/LocDetlController.java | 87
src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java | 1
src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java | 48
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 16
src/main/java/com/zy/asrs/entity/WrkMast.java | 212
src/main/java/com/zy/asrs/mapper/OrderSettleMapper.java | 2
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 34
src/main/java/com/zy/asrs/entity/OrderPakin.java | 151
src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java | 4
src/main/java/com/zy/asrs/controller/MobileController.java | 109
src/main/java/com/zy/asrs/entity/RowLastno.java | 75
src/main/java/com/zy/asrs/service/PackService.java | 2
/dev/null | 51
src/main/java/com/zy/asrs/controller/ConsoleController.java | 28
src/main/java/com/zy/asrs/entity/LocCache.java | 131
src/main/java/com/zy/asrs/service/WaitPakinService.java | 2
src/main/java/com/zy/asrs/service/WrkMastService.java | 3
src/main/java/com/zy/asrs/service/BasAreasService.java | 2
src/main/java/com/zy/asrs/controller/LocCheckController.java | 52
src/main/java/com/zy/asrs/service/ManLocDetlService.java | 3
src/main/java/com/zy/asrs/service/NodeService.java | 12
379 files changed, 10,272 insertions(+), 6,530 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9a4e10f..1a00ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/AdjDetlController.java b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
index 8db1a01..6a90f89 100644
--- a/src/main/java/com/zy/asrs/controller/AdjDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AdjDetlController.java
@@ -35,28 +35,28 @@
@RequestMapping(value = "/adjDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(AdjDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
+ if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(adjDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -73,10 +73,10 @@
return R.ok();
}
- @RequestMapping(value = "/adjDetl/update/auth")
- @ManagerAuth
- public R update(AdjDetl adjDetl){
- if (Cools.isEmpty(adjDetl) || null==adjDetl.getAdjId()){
+ @RequestMapping(value = "/adjDetl/update/auth")
+ @ManagerAuth
+ public R update(AdjDetl adjDetl) {
+ if (Cools.isEmpty(adjDetl) || null == adjDetl.getAdjId()) {
return R.error();
}
adjDetlService.updateById(adjDetl);
@@ -85,12 +85,12 @@
@RequestMapping(value = "/adjDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<AdjDetl> list = JSONArray.parseArray(param, AdjDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (AdjDetl entity : list){
+ for (AdjDetl entity : list) {
adjDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -98,7 +98,7 @@
@RequestMapping(value = "/adjDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<AdjDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("adjDetl"));
@@ -114,7 +114,7 @@
wrapper.like("adj_id", condition);
Page<AdjDetl> page = adjDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AdjDetl adjDetl : page.getRecords()){
+ for (AdjDetl adjDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", adjDetl.getAdjId());
map.put("value", adjDetl.getAdjId());
@@ -127,7 +127,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AdjDetl> wrapper = new EntityWrapper<AdjDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != adjDetlService.selectOne(wrapper)){
+ if (null != adjDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(AdjDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 1e450a3..fb201b1 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -34,24 +34,26 @@
@RequestMapping(value = "/apiLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/apiLog/update/auth")
- @ManagerAuth
- public R update(ApiLog apiLog){
- if (Cools.isEmpty(apiLog) || null==apiLog.getId()){
+ @RequestMapping(value = "/apiLog/update/auth")
+ @ManagerAuth
+ public R update(ApiLog apiLog) {
+ if (Cools.isEmpty(apiLog) || null == apiLog.getId()) {
return R.error();
}
apiLogService.updateById(apiLog);
@@ -80,8 +82,8 @@
@RequestMapping(value = "/apiLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
apiLogService.deleteById(id);
}
return R.ok();
@@ -89,7 +91,7 @@
@RequestMapping(value = "/apiLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("apiLog"));
@@ -105,7 +107,7 @@
wrapper.like("uuid", condition);
Page<ApiLog> page = apiLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (ApiLog apiLog : page.getRecords()){
+ for (ApiLog apiLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", apiLog.getId());
map.put("value", apiLog.getId());
@@ -118,7 +120,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<ApiLog> wrapper = new EntityWrapper<ApiLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != apiLogService.selectOne(wrapper)){
+ if (null != apiLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(ApiLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/AppVersionController.java b/src/main/java/com/zy/asrs/controller/AppVersionController.java
index dd879b2..0d5d98e 100644
--- a/src/main/java/com/zy/asrs/controller/AppVersionController.java
+++ b/src/main/java/com/zy/asrs/controller/AppVersionController.java
@@ -37,17 +37,19 @@
@RequestMapping(value = "/appVersion/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<AppVersion> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(AppVersion.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(appVersionService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -71,10 +73,10 @@
return R.ok("鏈夋柊鐗堟湰锛岄渶瑕佹洿鏂�").add(latestApp);
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -97,8 +99,8 @@
@RequestMapping(value = "/appVersion/update/auth")
@ManagerAuth
- public R update(AppVersion appVersion){
- if (Cools.isEmpty(appVersion) || null==appVersion.getId()){
+ public R update(AppVersion appVersion) {
+ if (Cools.isEmpty(appVersion) || null == appVersion.getId()) {
return R.error();
}
if (appVersion.getLatest() == 1) {
@@ -111,8 +113,8 @@
@RequestMapping(value = "/appVersion/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
appVersionService.deleteById(id);
}
return R.ok();
@@ -120,7 +122,7 @@
@RequestMapping(value = "/appVersion/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<AppVersion> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("appVersion"));
@@ -136,7 +138,7 @@
wrapper.like("id", condition);
Page<AppVersion> page = appVersionService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AppVersion appVersion : page.getRecords()){
+ for (AppVersion appVersion : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", appVersion.getId());
map.put("value", appVersion.getId());
@@ -149,7 +151,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AppVersion> wrapper = new EntityWrapper<AppVersion>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != appVersionService.selectOne(wrapper)){
+ if (null != appVersionService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(AppVersion.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -158,12 +160,12 @@
@RequestMapping(value = "/appVersion/uploadApp/auth")
@ManagerAuth
public R uploadApp(@RequestParam("id") Integer id,
- @RequestParam("file") MultipartFile[] files){
+ @RequestParam("file") MultipartFile[] files) {
AppVersion appVersion = appVersionService.selectById(id);
MultipartFile file = files[0];
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd_HHmmss");
- String path = ClassUtils.getDefaultClassLoader().getResource("appVersion").getPath();
+ String path = ClassUtils.getDefaultClassLoader().getResource("appVersion").getPath();
//鏂囦欢鍚庣紑鍚�
String suffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
//涓婁紶鏂囦欢鍚�
@@ -174,7 +176,7 @@
//鏈嶅姟鍣ㄧ淇濆瓨鐨勬枃浠跺璞�
File serverFile = new File(filepath);
- if(!serverFile.exists()) {
+ if (!serverFile.exists()) {
try {
//鍒涘缓鏂囦欢
serverFile.createNewFile();
diff --git a/src/main/java/com/zy/asrs/controller/BasAreasController.java b/src/main/java/com/zy/asrs/controller/BasAreasController.java
index 11545e1..d4a12a2 100644
--- a/src/main/java/com/zy/asrs/controller/BasAreasController.java
+++ b/src/main/java/com/zy/asrs/controller/BasAreasController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasAreas;
-import com.zy.asrs.service.BasAreasService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasAreas;
+import com.zy.asrs.service.BasAreasService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasAreasController extends BaseController {
@@ -32,24 +34,26 @@
@RequestMapping(value = "/basAreas/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasAreas> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasAreas.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basAreasService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -66,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basAreas/update/auth")
- @ManagerAuth
- public R update(BasAreas basAreas){
- if (Cools.isEmpty(basAreas) || null==basAreas.getId()){
+ @RequestMapping(value = "/basAreas/update/auth")
+ @ManagerAuth
+ public R update(BasAreas basAreas) {
+ if (Cools.isEmpty(basAreas) || null == basAreas.getId()) {
return R.error();
}
basAreasService.updateById(basAreas);
@@ -78,8 +82,8 @@
@RequestMapping(value = "/basAreas/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
basAreasService.deleteById(id);
}
return R.ok();
@@ -87,7 +91,7 @@
@RequestMapping(value = "/basAreas/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasAreas> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basAreas"));
@@ -103,7 +107,7 @@
wrapper.like("id", condition);
Page<BasAreas> page = basAreasService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasAreas basAreas : page.getRecords()){
+ for (BasAreas basAreas : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basAreas.getId());
map.put("value", basAreas.getName());
@@ -117,7 +121,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasAreas> wrapper = new EntityWrapper<BasAreas>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basAreasService.selectOne(wrapper)){
+ if (null != basAreasService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasAreas.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasContainerController.java b/src/main/java/com/zy/asrs/controller/BasContainerController.java
index b6754ae..171d0ca 100644
--- a/src/main/java/com/zy/asrs/controller/BasContainerController.java
+++ b/src/main/java/com/zy/asrs/controller/BasContainerController.java
@@ -1,23 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasContainer;
-import com.zy.asrs.entity.param.ContainerParams;
-import com.zy.asrs.service.BasContainerService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasContainer;
+import com.zy.asrs.service.BasContainerService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasContainerController extends BaseController {
@@ -33,24 +34,26 @@
@RequestMapping(value = "/basContainer/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasContainer> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasContainer.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basContainerService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,12 +71,10 @@
}
-
-
- @RequestMapping(value = "/basContainer/update/auth")
- @ManagerAuth
- public R update(BasContainer basContainer){
- if (Cools.isEmpty(basContainer) || null==basContainer.getId()){
+ @RequestMapping(value = "/basContainer/update/auth")
+ @ManagerAuth
+ public R update(BasContainer basContainer) {
+ if (Cools.isEmpty(basContainer) || null == basContainer.getId()) {
return R.error();
}
basContainerService.updateById(basContainer);
@@ -82,8 +83,8 @@
@RequestMapping(value = "/basContainer/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
basContainerService.deleteById(id);
}
return R.ok();
@@ -91,7 +92,7 @@
@RequestMapping(value = "/basContainer/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasContainer> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basContainer"));
@@ -107,7 +108,7 @@
wrapper.like("_id", condition);
Page<BasContainer> page = basContainerService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasContainer basContainer : page.getRecords()){
+ for (BasContainer basContainer : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basContainer.getId());
map.put("value", basContainer.getId());
@@ -120,7 +121,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasContainer> wrapper = new EntityWrapper<BasContainer>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basContainerService.selectOne(wrapper)){
+ if (null != basContainerService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasContainer.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
index f8981e9..72c41ab 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnErrorController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasCrnError;
-import com.zy.asrs.service.BasCrnErrorService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasCrnError;
+import com.zy.asrs.service.BasCrnErrorService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basCrnError/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basCrnErrorService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -56,6 +58,7 @@
}
}
}
+
@RequestMapping(value = "/basCrnError/add/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜娣诲姞")
public R add(BasCrnError basCrnError) {
@@ -67,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnError/update/auth")
+ @RequestMapping(value = "/basCrnError/update/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜淇敼")
- public R update(BasCrnError basCrnError){
- if (Cools.isEmpty(basCrnError) || null==basCrnError.getErrorCode()){
+ public R update(BasCrnError basCrnError) {
+ if (Cools.isEmpty(basCrnError) || null == basCrnError.getErrorCode()) {
return R.error();
}
basCrnError.setModiUser(getUserId());
@@ -81,12 +84,12 @@
@RequestMapping(value = "/basCrnError/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnError> list = JSONArray.parseArray(param, BasCrnError.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnError entity : list){
+ for (BasCrnError entity : list) {
basCrnErrorService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -94,7 +97,7 @@
@RequestMapping(value = "/basCrnError/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯哥爜瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnError> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnError"));
@@ -110,7 +113,7 @@
wrapper.like("err_name", condition);
Page<BasCrnError> page = basCrnErrorService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnError basCrnError : page.getRecords()){
+ for (BasCrnError basCrnError : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnError.getErrorCode());
map.put("value", basCrnError.getErrName());
@@ -123,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnError> wrapper = new EntityWrapper<BasCrnError>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnErrorService.selectOne(wrapper)){
+ if (null != basCrnErrorService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnError.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnOptController.java b/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
index dbec856..35e50bd 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnOptController.java
@@ -35,24 +35,26 @@
@RequestMapping(value = "/basCrnOpt/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasCrnOpt> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("send_time", false);
}
return R.ok(basCrnOptService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -69,10 +71,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnOpt/update/auth")
- @ManagerAuth
- public R update(BasCrnOpt basCrnOpt){
- if (Cools.isEmpty(basCrnOpt) || null==basCrnOpt.getId()){
+ @RequestMapping(value = "/basCrnOpt/update/auth")
+ @ManagerAuth
+ public R update(BasCrnOpt basCrnOpt) {
+ if (Cools.isEmpty(basCrnOpt) || null == basCrnOpt.getId()) {
return R.error();
}
basCrnOptService.updateById(basCrnOpt);
@@ -81,12 +83,12 @@
@RequestMapping(value = "/basCrnOpt/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnOpt> list = JSONArray.parseArray(param, BasCrnOpt.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnOpt entity : list){
+ for (BasCrnOpt entity : list) {
basCrnOptService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -94,7 +96,7 @@
@RequestMapping(value = "/basCrnOpt/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasCrnOpt> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnOpt"));
@@ -110,7 +112,7 @@
wrapper.like("id", condition);
Page<BasCrnOpt> page = basCrnOptService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnOpt basCrnOpt : page.getRecords()){
+ for (BasCrnOpt basCrnOpt : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnOpt.getId());
map.put("value", basCrnOpt.getId());
@@ -123,7 +125,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnOpt> wrapper = new EntityWrapper<BasCrnOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnOptService.selectOne(wrapper)){
+ if (null != basCrnOptService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnOpt.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
index f167ccf..7a48ab6 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnStatusController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasCrnStatus;
-import com.zy.asrs.service.BasCrnStatusService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasCrnStatus;
+import com.zy.asrs.service.BasCrnStatusService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,24 +32,26 @@
@RequestMapping(value = "/basCrnStatus/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false, defaultValue = "stsNo")String orderByField,
- @RequestParam(required = false, defaultValue = "asc")String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false, defaultValue = "stsNo") String orderByField,
+ @RequestParam(required = false, defaultValue = "asc") String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("sts_no", true);
}
return R.ok(basCrnStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -70,10 +72,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnStatus/update/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
- public R update(BasCrnStatus basCrnStatus){
- if (Cools.isEmpty(basCrnStatus) || null==basCrnStatus.getStsNo()){
+ @RequestMapping(value = "/basCrnStatus/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佷慨鏀�")
+ public R update(BasCrnStatus basCrnStatus) {
+ if (Cools.isEmpty(basCrnStatus) || null == basCrnStatus.getStsNo()) {
return R.error();
}
basCrnStatus.setModiUser(getUserId());
@@ -84,12 +86,12 @@
@RequestMapping(value = "/basCrnStatus/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnStatus> list = JSONArray.parseArray(param, BasCrnStatus.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnStatus entity : list){
+ for (BasCrnStatus entity : list) {
basCrnStatusService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -97,7 +99,7 @@
@RequestMapping(value = "/basCrnStatus/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈虹姸鎬佸鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnStatus> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnStatus"));
@@ -113,7 +115,7 @@
wrapper.like("sts_desc", condition);
Page<BasCrnStatus> page = basCrnStatusService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnStatus basCrnStatus : page.getRecords()){
+ for (BasCrnStatus basCrnStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnStatus.getStsNo());
map.put("value", basCrnStatus.getStsDesc());
@@ -126,7 +128,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnStatus> wrapper = new EntityWrapper<BasCrnStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnStatusService.selectOne(wrapper)){
+ if (null != basCrnStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasCrnpController.java b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
index 0c96b39..0b6b225 100644
--- a/src/main/java/com/zy/asrs/controller/BasCrnpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasCrnpController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.service.BasCrnpService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basCrnp/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basCrnpService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basCrnp/update/auth")
- @ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
- public R update(BasCrnp basCrnp){
- if (Cools.isEmpty(basCrnp) || null==basCrnp.getCrnNo()){
+ @RequestMapping(value = "/basCrnp/update/auth")
+ @ManagerAuth(memo = "鍫嗗灈鏈轰慨鏀�")
+ public R update(BasCrnp basCrnp) {
+ if (Cools.isEmpty(basCrnp) || null == basCrnp.getCrnNo()) {
return R.error();
}
basCrnp.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/basCrnp/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasCrnp> list = JSONArray.parseArray(param, BasCrnp.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasCrnp entity : list){
+ for (BasCrnp entity : list) {
basCrnpService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/basCrnp/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasCrnp> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basCrnp"));
@@ -111,7 +113,7 @@
wrapper.like("crn_no", condition);
Page<BasCrnp> page = basCrnpService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasCrnp basCrnp : page.getRecords()){
+ for (BasCrnp basCrnp : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basCrnp.getCrnNo());
map.put("value", basCrnp.getCrnNo());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasCrnp> wrapper = new EntityWrapper<BasCrnp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basCrnpService.selectOne(wrapper)){
+ if (null != basCrnpService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasCrnp.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpController.java b/src/main/java/com/zy/asrs/controller/BasDevpController.java
index 5182bc4..2a22878 100644
--- a/src/main/java/com/zy/asrs/controller/BasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/BasDevpController.java
@@ -5,15 +5,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.param.BasDevpInitParam;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.param.BasDevpInitParam;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,9 +29,9 @@
@ManagerAuth(memo = "鍒濆鍖栫珯鐐�")
public R init(BasDevpInitParam param) {
List<BasDevp> list = new ArrayList<>();
- for (int devNo = param.getStartDev() ; devNo<=param.getEndDev() ; devNo++){
+ for (int devNo = param.getStartDev(); devNo <= param.getEndDev(); devNo++) {
BasDevp basDevp = basDevpService.selectById(devNo);
- if (Cools.isEmpty(basDevp)){
+ if (Cools.isEmpty(basDevp)) {
BasDevp basDevp1 = new BasDevp();
basDevp1.setDevNo(devNo);
basDevp1.setInEnable("Y");
@@ -57,22 +57,24 @@
@RequestMapping(value = "/basDevp/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basDevpService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -93,10 +95,10 @@
return R.ok();
}
- @RequestMapping(value = "/basDevp/update/auth")
- @ManagerAuth(memo = "绔欑偣淇敼")
- public R update(BasDevp basDevp){
- if (Cools.isEmpty(basDevp) || null==basDevp.getDevNo()){
+ @RequestMapping(value = "/basDevp/update/auth")
+ @ManagerAuth(memo = "绔欑偣淇敼")
+ public R update(BasDevp basDevp) {
+ if (Cools.isEmpty(basDevp) || null == basDevp.getDevNo()) {
return R.error();
}
basDevp.setModiUser(getUserId());
@@ -107,12 +109,12 @@
@RequestMapping(value = "/basDevp/delete/auth")
@ManagerAuth(memo = "绔欑偣鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasDevp> list = JSONArray.parseArray(param, BasDevp.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasDevp entity : list){
+ for (BasDevp entity : list) {
basDevpService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -120,7 +122,7 @@
@RequestMapping(value = "/basDevp/export/auth")
@ManagerAuth(memo = "绔欑偣瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasDevp> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basDevp"));
@@ -136,7 +138,7 @@
wrapper.like("dev_no", condition);
Page<BasDevp> page = basDevpService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasDevp basDevp : page.getRecords()){
+ for (BasDevp basDevp : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basDevp.getDevNo());
map.put("value", basDevp.getDevNo());
@@ -149,7 +151,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasDevp> wrapper = new EntityWrapper<BasDevp>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basDevpService.selectOne(wrapper)){
+ if (null != basDevpService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasDevp.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasErrLogController.java b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
index 026db32..dfe3304 100644
--- a/src/main/java/com/zy/asrs/controller/BasErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasErrLogController.java
@@ -35,15 +35,15 @@
@RequestMapping(value = "/basErrLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasErrLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){
+ if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
wrapper.orderBy("create_time", false);
@@ -51,10 +51,10 @@
return R.ok(basErrLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -71,10 +71,10 @@
return R.ok();
}
- @RequestMapping(value = "/basErrLog/update/auth")
- @ManagerAuth
- public R update(BasErrLog basErrLog){
- if (Cools.isEmpty(basErrLog) || null==basErrLog.getId()){
+ @RequestMapping(value = "/basErrLog/update/auth")
+ @ManagerAuth
+ public R update(BasErrLog basErrLog) {
+ if (Cools.isEmpty(basErrLog) || null == basErrLog.getId()) {
return R.error();
}
basErrLogService.updateById(basErrLog);
@@ -83,12 +83,12 @@
@RequestMapping(value = "/basErrLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasErrLog> list = JSONArray.parseArray(param, BasErrLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasErrLog entity : list){
+ for (BasErrLog entity : list) {
basErrLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -96,7 +96,7 @@
@RequestMapping(value = "/basErrLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasErrLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basErrLog"));
@@ -112,7 +112,7 @@
wrapper.like("id", condition);
Page<BasErrLog> page = basErrLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasErrLog basErrLog : page.getRecords()){
+ for (BasErrLog basErrLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basErrLog.getId());
map.put("value", basErrLog.getId());
@@ -125,7 +125,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasErrLog> wrapper = new EntityWrapper<BasErrLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basErrLogService.selectOne(wrapper)){
+ if (null != basErrLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasErrLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasLocStsController.java b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
index e78a215..2d96b87 100644
--- a/src/main/java/com/zy/asrs/controller/BasLocStsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasLocSts;
-import com.zy.asrs.service.BasLocStsService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasLocSts;
+import com.zy.asrs.service.BasLocStsService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basLocSts/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basLocStsService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basLocSts/edit/auth")
@ManagerAuth
public R edit(BasLocSts basLocSts) {
- if (Cools.isEmpty(basLocSts)){
+ if (Cools.isEmpty(basLocSts)) {
return R.error();
}
- if (null == basLocSts.getLocSts()){
+ if (null == basLocSts.getLocSts()) {
basLocStsService.insert(basLocSts);
} else {
basLocStsService.updateById(basLocSts);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basLocSts/update/auth")
+ @RequestMapping(value = "/basLocSts/update/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佷慨鏀�")
- public R update(BasLocSts basLocSts){
- if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){
+ public R update(BasLocSts basLocSts) {
+ if (Cools.isEmpty(basLocSts) || null == basLocSts.getLocSts()) {
return R.error();
}
basLocSts.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basLocSts/delete/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasLocSts entity : list){
+ for (BasLocSts entity : list) {
basLocStsService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basLocSts/export/auth")
@ManagerAuth(memo = "搴撲綅鐘舵�佸鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basLocSts"));
@@ -125,7 +127,7 @@
wrapper.like("loc_desc", condition);
Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasLocSts basLocSts : page.getRecords()){
+ for (BasLocSts basLocSts : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basLocSts.getLocSts());
map.put("value", basLocSts.getLocDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasLocSts> wrapper = new EntityWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basLocStsService.selectOne(wrapper)){
+ if (null != basLocStsService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasLocSts.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
index 5e81cc1..aecec79 100644
--- a/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
+++ b/src/main/java/com/zy/asrs/controller/BasPlcerrorController.java
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basPlcerror/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basPlcerrorService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basPlcerror/update/auth")
- @ManagerAuth
- public R update(BasPlcerror basPlcerror){
- if (Cools.isEmpty(basPlcerror) || null==basPlcerror.getErrorCode()){
+ @RequestMapping(value = "/basPlcerror/update/auth")
+ @ManagerAuth
+ public R update(BasPlcerror basPlcerror) {
+ if (Cools.isEmpty(basPlcerror) || null == basPlcerror.getErrorCode()) {
return R.error();
}
basPlcerror.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/basPlcerror/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasPlcerror> list = JSONArray.parseArray(param, BasPlcerror.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasPlcerror entity : list){
+ for (BasPlcerror entity : list) {
basPlcerrorService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/basPlcerror/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasPlcerror> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basPlcerror"));
@@ -111,7 +113,7 @@
wrapper.like("error_desc", condition);
Page<BasPlcerror> page = basPlcerrorService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasPlcerror basPlcerror : page.getRecords()){
+ for (BasPlcerror basPlcerror : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basPlcerror.getErrorCode());
map.put("value", basPlcerror.getErrorDesc());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasPlcerror> wrapper = new EntityWrapper<BasPlcerror>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basPlcerrorService.selectOne(wrapper)){
+ if (null != basPlcerrorService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasPlcerror.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java b/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java
index c74936a..cf755d1 100644
--- a/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java
+++ b/src/main/java/com/zy/asrs/controller/BasProcessProceduresController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasProcessProcedures;
-import com.zy.asrs.service.BasProcessProceduresService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasProcessProcedures;
+import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasProcessProceduresController extends BaseController {
@@ -32,24 +34,26 @@
@RequestMapping(value = "/basProcessProcedures/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasProcessProcedures> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasProcessProcedures.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basProcessProceduresService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -63,22 +67,22 @@
@ManagerAuth
public R add(BasProcessProcedures basProcessProcedures) {
BasProcessProcedures boxType = basProcessProceduresService.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", basProcessProcedures.getBoxType()));
- if (!Cools.isEmpty(boxType)){
+ if (!Cools.isEmpty(boxType)) {
return R.error("鏍囪瘑鍙烽噸澶�,璇锋鏌�!!!");
}
basProcessProceduresService.insert(basProcessProcedures);
return R.ok();
}
- @RequestMapping(value = "/basProcessProcedures/update/auth")
- @ManagerAuth
- public R update(BasProcessProcedures basProcessProcedures){
- if (Cools.isEmpty(basProcessProcedures) || null==basProcessProcedures.getId()){
+ @RequestMapping(value = "/basProcessProcedures/update/auth")
+ @ManagerAuth
+ public R update(BasProcessProcedures basProcessProcedures) {
+ if (Cools.isEmpty(basProcessProcedures) || null == basProcessProcedures.getId()) {
return R.error();
}
BasProcessProcedures boxType = basProcessProceduresService.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", basProcessProcedures.getBoxType()));
BasProcessProcedures basProcessProcedures1 = basProcessProceduresService.selectById(basProcessProcedures.getId());
- if (!Cools.isEmpty(boxType) && !basProcessProcedures1.equals(boxType)){
+ if (!Cools.isEmpty(boxType) && !basProcessProcedures1.equals(boxType)) {
return R.error("鏍囪瘑鍙烽噸澶�,璇锋鏌�!!!");
}
basProcessProceduresService.updateById(basProcessProcedures);
@@ -87,8 +91,8 @@
@RequestMapping(value = "/basProcessProcedures/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
basProcessProceduresService.deleteById(id);
}
return R.ok();
@@ -96,7 +100,7 @@
@RequestMapping(value = "/basProcessProcedures/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasProcessProcedures> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basProcessProcedures"));
@@ -112,7 +116,7 @@
wrapper.like("id", condition);
Page<BasProcessProcedures> page = basProcessProceduresService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasProcessProcedures basProcessProcedures : page.getRecords()){
+ for (BasProcessProcedures basProcessProcedures : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basProcessProcedures.getId());
map.put("value", basProcessProcedures.getId());
@@ -125,7 +129,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasProcessProcedures> wrapper = new EntityWrapper<BasProcessProcedures>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basProcessProceduresService.selectOne(wrapper)){
+ if (null != basProcessProceduresService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasProcessProcedures.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasQualityTestingController.java b/src/main/java/com/zy/asrs/controller/BasQualityTestingController.java
index 41f3f6b..fdb5c54 100644
--- a/src/main/java/com/zy/asrs/controller/BasQualityTestingController.java
+++ b/src/main/java/com/zy/asrs/controller/BasQualityTestingController.java
@@ -4,18 +4,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasQualityTesting;
-import com.zy.asrs.service.BasQualityTestingService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasQualityTesting;
+import com.zy.asrs.service.BasQualityTestingService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class BasQualityTestingController extends BaseController {
@@ -31,24 +34,26 @@
@RequestMapping(value = "/basQualityTesting/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<BasQualityTesting> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(BasQualityTesting.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basQualityTestingService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -62,22 +67,22 @@
@ManagerAuth
public R add(BasQualityTesting basQualityTesting) {
BasQualityTesting boxType = basQualityTestingService.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", basQualityTesting.getBoxType()));
- if (!Cools.isEmpty(boxType)){
+ if (!Cools.isEmpty(boxType)) {
return R.error("鏍囪瘑鍙烽噸澶�,璇锋鏌�!!!");
}
basQualityTestingService.insert(basQualityTesting);
return R.ok();
}
- @RequestMapping(value = "/basQualityTesting/update/auth")
- @ManagerAuth
- public R update(BasQualityTesting basQualityTesting){
- if (Cools.isEmpty(basQualityTesting) || null==basQualityTesting.getId()){
+ @RequestMapping(value = "/basQualityTesting/update/auth")
+ @ManagerAuth
+ public R update(BasQualityTesting basQualityTesting) {
+ if (Cools.isEmpty(basQualityTesting) || null == basQualityTesting.getId()) {
return R.error();
}
BasQualityTesting boxType = basQualityTestingService.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", basQualityTesting.getBoxType()));
BasQualityTesting basQualityTesting1 = basQualityTestingService.selectById(basQualityTesting.getId());
- if (!Cools.isEmpty(boxType) && !basQualityTesting1.equals(boxType)){
+ if (!Cools.isEmpty(boxType) && !basQualityTesting1.equals(boxType)) {
return R.error("鏍囪瘑鍙烽噸澶�,璇锋鏌�!!!");
}
basQualityTestingService.updateById(basQualityTesting);
@@ -86,8 +91,8 @@
@RequestMapping(value = "/basQualityTesting/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
basQualityTestingService.deleteById(id);
}
return R.ok();
@@ -95,7 +100,7 @@
@RequestMapping(value = "/basQualityTesting/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<BasQualityTesting> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("basQualityTesting"));
@@ -111,7 +116,7 @@
wrapper.like("id", condition);
Page<BasQualityTesting> page = basQualityTestingService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasQualityTesting basQualityTesting : page.getRecords()){
+ for (BasQualityTesting basQualityTesting : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basQualityTesting.getId());
map.put("value", basQualityTesting.getId());
@@ -124,7 +129,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasQualityTesting> wrapper = new EntityWrapper<BasQualityTesting>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basQualityTestingService.selectOne(wrapper)){
+ if (null != basQualityTestingService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasQualityTesting.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasStationController.java b/src/main/java/com/zy/asrs/controller/BasStationController.java
index 6badd52..bc4aaa1 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.BasStation;
-import com.zy.asrs.service.BasStationService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasStation;
+import com.zy.asrs.service.BasStationService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/zy/asrs/controller/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index 044bfd5..1988aa4 100644
--- a/src/main/java/com/zy/asrs/controller/BasWhsController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasWhsType;
-import com.zy.asrs.service.BasWhsTypeService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWhsType;
+import com.zy.asrs.service.BasWhsTypeService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basWhs/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWhsTypeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWhs/update/auth")
+ @RequestMapping(value = "/basWhs/update/auth")
@ManagerAuth(memo = "搴撲綅绫诲瀷淇敼")
- public R update(BasWhsType basWhsType){
- if (Cools.isEmpty(basWhsType) || null== basWhsType.getId()){
+ public R update(BasWhsType basWhsType) {
+ if (Cools.isEmpty(basWhsType) || null == basWhsType.getId()) {
return R.error();
}
basWhsType.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/basWhs/delete/auth")
@ManagerAuth(memo = "搴撲綅绫诲瀷鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWhsType> list = JSONArray.parseArray(param, BasWhsType.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWhsType entity : list){
+ for (BasWhsType entity : list) {
basWhsTypeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/basWhs/export/auth")
@ManagerAuth(memo = "搴撲綅绫诲瀷瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs"));
@@ -111,7 +113,7 @@
wrapper.like("whs_desc", condition);
Page<BasWhsType> page = basWhsTypeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWhsType basWhsType : page.getRecords()){
+ for (BasWhsType basWhsType : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWhsType.getId());
map.put("value", basWhsType.getWhsDesc());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWhsType> wrapper = new EntityWrapper<BasWhsType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWhsTypeService.selectOne(wrapper)){
+ if (null != basWhsTypeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWhsType.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
index 9da0854..070c1b6 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkIotypeController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWrkIotype;
+import com.zy.asrs.service.BasWrkIotypeService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basWrkIotype/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWrkIotypeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basWrkIotype/edit/auth")
@ManagerAuth
public R edit(BasWrkIotype basWrkIotype) {
- if (Cools.isEmpty(basWrkIotype)){
+ if (Cools.isEmpty(basWrkIotype)) {
return R.error();
}
- if (null == basWrkIotype.getIoType()){
+ if (null == basWrkIotype.getIoType()) {
basWrkIotypeService.insert(basWrkIotype);
} else {
basWrkIotypeService.updateById(basWrkIotype);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWrkIotype/update/auth")
+ @RequestMapping(value = "/basWrkIotype/update/auth")
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬩慨鏀�")
- public R update(BasWrkIotype basWrkIotype){
- if (Cools.isEmpty(basWrkIotype) || null==basWrkIotype.getIoType()){
+ public R update(BasWrkIotype basWrkIotype) {
+ if (Cools.isEmpty(basWrkIotype) || null == basWrkIotype.getIoType()) {
return R.error();
}
basWrkIotype.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basWrkIotype/delete/auth")
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWrkIotype> list = JSONArray.parseArray(param, BasWrkIotype.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWrkIotype entity : list){
+ for (BasWrkIotype entity : list) {
basWrkIotypeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basWrkIotype/export/auth")
@ManagerAuth(memo = "鍏ュ嚭搴撶被鍨嬪鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkIotype> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkIotype"));
@@ -125,7 +127,7 @@
wrapper.like("io_desc", condition);
Page<BasWrkIotype> page = basWrkIotypeService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkIotype basWrkIotype : page.getRecords()){
+ for (BasWrkIotype basWrkIotype : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWrkIotype.getIoType());
map.put("value", basWrkIotype.getIoDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWrkIotype> wrapper = new EntityWrapper<BasWrkIotype>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkIotypeService.selectOne(wrapper)){
+ if (null != basWrkIotypeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkIotype.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
index fd70009..2fef0b5 100644
--- a/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
+++ b/src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.BasWrkStatus;
+import com.zy.asrs.service.BasWrkStatusService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/basWrkStatus/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(basWrkStatusService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -60,10 +62,10 @@
@RequestMapping(value = "/basWrkStatus/edit/auth")
@ManagerAuth
public R edit(BasWrkStatus basWrkStatus) {
- if (Cools.isEmpty(basWrkStatus)){
+ if (Cools.isEmpty(basWrkStatus)) {
return R.error();
}
- if (null == basWrkStatus.getWrkSts()){
+ if (null == basWrkStatus.getWrkSts()) {
basWrkStatusService.insert(basWrkStatus);
} else {
basWrkStatusService.updateById(basWrkStatus);
@@ -82,10 +84,10 @@
return R.ok();
}
- @RequestMapping(value = "/basWrkStatus/update/auth")
+ @RequestMapping(value = "/basWrkStatus/update/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佷慨鏀�")
- public R update(BasWrkStatus basWrkStatus){
- if (Cools.isEmpty(basWrkStatus) || null==basWrkStatus.getWrkSts()){
+ public R update(BasWrkStatus basWrkStatus) {
+ if (Cools.isEmpty(basWrkStatus) || null == basWrkStatus.getWrkSts()) {
return R.error();
}
basWrkStatus.setModiUser(getUserId());
@@ -96,12 +98,12 @@
@RequestMapping(value = "/basWrkStatus/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWrkStatus entity : list){
+ for (BasWrkStatus entity : list) {
basWrkStatusService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -109,7 +111,7 @@
@RequestMapping(value = "/basWrkStatus/export/auth")
@ManagerAuth(memo = "宸ヤ綔鐘舵�佸鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<BasWrkStatus> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWrkStatus"));
@@ -125,7 +127,7 @@
wrapper.like("wrk_desc", condition);
Page<BasWrkStatus> page = basWrkStatusService.selectPage(new Page<>(0, 100), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWrkStatus basWrkStatus : page.getRecords()){
+ for (BasWrkStatus basWrkStatus : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWrkStatus.getWrkSts());
map.put("value", basWrkStatus.getWrkDesc());
@@ -138,7 +140,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWrkStatus> wrapper = new EntityWrapper<BasWrkStatus>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWrkStatusService.selectOne(wrapper)){
+ if (null != basWrkStatusService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWrkStatus.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 1458636..6b583a3 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -25,12 +25,12 @@
private ReportQueryMapper reportQueryMapper;
@PostMapping("loc/pie/charts")
- public R dsa(){
- Map<String,Object> map=new HashMap<String, Object>();
- List<ChartBean> list = new ArrayList<ChartBean>();
+ public R dsa() {
+ Map<String, Object> map = new HashMap<String, Object>();
+ List<ChartBean> list = new ArrayList<ChartBean>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
ChartBean fqty = new ChartBean();
fqty.setName("鍦ㄥ簱搴撲綅");
fqty.setY(locUseRate.getFqty());
@@ -51,37 +51,37 @@
xqty.setY(locUseRate.getXqty());
list.add(xqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
@PostMapping("locIo/line/charts")
- public R locIoLineCharts(){
- Map<String,Object> map=new HashMap<String, Object>();
+ public R locIoLineCharts() {
+ Map<String, Object> map = new HashMap<String, Object>();
List<AxisBean> list = new ArrayList<AxisBean>();
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
- if(listChart!=null) {
+ if (listChart != null) {
ArrayList<Integer> data1 = new ArrayList<Integer>();
ArrayList<Integer> data2 = new ArrayList<Integer>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DATE, -12);
- for(int i=0;i<12;i++) {
+ for (int i = 0; i < 12; i++) {
boolean flag = true;
calendar.add(Calendar.DATE, 1);
String str = sf.format(calendar.getTime());
- for(WorkChartAxis workChart : listChart) {
- if(str.equals(workChart.getYmd())) {
+ for (WorkChartAxis workChart : listChart) {
+ if (str.equals(workChart.getYmd())) {
data1.add(workChart.getInqty());
data2.add(workChart.getOutqty());
flag = false;
break;
}
}
- if(flag) {
+ if (flag) {
data1.add(0);
data2.add(0);
}
@@ -97,11 +97,9 @@
outqty.setData(data2.toArray(array2));
list.add(outqty);
}
- map.put("rows",list);
+ map.put("rows", list);
return R.ok(map);
}
-
-
}
diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index 72ce073..e069350 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -31,22 +31,24 @@
@RequestMapping(value = "/docType/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<DocType> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(docTypeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/docType/update/auth")
- @ManagerAuth
- public R update(DocType docType){
- if (Cools.isEmpty(docType) || null==docType.getDocId()){
+ @RequestMapping(value = "/docType/update/auth")
+ @ManagerAuth
+ public R update(DocType docType) {
+ if (Cools.isEmpty(docType) || null == docType.getDocId()) {
return R.error();
}
docType.setUpdateBy(getUserId());
@@ -82,8 +84,8 @@
@RequestMapping(value = "/docType/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
docTypeService.deleteById(id);
}
return R.ok();
@@ -91,7 +93,7 @@
@RequestMapping(value = "/docType/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<DocType> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("docType"));
@@ -108,7 +110,7 @@
wrapper.eq("status", 1);
Page<DocType> page = docTypeService.selectPage(new Page<>(0, 30), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (DocType docType : page.getRecords()){
+ for (DocType docType : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", docType.getDocId());
map.put("value", docType.getDocName());
@@ -121,7 +123,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<DocType> wrapper = new EntityWrapper<DocType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != docTypeService.selectOne(wrapper)){
+ if (null != docTypeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(DocType.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/LocCacheController.java b/src/main/java/com/zy/asrs/controller/LocCacheController.java
index 10f96cb..3d521b7 100644
--- a/src/main/java/com/zy/asrs/controller/LocCacheController.java
+++ b/src/main/java/com/zy/asrs/controller/LocCacheController.java
@@ -4,18 +4,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.BasWhsType;
-import com.zy.asrs.entity.LocCache;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.param.LocMastInitParam;
-import com.zy.asrs.service.LocCacheService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.common.model.Shelves;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocCache;
+import com.zy.asrs.entity.param.LocMastInitParam;
+import com.zy.asrs.service.LocCacheService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,25 +33,27 @@
@RequestMapping(value = "/locCache/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<LocCache> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(LocCache.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
wrapper.eq("full_plt", "N");
return R.ok(locCacheService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -71,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/locCache/update/auth")
- @ManagerAuth
- public R update(LocCache locCache){
- if (Cools.isEmpty(locCache) || null==locCache.getLocNo()){
+ @RequestMapping(value = "/locCache/update/auth")
+ @ManagerAuth
+ public R update(LocCache locCache) {
+ if (Cools.isEmpty(locCache) || null == locCache.getLocNo()) {
return R.error();
}
locCacheService.updateById(locCache);
@@ -83,8 +82,8 @@
@RequestMapping(value = "/locCache/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
locCacheService.deleteById(id);
}
return R.ok();
@@ -92,7 +91,7 @@
@RequestMapping(value = "/locCache/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<LocCache> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("locCache"));
@@ -108,7 +107,7 @@
wrapper.like("loc_no", condition);
Page<LocCache> page = locCacheService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocCache locCache : page.getRecords()){
+ for (LocCache locCache : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locCache.getLocNo());
map.put("value", locCache.getLocNo());
@@ -121,7 +120,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocCache> wrapper = new EntityWrapper<LocCache>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locCacheService.selectOne(wrapper)){
+ if (null != locCacheService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocCache.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -134,7 +133,7 @@
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛�");
}
- return locCacheService.initLocCache(param, getUserId());
+ return locCacheService.initLocCache(param, getUserId());
}
}
diff --git a/src/main/java/com/zy/asrs/controller/LocCheckController.java b/src/main/java/com/zy/asrs/controller/LocCheckController.java
index 8549423..76fca43 100644
--- a/src/main/java/com/zy/asrs/controller/LocCheckController.java
+++ b/src/main/java/com/zy/asrs/controller/LocCheckController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.LocCheck;
-import com.zy.asrs.service.LocCheckService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.LocCheck;
+import com.zy.asrs.service.LocCheckService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class LocCheckController extends BaseController {
@@ -32,22 +34,24 @@
@RequestMapping(value = "/locCheck/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locCheckService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -64,10 +68,10 @@
return R.ok();
}
- @RequestMapping(value = "/locCheck/update/auth")
- @ManagerAuth
- public R update(LocCheck locCheck){
- if (Cools.isEmpty(locCheck) || null==locCheck.getId()){
+ @RequestMapping(value = "/locCheck/update/auth")
+ @ManagerAuth
+ public R update(LocCheck locCheck) {
+ if (Cools.isEmpty(locCheck) || null == locCheck.getId()) {
return R.error();
}
locCheckService.updateById(locCheck);
@@ -76,8 +80,8 @@
@RequestMapping(value = "/locCheck/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
locCheckService.deleteById(id);
}
return R.ok();
@@ -85,7 +89,7 @@
@RequestMapping(value = "/locCheck/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("locCheck"));
@@ -101,7 +105,7 @@
wrapper.like("id", condition);
Page<LocCheck> page = locCheckService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocCheck locCheck : page.getRecords()){
+ for (LocCheck locCheck : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locCheck.getId());
map.put("value", locCheck.getId());
@@ -114,14 +118,14 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocCheck> wrapper = new EntityWrapper<LocCheck>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locCheckService.selectOne(wrapper)){
+ if (null != locCheckService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocCheck.class, String.valueOf(param.get("key"))));
}
return R.ok();
}
@RequestMapping("/locCheck/create/auth")
- public R autoCreate(String prec){
+ public R autoCreate(String prec) {
locCheckService.autoCreatePick(prec);
return R.ok("鍒涘缓鎷ｈ揣鍗曟垚鍔�");
}
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 619459d..01bd62d 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -133,7 +133,7 @@
@RequestMapping(value = "/locDetl/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+ public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
@@ -149,10 +149,10 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
+ public R stockOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ if (!Cools.isEmpty(param.get("modi_time"))) {
String val = String.valueOf(param.get("modi_time"));
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
@@ -162,7 +162,7 @@
}
}
Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
- if (stockOut.getRecords().size()==0){
+ if (stockOut.getRecords().size() == 0) {
stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
}
return R.ok(stockOut);
@@ -170,12 +170,12 @@
@RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
// String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
// if (param.get("row") != null) {
@@ -191,7 +191,9 @@
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
// if (!row.equals("")){
// wrapper.and()
// .where("loc_no like '" +row +"%'");
@@ -200,10 +202,10 @@
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -228,10 +230,10 @@
return R.ok();
}
- @RequestMapping(value = "/locDetl/update/auth")
- @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
- public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ @RequestMapping(value = "/locDetl/update/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
+ public R update(LocDetl locDetl) {
+ if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
return R.error();
}
locDetl.setModiUser(getUserId());
@@ -242,12 +244,12 @@
@RequestMapping(value = "/locDetl/delete/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocDetl entity : list){
+ for (LocDetl entity : list) {
locDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -255,8 +257,8 @@
@PostMapping(value = "/locDetl/frozenInventory")
@ManagerAuth(memo = "搴撳瓨鍐荤粨")
- public R frozen(@RequestBody List<FrozenParam> param){
- if (param.size() == 0) {
+ public R frozen(@RequestBody List<FrozenParam> param) {
+ if (param.size() == 0) {
return R.parse("鏈敹鍒版暟鎹�");
}
@@ -265,8 +267,8 @@
@PostMapping(value = "/locDetl/unfreezeInventory")
@ManagerAuth(memo = "搴撳瓨瑙ｅ喕")
- public R unfreeze(@RequestBody List<FrozenParam> param){
- if (param.size() == 0) {
+ public R unfreeze(@RequestBody List<FrozenParam> param) {
+ if (param.size() == 0) {
return R.parse("鏈敹鍒版暟鎹�");
}
@@ -275,7 +277,7 @@
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
@@ -306,7 +308,7 @@
if (Cools.isEmpty(mat)) {
continue;
}
- if (!Cools.isEmpty(mat .getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
+ if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
@@ -335,15 +337,15 @@
@RequestMapping(value = "/locDetl/selectOwner/list/auth")
@ManagerAuth
- public R selectOwnerlist(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R selectOwnerlist(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
Integer owner = null;
- if (param.get("owner$") != null && param.get("owner$") != ""){
+ if (param.get("owner$") != null && param.get("owner$") != "") {
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
- if(locOwner == null){
+ if (locOwner == null) {
return R.error("鍙傛暟鏈夎锛�");
}
param.remove("owner$");
@@ -369,7 +371,7 @@
Page<LocDetlAll> page = new Page<>();
page.setRecords(list);
page.setTotal(count);
- if (list.size()==0){
+ if (list.size() == 0) {
locDetlDTO.setPageNumber(1);
list = locDetlService.selectAllOwner(locDetlDTO);
count = locDetlService.selectAllCount(locDetlDTO);
@@ -387,7 +389,7 @@
wrapper.like("matnr", condition);
Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocDetl locDetl : page.getRecords()){
+ for (LocDetl locDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locDetl.getMatnr());
map.put("value", locDetl.getMatnr());
@@ -400,7 +402,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locDetlService.selectOne(wrapper)){
+ if (null != locDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -408,8 +410,8 @@
@RequestMapping(value = "/locDetl/statis/auth")
@ManagerAuth
- public R statis(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
+ public R statis(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
@@ -446,10 +448,11 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@RequestMapping("/locDetl/count")
- public R getAllCount(){
+ public R getAllCount() {
Integer sum = locDetlService.sum();
return R.ok(sum);
}
diff --git a/src/main/java/com/zy/asrs/controller/LocOwnerController.java b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
index 9f9f0b2..b75531d 100644
--- a/src/main/java/com/zy/asrs/controller/LocOwnerController.java
+++ b/src/main/java/com/zy/asrs/controller/LocOwnerController.java
@@ -34,21 +34,23 @@
@RequestMapping(value = "/locOwner/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locOwnerService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping("/turn/over/take/site")
@ManagerAuth()
- public R availableTakeSite(){
+ public R availableTakeSite() {
List<Map<String, Object>> result = new ArrayList<>();
List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<>());
for (LocOwner owner : locOwners) {
@@ -60,10 +62,10 @@
return R.ok().add(result);
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -82,8 +84,8 @@
@RequestMapping(value = "/locOwner/update/auth")
@ManagerAuth
- public R update(LocOwner locOwner){
- if (Cools.isEmpty(locOwner) || null==locOwner.getId()){
+ public R update(LocOwner locOwner) {
+ if (Cools.isEmpty(locOwner) || null == locOwner.getId()) {
return R.error();
}
locOwnerService.updateById(locOwner);
@@ -92,8 +94,8 @@
@RequestMapping(value = "/locOwner/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Integer[] ids){
- for (Integer id : ids){
+ public R delete(@RequestParam(value = "ids[]") Integer[] ids) {
+ for (Integer id : ids) {
locOwnerService.deleteById(id);
}
return R.ok();
@@ -101,7 +103,7 @@
@RequestMapping(value = "/locOwner/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("locOwner"));
@@ -117,7 +119,7 @@
wrapper.like("id", condition);
Page<LocOwner> page = locOwnerService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocOwner locOwner : page.getRecords()){
+ for (LocOwner locOwner : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locOwner.getId());
map.put("value", locOwner.getId());
@@ -130,7 +132,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocOwner> wrapper = new EntityWrapper<LocOwner>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locOwnerService.selectOne(wrapper)){
+ if (null != locOwnerService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocOwner.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 61e94e1..25c6f50 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -6,7 +6,6 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.service.ManLocDetlService;
@@ -27,11 +26,11 @@
@RequestMapping(value = "/manLocDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
Long hostId = getHostId();
if (hostId != null) {
param.put("host_id", hostId);
@@ -46,7 +45,7 @@
tagId = getOriginTag().getId();
param.put("tag_id", String.valueOf(tagId));
}
- if (!Cools.isEmpty(param.get("update_time"))){
+ if (!Cools.isEmpty(param.get("update_time"))) {
String val = String.valueOf(param.get("update_time"));
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
@@ -60,11 +59,11 @@
@RequestMapping("/manLocDetl/list")
- public R outList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R outList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
Page<ManLocDetl> outPage = manLocDetlService.getOutPage(manLocDetlPage);
@@ -81,21 +80,22 @@
@RequestMapping(value = "/manLocDetl/asrsAndSaas/list")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
Page<ManLocDetl> all = manLocDetlService.selectAllPage(manLocDetlPage);
return R.ok().add(all);
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 7f5e0a8..e36f160 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -28,14 +28,51 @@
private LocDetlService locDetlService;
private static final List<String> DISABLE_LOC_NO = new ArrayList<String>() {{
- add("0400101");add("0500101");add("0600101");add("0700101");add("0700201");add("0700301");
- add("0800101");add("0800201");add("0800301");add("0900101");add("0900201");add("0900301");
- add("1000101");add("1000201");add("1000301");add("1100101");add("1100201");add("1100301");
- add("1200101");add("1200201");add("1200301");add("1300101");add("1300201");add("1300301");
- add("1400101");add("1400201");add("1400301");add("1500101");add("1500201");add("1500301");
- add("1600101");add("1600201");add("1600301");add("1700101");add("1700201");add("1700301");
- add("1800101");add("1800201");add("1800301");
- add("1900101");add("1900201");add("2000101");add("2000201");add("2100101");add("2100201");
+ add("0400101");
+ add("0500101");
+ add("0600101");
+ add("0700101");
+ add("0700201");
+ add("0700301");
+ add("0800101");
+ add("0800201");
+ add("0800301");
+ add("0900101");
+ add("0900201");
+ add("0900301");
+ add("1000101");
+ add("1000201");
+ add("1000301");
+ add("1100101");
+ add("1100201");
+ add("1100301");
+ add("1200101");
+ add("1200201");
+ add("1200301");
+ add("1300101");
+ add("1300201");
+ add("1300301");
+ add("1400101");
+ add("1400201");
+ add("1400301");
+ add("1500101");
+ add("1500201");
+ add("1500301");
+ add("1600101");
+ add("1600201");
+ add("1600301");
+ add("1700101");
+ add("1700201");
+ add("1700301");
+ add("1800101");
+ add("1800201");
+ add("1800301");
+ add("1900101");
+ add("1900201");
+ add("2000101");
+ add("2000201");
+ add("2100101");
+ add("2100201");
}};
@GetMapping("/map/getData/{lev}/auth")
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 04785d0..f6c3aeb 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -14,7 +14,6 @@
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.BatchMatsUpdateParam;
-import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
@@ -153,7 +152,7 @@
@ManagerAuth
public R batchUpdate(@RequestBody BatchMatsUpdateParam params) {
- return matService.batchInfo(params);
+ return matService.batchInfo(params);
}
@RequestMapping(value = "/mat/delete/auth")
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 95e7cda..19defbf 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -13,7 +13,6 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
import io.swagger.annotations.ApiOperation;
@@ -21,7 +20,6 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
import java.util.*;
/**
@@ -30,35 +28,51 @@
*/
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
+
@Autowired
private LocMastService locMastService;
+
@Autowired
private LocDetlService locDetlService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
+
@Autowired
private DocTypeService docTypeService;
+
@Autowired
private WrkMastService wrkMastService;
+
@Autowired
private WrkDetlService wrkDetlService;
+
@Autowired
private BasDevpService basDevpService;
+
@Autowired
private PackService packService;
+
@Autowired
private ManLocDetlMapper manLocDetlMapper;
- @Autowired
- private WrkDetlLogService wrkDetlLogService;
- @Resource
+ @Autowired
private StaDescService staDescService;
+
+ @Autowired
+ private OrderPakinService orderPakinService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+
+
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
@RequestMapping("/pda/WarehouseOut/v1")
@ManagerAuth(memo = "骞舵澘閫斾腑鎷ｆ枡-鍙傝�冨康鍒�")
@@ -69,7 +83,7 @@
@RequestMapping("/pda/WarehouseOutPickMerge/v1")
@ManagerAuth(memo = "鎷ｆ枡閫斾腑骞舵澘")
public R WarehouseOutPickMergeV1(@RequestBody WarehouseOutPickMergeParam param) {
- if (Cools.isEmpty(param,param.getLocNo(),param.getBarcode(),param.getCombMats())) {
+ if (Cools.isEmpty(param, param.getLocNo(), param.getBarcode(), param.getCombMats())) {
return R.parse("鍙傛暟涓嶈兘涓虹┖锛�");
}
return mobileService.WarehouseOutPickMergeV1(param, getHostId(), getUserId());
@@ -79,7 +93,7 @@
@ManagerAuth(memo = "骞舵澘鍏ュ簱")
public R pickConfirm(@RequestBody PickConfirmParam param) {
- if(Cools.isEmpty(param,param.getList(),param.getLocNo(),param.getStaNo())) {
+ if (Cools.isEmpty(param, param.getList(), param.getLocNo(), param.getStaNo())) {
return R.parse("鍙傛暟涓嶅畬鏁�");
}
return mobileService.pickConfirm(param, getUserId());
@@ -135,14 +149,15 @@
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
- public R matOnSale(@RequestBody CombParam combParam){
+ public R matOnSale(@RequestBody CombParam combParam) {
mobileService.onSale(combParam);
return R.ok("涓婃灦鎴愬姛");
}
+
// 鍟嗗搧涓嬫灦
@RequestMapping("/mat/offSale/auth")
//@ManagerAuth
- public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam) {
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
}
@@ -206,19 +221,18 @@
// }
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
- public R orderSearchByBarcode(@RequestParam String orderNo){
- if (Cools.isEmpty(orderNo)){
- orderNo=null;
+ public R orderSearchByBarcode(@RequestParam String orderNo) {
+ if (Cools.isEmpty(orderNo)) {
+ orderNo = null;
}
-// List<Order> orders = orderService.selectorderNoL(orderNo);
- List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
- if (Cools.isEmpty(orders)){
+ List<OrderPakin> orders = orderPakinService.selectorderNoL(orderNo);
+ if (Cools.isEmpty(orders)) {
return R.ok();
}
LinkedList<CombParam> combParams = new LinkedList<>();
- if (!Cools.isEmpty(orders)){
- for (Order order:orders){
- CombParam combParam=new CombParam();
+ if (!Cools.isEmpty(orders)) {
+ for (OrderPakin order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -229,15 +243,14 @@
if (order.getSettle() > 2) {
continue;
}
-// List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetlPakin orderDetl : orderDetls) {
CombParam.CombMat combMat = new CombParam.CombMat();
combMat.setMatnr(orderDetl.getMatnr());
combMat.setBatch(orderDetl.getBatch());
- combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
combMat.setMaktx(orderDetl.getMaktx());
combMat.setSpecs(orderDetl.getSpecs());
combMats.add(combMat);
@@ -253,14 +266,14 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public R comb(@RequestBody CombParam combParam) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/pack/get/auth")
@ManagerAuth
- public R packGet(@RequestParam String barcode){
+ public R packGet(@RequestParam String barcode) {
Pack pack = packService.selectByBarcode(barcode);
if (pack == null) {
return R.ok();
@@ -273,7 +286,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
+ public R packComb(@RequestBody CombParam combParam) {
mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -286,7 +299,7 @@
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
@RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
return R.ok();
}
@@ -310,7 +323,7 @@
*/
@RequestMapping("/pakout/confirm/barcode/auth")
@ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
+ public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) {
if (Cools.isEmpty(barcode)) {
return R.ok();
}
@@ -331,38 +344,34 @@
*/
@RequestMapping("/pakout/confirm/goods/auth") //寰呭畬鍠� 鍘熷洜锛堝鎴锋湭缁欏嚭璇︾粏淇℃伅锛�
@ManagerAuth
- public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam){
+ public R pakoutQueryByGoods(@RequestBody GDYKConfirmGoodsParam combParam) {
if (Cools.isEmpty(combParam)) {
return R.ok();
}
-// List<Order> orders = orderService.selectorderNoL(batch);
-// OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no",combParam.getOrderNo()));
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, combParam.getOrderNo());
- List<OrderDetl> orderDetlList = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
- OrderDetl orderDetl = null;
- for (OrderDetl orderDetl1 : orderDetlList){
- if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())){
+ List<OrderPakout> orders = orderPakoutService.selectorderNoL(combParam.getOrderNo());
+ List<OrderDetlPakout> orderDetlList = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
+ OrderDetlPakout orderDetl = null;
+ for (OrderDetlPakout orderDetl1 : orderDetlList) {
+ if (combParam.getMatnr().equals(orderDetl1.getMatnr()) && combParam.getBatch().equals(orderDetl1.getBatch())) {
orderDetl = orderDetl1;
break;
}
}
- if (Cools.isEmpty(orderDetl)){
+ if (Cools.isEmpty(orderDetl)) {
return R.error("鏈煡鍒版暟鎹�");
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
- //澶嶆牳鏁�
orderDetl.setSource(1);
-// orderDetlService.updateById(orderDetl);
- OrderInAndOutUtil.updateOrderDetl(Boolean.FALSE,order,orderDetl);
+ orderDetlPakoutService.updateById(orderDetl);
return R.ok();
}
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
//List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
return R.ok(manLocDetl);
@@ -375,7 +384,7 @@
@RequestMapping("/pakout/confirm/pick/auth")
@ManagerAuth
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(wrkNo)) {
return R.ok();
}
@@ -510,7 +519,7 @@
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
mobileService.adjust(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
@@ -518,10 +527,10 @@
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
- if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ if (!param.containsKey("staNo") || !param.containsKey("orderNo")) {
return R.parse(BaseRes.PARAM);
}
- mobileService.pakoutByOrder(param,getUserId());
+ mobileService.pakoutByOrder(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index 6ae3b3c..4e100cb 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -13,7 +13,6 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.PakinParam;
@@ -35,8 +34,6 @@
import java.net.URLEncoder;
import java.util.*;
-import static jdk.nashorn.api.scripting.ScriptUtils.convert;
-
@RestController
public class NodeController extends BaseController {
@@ -55,53 +52,59 @@
@RequestMapping(value = "/node/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(nodeService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/node/list/tree/auth")
@ManagerAuth
- public R listTree(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R listTree(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
}
@RequestMapping(value = "/node/tree/auth")
@ManagerAuth
- public R tree(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R tree(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
hostEq(wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.parse("0-鎿嶄綔鎴愬姛").add(nodeService.selectList(wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -121,7 +124,7 @@
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
- return R.error(node.getType()==2?"鎵�灞炰粨搴撲笉瀛樺湪":"鎵�灞炲簱鍖轰笉瀛樺湪");
+ return R.error(node.getType() == 2 ? "鎵�灞炰粨搴撲笉瀛樺湪" : "鎵�灞炲簱鍖轰笉瀛樺湪");
}
node.setParentName(parentNode.getName());
node.setLevel(parentNode.getLevel() + 1);
@@ -144,21 +147,20 @@
}
-
@RequestMapping(value = "/node/update/auth")
@ManagerAuth
- public R update(Node node){
+ public R update(Node node) {
Node node1 = nodeService.selectByUuid(node.getName());
if (!Cools.isEmpty(node1)) {
throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
}
- if (Cools.isEmpty(node) || null==node.getId()){
+ if (Cools.isEmpty(node) || null == node.getId()) {
return R.error();
}
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
- return R.error(node.getType()==2?"鎵�灞炰粨搴撲笉瀛樺湪":"鎵�灞炲簱鍖轰笉瀛樺湪");
+ return R.error(node.getType() == 2 ? "鎵�灞炰粨搴撲笉瀛樺湪" : "鎵�灞炲簱鍖轰笉瀛樺湪");
}
node.setParentName(parentNode.getName());
node.setLevel(parentNode.getLevel() + 1);
@@ -170,7 +172,7 @@
node.setNamePath(nodeUtils.pathName.toString());
node.setUuid(node.getName());
- manLocDetlMapper.updateLocNo0(node.getId(),node.getName());
+ manLocDetlMapper.updateLocNo0(node.getId(), node.getName());
node.setUpdateBy(getUserId());
node.setUpdateTime(new Date());
nodeService.updateById(node);
@@ -179,12 +181,12 @@
@RequestMapping(value = "/node/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<Node> list = JSONArray.parseArray(param, Node.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (Node entity : list){
+ for (Node entity : list) {
nodeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -192,8 +194,8 @@
@RequestMapping(value = "/node/delete0/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
nodeService.deleteById(id);
}
return R.ok();
@@ -201,7 +203,7 @@
@RequestMapping(value = "/node/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Node> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("node"));
@@ -218,10 +220,10 @@
hostEq(wrapper);
Page<Node> page = nodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Node node : page.getRecords()){
+ for (Node node : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", node.getId());
- map.put("value", node.getUuid() + "锛�" +node.getName()+ "锛�");
+ map.put("value", node.getUuid() + "锛�" + node.getName() + "锛�");
result.add(map);
}
return R.ok(result);
@@ -231,7 +233,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Node> wrapper = new EntityWrapper<Node>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != nodeService.selectOne(wrapper)){
+ if (null != nodeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Node.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -294,7 +296,7 @@
public R nodeExcelImport(MultipartFile file) throws IOException {
NodeExcelListener listener = new NodeExcelListener(getUserId(), getHostId());
EasyExcel.read(file.getInputStream(), NodeExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"涓揣浣�");
+ return R.ok("鎴愬姛鍚屾" + listener.getTotal() + "涓揣浣�");
}
/*************************************** 鍏ュ簱鍑虹浉鍏� ***********************************************/
@@ -314,9 +316,10 @@
@PostMapping(value = "/work/empty/stock")
public R getGroupEmptyStock(@RequestParam(required = false) String sourceLocNo) {
List<Node> allEmptys = nodeService.selectList(new EntityWrapper<Node>()
- .eq("type","3"));
+ .eq("type", "3"));
return R.ok().add(allEmptys);
}
+
@RequestMapping("/work/move/start")
@ManagerAuth(memo = "搴撲綅绉昏浆")
public R locMoveStart(@RequestParam String sourceLocNo,
@@ -324,11 +327,12 @@
nodeService.locMove(sourceLocNo, targetLocNo, getUserId());
return R.ok("绉诲簱鍚姩鎴愬姛");
}
+
@RequestMapping(value = "/node/select/{id}/auth")
@ManagerAuth
public R getById(@PathVariable("id") String id) {
Node node = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("uuid",id));
+ .eq("uuid", id));
return R.ok(node);
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8b0604a..1f5a85f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,7 +4,10 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.MatSyncParam;
+import com.zy.asrs.entity.param.OpenOrderCompleteParam;
+import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -36,8 +39,8 @@
@PostMapping("/order/matSync/default/v2")
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam.MatParam param,
- HttpServletRequest request){
+ @RequestBody(required = false) MatSyncParam.MatParam param,
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -55,7 +58,7 @@
// @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4c1bd74..6d94cdf 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -8,13 +8,8 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OrderDomainParam;
-
-import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
-import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -45,7 +40,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +68,17 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,235 +87,8 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", orderId)));
- }
-
- @RequestMapping(value = "/order/form/add/auth")
- @ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
- @Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
- int status = 0;
- if(Cools.isEmpty(param.getOrderNo())){
- String prefix = "";
- DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
- prefix = docType.getPakin() == 1 ? "RK" : "CK";
- status = (prefix.equals("RK") ? 1 : (prefix.equals("CK") ? 2 : 0));
- }
- param.setOrderNo(prefix + snowflakeIdWorker.nextId());
- } else {
- DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
- status = (docType.getPakin() == 1 ? 1 : 2 );
- }
- }
-
- Order order = orderService.selectByNo(param.getOrderNo());
- if (order != null) {
- return R.error("鍗曟嵁缂栧彿宸插瓨鍦�");
- }
- Date now = new Date();
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- param.getDocType(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- getUserId(), // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- getUserId(), // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null, // 澶囨敞
- status
- );
- if (!orderService.insert(order)) {
- throw new CoolException("淇濆瓨璁㈠崟涓绘。澶辫触");
- }
- List<DetlDto> list = new ArrayList<>();
- for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
- if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
- if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
- } else {
- list.add(dto);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(getUserId());
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(getUserId());
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- orderDetl.setPakinPakoutStatus(status);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
- }
- }
- return R.ok("璁㈠崟娣诲姞鎴愬姛");
- }
-
- @RequestMapping(value = "/order/form/modify/auth")
- @ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
- @Transactional
- public R formModify(@RequestBody OrderDomainParam param){
- Order order = orderService.selectById(param.getOrderId());
- if (order == null || order.getStatus() == 0) {
- return R.error("璁㈠崟涓嶅瓨鍦�");
- }
- Date now = new Date();
- Long userId = getUserId();
- // 淇敼涓绘。
- if (!param.getDocType().equals(order.getDocType())) {
- order.setDocType(param.getDocType());
- order.setUpdateBy(userId);
- order.setUpdateTime(now);
- if (!orderService.updateById(order)) {
- throw new CoolException("淇敼璁㈠崟绫诲瀷澶辫触");
- }
- }
- // 淇敼鏄庣粏妗�
-// List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- // 1.娓呯┖鏄庣粏妗�
- if (!orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()))) {
- throw new CoolException("娓呯┖璁㈠崟鏄庣粏澶辫触");
- }
- // 2.閲嶇粍鏁版嵁
- List<DetlDto> list = new ArrayList<>();
- for (OrderDetl orderDetl : param.getOrderDetlList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
- if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
- item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
- if (!orderDetlService.updateById(item)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
- } else {
- list.add(dto);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(getUserId());
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(getUserId());
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
- }
- }
- }
- return R.ok("璁㈠崟淇敼鎴愬姛");
- }
-
- @PostMapping(value = "/order/wrk/trace/auth")
- @ManagerAuth
- public R orderWrkTrace(@RequestParam("orderId") Long orderId) {
- Order order = orderService.selectById(orderId);
- if (null == order) {
- return R.error("鍗曟嵁涓嶅瓨鍦�");
- }
- // 鏁伴噺缁熻
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(orderId);
- double totalQty = 0;
- double wrkQty = 0;
- double lackQty = 0;
- double endQty = 0;
- for (OrderDetl orderDetl : orderDetls) {
- totalQty = totalQty + orderDetl.getAnfme();
- wrkQty = wrkQty + orderDetl.getWorkQty();
- endQty = endQty + orderDetl.getQty();
- double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued > 0.0) {
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- issued = issued - locDetl.getAnfme();
- } else {
- break;
- }
- }
- }
- if (issued > 0.0) {
- lackQty = lackQty + issued;
- }
- }
- // 浠诲姟杩芥函
- List<WrkTraceVo> wrkTraceVos = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectAndLogByOrderNoGroupByMatnrOfSum(order.getOrderNo());
- for (WrkDetl wrkDetl : wrkDetls) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMast == null) {
- WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
- }
- if (wrkMastLog != null) {
- wrkMast = new WrkMast();
- BeanUtils.copyProperties(wrkMastLog, wrkMast);
- } else {
- continue;
- }
- }
- boolean exist = false;
- for (WrkTraceVo vo : wrkTraceVos) {
- if (vo.getWrkNo().equals(wrkMast.getWrkNo()) && vo.getIoTimeStr().equals(DateUtils.convert(wrkMast.getIoTime()))) {
- vo.getWrkDetls().add(wrkDetl);
- exist = true;
- }
- }
- if (!exist) {
- WrkTraceVo vo = new WrkTraceVo(wrkMast.getWrkNo(), DateUtils.convert(wrkMast.getIoTime()), wrkMast, wrkDetl);
- wrkTraceVos.add(vo);
- }
- }
- if (!Cools.isEmpty(wrkTraceVos) && wrkTraceVos.size() > 1) {
- wrkTraceVos.sort((o1, o2) -> (int) (o2.getWrkMast().getIoTime().getTime() - o1.getWrkMast().getIoTime().getTime()));
- }
- return R.ok().add(Cools
- .add("list", wrkTraceVos)
- .add("orderNo", order.getOrderNo())
- .add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
- .add("lackQty", lackQty)
- .add("endQty",endQty)
- );
}
@@ -332,22 +102,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -359,15 +131,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(Order order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(Order order) {
+ if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
//璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
- if(order.getSettle() == 4){
- int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
- int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (order.getSettle() == 4) {
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -384,7 +156,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -399,7 +171,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -415,7 +187,7 @@
wrapper.like("id", condition);
Page<Order> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Order order : page.getRecords()){
+ for (Order order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -428,7 +200,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Order> wrapper = new EntityWrapper<Order>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Order.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 9b2e3d5..94f8f0e 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -34,15 +34,17 @@
@RequestMapping(value = "/orderDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -52,16 +54,16 @@
@RequestMapping(value = "/orderDetl/pakout/list/auth")
@ManagerAuth
- public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -78,10 +80,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetl orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetl orderDetl) {
+ if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
return R.error();
}
orderDetlService.updateById(orderDetl);
@@ -90,8 +92,8 @@
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -99,7 +101,7 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
@@ -115,7 +117,7 @@
wrapper.like("id", condition);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetl orderDetl : page.getRecords()){
+ for (OrderDetl orderDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
map.put("value", orderDetl.getId());
@@ -128,7 +130,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderDetl> wrapper = new EntityWrapper<OrderDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
+ if (null != orderDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
index 21215b6..1b18ad7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakinController.java
@@ -35,15 +35,17 @@
@RequestMapping(value = "/orderDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -53,16 +55,16 @@
@RequestMapping(value = "/orderDetl/pakout/list/auth")
@ManagerAuth
- public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakin.class)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +81,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetlPakin orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetlPakin orderDetl) {
+ if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
return R.error();
}
orderDetlService.updateById(orderDetl);
@@ -91,8 +93,8 @@
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -100,7 +102,7 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderDetlPakin> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
@@ -116,7 +118,7 @@
wrapper.like("id", condition);
Page<OrderDetlPakin> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetlPakin orderDetl : page.getRecords()){
+ for (OrderDetlPakin orderDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
map.put("value", orderDetl.getId());
@@ -129,7 +131,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderDetlPakin> wrapper = new EntityWrapper<OrderDetlPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
+ if (null != orderDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
index b0e739e..13e7650 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java
@@ -35,15 +35,17 @@
@RequestMapping(value = "/orderDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -53,16 +55,16 @@
@RequestMapping(value = "/orderDetl/pakout/list/auth")
@ManagerAuth
- public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
+ public R pakoutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetlPakout.class)));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +81,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderDetl/update/auth")
- @ManagerAuth
- public R update(OrderDetlPakout orderDetl){
- if (Cools.isEmpty(orderDetl) || null==orderDetl.getId()){
+ @RequestMapping(value = "/orderDetl/update/auth")
+ @ManagerAuth
+ public R update(OrderDetlPakout orderDetl) {
+ if (Cools.isEmpty(orderDetl) || null == orderDetl.getId()) {
return R.error();
}
orderDetlService.updateById(orderDetl);
@@ -91,8 +93,8 @@
@RequestMapping(value = "/orderDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderDetlService.deleteById(id);
}
return R.ok();
@@ -100,7 +102,7 @@
@RequestMapping(value = "/orderDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderDetl"));
@@ -116,7 +118,7 @@
wrapper.like("id", condition);
Page<OrderDetlPakout> page = orderDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderDetlPakout orderDetl : page.getRecords()){
+ for (OrderDetlPakout orderDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderDetl.getId());
map.put("value", orderDetl.getId());
@@ -129,7 +131,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderDetlPakout> wrapper = new EntityWrapper<OrderDetlPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderDetlService.selectOne(wrapper)){
+ if (null != orderDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderDetlPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index fb81d0f..e136ea0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -45,7 +45,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +73,17 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,18 +92,18 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
- if(Cools.isEmpty(param.getOrderNo())){
+ public R formAdd(@RequestBody OrderDomainParam param) {
+ if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
prefix = docType.getPakin() == 1 ? "RK" : "CK";
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
@@ -152,14 +154,14 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetlPakin orderDetl : param.getOrderDetlPakinList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -185,7 +187,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
OrderPakin order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -212,12 +214,12 @@
for (OrderDetlPakin orderDetl : param.getOrderDetlPakinList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand()
- ,orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand()
+ , orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -279,8 +281,8 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ if (wrkMastLog.getIoType() == 103) {
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type", 53));
}
if (wrkMastLog != null) {
wrkMast = new WrkMast();
@@ -308,9 +310,9 @@
.add("list", wrkTraceVos)
.add("orderNo", order.getOrderNo())
.add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
+ .add("wrkQty", wrkQty + endQty)
.add("lackQty", lackQty)
- .add("endQty",endQty)
+ .add("endQty", endQty)
);
}
@@ -325,22 +327,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -352,15 +356,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(OrderPakin order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(OrderPakin order) {
+ if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
//璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
- if(order.getSettle() == 4){
- int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
- int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (order.getSettle() == 4) {
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -377,7 +381,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -392,7 +396,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderPakin> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -408,7 +412,7 @@
wrapper.like("id", condition);
Page<OrderPakin> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderPakin order : page.getRecords()){
+ for (OrderPakin order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -421,7 +425,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderPakin> wrapper = new EntityWrapper<OrderPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 23fbfff..9907431 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -45,7 +45,7 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
@@ -73,15 +73,17 @@
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
- public R head(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R head(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
wrapper.eq("status", 1);
@@ -90,18 +92,18 @@
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
- public R head(@RequestParam Long orderId){
+ public R head(@RequestParam Long orderId) {
return R.ok().add(orderDetlService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_id", orderId)));
}
@RequestMapping(value = "/order/form/add/auth")
@ManagerAuth(memo = "鎵嬪姩娣诲姞璁㈠崟")
@Transactional
- public R formAdd(@RequestBody OrderDomainParam param){
- if(Cools.isEmpty(param.getOrderNo())){
+ public R formAdd(@RequestBody OrderDomainParam param) {
+ if (Cools.isEmpty(param.getOrderNo())) {
String prefix = "";
DocType docType = docTypeService.selectById(param.getDocType());
- if(!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
prefix = docType.getPakin() == 1 ? "RK" : "CK";
}
param.setOrderNo(prefix + snowflakeIdWorker.nextId());
@@ -152,12 +154,12 @@
}
List<DetlDto> list = new ArrayList<>();
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -183,7 +185,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
OrderPakout order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -208,13 +210,13 @@
// 2.閲嶇粍鏁版嵁
List<DetlDto> list = new ArrayList<>();
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
- DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -276,8 +278,8 @@
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
if (wrkMast == null) {
WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
- if (wrkMastLog.getIoType()==103){
- wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+ if (wrkMastLog.getIoType() == 103) {
+ wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type", 53));
}
if (wrkMastLog != null) {
wrkMast = new WrkMast();
@@ -305,9 +307,9 @@
.add("list", wrkTraceVos)
.add("orderNo", order.getOrderNo())
.add("totalQty", totalQty)
- .add("wrkQty", wrkQty+endQty)
+ .add("wrkQty", wrkQty + endQty)
.add("lackQty", lackQty)
- .add("endQty",endQty)
+ .add("endQty", endQty)
);
}
@@ -322,22 +324,24 @@
@RequestMapping(value = "/order/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -349,15 +353,15 @@
@RequestMapping(value = "/order/update/auth")
@ManagerAuth
- public R update(OrderPakout order){
- if (Cools.isEmpty(order) || null == order.getId()){
+ public R update(OrderPakout order) {
+ if (Cools.isEmpty(order) || null == order.getId()) {
return R.error();
}
//璁㈠崟瀹岀粨鍓嶏紝鍒ゆ柇鏄惁瀛樺湪浣滀笟涓暟鎹紝瀛樺湪鍒欎笉鑳藉畬缁�
- if(order.getSettle() == 4){
- int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no",order.getOrderNo()));
- int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no",order.getOrderNo()));
+ if (order.getSettle() == 4) {
+ int wrkCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ int pakinCount = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("order_no", order.getOrderNo()));
if (wrkCount > 0 || pakinCount > 0) {
throw new CoolException("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -374,7 +378,7 @@
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
- public R delete(@RequestParam Long orderId){
+ public R delete(@RequestParam Long orderId) {
orderService.remove(orderId);
// Order order = orderService.selectById(orderId);
// if (order != null) {
@@ -389,7 +393,7 @@
@RequestMapping(value = "/order/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("order"));
@@ -405,7 +409,7 @@
wrapper.like("id", condition);
Page<OrderPakout> page = orderService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderPakout order : page.getRecords()){
+ for (OrderPakout order : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", order.getId());
map.put("value", order.getOrderNo());
@@ -418,7 +422,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderPakout> wrapper = new EntityWrapper<OrderPakout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderService.selectOne(wrapper)){
+ if (null != orderService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderPakout.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OrderSettleController.java b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
index 3c28a47..8a6290d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderSettleController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderSettleController.java
@@ -31,22 +31,24 @@
@RequestMapping(value = "/orderSettle/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderSettle> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(orderSettleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -67,10 +69,10 @@
return R.ok();
}
- @RequestMapping(value = "/orderSettle/update/auth")
- @ManagerAuth
- public R update(OrderSettle orderSettle){
- if (Cools.isEmpty(orderSettle) || null==orderSettle.getOrderSettle()){
+ @RequestMapping(value = "/orderSettle/update/auth")
+ @ManagerAuth
+ public R update(OrderSettle orderSettle) {
+ if (Cools.isEmpty(orderSettle) || null == orderSettle.getOrderSettle()) {
return R.error();
}
orderSettle.setUpdateBy(getUserId());
@@ -81,8 +83,8 @@
@RequestMapping(value = "/orderSettle/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
orderSettleService.deleteById(id);
}
return R.ok();
@@ -90,7 +92,7 @@
@RequestMapping(value = "/orderSettle/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<OrderSettle> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("orderSettle"));
@@ -106,7 +108,7 @@
wrapper.like("settle_name", condition);
Page<OrderSettle> page = orderSettleService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OrderSettle orderSettle : page.getRecords()){
+ for (OrderSettle orderSettle : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", orderSettle.getOrderSettle());
map.put("value", orderSettle.getSettleName());
@@ -119,7 +121,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<OrderSettle> wrapper = new EntityWrapper<OrderSettle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != orderSettleService.selectOne(wrapper)){
+ if (null != orderSettleService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(OrderSettle.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 60b2dec..0c5feea 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -80,8 +80,8 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -126,8 +126,8 @@
if (issued <= 0.0D) {
continue;
}
- List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist,orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, orderDetl.getMatnr(), orderDetl.getBatch(),
+ orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -177,8 +177,8 @@
return R.parse(BaseRes.PARAM);
}
List<LocDto> locDtoArrayList = new ArrayList<>();
- for (LocDto locDto : locDtos){
- if (locDto.getFrozen()!=1 && locDto.getFrozenLoc()!=1){
+ for (LocDto locDto : locDtos) {
+ if (locDto.getFrozen() != 1 && locDto.getFrozenLoc() != 1) {
locDtoArrayList.add(locDto);
}
}
@@ -202,7 +202,9 @@
List<TaskDto> taskDtos = new ArrayList<>();
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getStaNo(), locDto);
if (TaskDto.has(taskDtos, taskDto)) {
TaskDto dto = TaskDto.find(taskDtos, taskDto);
diff --git a/src/main/java/com/zy/asrs/controller/PackController.java b/src/main/java/com/zy/asrs/controller/PackController.java
index 20b7b5a..6d92d4e 100644
--- a/src/main/java/com/zy/asrs/controller/PackController.java
+++ b/src/main/java/com/zy/asrs/controller/PackController.java
@@ -40,24 +40,26 @@
@RequestMapping(value = "/pack/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Pack> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("settle").orderBy("create_time", false);
}
return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -96,10 +98,10 @@
return R.ok();
}
- @RequestMapping(value = "/pack/update/auth")
- @ManagerAuth
- public R update(Pack pack){
- if (Cools.isEmpty(pack) || null==pack.getId()){
+ @RequestMapping(value = "/pack/update/auth")
+ @ManagerAuth
+ public R update(Pack pack) {
+ if (Cools.isEmpty(pack) || null == pack.getId()) {
return R.error();
}
pack.setUpdateBy(getUserId());
@@ -110,8 +112,8 @@
@RequestMapping(value = "/pack/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
packService.deleteById(id);
}
return R.ok();
@@ -119,7 +121,7 @@
@RequestMapping(value = "/pack/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Pack> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("pack"));
@@ -135,7 +137,7 @@
wrapper.like("id", condition);
Page<Pack> page = packService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Pack pack : page.getRecords()){
+ for (Pack pack : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", pack.getId());
map.put("value", pack.getId());
@@ -148,7 +150,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Pack> wrapper = new EntityWrapper<Pack>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != packService.selectOne(wrapper)){
+ if (null != packService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Pack.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..ca4023a 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -22,6 +22,7 @@
/**
* 鏃ュ織缁熻鎺у埗鍣ㄥ眰
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
@@ -29,221 +30,222 @@
@RequestMapping("/report")
public class ReportQueryController extends BaseController {
- @Autowired
- private LocDetlService locDetlService;
- @Autowired
- private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private LocDetlService locDetlService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
- //------------------搴撲綅浣跨敤缁熻--------------------------------------
- @RequestMapping("/viewStockUseList.action")
- public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStockUseBean bean = new ViewStockUseBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- List<ViewStockUseBean> list= reportQueryMapper.queryViewStockUseList(bean);
- int count = reportQueryMapper.getViewStockUseCount(bean);
- Page<ViewStockUseBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------搴撲綅浣跨敤缁熻--------------------------------------
+ @RequestMapping("/viewStockUseList.action")
+ public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStockUseBean bean = new ViewStockUseBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ List<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(bean);
+ int count = reportQueryMapper.getViewStockUseCount(bean);
+ Page<ViewStockUseBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStockUseExport.action")
- @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
- public R viewStockUseExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStockUseExport.action")
+ @ManagerAuth(memo = "搴撲綅浣跨敤缁熻瀵煎嚭")
+ public R viewStockUseExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------搴撳瓨婊炵暀缁熻--------------------------------------
- @RequestMapping("/viewStayTimeList.action")
- public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewStayTimeBean bean = new ViewStayTimeBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- String locNo = String.valueOf(param.get("loc_no"));
- if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
- bean.setLoc_no(locNo);
- }
- List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
- int count = reportQueryMapper.getViewStayTimeCount(bean);
- Page<ViewStayTimeBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------搴撳瓨婊炵暀缁熻--------------------------------------
+ @RequestMapping("/viewStayTimeList.action")
+ public Map<String, Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewStayTimeBean bean = new ViewStayTimeBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("loc_no"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ bean.setLoc_no(locNo);
+ }
+ List<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(bean);
+ int count = reportQueryMapper.getViewStayTimeCount(bean);
+ Page<ViewStayTimeBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- // 瀵煎嚭
- @RequestMapping(value = "/viewStayTimeExport.action")
- @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
- public R viewStayTimeExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
- return R.ok(exportSupport(list, fields));
- }
+ // 瀵煎嚭
+ @RequestMapping(value = "/viewStayTimeExport.action")
+ @ManagerAuth(memo = "搴撳瓨婊炵暀缁熻瀵煎嚭")
+ public R viewStayTimeExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(new ViewStayTimeBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //-----------------搴撳瓨MAP鍥�--------------------------------------
- @RequestMapping("/viewLocMapList/rows.action")
- public R queryViewLocMapRows(){
- return R.ok().add(reportQueryMapper.getViewLocRowTotal());
- }
+ //-----------------搴撳瓨MAP鍥�--------------------------------------
+ @RequestMapping("/viewLocMapList/rows.action")
+ public R queryViewLocMapRows() {
+ return R.ok().add(reportQueryMapper.getViewLocRowTotal());
+ }
- @RequestMapping("/viewLocMapList.action")
- public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1")Integer row){
- // 鑾峰彇鎺掔骇鏁版嵁
- // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
- List<String> bays = reportQueryMapper.getViewLocBayCount(row);
- // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- bays.add(0, "");
- // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
- List<String> levs = reportQueryMapper.getViewLocLevCount(row);
- List<Map<String, Object>> body = new ArrayList<>();
- for (String lev : levs){
- // 鑾峰彇灞傜骇鏁版嵁
- List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
- // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
- dtos.add(0, new ViewLocMapDto(null ,null, lev));
- Map<String, Object> map = new HashMap<>();
- map.put("loc", dtos);
- body.add(map);
- }
- Map<String, Object> result = new HashMap<>();
- result.put("title", bays);
- result.put("body", body);
- return R.ok(result);
- }
+ @RequestMapping("/viewLocMapList.action")
+ public R queryViewLocMapListByPages(@RequestParam(defaultValue = "1") Integer row) {
+ // 鑾峰彇鎺掔骇鏁版嵁
+ // 琛ㄦ牸鏍囬锛氬垪 ===>> 鍗囧簭
+ List<String> bays = reportQueryMapper.getViewLocBayCount(row);
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ bays.add(0, "");
+ // 琛ㄦ牸琛岋細灞� ====>> 鍊掑簭
+ List<String> levs = reportQueryMapper.getViewLocLevCount(row);
+ List<Map<String, Object>> body = new ArrayList<>();
+ for (String lev : levs) {
+ // 鑾峰彇灞傜骇鏁版嵁
+ List<ViewLocMapDto> dtos = reportQueryMapper.getViewLocBays(row, Integer.parseInt(lev));
+ // 锛佽〃鏍肩涓�鍒楁斁灞傜骇鏁�
+ dtos.add(0, new ViewLocMapDto(null, null, lev));
+ Map<String, Object> map = new HashMap<>();
+ map.put("loc", dtos);
+ body.add(map);
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("title", bays);
+ result.put("body", body);
+ return R.ok(result);
+ }
- //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
- @RequestMapping("/viewInOutList.action")
- public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(limit);
- bean.setPageNumber(curr);
- List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
- int count = reportQueryMapper.getViewInOutCount(bean);
- Page<ViewInOutBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
+ @RequestMapping("/viewInOutList.action")
+ public Map<String, Object> viewInOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(limit);
+ bean.setPageNumber(curr);
+ List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
+ int count = reportQueryMapper.getViewInOutCount(bean);
+ Page<ViewInOutBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewInOutExport.action")
- @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
- public R viewInOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewInOutExport.action")
+ @ManagerAuth(memo = "绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻瀵煎嚭")
+ public R viewInOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkInList.action")
- public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
- int count = reportQueryMapper.getViewWorkInCount(bean);
- Page<ViewWorkInBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------鏃ュ叆搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkInList.action")
+ public Map<String, Object> viewWorkInList(ViewWorkInBean bean) {
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
+ int count = reportQueryMapper.getViewWorkInCount(bean);
+ Page<ViewWorkInBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- /**
- * 鏃ュ叆搴撴眹鎬绘煡璇�
- * @return
- */
- @RequestMapping("/viewWorkCountInList.action")
- public R viewWorkCountInList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- String startTime = "1970.1.2";
- String endTime = "2099.1.2";
- if (!Cools.isEmpty(param.get("query_date"))) {
- String queryDate = (String) param.get("query_date");
- String[] split = queryDate.split(" - ");
- startTime= split[0].split(" ")[0].replace("-",".");
- endTime = split[1].split(" ")[0].replace("-",".");
- }
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
- Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime,endTime);
- Page<ViewWorkCountInView> page = new Page<>();
- page.setRecords(allCountIn);
- page.setTotal(total);
- Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime,endTime);
- HashMap<String, Object> result = new HashMap<>();
- result.put("page",page);
- result.put("sum",sum);
- return R.ok(result);
- }
+ /**
+ * 鏃ュ叆搴撴眹鎬绘煡璇�
+ *
+ * @return
+ */
+ @RequestMapping("/viewWorkCountInList.action")
+ public R viewWorkCountInList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountIn(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime, endTime);
+ Integer total = reportQueryMapper.selectWorkCountInTotal((String) param.get("matnr"), startTime, endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountInSum((String) param.get("matnr"), startTime, endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page", page);
+ result.put("sum", sum);
+ return R.ok(result);
+ }
- /**
- * 鏃ュ嚭搴撴眹鎬�
- */
- @RequestMapping("/viewWorkCountOutList.action")
- public R viewWorkCountOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- String startTime = "1970.1.2";
- String endTime = "2099.1.2";
- if (!Cools.isEmpty(param.get("query_date"))) {
- String queryDate = (String) param.get("query_date");
- String[] split = queryDate.split(" - ");
- startTime= split[0].split(" ")[0].replace("-",".");
- endTime = split[1].split(" ")[0].replace("-",".");
- }
- List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime,endTime);
- Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime,endTime);
- Page<ViewWorkCountInView> page = new Page<>();
- page.setRecords(allCountIn);
- page.setTotal(total);
- Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime,endTime);
- HashMap<String, Object> result = new HashMap<>();
- result.put("page",page);
- result.put("sum",sum);
- return R.ok(result);
- }
+ /**
+ * 鏃ュ嚭搴撴眹鎬�
+ */
+ @RequestMapping("/viewWorkCountOutList.action")
+ public R viewWorkCountOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ String startTime = "1970.1.2";
+ String endTime = "2099.1.2";
+ if (!Cools.isEmpty(param.get("query_date"))) {
+ String queryDate = (String) param.get("query_date");
+ String[] split = queryDate.split(" - ");
+ startTime = split[0].split(" ")[0].replace("-", ".");
+ endTime = split[1].split(" ")[0].replace("-", ".");
+ }
+ List<ViewWorkCountInView> allCountIn = reportQueryMapper.selectWorkCountOut(Integer.valueOf((String) param.get("pageNumber")), Integer.valueOf((String) param.get("pageSize")), (String) param.get("matnr"), startTime, endTime);
+ Integer total = reportQueryMapper.selectWorkCountOutTotal((String) param.get("matnr"), startTime, endTime);
+ Page<ViewWorkCountInView> page = new Page<>();
+ page.setRecords(allCountIn);
+ page.setTotal(total);
+ Integer sum = reportQueryMapper.selectWorkCountOutSum((String) param.get("matnr"), startTime, endTime);
+ HashMap<String, Object> result = new HashMap<>();
+ result.put("page", page);
+ result.put("sum", sum);
+ return R.ok(result);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewWorkInExport.action")
- @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkInExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQuery_date(bean.getQuery_date());
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkInExport.action")
+ @ManagerAuth(memo = "鏃ュ叆搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkInExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
- //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
- @RequestMapping("/viewWorkOutList.action")
- public R viewWorkOutList(ViewWorkInBean bean){
- List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
- int count = reportQueryMapper.getViewWorkOutCount(bean);
- Page<ViewWorkInBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ //------------------鏃ュ嚭搴撴槑缁嗙粺璁�--------------------------------------
+ @RequestMapping("/viewWorkOutList.action")
+ public R viewWorkOutList(ViewWorkInBean bean) {
+ List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(bean);
+ int count = reportQueryMapper.getViewWorkOutCount(bean);
+ Page<ViewWorkInBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- //excel瀵煎嚭
- @RequestMapping("/viewWorkOutExport.action")
- @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
- public R viewWorkOutExport(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- @SuppressWarnings("unchecked")
- ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
- bean.setQuery_date(bean.getQuery_date());
- List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
- return R.ok(exportSupport(list, fields));
- }
+ //excel瀵煎嚭
+ @RequestMapping("/viewWorkOutExport.action")
+ @ManagerAuth(memo = "鏃ュ嚭搴撴槑缁嗙粺璁″鍑�")
+ public R viewWorkOutExport(@RequestBody JSONObject param) {
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ @SuppressWarnings("unchecked")
+ ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class);
+ bean.setQuery_date(bean.getQuery_date());
+ List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(bean);
+ return R.ok(exportSupport(list, fields));
+ }
}
diff --git a/src/main/java/com/zy/asrs/controller/RowLastnoController.java b/src/main/java/com/zy/asrs/controller/RowLastnoController.java
index b3b2bdb..f2e0f9b 100644
--- a/src/main/java/com/zy/asrs/controller/RowLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/RowLastnoController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.RowLastno;
-import com.zy.asrs.service.RowLastnoService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.RowLastno;
+import com.zy.asrs.service.RowLastnoService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/rowLastno/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<RowLastno> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(rowLastnoService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/rowLastno/update/auth")
- @ManagerAuth
- public R update(RowLastno rowLastno){
- if (Cools.isEmpty(rowLastno) || null==rowLastno.getWhsType()){
+ @RequestMapping(value = "/rowLastno/update/auth")
+ @ManagerAuth
+ public R update(RowLastno rowLastno) {
+ if (Cools.isEmpty(rowLastno) || null == rowLastno.getWhsType()) {
return R.error();
}
rowLastno.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/rowLastno/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<RowLastno> list = JSONArray.parseArray(param, RowLastno.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (RowLastno entity : list){
+ for (RowLastno entity : list) {
rowLastnoService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/rowLastno/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<RowLastno> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("rowLastno"));
@@ -111,7 +113,7 @@
wrapper.like("whs_type", condition);
Page<RowLastno> page = rowLastnoService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (RowLastno rowLastno : page.getRecords()){
+ for (RowLastno rowLastno : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", rowLastno.getWhsType());
map.put("value", rowLastno.getWhsType());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<RowLastno> wrapper = new EntityWrapper<RowLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != rowLastnoService.selectOne(wrapper)){
+ if (null != rowLastnoService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(RowLastno.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/RowLastnoTypeController.java b/src/main/java/com/zy/asrs/controller/RowLastnoTypeController.java
index 0347a53..d8b5341 100644
--- a/src/main/java/com/zy/asrs/controller/RowLastnoTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/RowLastnoTypeController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.RowLastnoType;
-import com.zy.asrs.service.RowLastnoTypeService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.RowLastnoType;
+import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class RowLastnoTypeController extends BaseController {
@@ -32,24 +34,26 @@
@RequestMapping(value = "/rowLastnoType/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<RowLastnoType> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(RowLastnoType.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(rowLastnoTypeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -66,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/rowLastnoType/update/auth")
- @ManagerAuth
- public R update(RowLastnoType rowLastnoType){
- if (Cools.isEmpty(rowLastnoType) || null==rowLastnoType.getId()){
+ @RequestMapping(value = "/rowLastnoType/update/auth")
+ @ManagerAuth
+ public R update(RowLastnoType rowLastnoType) {
+ if (Cools.isEmpty(rowLastnoType) || null == rowLastnoType.getId()) {
return R.error();
}
rowLastnoTypeService.updateById(rowLastnoType);
@@ -78,8 +82,8 @@
@RequestMapping(value = "/rowLastnoType/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
rowLastnoTypeService.deleteById(id);
}
return R.ok();
@@ -87,7 +91,7 @@
@RequestMapping(value = "/rowLastnoType/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<RowLastnoType> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("rowLastnoType"));
@@ -103,7 +107,7 @@
wrapper.like("id", condition);
Page<RowLastnoType> page = rowLastnoTypeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (RowLastnoType rowLastnoType : page.getRecords()){
+ for (RowLastnoType rowLastnoType : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", rowLastnoType.getId());
map.put("value", rowLastnoType.getId());
@@ -116,7 +120,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<RowLastnoType> wrapper = new EntityWrapper<RowLastnoType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != rowLastnoTypeService.selectOne(wrapper)){
+ if (null != rowLastnoTypeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(RowLastnoType.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 3a6ac32..ca8f537 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -5,16 +5,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.entity.param.StaDescInitParam;
-import com.zy.asrs.mapper.StaDescMapper;
-import com.zy.asrs.service.StaDescService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.StaDesc;
+import com.zy.asrs.entity.param.StaDescInitParam;
+import com.zy.asrs.mapper.StaDescMapper;
+import com.zy.asrs.service.StaDescService;
+import com.zy.common.web.BaseController;
import org.apache.ibatis.session.ExecutorType;
import org.apache.ibatis.session.SqlSession;
import org.apache.ibatis.session.SqlSessionFactory;
@@ -37,18 +37,18 @@
@RequestMapping(value = "/staDesc/init/auth")
@ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�")
public R init(StaDescInitParam param) {
- try{
- if (param.getTypeDesc()==1){
+ try {
+ if (param.getTypeDesc() == 1) {
staDescService.delete(new EntityWrapper<>());
}
String[] startStaList = param.getStartStaList().split(";");
String[] endStaList = param.getEndStaList().split(";");
List<StaDesc> staDescList = new ArrayList<>();
- SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
+ SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);
- for (String startSta : startStaList){
- for (String endSta : endStaList){
- for (Integer type:param.getType()){
+ for (String startSta : startStaList) {
+ for (String endSta : endStaList) {
+ for (Integer type : param.getType()) {
int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>()
.eq("type_no", type)
.eq("stn_no", Integer.parseInt(startSta))
@@ -72,16 +72,16 @@
}
}
}
- try{
+ try {
sqlSession.commit();
sqlSession.close();
- }catch (Exception e){
- log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯�===>sql寮傚父锛歿}",e.getMessage());
+ } catch (Exception e) {
+ log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯�===>sql寮傚父锛歿}", e.getMessage());
}
// staDescService.insertBatch(staDescList);
- }catch (Exception e){
- log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細{}",e.getMessage());
- return R.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細"+e.getMessage());
+ } catch (Exception e) {
+ log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細{}", e.getMessage());
+ return R.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細" + e.getMessage());
}
return R.ok("ok1").add("ok2");
@@ -95,22 +95,24 @@
@RequestMapping(value = "/staDesc/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -139,10 +141,10 @@
return R.ok();
}
- @RequestMapping(value = "/staDesc/update/auth")
- @ManagerAuth(memo = "绔欑偣璺緞淇敼")
- public R update(StaDesc staDesc){
- if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){
+ @RequestMapping(value = "/staDesc/update/auth")
+ @ManagerAuth(memo = "绔欑偣璺緞淇敼")
+ public R update(StaDesc staDesc) {
+ if (Cools.isEmpty(staDesc) || null == staDesc.getTypeId()) {
return R.error();
}
staDesc.setModiUser(getUserId());
@@ -153,12 +155,12 @@
@RequestMapping(value = "/staDesc/delete/auth")
@ManagerAuth(memo = "绔欑偣璺緞鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (StaDesc entity : list){
+ for (StaDesc entity : list) {
staDescService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -166,7 +168,7 @@
@RequestMapping(value = "/staDesc/export/auth")
@ManagerAuth(memo = "绔欑偣璺緞瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("staDesc"));
@@ -182,7 +184,7 @@
wrapper.like("crn_no", condition);
Page<StaDesc> page = staDescService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (StaDesc staDesc : page.getRecords()){
+ for (StaDesc staDesc : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", staDesc.getCrnNo());
map.put("value", staDesc.getCrnNo());
@@ -195,7 +197,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != staDescService.selectOne(wrapper)){
+ if (null != staDescService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(StaDesc.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/StkPlcmController.java b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
index 4bf0d53..8e2d2b9 100644
--- a/src/main/java/com/zy/asrs/controller/StkPlcmController.java
+++ b/src/main/java/com/zy/asrs/controller/StkPlcmController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.StkPlcm;
-import com.zy.asrs.service.StkPlcmService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.StkPlcm;
+import com.zy.asrs.service.StkPlcmService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,22 +33,24 @@
@RequestMapping(value = "/stkPlcm/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(stkPlcmService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -67,12 +69,12 @@
@RequestMapping(value = "/stkPlcm/delete/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<StkPlcm> list = JSONArray.parseArray(param, StkPlcm.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (StkPlcm entity : list){
+ for (StkPlcm entity : list) {
stkPlcmService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -80,7 +82,7 @@
@RequestMapping(value = "/stkPlcm/export/auth")
@ManagerAuth(memo = "鍫嗗灈鏈哄紓甯告棩蹇楀鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<StkPlcm> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("stkPlcm"));
@@ -93,7 +95,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<StkPlcm> wrapper = new EntityWrapper<StkPlcm>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != stkPlcmService.selectOne(wrapper)){
+ if (null != stkPlcmService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(StkPlcm.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/TagController.java b/src/main/java/com/zy/asrs/controller/TagController.java
index c5e92f0..ad4462a 100644
--- a/src/main/java/com/zy/asrs/controller/TagController.java
+++ b/src/main/java/com/zy/asrs/controller/TagController.java
@@ -31,11 +31,11 @@
@RequestMapping(value = "/tag/list/pda/auth")
@ManagerAuth
- public R pdaList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)Long parentId){
+ public R pdaList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) Long parentId) {
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
- if(!Cools.isEmpty(parentId)) {
+ if (!Cools.isEmpty(parentId)) {
wrapper.eq("parent_id", parentId == null ? getOriginTag().getId() : parentId);
}
wrapper.orderBy("sort");
@@ -51,22 +51,24 @@
@RequestMapping(value = "/tag/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.parse("0-鎿嶄綔鎴愬姛").add(tagService.selectList(wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -104,10 +106,10 @@
return R.ok();
}
- @RequestMapping(value = "/tag/update/auth")
- @ManagerAuth
- public R update(Tag tag){
- if (Cools.isEmpty(tag) || null==tag.getId()){
+ @RequestMapping(value = "/tag/update/auth")
+ @ManagerAuth
+ public R update(Tag tag) {
+ if (Cools.isEmpty(tag) || null == tag.getId()) {
return R.error();
}
if (tag.getParentId() != null && tag.getParentId() > 0) {
@@ -133,8 +135,8 @@
@RequestMapping(value = "/tag/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
tagService.deleteById(id);
}
return R.ok();
@@ -142,7 +144,7 @@
@RequestMapping(value = "/tag/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<Tag> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("tag"));
@@ -158,7 +160,7 @@
wrapper.like("uuid", condition).or().like("name", condition);
Page<Tag> page = tagService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Tag tag : page.getRecords()){
+ for (Tag tag : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", tag.getId());
map.put("value", tag.getName());
@@ -171,7 +173,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<Tag> wrapper = new EntityWrapper<Tag>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != tagService.selectOne(wrapper)){
+ if (null != tagService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(Tag.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/TaskController.java b/src/main/java/com/zy/asrs/controller/TaskController.java
index b453629..2270bac 100644
--- a/src/main/java/com/zy/asrs/controller/TaskController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskController.java
@@ -1,17 +1,16 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.Task;
-import com.zy.asrs.service.TaskService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.Task;
+import com.zy.asrs.service.TaskService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/zy/asrs/controller/TaskDetlController.java b/src/main/java/com/zy/asrs/controller/TaskDetlController.java
index 3085f45..7e416e2 100644
--- a/src/main/java/com/zy/asrs/controller/TaskDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskDetlController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.TaskDetl;
-import com.zy.asrs.service.TaskDetlService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.TaskDetl;
+import com.zy.asrs.service.TaskDetlService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class TaskDetlController extends BaseController {
@@ -32,24 +34,26 @@
@RequestMapping(value = "/taskDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<TaskDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(TaskDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(taskDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -66,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/taskDetl/update/auth")
- @ManagerAuth
- public R update(TaskDetl taskDetl){
- if (Cools.isEmpty(taskDetl) || null==taskDetl.getId()){
+ @RequestMapping(value = "/taskDetl/update/auth")
+ @ManagerAuth
+ public R update(TaskDetl taskDetl) {
+ if (Cools.isEmpty(taskDetl) || null == taskDetl.getId()) {
return R.error();
}
taskDetlService.updateById(taskDetl);
@@ -78,8 +82,8 @@
@RequestMapping(value = "/taskDetl/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskDetlService.deleteById(id);
}
return R.ok();
@@ -87,7 +91,7 @@
@RequestMapping(value = "/taskDetl/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TaskDetl> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("taskDetl"));
@@ -103,7 +107,7 @@
wrapper.like("id", condition);
Page<TaskDetl> page = taskDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TaskDetl taskDetl : page.getRecords()){
+ for (TaskDetl taskDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", taskDetl.getId());
map.put("value", taskDetl.getId());
@@ -116,7 +120,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TaskDetl> wrapper = new EntityWrapper<TaskDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskDetlService.selectOne(wrapper)){
+ if (null != taskDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TaskDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java b/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java
index 3622acc..7b837b5 100644
--- a/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskDetlLogController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.TaskDetlLog;
-import com.zy.asrs.service.TaskDetlLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.TaskDetlLog;
+import com.zy.asrs.service.TaskDetlLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class TaskDetlLogController extends BaseController {
diff --git a/src/main/java/com/zy/asrs/controller/TaskLogController.java b/src/main/java/com/zy/asrs/controller/TaskLogController.java
index 1c642ba..a66de9f 100644
--- a/src/main/java/com/zy/asrs/controller/TaskLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskLogController.java
@@ -1,22 +1,24 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.asrs.entity.TaskLog;
-import com.zy.asrs.service.TaskLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.TaskLog;
+import com.zy.asrs.service.TaskLogService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class TaskLogController extends BaseController {
@@ -32,24 +34,26 @@
@RequestMapping(value = "/taskLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(TaskLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(taskLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -66,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/taskLog/update/auth")
- @ManagerAuth
- public R update(TaskLog taskLog){
- if (Cools.isEmpty(taskLog) || null==taskLog.getId()){
+ @RequestMapping(value = "/taskLog/update/auth")
+ @ManagerAuth
+ public R update(TaskLog taskLog) {
+ if (Cools.isEmpty(taskLog) || null == taskLog.getId()) {
return R.error();
}
taskLogService.updateById(taskLog);
@@ -78,8 +82,8 @@
@RequestMapping(value = "/taskLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
taskLogService.deleteById(id);
}
return R.ok();
@@ -87,7 +91,7 @@
@RequestMapping(value = "/taskLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TaskLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("taskLog"));
@@ -103,7 +107,7 @@
wrapper.like("id", condition);
Page<TaskLog> page = taskLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TaskLog taskLog : page.getRecords()){
+ for (TaskLog taskLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", taskLog.getId());
map.put("value", taskLog.getId());
@@ -116,7 +120,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TaskLog> wrapper = new EntityWrapper<TaskLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != taskLogService.selectOne(wrapper)){
+ if (null != taskLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TaskLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/TrayCodeController.java b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
index 555c80d..b512b3a 100644
--- a/src/main/java/com/zy/asrs/controller/TrayCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -33,25 +33,26 @@
@RequestMapping(value = "/trayCode/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<TrayCode> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
// wrapper.orderBy("id", false);
}
return R.ok(trayCodeService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +69,10 @@
return R.ok();
}
- @RequestMapping(value = "/trayCode/update/auth")
- @ManagerAuth
- public R update(TrayCode trayCode){
- if (Cools.isEmpty(trayCode) || null==trayCode.getId()){
+ @RequestMapping(value = "/trayCode/update/auth")
+ @ManagerAuth
+ public R update(TrayCode trayCode) {
+ if (Cools.isEmpty(trayCode) || null == trayCode.getId()) {
return R.error();
}
trayCodeService.updateById(trayCode);
@@ -80,12 +81,12 @@
@RequestMapping(value = "/trayCode/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<TrayCode> list = JSONArray.parseArray(param, TrayCode.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (TrayCode entity : list){
+ for (TrayCode entity : list) {
trayCodeService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -93,7 +94,7 @@
@RequestMapping(value = "/trayCode/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<TrayCode> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("trayCode"));
@@ -109,7 +110,7 @@
wrapper.like("id", condition);
Page<TrayCode> page = trayCodeService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (TrayCode trayCode : page.getRecords()){
+ for (TrayCode trayCode : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", trayCode.getId());
map.put("value", trayCode.getId());
@@ -122,7 +123,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<TrayCode> wrapper = new EntityWrapper<TrayCode>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != trayCodeService.selectOne(wrapper)){
+ if (null != trayCodeService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(TrayCode.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -132,7 +133,7 @@
@ManagerAuth
public R trayCodeLatest() {
List<TrayCode> latest = trayCodeService.selectList(new EntityWrapper<TrayCode>().orderBy("id", false));
- return R.ok().add(latest.isEmpty()?"10000001": Integer.parseInt(latest.get(0).getTrayNo())+1);
+ return R.ok().add(latest.isEmpty() ? "10000001" : Integer.parseInt(latest.get(0).getTrayNo()) + 1);
}
@RequestMapping(value = "/trayCode/print/preview")
@@ -144,8 +145,8 @@
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
List<Map<String, Object>> res = new ArrayList<>();
- for (int i = 0; i<count; i++) {
- res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
+ for (int i = 0; i < count; i++) {
+ res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo) + i)));
}
return R.ok().add(res);
}
@@ -153,16 +154,16 @@
@RequestMapping(value = "/trayCode/print/auth")
@ManagerAuth(memo = "鎵樼洏鐮佹墦鍗�")
public R print(@RequestParam String startNo,
- @RequestParam Integer count,
- @RequestParam Integer type){
+ @RequestParam Integer count,
+ @RequestParam Integer type) {
if (count <= 0) {
return R.error("鏁伴噺蹇呴』澶т簬闆�");
}
- for (int i = 0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
TrayCode trayCode = new TrayCode(
- String.valueOf(Integer.parseInt(startNo)+i), // 搴忓垪鍙穂闈炵┖]
- i==0?"Y":"N", // 璧峰
- i==count-1?"Y":"N", // 缁堟
+ String.valueOf(Integer.parseInt(startNo) + i), // 搴忓垪鍙穂闈炵┖]
+ i == 0 ? "Y" : "N", // 璧峰
+ i == count - 1 ? "Y" : "N", // 缁堟
null, // 澶囨敞
new Date(), // 淇敼鏃堕棿
getUserId(), // 淇敼浜哄憳
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 7f13959..86ffe38 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -11,12 +11,10 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.WaitPakinService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -45,25 +43,26 @@
@RequestMapping(value = "/waitPakin/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -80,10 +79,10 @@
return R.ok();
}
- @RequestMapping(value = "/waitPakin/update/auth")
- @ManagerAuth
- public R update(WaitPakin waitPakin){
- if (Cools.isEmpty(waitPakin)){
+ @RequestMapping(value = "/waitPakin/update/auth")
+ @ManagerAuth
+ public R update(WaitPakin waitPakin) {
+ if (Cools.isEmpty(waitPakin)) {
return R.error();
}
waitPakinService.updateById(waitPakin);
@@ -93,26 +92,24 @@
@RequestMapping(value = "/waitPakin/delete/auth")
@ManagerAuth
@Transactional
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WaitPakin> list = JSONArray.parseArray(param, WaitPakin.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error("鏁版嵁涓虹┖");
}
- for (WaitPakin entity : list){
+ for (WaitPakin entity : list) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("barcode", entity.getZpallet()));
- if(!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0){
+ if (!Cools.isEmpty(wrkMasts) || wrkMasts.size() > 0) {
return R.error("鏉＄爜宸茬敓鎴愬叆搴撳伐浣滄。锛岀姝㈠垹闄�");
}
waitPakinService.delete(new EntityWrapper<>(entity));
//璁㈠崟鍏宠仈锛屼慨鏀硅鍗曚綔涓氭暟閲�
if (!Cools.isEmpty(entity.getOrderNo())) {
-// if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
-// return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
-// }
- OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand()
- ,entity.getStandby1(),entity.getStandby2(),entity.getStandby3()
- ,entity.getBoxType1(),entity.getBoxType2(),entity.getBoxType3()
- , entity.getAnfme());
+ if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getBrand()
+ , entity.getStandby1(), entity.getStandby2(), entity.getStandby3()
+ , entity.getBoxType1(), entity.getBoxType2(), entity.getBoxType3(), entity.getAnfme())) {
+ return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
}
}
return R.ok();
@@ -120,7 +117,7 @@
@RequestMapping(value = "/waitPakin/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WaitPakin> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakin"));
@@ -136,7 +133,7 @@
wrapper.like("id", condition);
Page<WaitPakin> page = waitPakinService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WaitPakin waitPakin : page.getRecords()){
+ for (WaitPakin waitPakin : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", waitPakin.getZpallet());
map.put("value", waitPakin.getZpallet());
@@ -149,7 +146,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != waitPakinService.selectOne(wrapper)){
+ if (null != waitPakinService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WaitPakin.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index d0d8bc2..9e50944 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -35,25 +35,26 @@
@RequestMapping(value = "/waitPakinLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<WaitPakinLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private void convert(Map<String, Object> map, EntityWrapper wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private void convert(Map<String, Object> map, EntityWrapper wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -70,10 +71,10 @@
return R.ok();
}
- @RequestMapping(value = "/waitPakinLog/update/auth")
- @ManagerAuth
- public R update(WaitPakinLog waitPakinLog){
- if (Cools.isEmpty(waitPakinLog)){
+ @RequestMapping(value = "/waitPakinLog/update/auth")
+ @ManagerAuth
+ public R update(WaitPakinLog waitPakinLog) {
+ if (Cools.isEmpty(waitPakinLog)) {
return R.error();
}
waitPakinLogService.updateById(waitPakinLog);
@@ -82,12 +83,12 @@
@RequestMapping(value = "/waitPakinLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WaitPakinLog> list = JSONArray.parseArray(param, WaitPakinLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WaitPakinLog entity : list){
+ for (WaitPakinLog entity : list) {
waitPakinLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +96,7 @@
@RequestMapping(value = "/waitPakinLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<WaitPakinLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("waitPakinLog"));
@@ -111,7 +112,7 @@
wrapper.like("id", condition);
Page<WaitPakinLog> page = waitPakinLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WaitPakinLog waitPakinLog : page.getRecords()){
+ for (WaitPakinLog waitPakinLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", waitPakinLog.getZpallet());
map.put("value", waitPakinLog.getZpallet());
@@ -124,7 +125,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WaitPakinLog> wrapper = new EntityWrapper<WaitPakinLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != waitPakinLogService.selectOne(wrapper)){
+ if (null != waitPakinLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WaitPakinLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6de7c6e..579770b 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -37,19 +37,19 @@
@RequestMapping("/available/put/site")
@ManagerAuth()
- public R availablePutSite(){
+ public R availablePutSite() {
return R.ok().add(basDevpService.getAvailableInSite());
}
@RequestMapping("/available/empty/put/site")
@ManagerAuth()
- public R availableEmptyPutSite(){
+ public R availableEmptyPutSite() {
return R.ok().add(basDevpService.getAvailableEmptyInSite());
}
@RequestMapping("/available/take/site")
@ManagerAuth()
- public R availableTakeSite(){
+ public R availableTakeSite() {
List<Map<String, Object>> result = new ArrayList<>();
List<Integer> outSite = basDevpService.getAvailableOutSite(101);
for (Integer siteId : outSite) {
@@ -77,13 +77,13 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth()
- public R availableTakeCheckSite(){
+ public R availableTakeCheckSite() {
return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
@ManagerAuth()
- public R availableEmptyTakeSite(){
+ public R availableEmptyTakeSite() {
return R.ok().add(basDevpService.getAvailableEmptyOutSite());
}
@@ -93,8 +93,8 @@
try {
String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
- } catch (Exception e){
- return R.error("鍏ュ簱鍚姩澶辫触==>"+e.getMessage());
+ } catch (Exception e) {
+ return R.error("鍏ュ簱鍚姩澶辫触==>" + e.getMessage());
}
}
@@ -136,10 +136,10 @@
@RequestMapping("/mat/turn/over/out/start")
@ManagerAuth(memo = "鍝佸彿绉讳氦")
public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
- if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){
+ if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) {
return R.error("鍙傛暟涓虹┖");
}
- if (param.getLocDetls().size()>1){
+ if (param.getLocDetls().size() > 1) {
return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
}
workService.turnMatLocDetl(param, getUserId());
@@ -156,7 +156,7 @@
@RequestMapping("/hand/control/wrkMast")
@ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
public R handControlWrkMast(@RequestParam String workNo,
- @RequestParam Integer type){
+ @RequestParam Integer type) {
if (type == 1) {
workService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index 3baba43..2506a5d 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -35,17 +35,17 @@
@RequestMapping(value = "/wrkDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
+ if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
} else {
wrapper.orderBy("appe_time", false);
@@ -53,10 +53,10 @@
return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -75,12 +75,12 @@
@RequestMapping(value = "/wrkDetl/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkDetl> list = JSONArray.parseArray(param, WrkDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkDetl entity : list){
+ for (WrkDetl entity : list) {
wrkDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -88,7 +88,7 @@
@RequestMapping(value = "/wrkDetl/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｆ槑缁嗗鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkDetl"));
@@ -104,7 +104,7 @@
wrapper.like("id", condition);
Page<WrkDetl> page = wrkDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkDetl wrkDetl : page.getRecords()){
+ for (WrkDetl wrkDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkDetl.getWrkNo());
map.put("value", wrkDetl.getWrkNo());
@@ -117,7 +117,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkDetl> wrapper = new EntityWrapper<WrkDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkDetlService.selectOne(wrapper)){
+ if (null != wrkDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index dd97c89..c10986f 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -106,13 +106,13 @@
batch = val;
} else if (entry.getKey().equals("anfme")) {
anfme = Double.parseDouble(val);
- }else if (entry.getKey().equals("matnr")) {
+ } else if (entry.getKey().equals("matnr")) {
matnr = val;
}
}
- List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, modiTimeStart, modiTimeEnd, curr, limit);
Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
- page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd));
+ page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, modiTimeStart, modiTimeEnd));
return R.ok(page1);
} catch (Exception e) {
return R.error("寮傚父" + e);
diff --git a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
index bd46c69..51461dd 100644
--- a/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkLastnoController.java
@@ -5,14 +5,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.asrs.entity.WrkLastno;
-import com.zy.asrs.service.WrkLastnoService;
-import com.zy.common.web.BaseController;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.WrkLastno;
+import com.zy.asrs.service.WrkLastnoService;
+import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,22 +32,24 @@
@RequestMapping(value = "/wrkLastno/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(wrkLastnoService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -68,10 +70,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkLastno/update/auth")
- @ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
- public R update(WrkLastno wrkLastno){
- if (Cools.isEmpty(wrkLastno) || null==wrkLastno.getWrkMk()){
+ @RequestMapping(value = "/wrkLastno/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔搴忓彿淇敼")
+ public R update(WrkLastno wrkLastno) {
+ if (Cools.isEmpty(wrkLastno) || null == wrkLastno.getWrkMk()) {
return R.error();
}
wrkLastno.setModiUser(getUserId());
@@ -82,12 +84,12 @@
@RequestMapping(value = "/wrkLastno/delete/auth")
@ManagerAuth(memo = "宸ヤ綔搴忓彿鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkLastno> list = JSONArray.parseArray(param, WrkLastno.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkLastno entity : list){
+ for (WrkLastno entity : list) {
wrkLastnoService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -95,7 +97,7 @@
@RequestMapping(value = "/wrkLastno/export/auth")
@ManagerAuth(memo = "宸ヤ綔搴忓彿瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkLastno> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkLastno"));
@@ -111,7 +113,7 @@
wrapper.like("wrk_mk", condition);
Page<WrkLastno> page = wrkLastnoService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkLastno wrkLastno : page.getRecords()){
+ for (WrkLastno wrkLastno : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkLastno.getWrkMk());
map.put("value", wrkLastno.getWrkMk());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkLastno> wrapper = new EntityWrapper<WrkLastno>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkLastnoService.selectOne(wrapper)){
+ if (null != wrkLastnoService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkLastno.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastController.java b/src/main/java/com/zy/asrs/controller/WrkMastController.java
index 3a6a9c5..7a37f37 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -32,31 +32,31 @@
@RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMast.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("io_time", false);
}
return R.ok(wrkMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -77,10 +77,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMast/update/auth")
- @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
- public R update(WrkMast wrkMast){
- if (Cools.isEmpty(wrkMast) || null==wrkMast.getWrkNo()){
+ @RequestMapping(value = "/wrkMast/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｄ慨鏀�")
+ public R update(WrkMast wrkMast) {
+ if (Cools.isEmpty(wrkMast) || null == wrkMast.getWrkNo()) {
return R.error();
}
wrkMast.setModiUser(getUserId());
@@ -91,12 +91,12 @@
@RequestMapping(value = "/wrkMast/delete/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkMast> list = JSONArray.parseArray(param, WrkMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkMast entity : list){
+ for (WrkMast entity : list) {
wrkMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -104,7 +104,7 @@
@RequestMapping(value = "/wrkMast/export/auth")
@ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
@@ -120,7 +120,7 @@
wrapper.like("wrk_no", condition);
Page<WrkMast> page = wrkMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMast wrkMast : page.getRecords()){
+ for (WrkMast wrkMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMast.getWrkNo());
map.put("value", wrkMast.getWrkNo());
@@ -133,7 +133,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastService.selectOne(wrapper)){
+ if (null != wrkMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -145,8 +145,8 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (WrkMast entity : list){
- entity.setIoPri(entity.getIoPri() + 1);
+ for (WrkMast entity : list) {
+ entity.setIoPri(entity.getIoPri() + 1);
}
wrkMastService.updateBatchById(list);
return R.ok();
@@ -158,7 +158,7 @@
if (list.isEmpty()) {
return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
}
- for (WrkMast entity : list){
+ for (WrkMast entity : list) {
entity.setIoPri(entity.getIoPri() - 1);
}
wrkMastService.updateBatchById(list);
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index c16a7c2..eedaf89 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -35,22 +35,22 @@
@RequestMapping(value = "/wrkMastLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkMastLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){
- if (orderByField.endsWith("$")){
- orderByField = orderByField.substring(0, orderByField.length()-1);
+ if (!Cools.isEmpty(orderByField)) {
+ if (orderByField.endsWith("$")) {
+ orderByField = orderByField.substring(0, orderByField.length() - 1);
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
- }else {
+ } else {
wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
@@ -58,31 +58,31 @@
@RequestMapping(value = "/inventoryFlow/list/auth")
@ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍")
- public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param){
+ public R inventoryFlowList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam(required = false) String condition,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
if (Cools.isEmpty(param.get("io_time"))) {
- param.put("startTime","");
- param.put("endTime","");
+ param.put("startTime", "");
+ param.put("endTime", "");
} else {
String ioTime = (String) param.get("io_time");
- if (ioTime.contains(RANGE_TIME_LINK)){
+ if (ioTime.contains(RANGE_TIME_LINK)) {
String[] dates = ioTime.split(RANGE_TIME_LINK);
- param.put("startTime",dates[0]);
- param.put("endTime",dates[1]);
+ param.put("startTime", dates[0]);
+ param.put("endTime", dates[1]);
}
}
- return wrkMastLogService.inventoryFlowList(curr,limit,param);
+ return wrkMastLogService.inventoryFlowList(curr, limit, param);
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -103,10 +103,10 @@
return R.ok();
}
- @RequestMapping(value = "/wrkMastLog/update/auth")
- @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
- public R update(WrkMastLog wrkMastLog){
- if (Cools.isEmpty(wrkMastLog) || null==wrkMastLog.getId()){
+ @RequestMapping(value = "/wrkMastLog/update/auth")
+ @ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｄ慨鏀�")
+ public R update(WrkMastLog wrkMastLog) {
+ if (Cools.isEmpty(wrkMastLog) || null == wrkMastLog.getId()) {
return R.error();
}
wrkMastLogService.updateById(wrkMastLog);
@@ -115,12 +115,12 @@
@RequestMapping(value = "/wrkMastLog/delete/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ垹闄�")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<WrkMastLog> list = JSONArray.parseArray(param, WrkMastLog.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (WrkMastLog entity : list){
+ for (WrkMastLog entity : list) {
wrkMastLogService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -128,7 +128,7 @@
@RequestMapping(value = "/wrkMastLog/export/auth")
@ManagerAuth(memo = "宸ヤ綔鍘嗗彶妗ｅ鍑�")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<WrkMastLog> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastLog"));
@@ -144,7 +144,7 @@
wrapper.like("id", condition);
Page<WrkMastLog> page = wrkMastLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastLog wrkMastLog : page.getRecords()){
+ for (WrkMastLog wrkMastLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", wrkMastLog.getId());
map.put("value", wrkMastLog.getId());
@@ -157,7 +157,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<WrkMastLog> wrapper = new EntityWrapper<WrkMastLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastLogService.selectOne(wrapper)){
+ if (null != wrkMastLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(WrkMastLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index e6a3cc0..0bf1c5d 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -25,7 +25,7 @@
/**
* 搴忓彿
*/
- @ApiModelProperty(value= "搴忓彿")
+ @ApiModelProperty(value = "搴忓彿")
@TableId(value = "adj_id", type = IdType.AUTO)
@TableField("adj_id")
private Long adjId;
@@ -33,106 +33,107 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍙樻洿鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍙樻洿鍟嗗搧缂栧彿")
private String matnr;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
@TableField("matnr_old")
private String matnrOld;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍘熺鏁�
*/
- @ApiModelProperty(value= "鍘熺鏁�")
+ @ApiModelProperty(value = "鍘熺鏁�")
@TableField("ori_ctns")
private Double oriCtns;
/**
* 鍘熸暟閲�
*/
- @ApiModelProperty(value= "鍘熸暟閲�")
+ @ApiModelProperty(value = "鍘熸暟閲�")
@TableField("ori_qty")
private Double oriQty;
/**
* 鍘熼噸閲�
*/
- @ApiModelProperty(value= "鍘熼噸閲�")
+ @ApiModelProperty(value = "鍘熼噸閲�")
@TableField("ori_wt")
private Double oriWt;
/**
* 鍙樻洿绠辨暟
*/
- @ApiModelProperty(value= "鍙樻洿绠辨暟")
+ @ApiModelProperty(value = "鍙樻洿绠辨暟")
@TableField("adj_ctns")
private Double adjCtns;
/**
* 鍙樻洿鏁伴噺
*/
- @ApiModelProperty(value= "鍙樻洿鏁伴噺")
+ @ApiModelProperty(value = "鍙樻洿鏁伴噺")
@TableField("adj_qty")
private Double adjQty;
/**
* 鍙樻洿閲嶉噺
*/
- @ApiModelProperty(value= "鍙樻洿閲嶉噺")
+ @ApiModelProperty(value = "鍙樻洿閲嶉噺")
@TableField("adj_wt")
private Double adjWt;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public AdjDetl() {}
+ public AdjDetl() {
+ }
public AdjDetl(String locNo, String matnr, String batch, Double oriCtns, Double oriQty, Double oriWt, Double adjCtns, Double adjQty, Double adjWt, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.locNo = locNo;
@@ -169,34 +170,34 @@
// );
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/ApiLog.java b/src/main/java/com/zy/asrs/entity/ApiLog.java
index 78fa188..c30fa7d 100644
--- a/src/main/java/com/zy/asrs/entity/ApiLog.java
+++ b/src/main/java/com/zy/asrs/entity/ApiLog.java
@@ -1,18 +1,17 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("man_api_log")
@@ -23,102 +22,103 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏃ュ織缂栧彿
*/
- @ApiModelProperty(value= "鏃ュ織缂栧彿")
+ @ApiModelProperty(value = "鏃ュ織缂栧彿")
private String uuid;
/**
* 鍚嶇О绌洪棿
*/
- @ApiModelProperty(value= "鍚嶇О绌洪棿")
+ @ApiModelProperty(value = "鍚嶇О绌洪棿")
private String namespace;
/**
* 鎺ュ彛鍦板潃
*/
- @ApiModelProperty(value= "鎺ュ彛鍦板潃")
+ @ApiModelProperty(value = "鎺ュ彛鍦板潃")
private String url;
/**
* 骞冲彴瀵嗛挜
*/
- @ApiModelProperty(value= "骞冲彴瀵嗛挜")
+ @ApiModelProperty(value = "骞冲彴瀵嗛挜")
private String appkey;
/**
* 鏃堕棿鎴�
*/
- @ApiModelProperty(value= "鏃堕棿鎴�")
+ @ApiModelProperty(value = "鏃堕棿鎴�")
private String timestamp;
/**
* 瀹㈡埛绔疘P
*/
- @ApiModelProperty(value= "瀹㈡埛绔疘P")
+ @ApiModelProperty(value = "瀹㈡埛绔疘P")
@TableField("client_ip")
private String clientIp;
/**
* 璇锋眰鍐呭
*/
- @ApiModelProperty(value= "璇锋眰鍐呭")
+ @ApiModelProperty(value = "璇锋眰鍐呭")
private String request;
/**
* 鍝嶅簲鍐呭
*/
- @ApiModelProperty(value= "鍝嶅簲鍐呭")
+ @ApiModelProperty(value = "鍝嶅簲鍐呭")
private String response;
/**
* 寮傚父鍐呭
*/
- @ApiModelProperty(value= "寮傚父鍐呭")
+ @ApiModelProperty(value = "寮傚父鍐呭")
private String err;
/**
- * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
*/
- @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
+ @ApiModelProperty(value = "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
private Integer result;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public ApiLog() {}
+ public ApiLog() {
+ }
- public ApiLog(String uuid,String namespace,String url,String appkey,String timestamp,String clientIp,String request,String response,String err,Integer result,Integer status,Date createTime,Date updateTime,String memo) {
+ public ApiLog(String uuid, String namespace, String url, String appkey, String timestamp, String clientIp, String request, String response, String err, Integer result, Integer status, Date createTime, Date updateTime, String memo) {
this.uuid = uuid;
this.namespace = namespace;
this.url = url;
@@ -152,9 +152,11 @@
// null // 澶囨敞
// );
- public String getResult$(){
- if (null == this.result){ return null; }
- switch (this.result){
+ public String getResult$() {
+ if (null == this.result) {
+ return null;
+ }
+ switch (this.result) {
case 1:
return "鎴愬姛";
case 0:
@@ -164,9 +166,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -176,15 +180,15 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/AppVersion.java b/src/main/java/com/zy/asrs/entity/AppVersion.java
index d9e9c1e..5faef0c 100644
--- a/src/main/java/com/zy/asrs/entity/AppVersion.java
+++ b/src/main/java/com/zy/asrs/entity/AppVersion.java
@@ -1,11 +1,11 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -14,37 +14,38 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鐗堟湰鍙�
*/
- @ApiModelProperty(value= "鐗堟湰鍙�")
+ @ApiModelProperty(value = "鐗堟湰鍙�")
private String version;
/**
* app璺緞
*/
- @ApiModelProperty(value= "app璺緞")
+ @ApiModelProperty(value = "app璺緞")
private String path;
/**
- * 鏄惁涓烘渶鏂扮増鏈� 0: 鍚� 1: 鏄�
+ * 鏄惁涓烘渶鏂扮増鏈� 0: 鍚� 1: 鏄�
*/
- @ApiModelProperty(value= "鏄惁涓烘渶鏂扮増鏈� 0: 鍚� 1: 鏄� ")
+ @ApiModelProperty(value = "鏄惁涓烘渶鏂扮増鏈� 0: 鍚� 1: 鏄� ")
private Integer latest;
/**
- * app绫诲瀷 0: pda 1: lcd
+ * app绫诲瀷 0: pda 1: lcd
*/
- @ApiModelProperty(value= "app绫诲瀷 0: pda 1: lcd ")
+ @ApiModelProperty(value = "app绫诲瀷 0: pda 1: lcd ")
private Integer type;
- public AppVersion() {}
+ public AppVersion() {
+ }
- public AppVersion(String version,String path,Integer latest,Integer type) {
+ public AppVersion(String version, String path, Integer latest, Integer type) {
this.version = version;
this.path = path;
this.latest = latest;
@@ -58,9 +59,11 @@
// null // app绫诲瀷
// );
- public String getLatest$(){
- if (null == this.latest){ return null; }
- switch (this.latest){
+ public String getLatest$() {
+ if (null == this.latest) {
+ return null;
+ }
+ switch (this.latest) {
case 0:
return "鍚�";
case 1:
@@ -70,9 +73,11 @@
}
}
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 0:
return "pda";
case 1:
diff --git a/src/main/java/com/zy/asrs/entity/AxisBean.java b/src/main/java/com/zy/asrs/entity/AxisBean.java
index 9d74e90..b88c001 100644
--- a/src/main/java/com/zy/asrs/entity/AxisBean.java
+++ b/src/main/java/com/zy/asrs/entity/AxisBean.java
@@ -2,23 +2,27 @@
/**
* 鏇茬嚎鍥捐〃json閿�
- * @author admin
*
+ * @author admin
*/
public class AxisBean {
- private String name;
- private Integer[] data;
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public Integer[] getData() {
- return data;
- }
- public void setData(Integer[] data) {
- this.data = data;
- }
-
+ private String name;
+ private Integer[] data;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer[] getData() {
+ return data;
+ }
+
+ public void setData(Integer[] data) {
+ this.data = data;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/BasAreas.java b/src/main/java/com/zy/asrs/entity/BasAreas.java
index 82633b6..d1484f7 100644
--- a/src/main/java/com/zy/asrs/entity/BasAreas.java
+++ b/src/main/java/com/zy/asrs/entity/BasAreas.java
@@ -1,19 +1,19 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import com.zy.asrs.service.BasWhsTypeService;
-import org.springframework.format.annotation.DateTimeFormat;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_bas_areas")
@@ -21,77 +21,78 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.INPUT)
private Long id;
/**
* 浠撳簱ID
*/
- @ApiModelProperty(value= "浠撳簱ID")
+ @ApiModelProperty(value = "浠撳簱ID")
@TableField("whs_id")
private Long whsId;
/**
* 浠撳簱鍚嶇О
*/
- @ApiModelProperty(value= "浠撳簱鍚嶇О")
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
@TableField("whs_name")
private String whsName;
/**
* 搴撳尯鍚嶇О
*/
- @ApiModelProperty(value= "搴撳尯鍚嶇О")
+ @ApiModelProperty(value = "搴撳尯鍚嶇О")
private String name;
/**
* 浠撳簱绫诲瀷
*/
- @ApiModelProperty(value= "浠撳簱绫诲瀷")
+ @ApiModelProperty(value = "浠撳簱绫诲瀷")
@TableField("whs_type_id")
private Long whsTypeId;
/**
* 搴撳尯缂栫爜
*/
- @ApiModelProperty(value= "搴撳尯缂栫爜")
+ @ApiModelProperty(value = "搴撳尯缂栫爜")
@TableField("area_no")
private String areaNo;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 鍒涘缓浜哄憳
*/
- @ApiModelProperty(value= "鍒涘缓浜哄憳")
+ @ApiModelProperty(value = "鍒涘缓浜哄憳")
@TableField("create_by")
private String createBy;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private String updateBy;
- public BasAreas() {}
+ public BasAreas() {
+ }
- public BasAreas(Long id,Long whsId,String whsName,String name,Long whsTypeId,String areaNo,Date createTime,Date updateTime,String createBy,String updateBy) {
+ public BasAreas(Long id, Long whsId, String whsName, String name, Long whsTypeId, String areaNo, Date createTime, Date updateTime, String createBy, String updateBy) {
this.id = id;
this.whsId = whsId;
this.whsName = whsName;
@@ -117,24 +118,24 @@
// null // 淇敼浜哄憳
// );
- public String getWhsTypeId$(){
+ public String getWhsTypeId$() {
BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
BasWhsType basWhsType = service.selectById(this.whsTypeId);
- if (!Cools.isEmpty(basWhsType)){
+ if (!Cools.isEmpty(basWhsType)) {
return String.valueOf(basWhsType.getWhsDesc());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasContainer.java b/src/main/java/com/zy/asrs/entity/BasContainer.java
index 71aa45d..0ad518c 100644
--- a/src/main/java/com/zy/asrs/entity/BasContainer.java
+++ b/src/main/java/com/zy/asrs/entity/BasContainer.java
@@ -1,15 +1,15 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-
+import com.core.common.Cools;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.ContainerType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,13 +25,13 @@
/**
* 涓婚敭
*/
- @ApiModelProperty(value= "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 瀹瑰櫒缂栫爜
*/
- @ApiModelProperty(value= "瀹瑰櫒缂栫爜")
+ @ApiModelProperty(value = "瀹瑰櫒缂栫爜")
private String barcode;
@ApiModelProperty("瀹瑰櫒绫诲瀷")
@@ -54,7 +54,8 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
- public BasContainer() {}
+ public BasContainer() {
+ }
public BasContainer(String barcode) {
this.barcode = barcode;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnError.java b/src/main/java/com/zy/asrs/entity/BasCrnError.java
index 5faa8c6..3dce706 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnError.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnError.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +22,7 @@
/**
* 寮傚父浠ｅ彿
*/
- @ApiModelProperty(value= "寮傚父浠ｅ彿")
+ @ApiModelProperty(value = "寮傚父浠ｅ彿")
@TableId(value = "error_code", type = IdType.INPUT)
@TableField("error_code")
private Long errorCode;
@@ -30,41 +30,42 @@
/**
* 寮傚父鎻忚堪
*/
- @ApiModelProperty(value= "寮傚父鎻忚堪")
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
@TableField("err_name")
private String errName;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasCrnError() {}
+ public BasCrnError() {
+ }
- public BasCrnError(String errName,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasCrnError(String errName, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.errName = errName;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -100,10 +101,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -117,8 +118,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -132,10 +133,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -149,8 +150,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
index ed98925..88268e4 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnOpt.java
@@ -22,116 +22,117 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
/**
* 涓嬪彂鏃堕棿
*/
- @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @ApiModelProperty(value = "涓嬪彂鏃堕棿")
@TableField("send_time")
private Date sendTime;
/**
* 妯″紡
*/
- @ApiModelProperty(value= "妯″紡")
+ @ApiModelProperty(value = "妯″紡")
private String mode;
/**
* 婧愭帓
*/
- @ApiModelProperty(value= "婧愭帓")
+ @ApiModelProperty(value = "婧愭帓")
@TableField("source_row")
private Integer sourceRow;
/**
* 婧愬垪
*/
- @ApiModelProperty(value= "婧愬垪")
+ @ApiModelProperty(value = "婧愬垪")
@TableField("source_bay")
private Integer sourceBay;
/**
* 婧愬眰
*/
- @ApiModelProperty(value= "婧愬眰")
+ @ApiModelProperty(value = "婧愬眰")
@TableField("source_lev")
private Integer sourceLev;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta")
private Integer sourceSta;
/**
* 鐩爣鎺�
*/
- @ApiModelProperty(value= "鐩爣鎺�")
+ @ApiModelProperty(value = "鐩爣鎺�")
@TableField("pos_row")
private Integer posRow;
/**
* 鐩爣鍒�
*/
- @ApiModelProperty(value= "鐩爣鍒�")
+ @ApiModelProperty(value = "鐩爣鍒�")
@TableField("pos_bay")
private Integer posBay;
/**
* 鐩爣灞�
*/
- @ApiModelProperty(value= "鐩爣灞�")
+ @ApiModelProperty(value = "鐩爣灞�")
@TableField("pos_lev")
private Integer posLev;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("pos_sta")
private Integer posSta;
/**
- * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
+ * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
*/
- @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
+ @ApiModelProperty(value = "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
private Integer response;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
- public BasCrnOpt() {}
+ public BasCrnOpt() {
+ }
- public BasCrnOpt(Integer wrkNo,Integer crnNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy) {
+ public BasCrnOpt(Integer wrkNo, Integer crnNo, Date sendTime, String mode, Integer sourceRow, Integer sourceBay, Integer sourceLev, Integer sourceSta, Integer posRow, Integer posBay, Integer posLev, Integer posSta, Integer response, Date updateTime, Long updateBy) {
this.wrkNo = wrkNo;
this.crnNo = crnNo;
this.sendTime = sendTime;
@@ -195,8 +196,8 @@
return sendTime;
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
@@ -282,9 +283,11 @@
return response;
}
- public String getResponse$(){
- if (null == this.response){ return null; }
- switch (this.response){
+ public String getResponse$() {
+ if (null == this.response) {
+ return null;
+ }
+ switch (this.response) {
case 1:
return "姝ｅ父";
case 0:
@@ -302,8 +305,8 @@
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -317,10 +320,10 @@
return updateBy;
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index fdc4a58..09044f9 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +22,7 @@
/**
* 宸ヤ綔浠ｅ彿
*/
- @ApiModelProperty(value= "鐘舵�佷唬鍙�")
+ @ApiModelProperty(value = "鐘舵�佷唬鍙�")
@TableId(value = "sts_no", type = IdType.INPUT)
@TableField("sts_no")
private String stsNo;
@@ -30,41 +30,42 @@
/**
* 鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
@TableField("sts_desc")
private String stsDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasCrnStatus() {}
+ public BasCrnStatus() {
+ }
- public BasCrnStatus(String stsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasCrnStatus(String stsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.stsDesc = stsDesc;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -100,10 +101,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -117,8 +118,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -132,10 +133,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -149,8 +150,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 73d632e..0fbfe51 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -4,14 +4,14 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnErrorService;
import com.zy.asrs.service.BasCrnStatusService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -26,7 +26,7 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "crn_no", type = IdType.INPUT)
@TableField("crn_no")
private Integer crnNo;
@@ -34,131 +34,132 @@
/**
* 鍙叆
*/
- @ApiModelProperty(value= "鍙叆")
+ @ApiModelProperty(value = "鍙叆")
@TableField("in_enable")
private String inEnable;
/**
* 鍙嚭
*/
- @ApiModelProperty(value= "鍙嚭")
+ @ApiModelProperty(value = "鍙嚭")
@TableField("out_enable")
private String outEnable;
/**
* 鐘舵��
*/
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
@TableField("crn_sts")
private Integer crnSts;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 鍥炲師鐐�
*/
- @ApiModelProperty(value= "鍥炲師鐐�")
+ @ApiModelProperty(value = "鍥炲師鐐�")
private Integer origin;
/**
* 寮傚父鐮�
*/
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("crn_err")
private Long crnErr;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("frm_locno")
private String frmLocno;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("frm_sta")
private Integer frmSta;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("to_sta")
private Integer toSta;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("to_locno")
private String toLocno;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("hp_mk")
private String hpMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("retrieve_mk")
private String retrieveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctl_hp")
private String ctlHp;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctl_rest")
private String ctlRest;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("emp_in")
private String empIn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("tank_qty")
private Integer tankQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("tank_qty1")
private Integer tankQty1;
- public BasCrnp() {}
+ public BasCrnp() {
+ }
- public BasCrnp(String inEnable,String outEnable,Integer crnSts,Integer wrkNo,Long crnErr,String frmLocno,Integer frmSta,Integer toSta,String toLocno,Long appeUser,Date appeTime,Long modiUser,Date modiTime,String hpMk,String retrieveMk,String ctlHp,String ctlRest,String empIn,Integer tankQty,Integer tankQty1) {
+ public BasCrnp(String inEnable, String outEnable, Integer crnSts, Integer wrkNo, Long crnErr, String frmLocno, Integer frmSta, Integer toSta, String toLocno, Long appeUser, Date appeTime, Long modiUser, Date modiTime, String hpMk, String retrieveMk, String ctlHp, String ctlRest, String empIn, Integer tankQty, Integer tankQty1) {
this.inEnable = inEnable;
this.outEnable = outEnable;
this.crnSts = crnSts;
@@ -232,10 +233,10 @@
return crnSts;
}
- public String getCrnSts$(){
+ public String getCrnSts$() {
BasCrnStatusService service = SpringUtils.getBean(BasCrnStatusService.class);
BasCrnStatus basCrnStatus = service.selectById(this.crnSts);
- if (!Cools.isEmpty(basCrnStatus)){
+ if (!Cools.isEmpty(basCrnStatus)) {
return String.valueOf(basCrnStatus.getStsDesc());
}
return null;
@@ -265,10 +266,10 @@
return crnErr;
}
- public String getCrnErr$(){
+ public String getCrnErr$() {
BasCrnErrorService service = SpringUtils.getBean(BasCrnErrorService.class);
BasCrnError basCrnError = service.selectById(this.crnErr);
- if (!Cools.isEmpty(basCrnError)){
+ if (!Cools.isEmpty(basCrnError)) {
return String.valueOf(basCrnError.getErrName());
}
return null;
@@ -282,10 +283,10 @@
return frmLocno;
}
- public String getFrmLocno$(){
+ public String getFrmLocno$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.frmLocno);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
@@ -299,10 +300,10 @@
return frmSta;
}
- public String getFrmSta$(){
+ public String getFrmSta$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.frmSta);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
@@ -316,10 +317,10 @@
return toSta;
}
- public String getToSta$(){
+ public String getToSta$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.toSta);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
@@ -333,10 +334,10 @@
return toLocno;
}
- public String getToLocno$(){
+ public String getToLocno$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.toLocno);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
@@ -350,10 +351,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -367,8 +368,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -382,10 +383,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -399,8 +400,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 78ca14c..67a6cdb 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +24,7 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "dev_no", type = IdType.INPUT)
@TableField("dev_no")
private Integer devNo;
@@ -32,199 +32,201 @@
/**
* 璁惧鎻忚堪
*/
- @ApiModelProperty(value= "璁惧鎻忚堪")
+ @ApiModelProperty(value = "璁惧鎻忚堪")
@TableField("dec_desc")
private String decDesc;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@TableField("dev_mk")
private String devMk;
/**
* 鍙叆
*/
- @ApiModelProperty(value= "鍙叆")
+ @ApiModelProperty(value = "鍙叆")
@TableField("in_enable")
private String inEnable;
/**
* 鍙嚭
*/
- @ApiModelProperty(value= "鍙嚭")
+ @ApiModelProperty(value = "鍙嚭")
@TableField("out_enable")
private String outEnable;
/**
* 鑷姩
*/
- @ApiModelProperty(value= "鑷姩")
+ @ApiModelProperty(value = "鑷姩")
private String autoing;
/**
* 鏈夌墿
*/
- @ApiModelProperty(value= "鏈夌墿")
+ @ApiModelProperty(value = "鏈夌墿")
private String loading;
/**
* 鑳藉叆
*/
- @ApiModelProperty(value= "鑳藉叆")
+ @ApiModelProperty(value = "鑳藉叆")
private String canining;
/**
* 鑳藉嚭
*/
- @ApiModelProperty(value= "鑳藉嚭")
+ @ApiModelProperty(value = "鑳藉嚭")
private String canouting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String fronting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String rearing;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String uping;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String downing;
/**
* 闇�姹�1
*/
- @ApiModelProperty(value= "闇�姹�1")
+ @ApiModelProperty(value = "闇�姹�1")
private String inreq1;
/**
* 闇�姹�2
*/
- @ApiModelProperty(value= "闇�姹�2")
+ @ApiModelProperty(value = "闇�姹�2")
private String inreq2;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_no1")
private Integer wrkNo1;
/**
* 瀹瑰櫒绫诲瀷
*/
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+ @ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
@TableField("ctn_type")
private Integer ctnType;
/**
* 鏉″舰鐮�
*/
- @ApiModelProperty(value= "鏉″舰鐮�")
+ @ApiModelProperty(value = "鏉″舰鐮�")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("in_qty")
private Integer inQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Integer row1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String area;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("in_ok")
private String inOk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_ok")
private String outOk;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
@TableField("loc_type3")
private Short locType3;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("std_qty")
private Double stdQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("min_wt")
private Double minWt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("max_wt")
private Double maxWt;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
@TableField("gross_wt")
private Double grossWt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("cart_pos")
private Integer cartPos;
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
@@ -237,8 +239,10 @@
}
public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -251,8 +255,10 @@
}
public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -264,33 +270,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java
index 85ff2b2..db362a4 100644
--- a/src/main/java/com/zy/asrs/entity/BasErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java
@@ -24,155 +24,156 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 鍙戠敓鏃堕棿
*/
- @ApiModelProperty(value= "鍙戠敓鏃堕棿")
+ @ApiModelProperty(value = "鍙戠敓鏃堕棿")
@TableField("start_time")
private Date startTime;
/**
* 缁撴潫鏃堕棿
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
@TableField("end_time")
private Date endTime;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
/**
* plc
*/
- @ApiModelProperty(value= "plc")
+ @ApiModelProperty(value = "plc")
@TableField("plc_no")
private Integer plcNo;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 寮傚父鐮�
*/
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("err_code")
private Integer errCode;
/**
* 寮傚父
*/
- @ApiModelProperty(value= "寮傚父")
+ @ApiModelProperty(value = "寮傚父")
private String error;
/**
* 寮傚父鎯呭喌 1: 寰呭鐞� 2: 宸蹭慨澶�
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 寰呭鐞� 2: 宸蹭慨澶� ")
+ @ApiModelProperty(value = "寮傚父鎯呭喌 1: 寰呭鐞� 2: 宸蹭慨澶� ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public BasErrLog() {}
+ public BasErrLog() {
+ }
- public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasErrLog(String uuid, Integer wrkNo, Date startTime, Date endTime, Long wrkSts, Integer ioType, Integer crnNo, Integer plcNo, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String barcode, Integer errCode, String error, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
@@ -248,8 +249,8 @@
return startTime;
}
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
+ public String getStartTime$() {
+ if (Cools.isEmpty(this.startTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
@@ -263,8 +264,8 @@
return endTime;
}
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
@@ -278,10 +279,10 @@
return wrkSts;
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
@@ -295,10 +296,10 @@
return ioType;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
@@ -384,9 +385,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "寰呭鐞�";
case 2:
@@ -404,8 +407,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -419,10 +422,10 @@
return createBy;
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -436,8 +439,8 @@
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -451,10 +454,10 @@
return updateBy;
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index f426cea..c59f6f8 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +22,7 @@
/**
* 搴撲綅鐘舵�佷唬鍙�
*/
- @ApiModelProperty(value= "搴撲綅鐘舵�佷唬鍙�")
+ @ApiModelProperty(value = "搴撲綅鐘舵�佷唬鍙�")
@TableId(value = "loc_sts", type = IdType.INPUT)
@TableField("loc_sts")
private String locSts;
@@ -30,41 +30,42 @@
/**
* 搴撲綅鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "搴撲綅鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "搴撲綅鐘舵�佹弿杩�")
@TableField("loc_desc")
private String locDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasLocSts() {}
+ public BasLocSts() {
+ }
- public BasLocSts(String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasLocSts(String locDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.locDesc = locDesc;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -100,10 +101,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -117,8 +118,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -132,10 +133,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -149,8 +150,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasPlcerror.java b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
index 4138cbc..a645978 100644
--- a/src/main/java/com/zy/asrs/entity/BasPlcerror.java
+++ b/src/main/java/com/zy/asrs/entity/BasPlcerror.java
@@ -22,7 +22,7 @@
/**
* 寮傚父缂栧彿
*/
- @ApiModelProperty(value= "寮傚父缂栧彿")
+ @ApiModelProperty(value = "寮傚父缂栧彿")
@TableId(value = "error_code", type = IdType.INPUT)
@TableField("error_code")
private Integer errorCode;
@@ -30,41 +30,42 @@
/**
* 寮傚父鎻忚堪
*/
- @ApiModelProperty(value= "寮傚父鎻忚堪")
+ @ApiModelProperty(value = "寮傚父鎻忚堪")
@TableField("error_desc")
private String errorDesc;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- public BasPlcerror() {}
+ public BasPlcerror() {
+ }
- public BasPlcerror(Integer errorCode,String errorDesc,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
+ public BasPlcerror(Integer errorCode, String errorDesc, Date modiTime, Long modiUser, Date appeTime, Long appeUser) {
this.errorDesc = errorDesc;
this.modiTime = modiTime;
this.modiUser = modiUser;
@@ -101,8 +102,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -116,10 +117,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -133,8 +134,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -148,10 +149,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/BasProcessProcedures.java b/src/main/java/com/zy/asrs/entity/BasProcessProcedures.java
index 841a599..b49ffad 100644
--- a/src/main/java/com/zy/asrs/entity/BasProcessProcedures.java
+++ b/src/main/java/com/zy/asrs/entity/BasProcessProcedures.java
@@ -1,12 +1,12 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -18,27 +18,28 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("box_specs")
private String boxSpecs;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("box_type")
private String boxType;
- public BasProcessProcedures() {}
+ public BasProcessProcedures() {
+ }
- public BasProcessProcedures(String boxSpecs,String boxType) {
+ public BasProcessProcedures(String boxSpecs, String boxType) {
this.boxSpecs = boxSpecs;
this.boxType = boxType;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasQualityTesting.java b/src/main/java/com/zy/asrs/entity/BasQualityTesting.java
index 708c647..c4d6f27 100644
--- a/src/main/java/com/zy/asrs/entity/BasQualityTesting.java
+++ b/src/main/java/com/zy/asrs/entity/BasQualityTesting.java
@@ -1,12 +1,12 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -18,27 +18,28 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("box_specs")
private String boxSpecs;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("box_type")
private String boxType;
- public BasQualityTesting() {}
+ public BasQualityTesting() {
+ }
- public BasQualityTesting(String boxSpecs,String boxType) {
+ public BasQualityTesting(String boxSpecs, String boxType) {
this.boxSpecs = boxSpecs;
this.boxType = boxType;
}
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index f2f4b9d..e021b8e 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -1,28 +1,21 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.enums.LocStsType;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("agv_bas_station")
@@ -33,201 +26,202 @@
/**
* 涓婚敭
*/
- @ApiModelProperty(value= "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableField("dev_no")
private String devNo;
/**
* 璁惧鎻忚堪
*/
- @ApiModelProperty(value= "璁惧鎻忚堪")
+ @ApiModelProperty(value = "璁惧鎻忚堪")
@TableField("dec_desc")
private String decDesc;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@TableField("dev_mk")
private String devMk;
/**
* 鍙叆(checkBox)
*/
- @ApiModelProperty(value= "鍙叆(checkBox)")
+ @ApiModelProperty(value = "鍙叆(checkBox)")
@TableField("in_enable")
private String inEnable;
/**
* 鍙嚭(checkBox)
*/
- @ApiModelProperty(value= "鍙嚭(checkBox)")
+ @ApiModelProperty(value = "鍙嚭(checkBox)")
@TableField("out_enable")
private String outEnable;
/**
* 鑷姩(checkBox)
*/
- @ApiModelProperty(value= "鑷姩(checkBox)")
+ @ApiModelProperty(value = "鑷姩(checkBox)")
private String autoing;
/**
* 鏈夌墿(checkBox)
*/
- @ApiModelProperty(value= "鏈夌墿(checkBox)")
+ @ApiModelProperty(value = "鏈夌墿(checkBox)")
private String loading;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鑳藉叆(checkBox)
*/
- @ApiModelProperty(value= "鑳藉叆(checkBox)")
+ @ApiModelProperty(value = "鑳藉叆(checkBox)")
private String canining;
/**
* 鑳藉嚭(checkBox)
*/
- @ApiModelProperty(value= "鑳藉嚭(checkBox)")
+ @ApiModelProperty(value = "鑳藉嚭(checkBox)")
private String canouting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String fronting;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String rearing;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String uping;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String downing;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 瀹瑰櫒绫诲瀷
*/
- @ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
+ @ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
@TableField("ctn_type")
private Integer ctnType;
/**
* 鏉″舰鐮�
*/
- @ApiModelProperty(value= "鏉″舰鐮�")
+ @ApiModelProperty(value = "鏉″舰鐮�")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("in_qty")
private Integer inQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Integer row1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String area;
@ApiModelProperty("搴撳尯ID")
@TableField("area_id")
private String areaId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("in_ok")
private String inOk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_ok")
private String outOk;
/**
- * 楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣�
+ * 楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣�
*/
- @ApiModelProperty(value= "楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣� ")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣� ")
@TableField("loc_type1")
private Short locType1;
/**
- * 瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣�
+ * 瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣�
*/
- @ApiModelProperty(value= "瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣� ")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣� ")
@TableField("loc_type2")
private Short locType2;
/**
- * 杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣�
+ * 杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣�
*/
- @ApiModelProperty(value= "杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣� ")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣� ")
@TableField("loc_type3")
private Short locType3;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("std_qty")
private Double stdQty;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("min_wt")
private Double minWt;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
@TableField("gross_wt")
private Double grossWt;
- public BasStation() {}
+ public BasStation() {
+ }
- public BasStation(String devNo,String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String locSts,String canining,String canouting,String fronting,String rearing,String uping,String downing,Integer wrkNo,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Short locType1,Short locType2,Short locType3,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double grossWt) {
+ public BasStation(String devNo, String decDesc, String devMk, String inEnable, String outEnable, String autoing, String loading, String locSts, String canining, String canouting, String fronting, String rearing, String uping, String downing, Integer wrkNo, Integer ctnType, String barcode, Integer inQty, Integer row1, Date ioTime, String area, String inOk, String outOk, Short locType1, Short locType2, Short locType3, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Double stdQty, Double minWt, Double grossWt) {
this.devNo = devNo;
this.decDesc = decDesc;
this.devMk = devMk;
@@ -299,36 +293,38 @@
// null // 閲嶉噺
// );
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
public String getLocSts$() {
- if (Cools.isEmpty(this.locSts)){
+ if (Cools.isEmpty(this.locSts)) {
return null;
}
if (this.locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) {
- return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc;
+ return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) {
- return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc;
+ return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) {
- return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc;
+ return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) {
- return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc;
+ return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) {
- return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc;
+ return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc;
} else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) {
- return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc;
+ return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc;
}
return null;
}
- public String getLocType1$(){
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ public String getLocType1$() {
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
@@ -340,9 +336,11 @@
}
}
- public String getLocType2$(){
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ public String getLocType2$() {
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -354,9 +352,11 @@
}
}
- public String getLocType3$(){
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ public String getLocType3$() {
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -368,33 +368,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasWhsType.java b/src/main/java/com/zy/asrs/entity/BasWhsType.java
index b2094ca..ca02a6b 100644
--- a/src/main/java/com/zy/asrs/entity/BasWhsType.java
+++ b/src/main/java/com/zy/asrs/entity/BasWhsType.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,52 +22,53 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 搴撲綅绫诲瀷
*/
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
+ @ApiModelProperty(value = "搴撲綅绫诲瀷")
@TableField("whs_desc")
private String whsDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 鏍囪瘑
*/
- @ApiModelProperty(value= "鏍囪瘑")
+ @ApiModelProperty(value = "鏍囪瘑")
private String identifying;
- public BasWhsType() {}
+ public BasWhsType() {
+ }
public BasWhsType(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.whsDesc = whsDesc;
@@ -105,10 +106,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -122,8 +123,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -137,10 +138,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -154,8 +155,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index b368ad1..9f04629 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +22,7 @@
/**
* 鍏ュ嚭绫诲瀷浠ｅ彿
*/
- @ApiModelProperty(value= "鍏ュ嚭绫诲瀷浠ｅ彿")
+ @ApiModelProperty(value = "鍏ュ嚭绫诲瀷浠ｅ彿")
@TableId(value = "io_type", type = IdType.INPUT)
@TableField("io_type")
private Integer ioType;
@@ -30,48 +30,49 @@
/**
* 涓昏
*/
- @ApiModelProperty(value= "涓昏")
+ @ApiModelProperty(value = "涓昏")
@TableField("io_pri")
private String ioPri;
/**
* 鍏ュ嚭绫诲瀷鎻忚堪
*/
- @ApiModelProperty(value= "鍏ュ嚭绫诲瀷鎻忚堪")
+ @ApiModelProperty(value = "鍏ュ嚭绫诲瀷鎻忚堪")
@TableField("io_desc")
private String ioDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasWrkIotype() {}
+ public BasWrkIotype() {
+ }
- public BasWrkIotype(String ioPri,String ioDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasWrkIotype(String ioPri, String ioDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.ioPri = ioPri;
this.ioDesc = ioDesc;
this.modiUser = modiUser;
@@ -117,10 +118,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -134,8 +135,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -149,10 +150,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -166,8 +167,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index 93992ed..4193138 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +22,7 @@
/**
* 浠ｅ彿
*/
- @ApiModelProperty(value= "浠ｅ彿")
+ @ApiModelProperty(value = "浠ｅ彿")
@TableId(value = "wrk_sts", type = IdType.INPUT)
@TableField("wrk_sts")
private Long wrkSts;
@@ -30,41 +30,42 @@
/**
* 鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
@TableField("wrk_desc")
private String wrkDesc;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public BasWrkStatus() {}
+ public BasWrkStatus() {
+ }
- public BasWrkStatus(String wrkDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasWrkStatus(String wrkDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.wrkDesc = wrkDesc;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -100,10 +101,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -117,8 +118,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -132,10 +133,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -149,8 +150,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/ChartBean.java b/src/main/java/com/zy/asrs/entity/ChartBean.java
index 5946916..7cbe9d4 100644
--- a/src/main/java/com/zy/asrs/entity/ChartBean.java
+++ b/src/main/java/com/zy/asrs/entity/ChartBean.java
@@ -1,19 +1,23 @@
package com.zy.asrs.entity;
public class ChartBean {
- private String name;
- private double y;
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public double getY() {
- return y;
- }
- public void setY(double y) {
- this.y = y;
- }
-
+ private String name;
+ private double y;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public double getY() {
+ return y;
+ }
+
+ public void setY(double y) {
+ this.y = y;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/DocLog.java b/src/main/java/com/zy/asrs/entity/DocLog.java
index 1f25e05..e950583 100644
--- a/src/main/java/com/zy/asrs/entity/DocLog.java
+++ b/src/main/java/com/zy/asrs/entity/DocLog.java
@@ -20,64 +20,65 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("doc_num")
private String docNum;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_id")
private Long docId;
/**
* 鍗曟嵁鍚嶇О
*/
- @ApiModelProperty(value= "鍗曟嵁鍚嶇О")
+ @ApiModelProperty(value = "鍗曟嵁鍚嶇О")
@TableField("doc_name")
private String docName;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 涓婃姤鏁伴噺
*/
- @ApiModelProperty(value= "涓婃姤鏁伴噺")
+ @ApiModelProperty(value = "涓婃姤鏁伴噺")
private Double qua;
/**
- * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
*/
- @ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
+ @ApiModelProperty(value = "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
private Integer success;
/**
* 涓婃姤鏃堕棿
*/
- @ApiModelProperty(value= "涓婃姤鏃堕棿")
+ @ApiModelProperty(value = "涓婃姤鏃堕棿")
@TableField("send_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public DocLog() {}
+ public DocLog() {
+ }
public DocLog(String docNum, Long docId, String docName, String matnr, Double qua, Integer success, Date sendTime, String memo) {
this.docNum = docNum;
@@ -153,9 +154,11 @@
return success;
}
- public String getSuccess$(){
- if (null == this.success){ return null; }
- switch (this.success){
+ public String getSuccess$() {
+ if (null == this.success) {
+ return null;
+ }
+ switch (this.success) {
case 1:
return "鎴愬姛";
case 0:
@@ -173,8 +176,8 @@
return sendTime;
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
diff --git a/src/main/java/com/zy/asrs/entity/DocType.java b/src/main/java/com/zy/asrs/entity/DocType.java
index 3cd4c70..05032f1 100644
--- a/src/main/java/com/zy/asrs/entity/DocType.java
+++ b/src/main/java/com/zy/asrs/entity/DocType.java
@@ -25,7 +25,7 @@
/**
* 绫诲瀷缂栧彿
*/
- @ApiModelProperty(value= "绫诲瀷缂栧彿")
+ @ApiModelProperty(value = "绫诲瀷缂栧彿")
@TableId(value = "doc_id", type = IdType.INPUT)
@TableField("doc_id")
private Long docId;
@@ -33,67 +33,69 @@
/**
* 绫诲瀷鍚嶇О
*/
- @ApiModelProperty(value= "绫诲瀷鍚嶇О")
+ @ApiModelProperty(value = "绫诲瀷鍚嶇О")
@TableField("doc_name")
private String docName;
/**
* 鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴�
*/
- @ApiModelProperty(value= "鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴� ")
+ @ApiModelProperty(value = "鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴� ")
private Integer pakin;
/**
* 鍑哄簱 1: 鍑哄簱 0: 闈炲嚭搴�
*/
- @ApiModelProperty(value= "鍑哄簱 1: 鍑哄簱 0: 闈炲嚭搴� ")
+ @ApiModelProperty(value = "鍑哄簱 1: 鍑哄簱 0: 闈炲嚭搴� ")
private Integer pakout;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
public String getPakin$() {
- if (null == this.pakin){ return null; }
- switch (this.pakin){
+ if (null == this.pakin) {
+ return null;
+ }
+ switch (this.pakin) {
case 1:
return "鍏ュ簱";
case 0:
@@ -104,8 +106,10 @@
}
public String getPakout$() {
- if (null == this.pakout){ return null; }
- switch (this.pakout){
+ if (null == this.pakout) {
+ return null;
+ }
+ switch (this.pakout) {
case 1:
return "鍑哄簱";
case 0:
@@ -115,9 +119,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -127,43 +133,43 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getDocName$(){
- if (Cools.isEmpty(this.docName)){
+ public String getDocName$() {
+ if (Cools.isEmpty(this.docName)) {
return "";
- }else {
- switch (this.docName){
+ } else {
+ switch (this.docName) {
case "閲囪喘閿�鍞紙鍑哄簱锛�":
case "閲囪喘閿�鍞紙鍏ュ簱锛�":
return "TF_PSS";
diff --git a/src/main/java/com/zy/asrs/entity/LocCache.java b/src/main/java/com/zy/asrs/entity/LocCache.java
index 8fad291..6d944f5 100644
--- a/src/main/java/com/zy/asrs/entity/LocCache.java
+++ b/src/main/java/com/zy/asrs/entity/LocCache.java
@@ -1,23 +1,21 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.BasWhsTypeService;
-import com.zy.asrs.service.BasCrnpService;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_loc_cache")
@@ -33,119 +31,119 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
/**
* 搴撲綅绫诲瀷
*/
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
+ @ApiModelProperty(value = "搴撲綅绫诲瀷")
@TableField("whs_type")
private Long whsType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎺�
*/
- @ApiModelProperty(value= "鎺�")
+ @ApiModelProperty(value = "鎺�")
private Integer row1;
/**
* 鍒�
*/
- @ApiModelProperty(value= "鍒�")
+ @ApiModelProperty(value = "鍒�")
private Integer bay1;
/**
* 灞�
*/
- @ApiModelProperty(value= "灞�")
+ @ApiModelProperty(value = "灞�")
private Integer lev1;
/**
* 婊℃澘(checkBox)
*/
- @ApiModelProperty(value= "婊℃澘(checkBox)")
+ @ApiModelProperty(value = "婊℃澘(checkBox)")
@TableField("full_plt")
private String fullPlt;
/**
* 搴撲綅鐘舵��
*/
- @ApiModelProperty(value= "搴撲綅鐘舵��")
+ @ApiModelProperty(value = "搴撲綅鐘舵��")
@TableField("loc_type")
private String locType;
/**
- * 楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣�
+ * 楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣�
*/
- @ApiModelProperty(value= "楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣� ")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷 0: 鏈煡 1: 浣庡簱浣� 2: 楂樺簱浣� ")
@TableField("loc_type1")
private Short locType1;
/**
- * 瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣�
+ * 瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣�
*/
- @ApiModelProperty(value= "瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣� ")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷 0: 鏈煡 1: 绐勫簱浣� 2: 瀹藉簱浣� ")
@TableField("loc_type2")
private Short locType2;
/**
- * 杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣�
+ * 杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣�
*/
- @ApiModelProperty(value= "杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣� ")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷 0: 鏈煡 1: 杞诲簱浣� 2: 閲嶅簱浣� ")
@TableField("loc_type3")
private Short locType3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("first_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date firstTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String barcode;
@ApiModelProperty("搴撳尯ID")
@@ -162,19 +160,20 @@
/**
* 鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�
*/
- @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ @ApiModelProperty(value = "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
private Integer frozen;
/**
* 鍐荤粨澶囨敞
*/
- @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @ApiModelProperty(value = "鍐荤粨澶囨敞")
@TableField("frozen_memo")
private String frozenMemo;
- public LocCache() {}
+ public LocCache() {
+ }
- public LocCache(String locNo,Long whsType,Integer pltType,Integer ctnType,String locSts,String sheetNo,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,String locType,Short locType1,Short locType2,Short locType3,String outEnable,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,Integer ctnKind,Double scWeight,String invWh,String mk,String barcode,String PdcType,String ctnNo,Integer libraryType,Integer gro1,Integer frozen,String frozenMemo) {
+ public LocCache(String locNo, Long whsType, Integer pltType, Integer ctnType, String locSts, String sheetNo, Integer crnNo, Integer row1, Integer bay1, Integer lev1, String fullPlt, String locType, Short locType1, Short locType2, Short locType3, String outEnable, Date ioTime, Date firstTime, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Date errorTime, String errorMemo, Integer ctnKind, Double scWeight, String invWh, String mk, String barcode, String PdcType, String ctnNo, Integer libraryType, Integer gro1, Integer frozen, String frozenMemo) {
this.locNo = locNo;
this.whsType = whsType;
this.locSts = locSts;
@@ -199,10 +198,10 @@
}
- public String getWhsType$(){
+ public String getWhsType$() {
BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
BasWhsType basWhsType = service.selectById(this.whsType);
- if (!Cools.isEmpty(basWhsType)){
+ if (!Cools.isEmpty(basWhsType)) {
return String.valueOf(basWhsType.getWhsDesc());
}
return null;
@@ -235,9 +234,11 @@
// return null;
// }
- public String getLocType1$(){
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ public String getLocType1$() {
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
@@ -249,9 +250,11 @@
}
}
- public String getLocType2$(){
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ public String getLocType2$() {
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -263,9 +266,11 @@
}
}
- public String getLocType3$(){
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ public String getLocType3$() {
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -277,47 +282,47 @@
}
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getFirstTime$(){
- if (Cools.isEmpty(this.firstTime)){
+ public String getFirstTime$() {
+ if (Cools.isEmpty(this.firstTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/LocChartPie.java b/src/main/java/com/zy/asrs/entity/LocChartPie.java
index 55b7109..2f87450 100644
--- a/src/main/java/com/zy/asrs/entity/LocChartPie.java
+++ b/src/main/java/com/zy/asrs/entity/LocChartPie.java
@@ -2,6 +2,7 @@
/**
* 搴撲綅鍗犵敤鐧惧垎姣�
+ *
* @author admin
* @date 2018骞�12鏈�12鏃�
*/
@@ -10,28 +11,36 @@
private int oqty;
private int uqty;
private int xqty;
- public int getFqty() {
- return fqty;
- }
- public void setFqty(int fqty) {
- this.fqty = fqty;
- }
- public int getOqty() {
- return oqty;
- }
- public void setOqty(int oqty) {
- this.oqty = oqty;
- }
- public int getUqty() {
- return uqty;
- }
- public void setUqty(int uqty) {
- this.uqty = uqty;
- }
- public int getXqty() {
- return xqty;
- }
- public void setXqty(int xqty) {
- this.xqty = xqty;
- }
+
+ public int getFqty() {
+ return fqty;
+ }
+
+ public void setFqty(int fqty) {
+ this.fqty = fqty;
+ }
+
+ public int getOqty() {
+ return oqty;
+ }
+
+ public void setOqty(int oqty) {
+ this.oqty = oqty;
+ }
+
+ public int getUqty() {
+ return uqty;
+ }
+
+ public void setUqty(int uqty) {
+ this.uqty = uqty;
+ }
+
+ public int getXqty() {
+ return xqty;
+ }
+
+ public void setXqty(int xqty) {
+ this.xqty = xqty;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/LocCheck.java b/src/main/java/com/zy/asrs/entity/LocCheck.java
index aa7ba3e..739622d 100644
--- a/src/main/java/com/zy/asrs/entity/LocCheck.java
+++ b/src/main/java/com/zy/asrs/entity/LocCheck.java
@@ -1,18 +1,17 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("man_loc_check")
@@ -23,82 +22,83 @@
/**
* 鍞竴ID
*/
- @ApiModelProperty(value= "鍞竴ID")
+ @ApiModelProperty(value = "鍞竴ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫
+ * 鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫
*/
- @ApiModelProperty(value= "鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫 ")
private Integer type;
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
/**
* 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ApiModelProperty(value = "鐗╂枡鍙�")
private String matnr;
/**
* 鐩樼偣鍓嶆暟閲�
*/
- @ApiModelProperty(value= "鐩樼偣鍓嶆暟閲�")
+ @ApiModelProperty(value = "鐩樼偣鍓嶆暟閲�")
@TableField("origin_anfme")
private Double originAnfme;
/**
* 鐪熷疄鏁伴噺
*/
- @ApiModelProperty(value= "鐪熷疄鏁伴噺")
+ @ApiModelProperty(value = "鐪熷疄鏁伴噺")
@TableField("real_anfme")
private Double realAnfme;
/**
* 鍒涘缓浜�
*/
- @ApiModelProperty(value= "鍒涘缓浜�")
+ @ApiModelProperty(value = "鍒涘缓浜�")
@TableField("create_by")
private Long createBy;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜�
*/
- @ApiModelProperty(value= "淇敼浜�")
+ @ApiModelProperty(value = "淇敼浜�")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public LocCheck() {}
+ public LocCheck() {
+ }
- public LocCheck(Integer type,String locNo,String matnr,Double originAnfme,Double realAnfme,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public LocCheck(Integer type, String locNo, String matnr, Double originAnfme, Double realAnfme, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.type = type;
this.locNo = locNo;
this.matnr = matnr;
@@ -124,9 +124,11 @@
// null // 澶囨敞
// );
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 1:
return "鐩樼偣涓�";
case 2:
@@ -136,15 +138,15 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index c95626c..a0a5065 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -37,7 +37,7 @@
@TableField("loc_id")
private Long locId;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
@@ -47,206 +47,210 @@
@ApiModelProperty("area_name")
private String areaName;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
@ExcelProperty("鍟嗗搧缂栧彿")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@ExcelProperty("鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
@ExcelProperty("瑙勬牸")
private String specs;
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
@ExcelProperty("璐у搧鐗瑰緛")
private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@ExcelProperty("鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double man_length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鎷ユ湁鑰�
*/
- @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ @ApiModelProperty(value = "鎷ユ湁鑰� 1: 鏉板厠 ")
private Integer owner;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
/**
* 鏄惁鍐荤粨
*/
- @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ @ApiModelProperty(value = "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
private Integer frozen;
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getOwner$(){
+
+ public String getOwner$() {
LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
LocOwner locOwner = service.selectById(this.owner);
- if (!Cools.isEmpty(locOwner)){
+ if (!Cools.isEmpty(locOwner)) {
return String.valueOf(locOwner.getOwner());
}
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -256,9 +260,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -270,9 +276,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -282,9 +290,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -294,46 +304,46 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public long getStoreDate(){
+ public long getStoreDate() {
long timeNow = new Date().getTime();
- if (this.appeTime == null){
+ if (this.appeTime == null) {
return 0;
}
long timeCreate = this.appeTime.getTime();
- return (timeNow - timeCreate) /24/60/60/1000;
+ return (timeNow - timeCreate) / 24 / 60 / 60 / 1000;
}
public void sync(Object source) {
@@ -341,8 +351,10 @@
}
public String getFrozen$() {
- if (null == this.frozen){ return "鏈喕缁�"; }
- switch (this.frozen){
+ if (null == this.frozen) {
+ return "鏈喕缁�";
+ }
+ switch (this.frozen) {
case 0:
return "鏈喕缁�";
case 1:
@@ -352,19 +364,19 @@
}
}
- public String getBoxType1$(){
+ public String getBoxType1$() {
BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(processProcedures)){
+ if (!Cools.isEmpty(processProcedures)) {
return String.valueOf(processProcedures.getBoxSpecs());
}
return this.boxType1;
}
- public String getBoxType2$(){
+ public String getBoxType2$() {
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(basQualityTesting)){
+ if (!Cools.isEmpty(basQualityTesting)) {
return String.valueOf(basQualityTesting.getBoxSpecs());
}
return this.boxType1;
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 7eaa33e..3e31e36 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,7 +26,7 @@
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
@@ -34,203 +34,205 @@
/**
* 搴撲綅绫诲瀷
*/
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
+ @ApiModelProperty(value = "搴撲綅绫诲瀷")
@TableField("whs_type")
private Long whsType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "搴撲綅鐘舵��")
+ @ApiModelProperty(value = "搴撲綅鐘舵��")
@TableField("loc_sts")
private String locSts;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 鍫嗗灈鏈哄彿(asr_bas_crnp)
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
/**
* 鎺�
*/
- @ApiModelProperty(value= "鎺�")
+ @ApiModelProperty(value = "鎺�")
private Integer row1;
/**
* 鍒�
*/
- @ApiModelProperty(value= "鍒�")
+ @ApiModelProperty(value = "鍒�")
private Integer bay1;
/**
* 灞�
*/
- @ApiModelProperty(value= "灞�")
+ @ApiModelProperty(value = "灞�")
private Integer lev1;
/**
* 缁�
*/
- @ApiModelProperty(value= "缁�")
+ @ApiModelProperty(value = "缁�")
private Integer gro1;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_type")
private String locType;
- @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @ApiModelProperty(value = "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
@TableField("loc_type1")
private Short locType1;
- @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @ApiModelProperty(value = "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
@TableField("loc_type2")
private Short locType2;
- @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @ApiModelProperty(value = "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
@TableField("loc_type3")
private Short locType3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("first_time")
private Date firstTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 鏄惁鍐荤粨
*/
- @ApiModelProperty(value= "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
+ @ApiModelProperty(value = "鏄惁鍐荤粨,0.鏈喕缁擄紝1.宸插喕缁�")
private Integer frozen;
/**
* 鍐荤粨澶囨敞
*/
- @ApiModelProperty(value= "鍐荤粨澶囨敞")
+ @ApiModelProperty(value = "鍐荤粨澶囨敞")
@TableField("frozen_memo")
private String frozenMemo;
- public String getWhsType$(){
+ public String getWhsType$() {
BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class);
BasWhsType basWhsType = service.selectById(this.whsType);
- if (!Cools.isEmpty(basWhsType)){
+ if (!Cools.isEmpty(basWhsType)) {
return String.valueOf(basWhsType.getWhsDesc());
}
return null;
}
- public String getLocSts$(){
+ public String getLocSts$() {
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
BasLocSts basLocSts = service.selectById(this.locSts);
- if (!Cools.isEmpty(basLocSts)){
+ if (!Cools.isEmpty(basLocSts)) {
return String.valueOf(basLocSts.getLocDesc());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getFirstTime$(){
- if (Cools.isEmpty(this.firstTime)){
+ public String getFirstTime$() {
+ if (Cools.isEmpty(this.firstTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime);
}
public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
+ if (null == this.locType1) {
+ return null;
+ }
+ switch (this.locType1) {
case 0:
return "鏈煡";
case 1:
@@ -243,8 +245,10 @@
}
public String getLocType2$() {
- if (null == this.locType2){ return null; }
- switch (this.locType2){
+ if (null == this.locType2) {
+ return null;
+ }
+ switch (this.locType2) {
case 0:
return "鏈煡";
case 1:
@@ -257,8 +261,10 @@
}
public String getLocType3$() {
- if (null == this.locType3){ return null; }
- switch (this.locType3){
+ if (null == this.locType3) {
+ return null;
+ }
+ switch (this.locType3) {
case 0:
return "鏈煡";
case 1:
@@ -270,48 +276,50 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
public String getFrozen$() {
- if (null == this.frozen){ return "鏈喕缁�"; }
- switch (this.frozen){
+ if (null == this.frozen) {
+ return "鏈喕缁�";
+ }
+ switch (this.frozen) {
case 0:
return "鏈喕缁�";
case 1:
diff --git a/src/main/java/com/zy/asrs/entity/LocOwner.java b/src/main/java/com/zy/asrs/entity/LocOwner.java
index fe7ec79..af636bd 100644
--- a/src/main/java/com/zy/asrs/entity/LocOwner.java
+++ b/src/main/java/com/zy/asrs/entity/LocOwner.java
@@ -14,14 +14,15 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String owner;
- public LocOwner() {}
+ public LocOwner() {
+ }
public LocOwner(String owner) {
this.owner = owner;
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index 0237818..45fea75 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -29,14 +29,14 @@
/**
* 鎵�灞為」鐩�
*/
- @ApiModelProperty(value= "鎵�灞為」鐩�")
+ @ApiModelProperty(value = "鎵�灞為」鐩�")
@TableField("host_id")
private Long hostId;
/**
* 璐т綅缂栧彿
*/
- @ApiModelProperty(value= "璐т綅缂栧彿")
+ @ApiModelProperty(value = "璐т綅缂栧彿")
@TableId(value = "loc_no", type = IdType.INPUT)
@TableField("loc_no")
private String locNo;
@@ -44,27 +44,27 @@
/**
* 鎵�灞炶揣浣�
*/
- @ApiModelProperty(value= "鎵�灞炶揣浣�")
+ @ApiModelProperty(value = "鎵�灞炶揣浣�")
@TableField("node_id")
private Long nodeId;
/**
* 鎵樼洏鐮�
*/
- @ApiModelProperty(value= "鎵樼洏鐮�")
+ @ApiModelProperty(value = "鎵樼洏鐮�")
private String zpallet;
/**
* 搴撳瓨浣欓噺
*/
- @ApiModelProperty(value= "搴撳瓨浣欓噺")
+ @ApiModelProperty(value = "搴撳瓨浣欓噺")
@ExcelProperty(value = "搴撳瓨鎬婚噺")
private Double anfme;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
@TableId(value = "matnr", type = IdType.INPUT)
@ExcelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
@@ -72,146 +72,147 @@
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@ExcelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
@ExcelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
@TableId(value = "batch", type = IdType.INPUT)
private String batch;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
@ExcelProperty(value = "鍗曚綅")
private String unit;
/**
* SKC
*/
- @ApiModelProperty(value= "SKC")
+ @ApiModelProperty(value = "SKC")
@ExcelProperty(value = "SKC")
private String barcode;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_id")
private Long docId;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("doc_num")
private String docNum;
/**
* 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@TableField("cust_name")
private String custName;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private Integer itemNum;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Integer count;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鎷ユ湁鑰�
*/
- @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ @ApiModelProperty(value = "鎷ユ湁鑰� 1: 鏉板厠 ")
private Integer owner;
- public ManLocDetl() {}
+ public ManLocDetl() {
+ }
- public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date modiTime,String memo) {
+ public ManLocDetl(Long hostId, String locNo, Long nodeId, String zpallet, Double anfme, String matnr, String maktx, String name, String specs, String model, String batch, String unit, String barcode, Long docId, String docNum, String custName, Integer itemNum, Integer count, Double weight, Integer status, Long createBy, Date createTime, Long updateBy, Date modiTime, String memo) {
this.hostId = hostId;
this.nodeId = nodeId;
this.zpallet = zpallet;
@@ -264,19 +265,19 @@
// null // 澶囨敞
// );
- public String getHostId$(){
+ public String getHostId$() {
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
+ if (!Cools.isEmpty(host)) {
return String.valueOf(host.getName());
}
return null;
}
- public String getOwner$(){
+ public String getOwner$() {
LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
LocOwner locOwner = service.selectById(this.owner);
- if (!Cools.isEmpty(locOwner)){
+ if (!Cools.isEmpty(locOwner)) {
return String.valueOf(locOwner.getOwner());
}
return null;
@@ -286,18 +287,20 @@
return nodeId;
}
- public String getNodeId$(){
+ public String getNodeId$() {
NodeService service = SpringUtils.getBean(NodeService.class);
Node node = service.selectById(this.nodeId);
- if (!Cools.isEmpty(node)){
+ if (!Cools.isEmpty(node)) {
return String.valueOf(node.getName());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -307,33 +310,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 1ccd199..43cc500 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -8,7 +8,6 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.enums.ContainerType;
-import com.zy.asrs.service.BasContainerService;
import com.zy.asrs.service.TagService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -41,27 +40,27 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 鎵�灞炲綊绫�
*/
- @ApiModelProperty(value= "鎵�灞炲綊绫�")
+ @ApiModelProperty(value = "鎵�灞炲綊绫�")
@TableField("tag_id")
private Long tagId;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
@ExcelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
@@ -69,98 +68,98 @@
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@ExcelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鍒悕
*/
- @ApiModelProperty(value= "鍒悕")
+ @ApiModelProperty(value = "鍒悕")
@ExcelProperty(value = "鍒悕")
private String name;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
@ExcelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
@ExcelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
@ExcelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
@ExcelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
@ExcelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
@ExcelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
@ExcelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
@ExcelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
@ExcelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
@ExcelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
@ExcelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@ExcelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
@@ -168,7 +167,7 @@
/**
* 鍝侀」鏁�/鏈�澶х粍鎵樻暟閲�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
@@ -176,7 +175,7 @@
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
@@ -184,11 +183,11 @@
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
@ExcelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "鏈�澶х粍鎵樹笂闄�")
+ @ApiModelProperty(value = "鏈�澶х粍鎵樹笂闄�")
@ExcelProperty(value = "鏈�澶х粍鎵樹笂闄�")
@TableField("up_qty")
private Double upQty;
@@ -196,21 +195,21 @@
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
@ExcelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@ExcelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
@@ -218,14 +217,14 @@
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
@ExcelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
@@ -233,14 +232,14 @@
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
@ExcelProperty(value = "淇濊川鏈�")
private String deadTime;
@@ -248,7 +247,7 @@
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
@ExcelProperty(value = "棰勮澶╂暟")
private Integer deadWarn;
@@ -256,55 +255,55 @@
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@ApiModelProperty("搴撲綅绫诲瀷")
@@ -315,7 +314,7 @@
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@ExcelProperty(value = "澶囨敞")
private String memo;
@@ -337,9 +336,10 @@
@TableField("store_max_date")
private Integer storeMaxDate;
- public Mat() {}
+ public Mat() {
+ }
- public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.tagId = tagId;
this.matnr = matnr;
@@ -419,16 +419,16 @@
// null // 澶囨敞
// );
- public String getTagId$(){
+ public String getTagId$() {
TagService service = SpringUtils.getBean(TagService.class);
Tag tag = service.selectById(this.tagId);
- if (!Cools.isEmpty(tag)){
+ if (!Cools.isEmpty(tag)) {
return String.valueOf(tag.getName());
}
return null;
}
- public String getLocType$(){
+ public String getLocType$() {
if (Cools.isEmpty(locType)) {
return "鏂欑";
}
@@ -442,9 +442,11 @@
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -454,9 +456,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -468,9 +472,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -480,9 +486,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -492,9 +500,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -504,33 +514,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/Node.java b/src/main/java/com/zy/asrs/entity/Node.java
index db7fe9d..dc4d4b0 100644
--- a/src/main/java/com/zy/asrs/entity/Node.java
+++ b/src/main/java/com/zy/asrs/entity/Node.java
@@ -23,135 +23,136 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鎵�灞為」鐩�
*/
- @ApiModelProperty(value= "鎵�灞為」鐩�")
+ @ApiModelProperty(value = "鎵�灞為」鐩�")
@TableField("host_id")
private Long hostId;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 鐖剁骇
*/
- @ApiModelProperty(value= "鐖剁骇")
+ @ApiModelProperty(value = "鐖剁骇")
@TableField("parent_id")
private Long parentId;
/**
* 鐖剁骇鍚嶇О
*/
- @ApiModelProperty(value= "鐖剁骇鍚嶇О")
+ @ApiModelProperty(value = "鐖剁骇鍚嶇О")
@TableField("parent_name")
private String parentName;
/**
* 绫诲瀷 1: 浠撳簱 2: 搴撳尯 3: 璐т綅
*/
- @ApiModelProperty(value= "绫诲瀷 1: 浠撳簱 2: 搴撳尯 3: 璐т綅 ")
+ @ApiModelProperty(value = "绫诲瀷 1: 浠撳簱 2: 搴撳尯 3: 璐т綅 ")
private Integer type;
/**
* 鍏宠仈璺緞
*/
- @ApiModelProperty(value= "鍏宠仈璺緞")
+ @ApiModelProperty(value = "鍏宠仈璺緞")
private String path;
/**
* 鍏宠仈璺緞鍚�
*/
- @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
+ @ApiModelProperty(value = "鍏宠仈璺緞鍚�")
@TableField("name_path")
private String namePath;
/**
* 绛夌骇
*/
- @ApiModelProperty(value= "绛夌骇")
+ @ApiModelProperty(value = "绛夌骇")
private Integer level;
/**
* 璐熻矗浜�
*/
- @ApiModelProperty(value= "璐熻矗浜�")
+ @ApiModelProperty(value = "璐熻矗浜�")
private String leading;
/**
* 鎺掑簭
*/
- @ApiModelProperty(value= "鎺掑簭")
+ @ApiModelProperty(value = "鎺掑簭")
private Integer sort;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 鎺ㄨ崘浣�
*/
- @ApiModelProperty(value= "鎺ㄨ崘浣�")
+ @ApiModelProperty(value = "鎺ㄨ崘浣�")
private Integer major;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public Node() {}
+ public Node() {
+ }
- public Node(Long hostId, String uuid,String name,Long parentId,String parentName,Integer type,String path,String namePath,Integer level,String leading,Integer sort,String barcode,Integer major,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public Node(Long hostId, String uuid, String name, Long parentId, String parentName, Integer type, String path, String namePath, Integer level, String leading, Integer sort, String barcode, Integer major, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.hostId = hostId;
this.uuid = uuid;
this.name = name;
@@ -210,10 +211,10 @@
this.hostId = hostId;
}
- public String getHostId$(){
+ public String getHostId$() {
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
+ if (!Cools.isEmpty(host)) {
return String.valueOf(host.getName());
}
return null;
@@ -255,9 +256,11 @@
return type;
}
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 1:
return "浠撳簱";
case 2:
@@ -333,9 +336,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -353,8 +358,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -368,10 +373,10 @@
return createBy;
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -385,8 +390,8 @@
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -400,10 +405,10 @@
return updateBy;
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 90aac1d..3979879 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -28,257 +28,258 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 璁㈠崟缂栧彿
*/
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 鍗曟嵁鏃ユ湡
*/
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
@TableField("order_time")
private String orderTime;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_type")
private Long docType;
/**
* 椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "椤圭洰缂栧彿")
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("item_name")
private String itemName;
/**
* 璋冩嫧椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
private Long allotItemId;
/**
* 鍒濆绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
@TableField("def_number")
private String defNumber;
/**
* 绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
private String number;
/**
* 瀹㈡埛缂栧彿
*/
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
private Long cstmr;
/**
* 瀹㈡埛
*/
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value = "瀹㈡埛")
@TableField("cstmr_name")
private String cstmrName;
/**
* 鑱旂郴鏂瑰紡
*/
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String tel;
/**
* 鎿嶄綔浜哄憳
*/
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
@TableField("oper_memb")
private String operMemb;
/**
* 鍚堣閲戦
*/
- @ApiModelProperty(value= "鍚堣閲戦")
+ @ApiModelProperty(value = "鍚堣閲戦")
@TableField("total_fee")
private Double totalFee;
/**
* 浼樻儬鐜�
*/
- @ApiModelProperty(value= "浼樻儬鐜�")
+ @ApiModelProperty(value = "浼樻儬鐜�")
private Double discount;
/**
* 浼樻儬閲戦
*/
- @ApiModelProperty(value= "浼樻儬閲戦")
+ @ApiModelProperty(value = "浼樻儬閲戦")
@TableField("discount_fee")
private Double discountFee;
/**
* 閿�鍞垨閲囪喘璐圭敤鍚堣
*/
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
@TableField("other_fee")
private Double otherFee;
/**
* 瀹炰粯閲戦
*/
- @ApiModelProperty(value= "瀹炰粯閲戦")
+ @ApiModelProperty(value = "瀹炰粯閲戦")
@TableField("act_fee")
private Double actFee;
/**
* 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
*/
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
@TableField("pay_type")
private Integer payType;
/**
* 涓氬姟鍛�
*/
- @ApiModelProperty(value= "涓氬姟鍛�")
+ @ApiModelProperty(value = "涓氬姟鍛�")
private String salesman;
/**
* 缁撶畻澶╂暟
*/
- @ApiModelProperty(value= "缁撶畻澶╂暟")
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
@TableField("account_day")
private Integer accountDay;
/**
* 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
*/
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
@TableField("post_fee_type")
private Integer postFeeType;
/**
* 閭垂
*/
- @ApiModelProperty(value= "閭垂")
+ @ApiModelProperty(value = "閭垂")
@TableField("post_fee")
private Double postFee;
/**
* 浠樻鏃堕棿
*/
- @ApiModelProperty(value= "浠樻鏃堕棿")
+ @ApiModelProperty(value = "浠樻鏃堕棿")
@TableField("pay_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
/**
* 鍙戣揣鏃堕棿
*/
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
@TableField("send_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
* 鐗╂祦鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
@TableField("ship_code")
private String shipCode;
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
private Long settle;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
@TableField("move_status")
private Integer moveStatus;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
- public Order() {}
+ public Order() {
+ }
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Order(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
@@ -315,43 +316,6 @@
this.memo = memo;
}
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer pakinPakoutStatus) {
- this.uuid = uuid;
- this.orderNo = orderNo;
- this.orderTime = orderTime;
- this.docType = docType;
- this.itemId = itemId;
- this.itemName = itemName;
- this.allotItemId = allotItemId;
- this.defNumber = defNumber;
- this.number = number;
- this.cstmr = cstmr;
- this.cstmrName = cstmrName;
- this.tel = tel;
- this.operMemb = operMemb;
- this.totalFee = totalFee;
- this.discount = discount;
- this.discountFee = discountFee;
- this.otherFee = otherFee;
- this.actFee = actFee;
- this.payType = payType;
- this.salesman = salesman;
- this.accountDay = accountDay;
- this.postFeeType = postFeeType;
- this.postFee = postFee;
- this.payTime = payTime;
- this.sendTime = sendTime;
- this.shipName = shipName;
- this.shipCode = shipCode;
- this.settle = settle;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.pakinPakoutStatus = pakinPakoutStatus;
- }
public Order(Order order) {
this.uuid = order.getUuid();
@@ -429,18 +393,20 @@
// null // 澶囨敞
// );
- public String getDocType$(){
+ public String getDocType$() {
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
- if (!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
return String.valueOf(docType.getDocName());
}
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
case 1:
return "鐜伴噾";
case 2:
@@ -450,8 +416,8 @@
}
}
- public String getPakinPakoutStatus$(){
- switch (this.pakinPakoutStatus){
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
@@ -461,9 +427,11 @@
}
}
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
case 1:
return "鍦ㄧ嚎鏀粯";
case 2:
@@ -473,32 +441,34 @@
}
}
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
}
- public String getSettle$(){
+ public String getSettle$() {
OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
OrderSettle orderSettle = service.selectById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
+ if (!Cools.isEmpty(orderSettle)) {
return String.valueOf(orderSettle.getSettleName());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -508,9 +478,11 @@
}
}
- public String getMoveStatus$(){
- if (null == this.moveStatus){ return null; }
- switch (this.moveStatus){
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
case 2:
return "宸插璐�";
case 1:
@@ -522,33 +494,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 006c610..849f14d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -10,7 +10,6 @@
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -33,21 +32,21 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁㈠崟鍐呯爜
*/
- @ApiModelProperty(value= "璁㈠崟鍐呯爜")
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@@ -55,307 +54,308 @@
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 浣滀笟鏁伴噺
- *
- * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
- * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
- @ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
@TableField("work_qty")
private Double workQty;
/**
* 瀹屾垚鏁伴噺
- *
- * 鍏ュ簱 : qty 馃憜
- * 鍑哄簱 : qty 馃憜
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
*/
- @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
/**
* 琛屽彿
*/
- @ApiModelProperty(value= "琛屽彿")
+ @ApiModelProperty(value = "琛屽彿")
@TableField("line_number")
private Long lineNumber;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public OrderDetl() {}
+ public OrderDetl() {
+ }
public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
@@ -447,18 +447,20 @@
}
- public String getOrderId$(){
+ public String getOrderId$() {
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)){
+ if (!Cools.isEmpty(order)) {
return String.valueOf(order.getId());
}
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -468,9 +470,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -482,9 +486,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -494,9 +500,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -506,9 +514,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -518,33 +528,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -560,14 +570,14 @@
return null;
}
- public String getQty$(){
- if (getAnfme().equals(getQty())){
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
return "宸插畬鎴�";
}
return "鏈畬鎴�";
}
- public boolean beSimilar(OrderDetl orderDetl){
+ public boolean beSimilar(OrderDetl orderDetl) {
return (
this.orderNo.equals(orderDetl.getOrderNo())
&& this.matnr.equals(orderDetl.getMatnr())
@@ -599,9 +609,9 @@
return null;
}
- public String getPakinPakoutStatus$(){
+ public String getPakinPakoutStatus$() {
if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
- switch (this.pakinPakoutStatus){
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
@@ -611,19 +621,19 @@
}
}
- public String getBoxType1$(){
+ public String getBoxType1$() {
BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(processProcedures)){
+ if (!Cools.isEmpty(processProcedures)) {
return String.valueOf(processProcedures.getBoxSpecs());
}
return this.boxType1;
}
- public String getBoxType2$(){
+ public String getBoxType2$() {
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(basQualityTesting)){
+ if (!Cools.isEmpty(basQualityTesting)) {
return String.valueOf(basQualityTesting.getBoxSpecs());
}
return this.boxType1;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
new file mode 100644
index 0000000..de76be9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlLog.java
@@ -0,0 +1,648 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.OrderService;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+
+@Data
+@TableName("man_order_detl_log")
+public class OrderDetlLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁㈠崟鍐呯爜
+ */
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
+ @TableField("order_id")
+ private Long orderId;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 浣滀笟鏁伴噺
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ */
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
+ private Double qty;
+
+ /**
+ * 鍟嗗搧缂栫爜
+ */
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value = "闀垮害")
+ @TableField("man_length")
+ private Double manLength;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value = "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
+ */
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴�
+ */
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value = "琛屽彿")
+ @TableField("line_number")
+ private Long lineNumber;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
+ public OrderDetlLog() {
+ }
+
+ public OrderDetlLog(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.orderId = orderId;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.qty = qty;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.specs = specs;
+ this.model = model;
+ this.color = color;
+ this.brand = brand;
+ this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
+ this.barcode = barcode;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
+ this.itemNum = itemNum;
+ this.safeQty = safeQty;
+ this.weight = weight;
+ this.manLength = manLength;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+ public OrderDetlLog(OrderDetlLog orderDetl) {
+ this.orderId = orderDetl.getOrderId();
+ this.orderNo = orderDetl.getOrderNo();
+ this.anfme = orderDetl.getAnfme();
+ this.qty = orderDetl.getQty();
+ this.matnr = orderDetl.getMatnr();
+ this.maktx = orderDetl.getMaktx();
+ this.batch = orderDetl.getBatch();
+ this.specs = orderDetl.getSpecs();
+ this.model = orderDetl.getModel();
+ this.color = orderDetl.getColor();
+ this.brand = orderDetl.getBrand();
+ this.unit = orderDetl.getUnit();
+ this.price = orderDetl.getPrice();
+ this.sku = orderDetl.getSku();
+ this.units = orderDetl.getUnits();
+ this.barcode = orderDetl.getBarcode();
+ this.origin = orderDetl.getOrigin();
+ this.manu = orderDetl.getManu();
+ this.manuDate = orderDetl.getManuDate();
+ this.itemNum = orderDetl.getItemNum();
+ this.safeQty = orderDetl.getSafeQty();
+ this.weight = orderDetl.getWeight();
+ this.manLength = orderDetl.getManLength();
+ this.volume = orderDetl.getVolume();
+ this.threeCode = orderDetl.getThreeCode();
+ this.supp = orderDetl.getSupp();
+ this.suppCode = orderDetl.getSuppCode();
+ this.beBatch = orderDetl.getBeBatch();
+ this.deadTime = orderDetl.getDeadTime();
+ this.deadWarn = orderDetl.getDeadWarn();
+ this.source = orderDetl.getSource();
+ this.inspect = orderDetl.getInspect();
+ this.danger = orderDetl.getDanger();
+ this.status = orderDetl.getStatus();
+ this.createBy = orderDetl.getCreateBy();
+ this.createTime = orderDetl.getCreateTime();
+ this.updateBy = orderDetl.getUpdateBy();
+ this.updateTime = orderDetl.getUpdateTime();
+ this.memo = orderDetl.getMemo();
+ this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
+ this.lineNumber = orderDetl.getLineNumber();
+ this.standby1 = orderDetl.getStandby1();
+ this.standby2 = orderDetl.getStandby2();
+ this.standby3 = orderDetl.getStandby3();
+ }
+
+
+ public String getOrderId$() {
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.selectById(this.orderId);
+ if (!Cools.isEmpty(order)) {
+ return String.valueOf(order.getId());
+ }
+ return null;
+ }
+
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public Double getEnableQty() {
+ if (null != this.anfme && this.workQty != null) {
+ return this.anfme - this.workQty;
+ }
+// if (null != this.anfme && this.qty != null) {
+// return this.anfme - this.qty;
+// }
+ return null;
+ }
+
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
+ return "宸插畬鎴�";
+ }
+ return "鏈畬鎴�";
+ }
+
+ public boolean beSimilar(OrderDetlLog orderDetl) {
+ return (
+ this.orderNo.equals(orderDetl.getOrderNo())
+ && this.matnr.equals(orderDetl.getMatnr())
+ && this.batch.equals(orderDetl.getBatch())
+ && this.brand.equals(orderDetl.getBrand())
+ && this.standby1.equals(orderDetl.getStandby1())
+ && this.standby2.equals(orderDetl.getStandby2())
+ && this.standby3.equals(orderDetl.getStandby3())
+ && this.boxType1.equals(orderDetl.getBoxType1())
+ && this.boxType2.equals(orderDetl.getBoxType2())
+ && this.boxType3.equals(orderDetl.getBoxType3())
+ );
+ }
+
+ public static OrderDetlLog find(List<OrderDetlLog> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ if (Cools.isEmpty(matnr)) {
+ return null;
+ }
+ for (OrderDetlLog detlDto : detlDtos) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+ && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
+ && standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())
+ && boxType1.equals(detlDto.getBoxType1())
+ && boxType2.equals(detlDto.getBoxType2()) && boxType3.equals(detlDto.getBoxType3())
+ ) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
+ public String getPakinPakoutStatus$() {
+ if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
+ switch (this.pakinPakoutStatus) {
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+ public String getBoxType1$() {
+ BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+ BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(processProcedures)) {
+ return String.valueOf(processProcedures.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public String getBoxType2$() {
+ BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+ BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(basQualityTesting)) {
+ return String.valueOf(basQualityTesting.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public void sync(Object source) {
+ if (!Objects.isNull(source)) {
+ BeanUtils.copyProperties(source, this);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 935e58b..b521c73 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -31,21 +31,21 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁㈠崟鍐呯爜
*/
- @ApiModelProperty(value= "璁㈠崟鍐呯爜")
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@@ -53,307 +53,308 @@
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 浣滀笟鏁伴噺
- *
- * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
- * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
- @ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
@TableField("work_qty")
private Double workQty;
/**
* 瀹屾垚鏁伴噺
- *
- * 鍏ュ簱 : qty 馃憜
- * 鍑哄簱 : qty 馃憜
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
*/
- @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
/**
* 琛屽彿
*/
- @ApiModelProperty(value= "琛屽彿")
+ @ApiModelProperty(value = "琛屽彿")
@TableField("line_number")
private Long lineNumber;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public OrderDetlPakin() {}
+ public OrderDetlPakin() {
+ }
public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
@@ -397,18 +398,20 @@
this.memo = memo;
}
- public String getOrderId$(){
+ public String getOrderId$() {
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)){
+ if (!Cools.isEmpty(order)) {
return String.valueOf(order.getId());
}
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -418,9 +421,11 @@
}
}
- public String getPakinPakoutStatus$(){
- if (Objects.isNull(pakinPakoutStatus)) {return null;}
- switch (this.pakinPakoutStatus){
+ public String getPakinPakoutStatus$() {
+ if (Objects.isNull(pakinPakoutStatus)) {
+ return null;
+ }
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
@@ -431,9 +436,11 @@
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -445,9 +452,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -457,9 +466,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -470,9 +481,11 @@
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -482,33 +495,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -521,32 +534,32 @@
return null;
}
- public String getQty$(){
- if (getAnfme().equals(getQty())){
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
return "宸插畬鎴�";
}
return "鏈畬鎴�";
}
- public String getBoxType1$(){
+ public String getBoxType1$() {
BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(processProcedures)){
+ if (!Cools.isEmpty(processProcedures)) {
return String.valueOf(processProcedures.getBoxSpecs());
}
return this.boxType1;
}
- public String getBoxType2$(){
+ public String getBoxType2$() {
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(basQualityTesting)){
+ if (!Cools.isEmpty(basQualityTesting)) {
return String.valueOf(basQualityTesting.getBoxSpecs());
}
return this.boxType1;
}
- public boolean beSimilar(OrderDetlPakin orderDetlPakin){
+ public boolean beSimilar(OrderDetlPakin orderDetlPakin) {
return (
this.orderNo.equals(orderDetlPakin.getOrderNo())
&& this.matnr.equals(orderDetlPakin.getMatnr())
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java
new file mode 100644
index 0000000..bfed386
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakinLog.java
@@ -0,0 +1,581 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Objects;
+
+@Data
+@TableName("man_order_detl_pakin_log")
+public class OrderDetlPakinLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁㈠崟鍐呯爜
+ */
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
+ @TableField("order_id")
+ private Long orderId;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 浣滀笟鏁伴噺
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ */
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
+ private Double qty;
+
+ /**
+ * 鍟嗗搧缂栫爜
+ */
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value = "闀垮害")
+ @TableField("man_length")
+ private Double manLength;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value = "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
+ */
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value = "琛屽彿")
+ @TableField("line_number")
+ private Long lineNumber;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
+ public OrderDetlPakinLog() {
+ }
+
+ public OrderDetlPakinLog(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.orderId = orderId;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.qty = qty;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.specs = specs;
+ this.model = model;
+ this.color = color;
+ this.brand = brand;
+ this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
+ this.barcode = barcode;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
+ this.itemNum = itemNum;
+ this.safeQty = safeQty;
+ this.weight = weight;
+ this.manLength = manLength;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+ public String getOrderId$() {
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.selectById(this.orderId);
+ if (!Cools.isEmpty(order)) {
+ return String.valueOf(order.getId());
+ }
+ return null;
+ }
+
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getPakinPakoutStatus$() {
+ if (Objects.isNull(pakinPakoutStatus)) {
+ return null;
+ }
+ switch (this.pakinPakoutStatus) {
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public Double getEnableQty() {
+ if (null != this.anfme && this.workQty != null) {
+ return this.anfme - this.workQty;
+ }
+ return null;
+ }
+
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
+ return "宸插畬鎴�";
+ }
+ return "鏈畬鎴�";
+ }
+
+ public String getBoxType1$() {
+ BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+ BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(processProcedures)) {
+ return String.valueOf(processProcedures.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public String getBoxType2$() {
+ BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+ BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(basQualityTesting)) {
+ return String.valueOf(basQualityTesting.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public boolean beSimilar(OrderDetlPakinLog orderDetlPakin) {
+ return (
+ this.orderNo.equals(orderDetlPakin.getOrderNo())
+ && this.matnr.equals(orderDetlPakin.getMatnr())
+ && this.batch.equals(orderDetlPakin.getBatch())
+ && this.brand.equals(orderDetlPakin.getBrand())
+ && this.standby1.equals(orderDetlPakin.getStandby1())
+ && this.standby2.equals(orderDetlPakin.getStandby2())
+ && this.standby3.equals(orderDetlPakin.getStandby3())
+ && this.boxType1.equals(orderDetlPakin.getBoxType1())
+ && this.boxType2.equals(orderDetlPakin.getBoxType2())
+ && this.boxType3.equals(orderDetlPakin.getBoxType3())
+ );
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 3af2a93..d78951b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -30,21 +30,21 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁㈠崟鍐呯爜
*/
- @ApiModelProperty(value= "璁㈠崟鍐呯爜")
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@@ -52,307 +52,308 @@
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 浣滀笟鏁伴噺
- *
- * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
- * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
- @ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
@TableField("work_qty")
private Double workQty;
/**
* 瀹屾垚鏁伴噺
- *
- * 鍏ュ簱 : qty 馃憜
- * 鍑哄簱 : qty 馃憜
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
*/
- @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
/**
* 琛屽彿
*/
- @ApiModelProperty(value= "琛屽彿")
+ @ApiModelProperty(value = "琛屽彿")
@TableField("line_number")
private Long lineNumber;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public OrderDetlPakout() {}
+ public OrderDetlPakout() {
+ }
public OrderDetlPakout(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
@@ -396,18 +397,20 @@
this.memo = memo;
}
- public String getOrderId$(){
+ public String getOrderId$() {
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)){
+ if (!Cools.isEmpty(order)) {
return String.valueOf(order.getId());
}
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -417,9 +420,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -431,9 +436,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -443,9 +450,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -455,9 +464,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -467,18 +478,18 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getPakinPakoutStatus$(){
+ public String getPakinPakoutStatus$() {
if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
- switch (this.pakinPakoutStatus){
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
@@ -489,24 +500,24 @@
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -522,40 +533,40 @@
return null;
}
- public String getQty$(){
- if (getAnfme().equals(getQty())){
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
return "宸插畬鎴�";
}
return "鏈畬鎴�";
}
- public String getBoxType1$(){
+ public String getBoxType1$() {
BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(processProcedures)){
+ if (!Cools.isEmpty(processProcedures)) {
return String.valueOf(processProcedures.getBoxSpecs());
}
return this.boxType1;
}
- public String getBoxType2$(){
+ public String getBoxType2$() {
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(basQualityTesting)){
+ if (!Cools.isEmpty(basQualityTesting)) {
return String.valueOf(basQualityTesting.getBoxSpecs());
}
return this.boxType1;
}
- public boolean beSimilar(OrderDetlPakout orderDetlPakout){
+ public boolean beSimilar(OrderDetlPakout orderDetlPakout) {
return (
this.orderNo.equals(orderDetlPakout.getOrderNo())
- && this.matnr.equals(orderDetlPakout.getMatnr())
- && this.batch.equals(orderDetlPakout.getBatch())
- && this.brand.equals(orderDetlPakout.getBrand())
- && this.standby1.equals(orderDetlPakout.getStandby1())
- && this.standby2.equals(orderDetlPakout.getStandby2())
- && this.standby3.equals(orderDetlPakout.getStandby3())
+ && this.matnr.equals(orderDetlPakout.getMatnr())
+ && this.batch.equals(orderDetlPakout.getBatch())
+ && this.brand.equals(orderDetlPakout.getBrand())
+ && this.standby1.equals(orderDetlPakout.getStandby1())
+ && this.standby2.equals(orderDetlPakout.getStandby2())
+ && this.standby3.equals(orderDetlPakout.getStandby3())
&& this.boxType1.equals(orderDetlPakout.getBoxType1())
&& this.boxType2.equals(orderDetlPakout.getBoxType2())
&& this.boxType3.equals(orderDetlPakout.getBoxType3())
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java
new file mode 100644
index 0000000..a8df34e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakoutLog.java
@@ -0,0 +1,580 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_order_detl_pakout_log")
+public class OrderDetlPakoutLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 璁㈠崟鍐呯爜
+ */
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
+ @TableField("order_id")
+ private Long orderId;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 浣滀笟鏁伴噺
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ */
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
+ private Double qty;
+
+ /**
+ * 鍟嗗搧缂栫爜
+ */
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
+ private String matnr;
+
+ /**
+ * 鍟嗗搧鍚嶇О
+ */
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍨嬪彿
+ */
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
+
+ /**
+ * 鍗曚环
+ */
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ @TableField("manu_date")
+ private String manuDate;
+
+ /**
+ * 鍝侀」鏁�
+ */
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ @TableField("item_num")
+ private String itemNum;
+
+ /**
+ * 瀹夊叏搴撳瓨閲�
+ */
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
+
+ /**
+ * 閲嶉噺
+ */
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value = "闀垮害")
+ @TableField("man_length")
+ private Double manLength;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value = "淇濊川鏈�")
+ @TableField("dead_time")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ @TableField("dead_warn")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
+ */
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value = "琛屽彿")
+ @TableField("line_number")
+ private Long lineNumber;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ private String standby1 = "";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ private String standby2 = "";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value = "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value = "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value = "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
+ public OrderDetlPakoutLog() {
+ }
+
+ public OrderDetlPakoutLog(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.orderId = orderId;
+ this.orderNo = orderNo;
+ this.anfme = anfme;
+ this.qty = qty;
+ this.matnr = matnr;
+ this.maktx = maktx;
+ this.batch = batch;
+ this.specs = specs;
+ this.model = model;
+ this.color = color;
+ this.brand = brand;
+ this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
+ this.barcode = barcode;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
+ this.itemNum = itemNum;
+ this.safeQty = safeQty;
+ this.weight = weight;
+ this.manLength = manLength;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+ public String getOrderId$() {
+ OrderService service = SpringUtils.getBean(OrderService.class);
+ Order order = service.selectById(this.orderId);
+ if (!Cools.isEmpty(order)) {
+ return String.valueOf(order.getId());
+ }
+ return null;
+ }
+
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.beBatch);
+ }
+ }
+
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getPakinPakoutStatus$() {
+ if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
+ switch (this.pakinPakoutStatus) {
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public Double getEnableQty() {
+ if (null != this.anfme && this.workQty != null) {
+ return this.anfme - this.workQty;
+ }
+// if (null != this.anfme && this.qty != null) {
+// return this.anfme - this.qty;
+// }
+ return null;
+ }
+
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
+ return "宸插畬鎴�";
+ }
+ return "鏈畬鎴�";
+ }
+
+ public String getBoxType1$() {
+ BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+ BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(processProcedures)) {
+ return String.valueOf(processProcedures.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public String getBoxType2$() {
+ BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+ BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+ if (!Cools.isEmpty(basQualityTesting)) {
+ return String.valueOf(basQualityTesting.getBoxSpecs());
+ }
+ return this.boxType1;
+ }
+
+ public boolean beSimilar(OrderDetlPakoutLog orderDetlPakout) {
+ return (
+ this.orderNo.equals(orderDetlPakout.getOrderNo())
+ && this.matnr.equals(orderDetlPakout.getMatnr())
+ && this.batch.equals(orderDetlPakout.getBatch())
+ && this.brand.equals(orderDetlPakout.getBrand())
+ && this.standby1.equals(orderDetlPakout.getStandby1())
+ && this.standby2.equals(orderDetlPakout.getStandby2())
+ && this.standby3.equals(orderDetlPakout.getStandby3())
+ && this.boxType1.equals(orderDetlPakout.getBoxType1())
+ && this.boxType2.equals(orderDetlPakout.getBoxType2())
+ && this.boxType3.equals(orderDetlPakout.getBoxType3())
+ );
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/OrderLog.java b/src/main/java/com/zy/asrs/entity/OrderLog.java
new file mode 100644
index 0000000..234a9dd
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderLog.java
@@ -0,0 +1,570 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderSettleService;
+import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_order_log")
+public class OrderLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value = "缂栧彿")
+ private String uuid;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
+ @TableField("order_time")
+ private String orderTime;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
+ @TableField("doc_type")
+ private Long docType;
+
+ /**
+ * 椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
+ @TableField("item_id")
+ private Long itemId;
+
+ @ApiModelProperty(value = "")
+ @TableField("item_name")
+ private String itemName;
+
+ /**
+ * 璋冩嫧椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
+ @TableField("allot_item_id")
+ private Long allotItemId;
+
+ /**
+ * 鍒濆绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
+ @TableField("def_number")
+ private String defNumber;
+
+ /**
+ * 绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
+ private String number;
+
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
+ private Long cstmr;
+
+ /**
+ * 瀹㈡埛
+ */
+ @ApiModelProperty(value = "瀹㈡埛")
+ @TableField("cstmr_name")
+ private String cstmrName;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
+ private String tel;
+
+ /**
+ * 鎿嶄綔浜哄憳
+ */
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
+ @TableField("oper_memb")
+ private String operMemb;
+
+ /**
+ * 鍚堣閲戦
+ */
+ @ApiModelProperty(value = "鍚堣閲戦")
+ @TableField("total_fee")
+ private Double totalFee;
+
+ /**
+ * 浼樻儬鐜�
+ */
+ @ApiModelProperty(value = "浼樻儬鐜�")
+ private Double discount;
+
+ /**
+ * 浼樻儬閲戦
+ */
+ @ApiModelProperty(value = "浼樻儬閲戦")
+ @TableField("discount_fee")
+ private Double discountFee;
+
+ /**
+ * 閿�鍞垨閲囪喘璐圭敤鍚堣
+ */
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @TableField("other_fee")
+ private Double otherFee;
+
+ /**
+ * 瀹炰粯閲戦
+ */
+ @ApiModelProperty(value = "瀹炰粯閲戦")
+ @TableField("act_fee")
+ private Double actFee;
+
+ /**
+ * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ */
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @TableField("pay_type")
+ private Integer payType;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value = "涓氬姟鍛�")
+ private String salesman;
+
+ /**
+ * 缁撶畻澶╂暟
+ */
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
+ @TableField("account_day")
+ private Integer accountDay;
+
+ /**
+ * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ */
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @TableField("post_fee_type")
+ private Integer postFeeType;
+
+ /**
+ * 閭垂
+ */
+ @ApiModelProperty(value = "閭垂")
+ @TableField("post_fee")
+ private Double postFee;
+
+ /**
+ * 浠樻鏃堕棿
+ */
+ @ApiModelProperty(value = "浠樻鏃堕棿")
+ @TableField("pay_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 鍙戣揣鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 鐗╂祦鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
+ @TableField("ship_name")
+ private String shipName;
+
+ /**
+ * 鐗╂祦鍗曞彿
+ */
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
+ @TableField("ship_code")
+ private String shipCode;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
+ private Long settle;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @TableField("move_status")
+ private Integer moveStatus;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ public OrderLog() {
+ }
+
+ public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+ public OrderLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Integer pakinPakoutStatus) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ this.pakinPakoutStatus = pakinPakoutStatus;
+ }
+
+ public OrderLog(OrderLog order) {
+ this.uuid = order.getUuid();
+ this.orderNo = order.getOrderNo();
+ this.orderTime = order.getOrderTime();
+ this.docType = order.getDocType();
+ this.itemId = order.getItemId();
+ this.itemName = order.getItemName();
+ this.allotItemId = order.getAllotItemId();
+ this.defNumber = order.getDefNumber();
+ this.number = order.getNumber();
+ this.cstmr = order.getCstmr();
+ this.cstmrName = order.getCstmrName();
+ this.tel = order.getTel();
+ this.operMemb = order.getOperMemb();
+ this.totalFee = order.getTotalFee();
+ this.discount = order.getDiscount();
+ this.discountFee = order.getDiscountFee();
+ this.otherFee = order.getOtherFee();
+ this.actFee = order.getActFee();
+ this.payType = order.getPayType();
+ this.salesman = order.getSalesman();
+ this.accountDay = order.getAccountDay();
+ this.postFeeType = order.getPostFeeType();
+ this.postFee = order.getPostFee();
+ this.payTime = order.getPayTime();
+ this.sendTime = order.getSendTime();
+ this.shipName = order.getShipName();
+ this.shipCode = order.getShipCode();
+ this.settle = order.getSettle();
+ this.status = order.getStatus();
+ this.createBy = order.getCreateBy();
+ this.createTime = order.getCreateTime();
+ this.updateBy = order.getUpdateBy();
+ this.updateTime = order.getUpdateTime();
+ this.memo = order.getMemo();
+ this.moveStatus = order.getMoveStatus();
+ this.pakinPakoutStatus = order.getPakinPakoutStatus();
+ }
+
+// Order order = new Order(
+// null, // 缂栧彿[闈炵┖]
+// null, // 璁㈠崟缂栧彿
+// null, // 鍗曟嵁鏃ユ湡
+// null, // 鍗曟嵁绫诲瀷
+// null, // 椤圭洰缂栧彿
+// null, //
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// null, // 瀹㈡埛缂栧彿
+// null, // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// null, // 璁㈠崟鐘舵��
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getDocType$() {
+ DocTypeService service = SpringUtils.getBean(DocTypeService.class);
+ DocType docType = service.selectById(this.docType);
+ if (!Cools.isEmpty(docType)) {
+ return String.valueOf(docType.getDocName());
+ }
+ return null;
+ }
+
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
+ case 1:
+ return "鐜伴噾";
+ case 2:
+ return "璁拌处";
+ default:
+ return String.valueOf(this.payType);
+ }
+ }
+
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
+ case 1:
+ return "鍦ㄧ嚎鏀粯";
+ case 2:
+ return "璐у埌浠樻";
+ default:
+ return String.valueOf(this.postFeeType);
+ }
+ }
+
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
+ }
+
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getSettle$() {
+ OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
+ OrderSettle orderSettle = service.selectById(this.settle);
+ if (!Cools.isEmpty(orderSettle)) {
+ return String.valueOf(orderSettle.getSettleName());
+ }
+ return null;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
+ case 2:
+ return "宸插璐�";
+ case 1:
+ return "澶囪揣涓�";
+ case 0:
+ return "鏈垵濮�";
+ default:
+ return String.valueOf(this.moveStatus);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakin.java b/src/main/java/com/zy/asrs/entity/OrderPakin.java
index 8d853de..a88c89f 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakin.java
@@ -28,255 +28,254 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 璁㈠崟缂栧彿
*/
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 鍗曟嵁鏃ユ湡
*/
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
@TableField("order_time")
private String orderTime;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_type")
private Long docType;
/**
* 椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "椤圭洰缂栧彿")
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("item_name")
private String itemName;
/**
* 璋冩嫧椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
private Long allotItemId;
/**
* 鍒濆绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
@TableField("def_number")
private String defNumber;
/**
* 绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
private String number;
/**
* 瀹㈡埛缂栧彿
*/
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
private Long cstmr;
/**
* 瀹㈡埛
*/
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value = "瀹㈡埛")
@TableField("cstmr_name")
private String cstmrName;
/**
* 鑱旂郴鏂瑰紡
*/
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String tel;
/**
* 鎿嶄綔浜哄憳
*/
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
@TableField("oper_memb")
private String operMemb;
/**
* 鍚堣閲戦
*/
- @ApiModelProperty(value= "鍚堣閲戦")
+ @ApiModelProperty(value = "鍚堣閲戦")
@TableField("total_fee")
private Double totalFee;
/**
* 浼樻儬鐜�
*/
- @ApiModelProperty(value= "浼樻儬鐜�")
+ @ApiModelProperty(value = "浼樻儬鐜�")
private Double discount;
/**
* 浼樻儬閲戦
*/
- @ApiModelProperty(value= "浼樻儬閲戦")
+ @ApiModelProperty(value = "浼樻儬閲戦")
@TableField("discount_fee")
private Double discountFee;
/**
* 閿�鍞垨閲囪喘璐圭敤鍚堣
*/
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
@TableField("other_fee")
private Double otherFee;
/**
* 瀹炰粯閲戦
*/
- @ApiModelProperty(value= "瀹炰粯閲戦")
+ @ApiModelProperty(value = "瀹炰粯閲戦")
@TableField("act_fee")
private Double actFee;
/**
* 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
*/
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
@TableField("pay_type")
private Integer payType;
/**
* 涓氬姟鍛�
*/
- @ApiModelProperty(value= "涓氬姟鍛�")
+ @ApiModelProperty(value = "涓氬姟鍛�")
private String salesman;
/**
* 缁撶畻澶╂暟
*/
- @ApiModelProperty(value= "缁撶畻澶╂暟")
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
@TableField("account_day")
private Integer accountDay;
/**
* 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
*/
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
@TableField("post_fee_type")
private Integer postFeeType;
/**
* 閭垂
*/
- @ApiModelProperty(value= "閭垂")
+ @ApiModelProperty(value = "閭垂")
@TableField("post_fee")
private Double postFee;
/**
* 浠樻鏃堕棿
*/
- @ApiModelProperty(value= "浠樻鏃堕棿")
+ @ApiModelProperty(value = "浠樻鏃堕棿")
@TableField("pay_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
/**
* 鍙戣揣鏃堕棿
*/
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
@TableField("send_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
* 鐗╂祦鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
@TableField("ship_code")
private String shipCode;
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
private Long settle;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
@TableField("move_status")
private Integer moveStatus;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
- public OrderPakin() {}
public OrderPakin(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
@@ -352,18 +351,20 @@
// null // 澶囨敞
// );
- public String getDocType$(){
+ public String getDocType$() {
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
- if (!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
return String.valueOf(docType.getDocName());
}
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
case 1:
return "鐜伴噾";
case 2:
@@ -373,9 +374,11 @@
}
}
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
case 1:
return "鍦ㄧ嚎鏀粯";
case 2:
@@ -385,32 +388,34 @@
}
}
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
}
- public String getSettle$(){
+ public String getSettle$() {
OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
OrderSettle orderSettle = service.selectById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
+ if (!Cools.isEmpty(orderSettle)) {
return String.valueOf(orderSettle.getSettleName());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -420,9 +425,11 @@
}
}
- public String getMoveStatus$(){
- if (null == this.moveStatus){ return null; }
- switch (this.moveStatus){
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
case 2:
return "宸插璐�";
case 1:
@@ -434,40 +441,40 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getPakinPakoutStatus$(){
- switch (this.pakinPakoutStatus){
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakinLog.java b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
new file mode 100644
index 0000000..7123341
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderPakinLog.java
@@ -0,0 +1,494 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderSettleService;
+import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_order_pakin_log")
+public class OrderPakinLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value = "缂栧彿")
+ private String uuid;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
+ @TableField("order_time")
+ private String orderTime;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
+ @TableField("doc_type")
+ private Long docType;
+
+ /**
+ * 椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
+ @TableField("item_id")
+ private Long itemId;
+
+ @ApiModelProperty(value = "")
+ @TableField("item_name")
+ private String itemName;
+
+ /**
+ * 璋冩嫧椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
+ @TableField("allot_item_id")
+ private Long allotItemId;
+
+ /**
+ * 鍒濆绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
+ @TableField("def_number")
+ private String defNumber;
+
+ /**
+ * 绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
+ private String number;
+
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
+ private Long cstmr;
+
+ /**
+ * 瀹㈡埛
+ */
+ @ApiModelProperty(value = "瀹㈡埛")
+ @TableField("cstmr_name")
+ private String cstmrName;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
+ private String tel;
+
+ /**
+ * 鎿嶄綔浜哄憳
+ */
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
+ @TableField("oper_memb")
+ private String operMemb;
+
+ /**
+ * 鍚堣閲戦
+ */
+ @ApiModelProperty(value = "鍚堣閲戦")
+ @TableField("total_fee")
+ private Double totalFee;
+
+ /**
+ * 浼樻儬鐜�
+ */
+ @ApiModelProperty(value = "浼樻儬鐜�")
+ private Double discount;
+
+ /**
+ * 浼樻儬閲戦
+ */
+ @ApiModelProperty(value = "浼樻儬閲戦")
+ @TableField("discount_fee")
+ private Double discountFee;
+
+ /**
+ * 閿�鍞垨閲囪喘璐圭敤鍚堣
+ */
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @TableField("other_fee")
+ private Double otherFee;
+
+ /**
+ * 瀹炰粯閲戦
+ */
+ @ApiModelProperty(value = "瀹炰粯閲戦")
+ @TableField("act_fee")
+ private Double actFee;
+
+ /**
+ * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ */
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @TableField("pay_type")
+ private Integer payType;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value = "涓氬姟鍛�")
+ private String salesman;
+
+ /**
+ * 缁撶畻澶╂暟
+ */
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
+ @TableField("account_day")
+ private Integer accountDay;
+
+ /**
+ * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ */
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @TableField("post_fee_type")
+ private Integer postFeeType;
+
+ /**
+ * 閭垂
+ */
+ @ApiModelProperty(value = "閭垂")
+ @TableField("post_fee")
+ private Double postFee;
+
+ /**
+ * 浠樻鏃堕棿
+ */
+ @ApiModelProperty(value = "浠樻鏃堕棿")
+ @TableField("pay_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 鍙戣揣鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 鐗╂祦鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
+ @TableField("ship_name")
+ private String shipName;
+
+ /**
+ * 鐗╂祦鍗曞彿
+ */
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
+ @TableField("ship_code")
+ private String shipCode;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
+ private Long settle;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @TableField("move_status")
+ private Integer moveStatus;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ public OrderPakinLog() {
+ }
+
+ public OrderPakinLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Order order = new Order(
+// null, // 缂栧彿[闈炵┖]
+// null, // 璁㈠崟缂栧彿
+// null, // 鍗曟嵁鏃ユ湡
+// null, // 鍗曟嵁绫诲瀷
+// null, // 椤圭洰缂栧彿
+// null, //
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// null, // 瀹㈡埛缂栧彿
+// null, // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// null, // 璁㈠崟鐘舵��
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getDocType$() {
+ DocTypeService service = SpringUtils.getBean(DocTypeService.class);
+ DocType docType = service.selectById(this.docType);
+ if (!Cools.isEmpty(docType)) {
+ return String.valueOf(docType.getDocName());
+ }
+ return null;
+ }
+
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
+ case 1:
+ return "鐜伴噾";
+ case 2:
+ return "璁拌处";
+ default:
+ return String.valueOf(this.payType);
+ }
+ }
+
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
+ case 1:
+ return "鍦ㄧ嚎鏀粯";
+ case 2:
+ return "璐у埌浠樻";
+ default:
+ return String.valueOf(this.postFeeType);
+ }
+ }
+
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
+ }
+
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getSettle$() {
+ OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
+ OrderSettle orderSettle = service.selectById(this.settle);
+ if (!Cools.isEmpty(orderSettle)) {
+ return String.valueOf(orderSettle.getSettleName());
+ }
+ return null;
+ }
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
+ case 2:
+ return "宸插璐�";
+ case 1:
+ return "澶囪揣涓�";
+ case 0:
+ return "鏈垵濮�";
+ default:
+ return String.valueOf(this.moveStatus);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index aaa08a9..1edce52 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -28,255 +28,256 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 璁㈠崟缂栧彿
*/
- @ApiModelProperty(value= "璁㈠崟缂栧彿")
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 鍗曟嵁鏃ユ湡
*/
- @ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
@TableField("order_time")
private String orderTime;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_type")
private Long docType;
/**
* 椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "椤圭洰缂栧彿")
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
@TableField("item_id")
private Long itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("item_name")
private String itemName;
/**
* 璋冩嫧椤圭洰缂栧彿
*/
- @ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
@TableField("allot_item_id")
private Long allotItemId;
/**
* 鍒濆绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
@TableField("def_number")
private String defNumber;
/**
* 绁ㄦ嵁鍙�
*/
- @ApiModelProperty(value= "绁ㄦ嵁鍙�")
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
private String number;
/**
* 瀹㈡埛缂栧彿
*/
- @ApiModelProperty(value= "瀹㈡埛缂栧彿")
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
private Long cstmr;
/**
* 瀹㈡埛
*/
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value = "瀹㈡埛")
@TableField("cstmr_name")
private String cstmrName;
/**
* 鑱旂郴鏂瑰紡
*/
- @ApiModelProperty(value= "鑱旂郴鏂瑰紡")
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
private String tel;
/**
* 鎿嶄綔浜哄憳
*/
- @ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
@TableField("oper_memb")
private String operMemb;
/**
* 鍚堣閲戦
*/
- @ApiModelProperty(value= "鍚堣閲戦")
+ @ApiModelProperty(value = "鍚堣閲戦")
@TableField("total_fee")
private Double totalFee;
/**
* 浼樻儬鐜�
*/
- @ApiModelProperty(value= "浼樻儬鐜�")
+ @ApiModelProperty(value = "浼樻儬鐜�")
private Double discount;
/**
* 浼樻儬閲戦
*/
- @ApiModelProperty(value= "浼樻儬閲戦")
+ @ApiModelProperty(value = "浼樻儬閲戦")
@TableField("discount_fee")
private Double discountFee;
/**
* 閿�鍞垨閲囪喘璐圭敤鍚堣
*/
- @ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
@TableField("other_fee")
private Double otherFee;
/**
* 瀹炰粯閲戦
*/
- @ApiModelProperty(value= "瀹炰粯閲戦")
+ @ApiModelProperty(value = "瀹炰粯閲戦")
@TableField("act_fee")
private Double actFee;
/**
* 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
*/
- @ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
@TableField("pay_type")
private Integer payType;
/**
* 涓氬姟鍛�
*/
- @ApiModelProperty(value= "涓氬姟鍛�")
+ @ApiModelProperty(value = "涓氬姟鍛�")
private String salesman;
/**
* 缁撶畻澶╂暟
*/
- @ApiModelProperty(value= "缁撶畻澶╂暟")
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
@TableField("account_day")
private Integer accountDay;
/**
* 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
*/
- @ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
@TableField("post_fee_type")
private Integer postFeeType;
/**
* 閭垂
*/
- @ApiModelProperty(value= "閭垂")
+ @ApiModelProperty(value = "閭垂")
@TableField("post_fee")
private Double postFee;
/**
* 浠樻鏃堕棿
*/
- @ApiModelProperty(value= "浠樻鏃堕棿")
+ @ApiModelProperty(value = "浠樻鏃堕棿")
@TableField("pay_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date payTime;
/**
* 鍙戣揣鏃堕棿
*/
- @ApiModelProperty(value= "鍙戣揣鏃堕棿")
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
@TableField("send_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
/**
* 鐗╂祦鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
@TableField("ship_name")
private String shipName;
/**
* 鐗╂祦鍗曞彿
*/
- @ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
@TableField("ship_code")
private String shipCode;
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
private Long settle;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
@TableField("move_status")
private Integer moveStatus;
/**
* 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
@TableField("pakin_pakout_status")
private Integer pakinPakoutStatus;
- public OrderPakout() {}
+ public OrderPakout() {
+ }
public OrderPakout(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.uuid = uuid;
@@ -352,18 +353,20 @@
// null // 澶囨敞
// );
- public String getDocType$(){
+ public String getDocType$() {
DocTypeService service = SpringUtils.getBean(DocTypeService.class);
DocType docType = service.selectById(this.docType);
- if (!Cools.isEmpty(docType)){
+ if (!Cools.isEmpty(docType)) {
return String.valueOf(docType.getDocName());
}
return null;
}
- public String getPayType$(){
- if (null == this.payType){ return null; }
- switch (this.payType){
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
case 1:
return "鐜伴噾";
case 2:
@@ -373,9 +376,11 @@
}
}
- public String getPostFeeType$(){
- if (null == this.postFeeType){ return null; }
- switch (this.postFeeType){
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
case 1:
return "鍦ㄧ嚎鏀粯";
case 2:
@@ -385,31 +390,31 @@
}
}
- public String getPayTime$(){
- if (Cools.isEmpty(this.payTime)){
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
}
- public String getSendTime$(){
- if (Cools.isEmpty(this.sendTime)){
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
}
- public String getSettle$(){
+ public String getSettle$() {
OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
OrderSettle orderSettle = service.selectById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
+ if (!Cools.isEmpty(orderSettle)) {
return String.valueOf(orderSettle.getSettleName());
}
return null;
}
- public String getPakinPakoutStatus$(){
- switch (this.pakinPakoutStatus){
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
case 1:
return "Y";
case 2:
@@ -420,9 +425,11 @@
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -432,9 +439,11 @@
}
}
- public String getMoveStatus$(){
- if (null == this.moveStatus){ return null; }
- switch (this.moveStatus){
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
case 2:
return "宸插璐�";
case 1:
@@ -446,33 +455,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
new file mode 100644
index 0000000..32757ce
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/OrderPakoutLog.java
@@ -0,0 +1,494 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderSettleService;
+import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("man_order_pakout_log")
+public class OrderPakoutLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 缂栧彿
+ */
+ @ApiModelProperty(value = "缂栧彿")
+ private String uuid;
+
+ /**
+ * 璁㈠崟缂栧彿
+ */
+ @ApiModelProperty(value = "璁㈠崟缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
+
+ /**
+ * 鍗曟嵁鏃ユ湡
+ */
+ @ApiModelProperty(value = "鍗曟嵁鏃ユ湡")
+ @TableField("order_time")
+ private String orderTime;
+
+ /**
+ * 鍗曟嵁绫诲瀷
+ */
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
+ @TableField("doc_type")
+ private Long docType;
+
+ /**
+ * 椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "椤圭洰缂栧彿")
+ @TableField("item_id")
+ private Long itemId;
+
+ @ApiModelProperty(value = "")
+ @TableField("item_name")
+ private String itemName;
+
+ /**
+ * 璋冩嫧椤圭洰缂栧彿
+ */
+ @ApiModelProperty(value = "璋冩嫧椤圭洰缂栧彿")
+ @TableField("allot_item_id")
+ private Long allotItemId;
+
+ /**
+ * 鍒濆绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "鍒濆绁ㄦ嵁鍙�")
+ @TableField("def_number")
+ private String defNumber;
+
+ /**
+ * 绁ㄦ嵁鍙�
+ */
+ @ApiModelProperty(value = "绁ㄦ嵁鍙�")
+ private String number;
+
+ /**
+ * 瀹㈡埛缂栧彿
+ */
+ @ApiModelProperty(value = "瀹㈡埛缂栧彿")
+ private Long cstmr;
+
+ /**
+ * 瀹㈡埛
+ */
+ @ApiModelProperty(value = "瀹㈡埛")
+ @TableField("cstmr_name")
+ private String cstmrName;
+
+ /**
+ * 鑱旂郴鏂瑰紡
+ */
+ @ApiModelProperty(value = "鑱旂郴鏂瑰紡")
+ private String tel;
+
+ /**
+ * 鎿嶄綔浜哄憳
+ */
+ @ApiModelProperty(value = "鎿嶄綔浜哄憳")
+ @TableField("oper_memb")
+ private String operMemb;
+
+ /**
+ * 鍚堣閲戦
+ */
+ @ApiModelProperty(value = "鍚堣閲戦")
+ @TableField("total_fee")
+ private Double totalFee;
+
+ /**
+ * 浼樻儬鐜�
+ */
+ @ApiModelProperty(value = "浼樻儬鐜�")
+ private Double discount;
+
+ /**
+ * 浼樻儬閲戦
+ */
+ @ApiModelProperty(value = "浼樻儬閲戦")
+ @TableField("discount_fee")
+ private Double discountFee;
+
+ /**
+ * 閿�鍞垨閲囪喘璐圭敤鍚堣
+ */
+ @ApiModelProperty(value = "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @TableField("other_fee")
+ private Double otherFee;
+
+ /**
+ * 瀹炰粯閲戦
+ */
+ @ApiModelProperty(value = "瀹炰粯閲戦")
+ @TableField("act_fee")
+ private Double actFee;
+
+ /**
+ * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ */
+ @ApiModelProperty(value = "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @TableField("pay_type")
+ private Integer payType;
+
+ /**
+ * 涓氬姟鍛�
+ */
+ @ApiModelProperty(value = "涓氬姟鍛�")
+ private String salesman;
+
+ /**
+ * 缁撶畻澶╂暟
+ */
+ @ApiModelProperty(value = "缁撶畻澶╂暟")
+ @TableField("account_day")
+ private Integer accountDay;
+
+ /**
+ * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ */
+ @ApiModelProperty(value = "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @TableField("post_fee_type")
+ private Integer postFeeType;
+
+ /**
+ * 閭垂
+ */
+ @ApiModelProperty(value = "閭垂")
+ @TableField("post_fee")
+ private Double postFee;
+
+ /**
+ * 浠樻鏃堕棿
+ */
+ @ApiModelProperty(value = "浠樻鏃堕棿")
+ @TableField("pay_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date payTime;
+
+ /**
+ * 鍙戣揣鏃堕棿
+ */
+ @ApiModelProperty(value = "鍙戣揣鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 鐗╂祦鍚嶇О
+ */
+ @ApiModelProperty(value = "鐗╂祦鍚嶇О")
+ @TableField("ship_name")
+ private String shipName;
+
+ /**
+ * 鐗╂祦鍗曞彿
+ */
+ @ApiModelProperty(value = "鐗╂祦鍗曞彿")
+ @TableField("ship_code")
+ private String shipCode;
+
+ /**
+ * 璁㈠崟鐘舵��
+ */
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
+ private Long settle;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鐘舵�� 2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆 ")
+ @TableField("move_status")
+ private Integer moveStatus;
+
+ /**
+ * 鐘舵�� 1: 杩涜涓� 0: 鍒濆 2:宸插畬鎴�
+ */
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ public OrderPakoutLog() {
+ }
+
+ public OrderPakoutLog(String uuid, String orderNo, String orderTime, Long docType, Long itemId, String itemName, Long allotItemId, String defNumber, String number, Long cstmr, String cstmrName, String tel, String operMemb, Double totalFee, Double discount, Double discountFee, Double otherFee, Double actFee, Integer payType, String salesman, Integer accountDay, Integer postFeeType, Double postFee, Date payTime, Date sendTime, String shipName, String shipCode, Long settle, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ this.uuid = uuid;
+ this.orderNo = orderNo;
+ this.orderTime = orderTime;
+ this.docType = docType;
+ this.itemId = itemId;
+ this.itemName = itemName;
+ this.allotItemId = allotItemId;
+ this.defNumber = defNumber;
+ this.number = number;
+ this.cstmr = cstmr;
+ this.cstmrName = cstmrName;
+ this.tel = tel;
+ this.operMemb = operMemb;
+ this.totalFee = totalFee;
+ this.discount = discount;
+ this.discountFee = discountFee;
+ this.otherFee = otherFee;
+ this.actFee = actFee;
+ this.payType = payType;
+ this.salesman = salesman;
+ this.accountDay = accountDay;
+ this.postFeeType = postFeeType;
+ this.postFee = postFee;
+ this.payTime = payTime;
+ this.sendTime = sendTime;
+ this.shipName = shipName;
+ this.shipCode = shipCode;
+ this.settle = settle;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// Order order = new Order(
+// null, // 缂栧彿[闈炵┖]
+// null, // 璁㈠崟缂栧彿
+// null, // 鍗曟嵁鏃ユ湡
+// null, // 鍗曟嵁绫诲瀷
+// null, // 椤圭洰缂栧彿
+// null, //
+// null, // 璋冩嫧椤圭洰缂栧彿
+// null, // 鍒濆绁ㄦ嵁鍙�
+// null, // 绁ㄦ嵁鍙�
+// null, // 瀹㈡埛缂栧彿
+// null, // 瀹㈡埛
+// null, // 鑱旂郴鏂瑰紡
+// null, // 鎿嶄綔浜哄憳
+// null, // 鍚堣閲戦
+// null, // 浼樻儬鐜�
+// null, // 浼樻儬閲戦
+// null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+// null, // 瀹炰粯閲戦
+// null, // 浠樻绫诲瀷
+// null, // 涓氬姟鍛�
+// null, // 缁撶畻澶╂暟
+// null, // 閭垂鏀粯绫诲瀷
+// null, // 閭垂
+// null, // 浠樻鏃堕棿
+// null, // 鍙戣揣鏃堕棿
+// null, // 鐗╂祦鍚嶇О
+// null, // 鐗╂祦鍗曞彿
+// null, // 璁㈠崟鐘舵��
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getDocType$() {
+ DocTypeService service = SpringUtils.getBean(DocTypeService.class);
+ DocType docType = service.selectById(this.docType);
+ if (!Cools.isEmpty(docType)) {
+ return String.valueOf(docType.getDocName());
+ }
+ return null;
+ }
+
+ public String getPayType$() {
+ if (null == this.payType) {
+ return null;
+ }
+ switch (this.payType) {
+ case 1:
+ return "鐜伴噾";
+ case 2:
+ return "璁拌处";
+ default:
+ return String.valueOf(this.payType);
+ }
+ }
+
+ public String getPostFeeType$() {
+ if (null == this.postFeeType) {
+ return null;
+ }
+ switch (this.postFeeType) {
+ case 1:
+ return "鍦ㄧ嚎鏀粯";
+ case 2:
+ return "璐у埌浠樻";
+ default:
+ return String.valueOf(this.postFeeType);
+ }
+ }
+
+ public String getPayTime$() {
+ if (Cools.isEmpty(this.payTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.payTime);
+ }
+
+ public String getSendTime$() {
+ if (Cools.isEmpty(this.sendTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getSettle$() {
+ OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
+ OrderSettle orderSettle = service.selectById(this.settle);
+ if (!Cools.isEmpty(orderSettle)) {
+ return String.valueOf(orderSettle.getSettleName());
+ }
+ return null;
+ }
+
+ public String getPakinPakoutStatus$() {
+ switch (this.pakinPakoutStatus) {
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
+
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getMoveStatus$() {
+ if (null == this.moveStatus) {
+ return null;
+ }
+ switch (this.moveStatus) {
+ case 2:
+ return "宸插璐�";
+ case 1:
+ return "澶囪揣涓�";
+ case 0:
+ return "鏈垵濮�";
+ default:
+ return String.valueOf(this.moveStatus);
+ }
+ }
+
+ public String getCreateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/OrderSettle.java b/src/main/java/com/zy/asrs/entity/OrderSettle.java
index 1d47628..96feb90 100644
--- a/src/main/java/com/zy/asrs/entity/OrderSettle.java
+++ b/src/main/java/com/zy/asrs/entity/OrderSettle.java
@@ -25,7 +25,7 @@
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
@TableId(value = "order_settle", type = IdType.INPUT)
@TableField("order_settle")
private Long orderSettle;
@@ -33,49 +33,50 @@
/**
* 鐘舵�佹弿杩�
*/
- @ApiModelProperty(value= "鐘舵�佹弿杩�")
+ @ApiModelProperty(value = "鐘舵�佹弿杩�")
@TableField("settle_name")
private String settleName;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public OrderSettle() {}
+ public OrderSettle() {
+ }
- public OrderSettle(Long orderSettle,String settleName,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public OrderSettle(Long orderSettle, String settleName, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderSettle = orderSettle;
this.settleName = settleName;
this.createBy = createBy;
@@ -95,33 +96,33 @@
// null // 澶囨敞
// );
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/entity/Pack.java b/src/main/java/com/zy/asrs/entity/Pack.java
index c63e1f7..a1416c4 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -1,27 +1,21 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.OrderSettleService;
-import com.zy.asrs.entity.OrderSettle;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotations.TableField;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("man_pack")
@@ -32,79 +26,80 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 璁㈠崟鐘舵��
*/
- @ApiModelProperty(value= "璁㈠崟鐘舵��")
+ @ApiModelProperty(value = "璁㈠崟鐘舵��")
private Long settle;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public Pack() {}
+ public Pack() {
+ }
- public Pack(String barcode,String matnr,String batch,Long settle,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public Pack(String barcode, String matnr, String batch, Long settle, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.barcode = barcode;
this.matnr = matnr;
this.batch = batch;
@@ -130,18 +125,20 @@
// null // 澶囨敞
// );
- public String getSettle$(){
+ public String getSettle$() {
OrderSettleService service = SpringUtils.getBean(OrderSettleService.class);
OrderSettle orderSettle = service.selectById(this.settle);
- if (!Cools.isEmpty(orderSettle)){
+ if (!Cools.isEmpty(orderSettle)) {
return String.valueOf(orderSettle.getSettleName());
}
return null;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -151,33 +148,33 @@
}
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/PieChartsVo.java b/src/main/java/com/zy/asrs/entity/PieChartsVo.java
index 30ee6ed..3225f0a 100644
--- a/src/main/java/com/zy/asrs/entity/PieChartsVo.java
+++ b/src/main/java/com/zy/asrs/entity/PieChartsVo.java
@@ -23,11 +23,11 @@
private Long occQty = 0L;
private String occDes = "浣跨敤搴撲綅";
- public void complete(){
- fullDes = fullDes.concat(Arith.multiplys(1, Arith.divides(3, fullQty, totalQty), 100)+"%");
- nullDes = nullDes.concat(Arith.multiplys(1,Arith.divides(3, nullQty, totalQty), 100)+"%");
- forbidDes = forbidDes.concat(Arith.multiplys(1,Arith.divides(4, forbidQty, totalQty), 100)+"%");
- occDes = occDes.concat(Arith.multiplys(1,Arith.divides(3, occQty, totalQty), 100)+"%");
+ public void complete() {
+ fullDes = fullDes.concat(Arith.multiplys(1, Arith.divides(3, fullQty, totalQty), 100) + "%");
+ nullDes = nullDes.concat(Arith.multiplys(1, Arith.divides(3, nullQty, totalQty), 100) + "%");
+ forbidDes = forbidDes.concat(Arith.multiplys(1, Arith.divides(4, forbidQty, totalQty), 100) + "%");
+ occDes = occDes.concat(Arith.multiplys(1, Arith.divides(3, occQty, totalQty), 100) + "%");
}
public Long getTotalQty() {
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 3da10a7..5b969fb 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.BasWhsTypeService;
import com.zy.asrs.service.RowLastnoTypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -24,7 +24,7 @@
/**
* 绫诲埆
*/
- @ApiModelProperty(value= "绫诲埆")
+ @ApiModelProperty(value = "绫诲埆")
@TableId(value = "whs_type", type = IdType.INPUT)
@TableField("whs_type")
private Integer whsType;
@@ -32,149 +32,150 @@
/**
* 褰撳墠宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "褰撳墠宸ヤ綔鍙�")
+ @ApiModelProperty(value = "褰撳墠宸ヤ綔鍙�")
@TableField("wrk_mk")
private String wrkMk;
/**
* 褰撳墠鎺掑彿
*/
- @ApiModelProperty(value= "褰撳墠鎺掑彿")
+ @ApiModelProperty(value = "褰撳墠鎺掑彿")
@TableField("current_row")
private Integer currentRow;
/**
* 璧峰鎺掑彿
*/
- @ApiModelProperty(value= "璧峰鎺掑彿")
+ @ApiModelProperty(value = "璧峰鎺掑彿")
@TableField("s_row")
private Integer sRow;
/**
* 缁堟鎺掑彿
*/
- @ApiModelProperty(value= "缁堟鎺掑彿")
+ @ApiModelProperty(value = "缁堟鎺掑彿")
@TableField("e_row")
private Integer eRow;
/**
* 鍫嗗灈鏈烘暟閲�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈烘暟閲�")
+ @ApiModelProperty(value = "鍫嗗灈鏈烘暟閲�")
@TableField("crn_qty")
private Integer crnQty;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("limint_loc")
private Integer limintLoc;
/**
* 璧峰鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "璧峰鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "璧峰鍫嗗灈鏈哄彿")
@TableField("s_crn_no")
private Integer sCrnNo;
/**
* 缁堟鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "缁堟鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "缁堟鍫嗗灈鏈哄彿")
@TableField("e_crn_no")
private Integer eCrnNo;
/**
* 鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
*/
- @ApiModelProperty(value= "鏍囪绫诲埆")
+ @ApiModelProperty(value = "鏍囪绫诲埆")
@TableField("sign_type")
private Integer signType;
/**
* 鏄惁鍚敤鍏跺畠鏍囪绫诲埆 0:鍏抽棴 1锛氭墦寮�
*/
- @ApiModelProperty(value= "鏄惁鍚敤鍏跺畠鏍囪绫诲埆")
+ @ApiModelProperty(value = "鏄惁鍚敤鍏跺畠鏍囪绫诲埆")
@TableField("sign_type_other")
private Integer signTypeOther;
/**
* 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
*/
- @ApiModelProperty(value= "鍏跺畠鏍囪绫诲埆")
+ @ApiModelProperty(value = "鍏跺畠鏍囪绫诲埆")
@TableField("sign_type_other_boolean")
private String signTypeOtherBoolean;
/**
* 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
*/
- @ApiModelProperty(value= "鍏ュ簱绔欑偣闆嗗悎")
+ @ApiModelProperty(value = "鍏ュ簱绔欑偣闆嗗悎")
@TableField("sta_no_list")
private String staNoList;
/**
* 搴撶被鍨婭D
*/
- @ApiModelProperty(value= "搴撶被鍨婭D")
+ @ApiModelProperty(value = "搴撶被鍨婭D")
@TableField("type_id")
private Integer typeId;
/**
* 鐩镐技鐗╂枡寮�鍏�
*/
- @ApiModelProperty(value= "鐩镐技鐗╂枡寮�鍏�")
+ @ApiModelProperty(value = "鐩镐技鐗╂枡寮�鍏�")
@TableField("be_similar")
private String beSimilar;
/**
* 鏄惁瀛樺湪鐐逛綅
*/
- @ApiModelProperty(value= "鏄惁瀛樺湪鐐逛綅")
+ @ApiModelProperty(value = "鏄惁瀛樺湪鐐逛綅")
@TableField("point_switch")
private String pointSwitch;
/**
* 绌烘澘闈犺繎鎽嗘斁
*/
- @ApiModelProperty(value= "绌烘澘闈犺繎鎽嗘斁")
+ @ApiModelProperty(value = "绌烘澘闈犺繎鎽嗘斁")
@TableField("empty_similar")
private String emptySimilar;
- public RowLastno() {}
+ public RowLastno() {
+ }
- public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
+ public RowLastno(String wrkMk, Integer currentRow, Integer sRow, Integer eRow, Integer crnQty, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Integer limintLoc) {
this.wrkMk = wrkMk;
this.currentRow = currentRow;
this.sRow = sRow;
@@ -262,10 +263,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -279,8 +280,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -294,10 +295,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -311,8 +312,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -329,6 +330,7 @@
public void setLimintLoc(Integer limintLoc) {
this.limintLoc = limintLoc;
}
+
public Integer getsCrnNo() {
return sCrnNo;
}
@@ -380,13 +382,14 @@
public Integer getTypeId() {
return typeId;
}
+
public String getTypeId$() {
RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
BasWhsTypeService basWhsTypeService = SpringUtils.getBean(BasWhsTypeService.class);
BasWhsType basWhsType = basWhsTypeService.selectById(rowLastnoType.getType().longValue());
- if (!Cools.isEmpty(rowLastnoType)){
- return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+ basWhsType.getWhsDesc();
+ if (!Cools.isEmpty(rowLastnoType)) {
+ return rowLastnoType.getTypeName() + "<==>" + rowLastnoType.getMemo() + "<==>" + basWhsType.getWhsDesc();
}
return typeId.toString();
}
diff --git a/src/main/java/com/zy/asrs/entity/RowLastnoType.java b/src/main/java/com/zy/asrs/entity/RowLastnoType.java
index e3a822d..7b25ca2 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastnoType.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastnoType.java
@@ -1,19 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("asr_row_lastno_type")
@@ -24,62 +25,63 @@
/**
* 绫诲埆
*/
- @ApiModelProperty(value= "绫诲埆")
+ @ApiModelProperty(value = "绫诲埆")
@TableId(value = "id", type = IdType.INPUT)
private Integer id;
/**
* 瑙勫垯绠�杩�
*/
- @ApiModelProperty(value= "瑙勫垯绠�杩�")
+ @ApiModelProperty(value = "瑙勫垯绠�杩�")
@TableField("type_name")
private String typeName;
/**
* 琛ュ厖
*/
- @ApiModelProperty(value= "琛ュ厖")
+ @ApiModelProperty(value = "琛ュ厖")
private String memo;
/**
* 鍒涘缓浜哄憳
*/
- @ApiModelProperty(value= "鍒涘缓浜哄憳")
+ @ApiModelProperty(value = "鍒涘缓浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 鍒涘缓鏃堕棿
*/
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("appe_user")
private Long appeUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appeTime;
/**
* 搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡
*/
- @ApiModelProperty(value= "搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡 ")
+ @ApiModelProperty(value = "搴撳瀷 1: 鏍囧噯鍫嗗灈鏈哄簱 2: 骞冲簱 3: 绌挎鏉� 4: 鍥涘悜杞� 5: AGV 0: 鏈煡 ")
private Integer type;
- public RowLastnoType() {}
+ public RowLastnoType() {
+ }
- public RowLastnoType(Integer id,String typeName,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer type) {
+ public RowLastnoType(Integer id, String typeName, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Integer type) {
this.id = id;
this.typeName = typeName;
this.memo = memo;
@@ -101,41 +103,43 @@
// null // 搴撳瀷
// );
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 0:
return "鏍囧噯鍫嗗灈鏈哄簱";
case 1:
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index 6145e8c..d28f047 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -4,13 +4,13 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasWrkIotypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -25,7 +25,7 @@
/**
* 璺緞ID
*/
- @ApiModelProperty(value= "璺緞ID")
+ @ApiModelProperty(value = "璺緞ID")
@TableId(value = "type_id", type = IdType.AUTO)
@TableField("type_id")
private Long typeId;
@@ -33,7 +33,7 @@
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableId(value = "type_no", type = IdType.INPUT)
@TableField("type_no")
private Integer typeNo;
@@ -41,14 +41,14 @@
/**
* 浣滀笟绫诲瀷
*/
- @ApiModelProperty(value= "浣滀笟绫诲瀷")
+ @ApiModelProperty(value = "浣滀笟绫诲瀷")
@TableField("type_desc")
private String typeDesc;
/**
* 浣滀笟绔欑偣
*/
- @ApiModelProperty(value= "浣滀笟绔欑偣")
+ @ApiModelProperty(value = "浣滀笟绔欑偣")
@TableId(value = "stn_no", type = IdType.INPUT)
@TableField("stn_no")
private Integer stnNo;
@@ -56,14 +56,14 @@
/**
* 绔欑偣鍚嶇О
*/
- @ApiModelProperty(value= "绔欑偣鍚嶇О")
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
@TableField("stn_desc")
private String stnDesc;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableId(value = "crn_no", type = IdType.INPUT)
@TableField("crn_no")
private Integer crnNo;
@@ -71,47 +71,48 @@
/**
* 鍫嗗灈鏈虹珯鐐�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈虹珯鐐�")
+ @ApiModelProperty(value = "鍫嗗灈鏈虹珯鐐�")
@TableField("crn_stn")
private Integer crnStn;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public StaDesc() {}
+ public StaDesc() {
+ }
- public StaDesc(String typeDesc,String stnDesc,Integer crnStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public StaDesc(String typeDesc, String stnDesc, Integer crnStn, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.typeDesc = typeDesc;
this.stnDesc = stnDesc;
this.crnStn = crnStn;
@@ -145,10 +146,10 @@
return typeNo;
}
- public String getTypeNo$(){
+ public String getTypeNo$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.typeNo);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
@@ -170,10 +171,10 @@
return stnNo;
}
- public String getStnNo$(){
+ public String getStnNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.stnNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
@@ -195,10 +196,10 @@
return crnNo;
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
@@ -212,10 +213,10 @@
return crnStn;
}
- public String getCrnStn$(){
+ public String getCrnStn$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.crnStn);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
@@ -237,10 +238,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -254,8 +255,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -269,10 +270,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -286,8 +287,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/StkPlcm.java b/src/main/java/com/zy/asrs/entity/StkPlcm.java
index 2ee7fc4..1dd23e9 100644
--- a/src/main/java/com/zy/asrs/entity/StkPlcm.java
+++ b/src/main/java/com/zy/asrs/entity/StkPlcm.java
@@ -2,13 +2,13 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnErrorService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.LocMastService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -23,95 +23,96 @@
/**
* 鏃ユ湡
*/
- @ApiModelProperty(value= "鏃ユ湡")
+ @ApiModelProperty(value = "鏃ユ湡")
@TableField("io_time")
private Date ioTime;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_type")
private String wrkType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("s_station")
private String sStation;
/**
* 搴撲綅鍙�
*/
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
/**
* 寮傚父鐮�
*/
- @ApiModelProperty(value= "寮傚父鐮�")
+ @ApiModelProperty(value = "寮傚父鐮�")
@TableField("crn_error")
private Long crnError;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("o_station")
private String oStation;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 寮傚父鏃堕棿
*/
- @ApiModelProperty(value= "寮傚父鏃堕棿")
+ @ApiModelProperty(value = "寮傚父鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("dev_no")
private Integer devNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("input_type")
private Integer inputType;
/**
* 宸ヤ綔妗ｆ椂闂�
*/
- @ApiModelProperty(value= "宸ヤ綔妗ｆ椂闂�")
+ @ApiModelProperty(value = "宸ヤ綔妗ｆ椂闂�")
@TableField("wrk_time")
private Date wrkTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Integer tag;
- public StkPlcm() {}
+ public StkPlcm() {
+ }
- public StkPlcm(Date ioTime,Integer wrkNo,String wrkType,String sStation,String locNo,Long crnError,String oStation,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer devNo,Integer inputType,Date wrkTime,Integer tag) {
+ public StkPlcm(Date ioTime, Integer wrkNo, String wrkType, String sStation, String locNo, Long crnError, String oStation, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Integer devNo, Integer inputType, Date wrkTime, Integer tag) {
this.ioTime = ioTime;
this.wrkNo = wrkNo;
this.wrkType = wrkType;
@@ -151,8 +152,8 @@
return ioTime;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
@@ -190,10 +191,10 @@
return locNo;
}
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
@@ -207,10 +208,10 @@
return crnError;
}
- public String getCrnError$(){
+ public String getCrnError$() {
BasCrnErrorService service = SpringUtils.getBean(BasCrnErrorService.class);
BasCrnError basCrnError = service.selectById(this.crnError);
- if (!Cools.isEmpty(basCrnError)){
+ if (!Cools.isEmpty(basCrnError)) {
return String.valueOf(basCrnError.getErrName());
}
return null;
@@ -232,10 +233,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -249,8 +250,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -264,10 +265,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -281,8 +282,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -296,10 +297,10 @@
return devNo;
}
- public String getDevNo$(){
+ public String getDevNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.devNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
@@ -321,8 +322,8 @@
return wrkTime;
}
- public String getWrkTime$(){
- if (Cools.isEmpty(this.wrkTime)){
+ public String getWrkTime$() {
+ if (Cools.isEmpty(this.wrkTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkTime);
diff --git a/src/main/java/com/zy/asrs/entity/Tag.java b/src/main/java/com/zy/asrs/entity/Tag.java
index d5e843c..95752e3 100644
--- a/src/main/java/com/zy/asrs/entity/Tag.java
+++ b/src/main/java/com/zy/asrs/entity/Tag.java
@@ -22,134 +22,135 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
private String uuid;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 鐖剁骇
*/
- @ApiModelProperty(value= "鐖剁骇")
+ @ApiModelProperty(value = "鐖剁骇")
@TableField("parent_id")
private Long parentId;
/**
* 鐖剁骇鍚嶇О
*/
- @ApiModelProperty(value= "鐖剁骇鍚嶇О")
+ @ApiModelProperty(value = "鐖剁骇鍚嶇О")
@TableField("parent_name")
private String parentName;
/**
* 鍏宠仈璺緞
*/
- @ApiModelProperty(value= "鍏宠仈璺緞")
+ @ApiModelProperty(value = "鍏宠仈璺緞")
private String path;
/**
* 鍏宠仈璺緞鍚�
*/
- @ApiModelProperty(value= "鍏宠仈璺緞鍚�")
+ @ApiModelProperty(value = "鍏宠仈璺緞鍚�")
@TableField("path_name")
private String pathName;
/**
* 绫诲瀷 1: 鐩掕 2: 琚嬭 0: 鍏朵粬
*/
- @ApiModelProperty(value= "绫诲瀷 1: 鐩掕 2: 琚嬭 0: 鍏朵粬 ")
+ @ApiModelProperty(value = "绫诲瀷 1: 鐩掕 2: 琚嬭 0: 鍏朵粬 ")
private Integer type;
/**
* 璐熻矗浜�
*/
- @ApiModelProperty(value= "璐熻矗浜�")
+ @ApiModelProperty(value = "璐熻矗浜�")
private String leading;
/**
* 鍥剧墖
*/
- @ApiModelProperty(value= "鍥剧墖")
+ @ApiModelProperty(value = "鍥剧墖")
private String img;
/**
* 绠�瑕佹弿杩�
*/
- @ApiModelProperty(value= "绠�瑕佹弿杩�")
+ @ApiModelProperty(value = "绠�瑕佹弿杩�")
private String brief;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Integer count;
/**
* 绛夌骇
*/
- @ApiModelProperty(value= "绛夌骇")
+ @ApiModelProperty(value = "绛夌骇")
private Integer level;
/**
* 鎺掑簭
*/
- @ApiModelProperty(value= "鎺掑簭")
+ @ApiModelProperty(value = "鎺掑簭")
private Integer sort;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public Tag() {}
+ public Tag() {
+ }
- public Tag(String uuid,String name,Long parentId,String parentName,String path,String pathName,Integer type,String leading,String img,String brief,Integer count,Integer level,Integer sort,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public Tag(String uuid, String name, Long parentId, String parentName, String path, String pathName, Integer type, String leading, String img, String brief, Integer count, Integer level, Integer sort, Integer status, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.uuid = uuid;
this.name = name;
this.parentId = parentId;
@@ -253,9 +254,11 @@
return type;
}
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 1:
return "鐩掕";
case 2:
@@ -323,9 +326,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -343,8 +348,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -358,10 +363,10 @@
return createBy;
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
@@ -375,8 +380,8 @@
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -390,10 +395,10 @@
return updateBy;
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/Task.java b/src/main/java/com/zy/asrs/entity/Task.java
index 79496f2..24d91fe 100644
--- a/src/main/java/com/zy/asrs/entity/Task.java
+++ b/src/main/java/com/zy/asrs/entity/Task.java
@@ -1,17 +1,17 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
import lombok.experimental.Accessors;
import java.io.Serializable;
@@ -25,369 +25,372 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟绫诲瀷锛� agv , crn
*/
- @ApiModelProperty(value= "浠诲姟绫诲瀷锛� agv , crn")
+ @ApiModelProperty(value = "浠诲姟绫诲瀷锛� agv , crn")
@TableField("task_type")
private String taskType;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Date ymd;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("whs_type")
private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_date")
private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private String staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private String sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡
*/
- @ApiModelProperty(value= "鎷ｆ枡")
+ @ApiModelProperty(value = "鎷ｆ枡")
private String picking;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�
*/
- @ApiModelProperty(value= "閫�鍑�")
+ @ApiModelProperty(value = "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘
*/
- @ApiModelProperty(value= "绌烘澘")
+ @ApiModelProperty(value = "绌烘澘")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String packed;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
private Date crnEndTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plc_str_time")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("crn_pos_time")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_wrkno")
private Double refWrkno;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @ApiModelProperty(value = "鎷ｆ枡鏃堕棿")
@TableField("ref_iotime")
private Date refIotime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("manu_type")
private String manuType;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_time")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
// Y:閿�鍞鍗曞嚭搴撲换鍔�
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
/**
* 鍏堝叆鍝� / 鍙岄噸鍏ュ簱
*/
- @ApiModelProperty(value= "鍏堝叆鍝�")
+ @ApiModelProperty(value = "鍏堝叆鍝�")
@TableField("pre_have")
private String preHave;
/**
* 绌烘搷浣� / 鍙栬揣鏃犵
*/
- @ApiModelProperty(value= "绌烘搷浣�")
+ @ApiModelProperty(value = "绌烘搷浣�")
@TableField("take_none")
private String takeNone;
- public Task() {}
+ public Task() {
+ }
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
+ public String getYmd$() {
+ if (Cools.isEmpty(this.ymd)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
}
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
+ public String getWrkDate$() {
+ if (Cools.isEmpty(this.wrkDate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getTaskType$(){
- if (Cools.isEmpty(this.taskType)){return null;}
+ public String getTaskType$() {
+ if (Cools.isEmpty(this.taskType)) {
+ return null;
+ }
if (taskType.equals("agv")) {
return "AGV浠诲姟";
} else {
@@ -396,117 +399,117 @@
}
- public String getStaNo$(){
+ public String getStaNo$() {
BasStationService service = SpringUtils.getBean(BasStationService.class);
BasStation basDevp = service.selectOne(new EntityWrapper<BasStation>().eq("dev_no", this.staNo));
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceStaNo$(){
+ public String getSourceStaNo$() {
BasStationService service = SpringUtils.getBean(BasStationService.class);
BasStation basDevp = service.selectOne(new EntityWrapper<BasStation>().eq("dev_no", this.sourceStaNo));
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceLocNo$(){
+ public String getSourceLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getCrnStrTime$(){
- if (Cools.isEmpty(this.crnStrTime)){
+ public String getCrnStrTime$() {
+ if (Cools.isEmpty(this.crnStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
}
- public String getCrnEndTime$(){
- if (Cools.isEmpty(this.crnEndTime)){
+ public String getCrnEndTime$() {
+ if (Cools.isEmpty(this.crnEndTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
}
- public String getPlcStrTime$(){
- if (Cools.isEmpty(this.plcStrTime)){
+ public String getPlcStrTime$() {
+ if (Cools.isEmpty(this.plcStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
}
- public String getCrnPosTime$(){
- if (Cools.isEmpty(this.crnPosTime)){
+ public String getCrnPosTime$() {
+ if (Cools.isEmpty(this.crnPosTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
}
- public String getRefIotime$(){
- if (Cools.isEmpty(this.refIotime)){
+ public String getRefIotime$() {
+ if (Cools.isEmpty(this.refIotime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
+ public String getLogErrTime$() {
+ if (Cools.isEmpty(this.logErrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
diff --git a/src/main/java/com/zy/asrs/entity/TaskDetl.java b/src/main/java/com/zy/asrs/entity/TaskDetl.java
index 2467477..4377775 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetl.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetl.java
@@ -1,27 +1,19 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@Accessors(chain = true)
@@ -35,284 +27,285 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("line_number")
private Long lineNumber;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String standby1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String standby2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String standby3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("box_type1")
private String boxType1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("box_type2")
private String boxType2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("box_type3")
private String boxType3;
- public TaskDetl() {}
+ public TaskDetl() {
+ }
- public TaskDetl(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
+ public TaskDetl(Integer wrkNo, Date ioTime, Double anfme, String zpallet, String matnr, String maktx, String batch, String orderNo, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
this.wrkNo = wrkNo;
this.ioTime = ioTime;
this.anfme = anfme;
@@ -410,16 +403,18 @@
// null //
// );
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -429,9 +424,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -443,9 +440,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -455,9 +454,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -467,33 +468,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/TaskDetlLog.java b/src/main/java/com/zy/asrs/entity/TaskDetlLog.java
index 52bb660..e943741 100644
--- a/src/main/java/com/zy/asrs/entity/TaskDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskDetlLog.java
@@ -1,24 +1,18 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("agv_task_detl_log")
@@ -34,284 +28,285 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
- * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
- * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("line_number")
private Long lineNumber;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String standby1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String standby2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String standby3;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("box_type1")
private String boxType1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("box_type2")
private String boxType2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("box_type3")
private String boxType3;
- public TaskDetlLog() {}
+ public TaskDetlLog() {
+ }
- public TaskDetlLog(Integer wrkNo,Date ioTime,Double anfme,String zpallet,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long lineNumber,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
+ public TaskDetlLog(Integer wrkNo, Date ioTime, Double anfme, String zpallet, String matnr, String maktx, String batch, String orderNo, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String memo, Long lineNumber, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
this.wrkNo = wrkNo;
this.ioTime = ioTime;
this.anfme = anfme;
@@ -409,16 +404,18 @@
// null //
// );
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -428,9 +425,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -442,9 +441,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -454,9 +455,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -466,33 +469,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/TaskLog.java b/src/main/java/com/zy/asrs/entity/TaskLog.java
index 47d9f5c..cd3b222 100644
--- a/src/main/java/com/zy/asrs/entity/TaskLog.java
+++ b/src/main/java/com/zy/asrs/entity/TaskLog.java
@@ -1,66 +1,19 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.core.common.SpringUtils;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.entity.WrkMast;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.entity.BasCrnp;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.entity.LocMast;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.entity.BasDevp;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.entity.BasDevp;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.entity.LocMast;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
+import com.zy.asrs.service.*;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("agv_task_log")
@@ -68,321 +21,322 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Long id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_id")
private Long logId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ymd;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("whs_type")
private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Integer wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_date")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private Integer staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private Integer sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡(checkBox)
*/
- @ApiModelProperty(value= "鎷ｆ枡(checkBox)")
+ @ApiModelProperty(value = "鎷ｆ枡(checkBox)")
private String picking;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�(checkBox)
*/
- @ApiModelProperty(value= "閫�鍑�(checkBox)")
+ @ApiModelProperty(value = "閫�鍑�(checkBox)")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘(checkBox)
*/
- @ApiModelProperty(value= "绌烘澘(checkBox)")
+ @ApiModelProperty(value = "绌烘澘(checkBox)")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String packed;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date crnEndTime;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @ApiModelProperty(value = "鎷ｆ枡鏃堕棿")
@TableField("plc_str_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("crn_pos_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_wrkno")
private Double refWrkno;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_iotime")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date refIotime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("manu_type")
private String manuType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("memo_m")
private String memoM;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘(checkBox)
*/
- @ApiModelProperty(value= "婊℃澘(checkBox)")
+ @ApiModelProperty(value = "婊℃澘(checkBox)")
@TableField("full_plt")
private String fullPlt;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("pre_have")
private String preHave;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("take_none")
private String takeNone;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("line_number")
private Long lineNumber;
- public TaskLog() {}
+ public TaskLog() {
+ }
- public TaskLog(Long id,Integer wrkNo,Long logId,String invWh,Date ymd,String mk,Integer whsType,Integer wrkSts,Integer ioType,Integer crnNo,String sheetNo,Double ioPri,Date wrkDate,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String locSts,String picking,String linkMis,String onlineYn,String updMk,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String packed,String oveMk,Double mtnType,String userNo,Date crnStrTime,Date crnEndTime,Date plcStrTime,Date crnPosTime,Double loadTime,Double expTime,Double refWrkno,Date refIotime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String pauseMk,Date errorTime,String errorMemo,Integer ctnKind,String manuType,String memoM,Double scWeight,String logMk,Date logErrTime,String logErrMemo,String barcode,String PdcType,String ctnNo,String fullPlt,String preHave,String takeNone,Long lineNumber) {
+ public TaskLog(Long id, Integer wrkNo, Long logId, String invWh, Date ymd, String mk, Integer whsType, Integer wrkSts, Integer ioType, Integer crnNo, String sheetNo, Double ioPri, Date wrkDate, String locNo, Integer staNo, Integer sourceStaNo, String sourceLocNo, String locSts, String picking, String linkMis, String onlineYn, String updMk, String exitMk, Integer pltType, String emptyMk, Date ioTime, Integer ctnType, String packed, String oveMk, Double mtnType, String userNo, Date crnStrTime, Date crnEndTime, Date plcStrTime, Date crnPosTime, Double loadTime, Double expTime, Double refWrkno, Date refIotime, Long modiUser, Date modiTime, Long appeUser, Date appeTime, String pauseMk, Date errorTime, String errorMemo, Integer ctnKind, String manuType, String memoM, Double scWeight, String logMk, Date logErrTime, String logErrMemo, String barcode, String PdcType, String ctnNo, String fullPlt, String preHave, String takeNone, Long lineNumber) {
this.id = id;
this.wrkNo = wrkNo;
this.logId = logId;
@@ -508,175 +462,175 @@
// null //
// );
- public String getWrkNo$(){
+ public String getWrkNo$() {
WrkMastService service = SpringUtils.getBean(WrkMastService.class);
WrkMast wrkMast = service.selectById(this.wrkNo);
- if (!Cools.isEmpty(wrkMast)){
+ if (!Cools.isEmpty(wrkMast)) {
return String.valueOf(wrkMast.getId());
}
return null;
}
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
+ public String getYmd$() {
+ if (Cools.isEmpty(this.ymd)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
}
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
+ public String getWrkDate$() {
+ if (Cools.isEmpty(this.wrkDate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getStaNo$(){
+ public String getStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceStaNo$(){
+ public String getSourceStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceLocNo$(){
+ public String getSourceLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getCrnStrTime$(){
- if (Cools.isEmpty(this.crnStrTime)){
+ public String getCrnStrTime$() {
+ if (Cools.isEmpty(this.crnStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
}
- public String getCrnEndTime$(){
- if (Cools.isEmpty(this.crnEndTime)){
+ public String getCrnEndTime$() {
+ if (Cools.isEmpty(this.crnEndTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
}
- public String getPlcStrTime$(){
- if (Cools.isEmpty(this.plcStrTime)){
+ public String getPlcStrTime$() {
+ if (Cools.isEmpty(this.plcStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
}
- public String getCrnPosTime$(){
- if (Cools.isEmpty(this.crnPosTime)){
+ public String getCrnPosTime$() {
+ if (Cools.isEmpty(this.crnPosTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
}
- public String getRefIotime$(){
- if (Cools.isEmpty(this.refIotime)){
+ public String getRefIotime$() {
+ if (Cools.isEmpty(this.refIotime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
+ public String getLogErrTime$() {
+ if (Cools.isEmpty(this.logErrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
diff --git a/src/main/java/com/zy/asrs/entity/TrayCode.java b/src/main/java/com/zy/asrs/entity/TrayCode.java
index cbb30ba..f084b98 100644
--- a/src/main/java/com/zy/asrs/entity/TrayCode.java
+++ b/src/main/java/com/zy/asrs/entity/TrayCode.java
@@ -6,8 +6,8 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,66 +22,67 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 搴忓垪鍙�
*/
- @ApiModelProperty(value= "搴忓垪鍙�")
+ @ApiModelProperty(value = "搴忓垪鍙�")
@TableField("tray_no")
private String trayNo;
/**
* 璧峰
*/
- @ApiModelProperty(value= "璧峰")
+ @ApiModelProperty(value = "璧峰")
private String start;
/**
* 缁堟
*/
- @ApiModelProperty(value= "缁堟")
+ @ApiModelProperty(value = "缁堟")
private String finish;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("appe_user")
private Long appeUser;
- public TrayCode() {}
+ public TrayCode() {
+ }
- public TrayCode(String trayNo,String start,String finish,String memo,Date modiTime,Long modiUser,Date appeTime,Long appeUser) {
+ public TrayCode(String trayNo, String start, String finish, String memo, Date modiTime, Long modiUser, Date appeTime, Long appeUser) {
this.trayNo = trayNo;
this.start = start;
this.finish = finish;
@@ -147,8 +148,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -162,10 +163,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -179,8 +180,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
@@ -194,10 +195,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
diff --git a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
index 27fdb86..111ce43 100644
--- a/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewInOutBean.java
@@ -2,11 +2,12 @@
/**
* 鏃ュ嚭鍏ュ簱娆℃暟缁熻
+ *
* @author admin
* @date 2018骞�11鏈�24鏃�
*/
public class ViewInOutBean {
- private String ymd;
+ private String ymd;
private String source_sta_no;
private Long sto_qty;
private Long ret_qty;
@@ -15,59 +16,76 @@
private int pageSize;
private String begin_date; //鏌ヨ寮�濮嬫棩鏈�
private String end_date; //鏌ヨ鎴鏃ユ湡
-
- public String getYmd() {
- return ymd;
- }
- public void setYmd(String ymd) {
- this.ymd = ymd;
- }
- public String getSource_sta_no() {
- return source_sta_no;
- }
- public void setSource_sta_no(String source_sta_no) {
- this.source_sta_no = source_sta_no;
- }
- public Long getSto_qty() {
- return sto_qty;
- }
- public void setSto_qty(Long sto_qty) {
- this.sto_qty = sto_qty;
- }
- public Long getRet_qty() {
- return ret_qty;
- }
- public void setRet_qty(Long ret_qty) {
- this.ret_qty = ret_qty;
- }
- public Long getTotal_qty() {
- return total_qty;
- }
- public void setTotal_qty(Long total_qty) {
- this.total_qty = total_qty;
- }
- public int getPageNumber() {
- return pageNumber;
- }
- public void setPageNumber(int pageNumber) {
- this.pageNumber = pageNumber;
- }
- public int getPageSize() {
- return pageSize;
- }
- public void setPageSize(int pageSize) {
- this.pageSize = pageSize;
- }
- public String getBegin_date() {
- return begin_date;
- }
- public void setBegin_date(String begin_date) {
- this.begin_date = begin_date;
- }
- public String getEnd_date() {
- return end_date;
- }
- public void setEnd_date(String end_date) {
- this.end_date = end_date;
- }
+
+ public String getYmd() {
+ return ymd;
+ }
+
+ public void setYmd(String ymd) {
+ this.ymd = ymd;
+ }
+
+ public String getSource_sta_no() {
+ return source_sta_no;
+ }
+
+ public void setSource_sta_no(String source_sta_no) {
+ this.source_sta_no = source_sta_no;
+ }
+
+ public Long getSto_qty() {
+ return sto_qty;
+ }
+
+ public void setSto_qty(Long sto_qty) {
+ this.sto_qty = sto_qty;
+ }
+
+ public Long getRet_qty() {
+ return ret_qty;
+ }
+
+ public void setRet_qty(Long ret_qty) {
+ this.ret_qty = ret_qty;
+ }
+
+ public Long getTotal_qty() {
+ return total_qty;
+ }
+
+ public void setTotal_qty(Long total_qty) {
+ this.total_qty = total_qty;
+ }
+
+ public int getPageNumber() {
+ return pageNumber;
+ }
+
+ public void setPageNumber(int pageNumber) {
+ this.pageNumber = pageNumber;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public String getBegin_date() {
+ return begin_date;
+ }
+
+ public void setBegin_date(String begin_date) {
+ this.begin_date = begin_date;
+ }
+
+ public String getEnd_date() {
+ return end_date;
+ }
+
+ public void setEnd_date(String end_date) {
+ this.end_date = end_date;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
index 53fbbc4..8752b3b 100644
--- a/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
+++ b/src/main/java/com/zy/asrs/entity/ViewLocMapDto.java
@@ -47,7 +47,7 @@
public void setLocSts(String locSts) {
this.locSts = locSts;
- switch (locSts){
+ switch (locSts) {
case "D":
this.bgc = "#00B271";
this.color = "#fff";
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 4105561..a97d914 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -13,167 +13,168 @@
/**
* 搴撳瓨婊炵暀鏃堕棿瀹炰綋绫�
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
@Data
public class ViewStayTimeBean {
- private int pageNumber;
- private int pageSize;
+ private int pageNumber;
+ private int pageSize;
- private int stay_time;
+ private int stay_time;
- private String begin_date;
- private String end_date;
+ private String begin_date;
+ private String end_date;
- private Integer row;
+ private Integer row;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ApiModelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "浜у湴")
- private String origin;
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manu_date;
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ private String manu_date;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
- @ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ @ApiModelProperty(value = "闀垮害")
+ private Double man_length;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String three_code;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String dead_time;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Date modi_time;
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ private Date modi_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Date appe_time;
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ private Date appe_time;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getModiTime$(){
- if (Cools.isEmpty(this.modi_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
- }
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modi_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
+ }
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appe_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
- }
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appe_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appe_time);
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java b/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
index 616a857..888cd33 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStockUseBean.java
@@ -2,80 +2,100 @@
/**
* 搴撲綅浣跨敤鐜囪鍥惧疄浣撶被
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
public class ViewStockUseBean {
- private String row1; //閽㈡灦鍙�
- private Long total_qty; //搴撲綅鎬绘暟
- private Long full_qty; //鍦ㄥ簱鏁伴噺
- private Long null_qty; //绌哄簱浣�
+ private String row1; //閽㈡灦鍙�
+ private Long total_qty; //搴撲綅鎬绘暟
+ private Long full_qty; //鍦ㄥ簱鏁伴噺
+ private Long null_qty; //绌哄簱浣�
private Long forbid_qty; //绂佺敤搴撲綅
- private Long empty_qty; //绌哄鍣�
+ private Long empty_qty; //绌哄鍣�
private String full_rate; //鍦ㄥ簱鐜�
private String occ_rate; //浣跨敤鐜�
private int pageNumber;
private int pageSize;
-
- public String getRow1() {
- return row1;
- }
- public void setRow1(String row1) {
- this.row1 = row1;
- }
- public Long getTotal_qty() {
- return total_qty;
- }
- public void setTotal_qty(Long total_qty) {
- this.total_qty = total_qty;
- }
- public Long getFull_qty() {
- return full_qty;
- }
- public void setFull_qty(Long full_qty) {
- this.full_qty = full_qty;
- }
- public Long getNull_qty() {
- return null_qty;
- }
- public void setNull_qty(Long null_qty) {
- this.null_qty = null_qty;
- }
- public Long getForbid_qty() {
- return forbid_qty;
- }
- public void setForbid_qty(Long forbid_qty) {
- this.forbid_qty = forbid_qty;
- }
- public Long getEmpty_qty() {
- return empty_qty;
- }
- public void setEmpty_qty(Long empty_qty) {
- this.empty_qty = empty_qty;
- }
- public String getFull_rate() {
- return full_rate;
- }
- public void setFull_rate(String full_rate) {
- this.full_rate = full_rate;
- }
- public String getOcc_rate() {
- return occ_rate;
- }
- public void setOcc_rate(String occ_rate) {
- this.occ_rate = occ_rate;
- }
- public int getPageNumber() {
- return pageNumber;
- }
- public void setPageNumber(int pageNumber) {
- this.pageNumber = pageNumber;
- }
- public int getPageSize() {
- return pageSize;
- }
- public void setPageSize(int pageSize) {
- this.pageSize = pageSize;
- }
+
+ public String getRow1() {
+ return row1;
+ }
+
+ public void setRow1(String row1) {
+ this.row1 = row1;
+ }
+
+ public Long getTotal_qty() {
+ return total_qty;
+ }
+
+ public void setTotal_qty(Long total_qty) {
+ this.total_qty = total_qty;
+ }
+
+ public Long getFull_qty() {
+ return full_qty;
+ }
+
+ public void setFull_qty(Long full_qty) {
+ this.full_qty = full_qty;
+ }
+
+ public Long getNull_qty() {
+ return null_qty;
+ }
+
+ public void setNull_qty(Long null_qty) {
+ this.null_qty = null_qty;
+ }
+
+ public Long getForbid_qty() {
+ return forbid_qty;
+ }
+
+ public void setForbid_qty(Long forbid_qty) {
+ this.forbid_qty = forbid_qty;
+ }
+
+ public Long getEmpty_qty() {
+ return empty_qty;
+ }
+
+ public void setEmpty_qty(Long empty_qty) {
+ this.empty_qty = empty_qty;
+ }
+
+ public String getFull_rate() {
+ return full_rate;
+ }
+
+ public void setFull_rate(String full_rate) {
+ this.full_rate = full_rate;
+ }
+
+ public String getOcc_rate() {
+ return occ_rate;
+ }
+
+ public void setOcc_rate(String occ_rate) {
+ this.occ_rate = occ_rate;
+ }
+
+ public int getPageNumber() {
+ return pageNumber;
+ }
+
+ public void setPageNumber(int pageNumber) {
+ this.pageNumber = pageNumber;
+ }
+
+ public int getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(int pageSize) {
+ this.pageSize = pageSize;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 23f6b0d..4d3bb53 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -13,6 +13,7 @@
/**
* 鍏ュ簱鏄庣粏缁熻
+ *
* @author admin
* @date 2018骞�11鏈�26鏃�
*/
@@ -20,174 +21,174 @@
public class ViewWorkInBean {
- private int pageNumber;
- private int pageSize;
+ private int pageNumber;
+ private int pageSize;
- private int stay_time;
+ private int stay_time;
- private String begin_date;
- private String end_date;
- private String query_date;
+ private String begin_date;
+ private String end_date;
+ private String query_date;
- private Integer row;
+ private Integer row;
- private String crn_str_time;
- private String crn_end_time;
+ private String crn_str_time;
+ private String crn_end_time;
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- private Integer wrk_no;
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
+ private Integer wrk_no;
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- private Date io_time;
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
+ private Date io_time;
- @ApiModelProperty(value= "搴撲綅鍙�")
- private String loc_no;
+ @ApiModelProperty(value = "搴撲綅鍙�")
+ private String loc_no;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
- private String zpallet;
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
+ private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- private String matnr;
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
+ private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- private String maktx;
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
+ private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("order_no")
- private String orderNo;
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+ @ApiModelProperty(value = "瑙勬牸")
+ private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
+ @ApiModelProperty(value = "鍨嬪彿")
+ private String model;
- @ApiModelProperty(value= "棰滆壊")
- private String color;
+ @ApiModelProperty(value = "棰滆壊")
+ private String color;
- @ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ @ApiModelProperty(value = "鍝佺墝")
+ private String brand;
- @ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ @ApiModelProperty(value = "鍗曚綅")
+ private String unit;
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value = "鍗曚环")
+ private Double price;
- @ApiModelProperty(value= "sku")
- private String sku;
+ @ApiModelProperty(value = "sku")
+ private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
- private Double units;
+ @ApiModelProperty(value = "鍗曚綅閲�")
+ private Double units;
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value = "鏉＄爜")
+ private String barcode;
- @ApiModelProperty(value= "浜у湴")
- private String origin;
+ @ApiModelProperty(value = "浜у湴")
+ private String origin;
- @ApiModelProperty(value= "鍘傚")
- private String manu;
+ @ApiModelProperty(value = "鍘傚")
+ private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- private String manu_date;
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+ private String manu_date;
- @ApiModelProperty(value= "鍝侀」鏁�")
- private String item_num;
+ @ApiModelProperty(value = "鍝侀」鏁�")
+ private String item_num;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
- private Double safe_qty;
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
+ private Double safe_qty;
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
+ @ApiModelProperty(value = "閲嶉噺")
+ private Double weight;
- @ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ @ApiModelProperty(value = "闀垮害")
+ private Double man_length;
- @ApiModelProperty(value= "浣撶Н")
- private Double volume;
+ @ApiModelProperty(value = "浣撶Н")
+ private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
- private String three_code;
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
+ private String three_code;
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supp;
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
- private String supp_code;
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ private String supp_code;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
- private Integer be_batch;
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer be_batch;
- @ApiModelProperty(value= "淇濊川鏈�")
- private String dead_time;
+ @ApiModelProperty(value = "淇濊川鏈�")
+ private String dead_time;
- @ApiModelProperty(value= "棰勮澶╂暟")
- private Integer dead_warn;
+ @ApiModelProperty(value = "棰勮澶╂暟")
+ private Integer dead_warn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
- private Integer source;
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
- private Integer inspect;
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
- @ApiModelProperty(value= "淇敼浜哄憳")
- private Long modi_user;
+ @ApiModelProperty(value = "淇敼浜哄憳")
+ private Long modi_user;
- @ApiModelProperty(value= "淇敼鏃堕棿")
- private Object modi_time;
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ private Object modi_time;
- @ApiModelProperty(value= "鍒涘缓鑰�")
- private Long appe_user;
+ @ApiModelProperty(value = "鍒涘缓鑰�")
+ private Long appe_user;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- private Object appe_time;
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
+ private Object appe_time;
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value = "澶囨敞")
+ private String memo;
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modi_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getModiUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modi_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appe_user);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
- }
- return null;
- }
+ public String getAppeUser$() {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appe_user);
+ if (!Cools.isEmpty(user)) {
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
- public String getIoTime$(){
- if (Cools.isEmpty(this.io_time)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
- }
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.io_time)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.io_time);
+ }
- public void setQuery_date(String query_date) {
- this.query_date = query_date;
- if (query_date.contains(" - ")) {
- String[] dates = query_date.split(" - ");
- this.begin_date = dates[0];
- this.end_date = dates[1];
+ public void setQuery_date(String query_date) {
+ this.query_date = query_date;
+ if (query_date.contains(" - ")) {
+ String[] dates = query_date.split(" - ");
+ this.begin_date = dates[0];
+ this.end_date = dates[1];
- }
- }
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 51002e4..c6bee3f 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -7,7 +7,6 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,26 +20,26 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@@ -48,160 +47,162 @@
@TableField("order_id")
private Long orderId;
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand = "";
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double man_length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
private String status;
- @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
+ @ApiModelProperty(value = "鍏ュ嚭鐘舵��")
@TableField("io_status")
private String ioStatus;
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -211,9 +212,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -225,9 +228,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -237,9 +242,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -249,33 +256,33 @@
}
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getBoxType1$(){
+ public String getBoxType1$() {
BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(processProcedures)){
+ if (!Cools.isEmpty(processProcedures)) {
return String.valueOf(processProcedures.getBoxSpecs());
}
return this.boxType1;
}
- public String getBoxType2$(){
+ public String getBoxType2$() {
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(basQualityTesting)){
+ if (!Cools.isEmpty(basQualityTesting)) {
return String.valueOf(basQualityTesting.getBoxSpecs());
}
return this.boxType1;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index d8c7306..f9a25de 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -20,183 +20,185 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double man_length;
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
private String status;
- @ApiModelProperty(value= "鍏ュ嚭鐘舵��")
+ @ApiModelProperty(value = "鍏ュ嚭鐘舵��")
@TableField("io_status")
private String ioStatus;
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -206,9 +208,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -220,9 +224,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -232,9 +238,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -244,33 +252,33 @@
}
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getBoxType1$(){
+ public String getBoxType1$() {
BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(processProcedures)){
+ if (!Cools.isEmpty(processProcedures)) {
return String.valueOf(processProcedures.getBoxSpecs());
}
return this.boxType1;
}
- public String getBoxType2$(){
+ public String getBoxType2$() {
BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
- if (!Cools.isEmpty(basQualityTesting)){
+ if (!Cools.isEmpty(basQualityTesting)) {
return String.valueOf(basQualityTesting.getBoxSpecs());
}
return this.boxType1;
diff --git a/src/main/java/com/zy/asrs/entity/WorkChartAxis.java b/src/main/java/com/zy/asrs/entity/WorkChartAxis.java
index e433b13..96fab78 100644
--- a/src/main/java/com/zy/asrs/entity/WorkChartAxis.java
+++ b/src/main/java/com/zy/asrs/entity/WorkChartAxis.java
@@ -2,30 +2,36 @@
/**
* 鍏ュ嚭搴撶粺璁℃洸绾垮浘
+ *
* @author admin
* @date 2018骞�12鏈�12鏃�
*/
public class WorkChartAxis {
- private String ymd;
+ private String ymd;
private int inqty;
private int outqty;
-
- public String getYmd() {
- return ymd;
- }
- public void setYmd(String ymd) {
- this.ymd = ymd;
- }
- public int getInqty() {
- return inqty;
- }
- public void setInqty(int inqty) {
- this.inqty = inqty;
- }
- public int getOutqty() {
- return outqty;
- }
- public void setOutqty(int outqty) {
- this.outqty = outqty;
- }
+
+ public String getYmd() {
+ return ymd;
+ }
+
+ public void setYmd(String ymd) {
+ this.ymd = ymd;
+ }
+
+ public int getInqty() {
+ return inqty;
+ }
+
+ public void setInqty(int inqty) {
+ this.inqty = inqty;
+ }
+
+ public int getOutqty() {
+ return outqty;
+ }
+
+ public void setOutqty(int outqty) {
+ this.outqty = outqty;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 4d10ea7..6fe4a9e 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -25,302 +25,304 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -330,9 +332,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -344,9 +348,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -356,9 +362,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -368,33 +376,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 6fa1590..2beb58f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -23,302 +23,304 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 鎵樼洏鏉＄爜
*/
- @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @ApiModelProperty(value = "鎵樼洏鏉＄爜")
private String zpallet;
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value = "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@TableField("man_length")
private Double manLength;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -328,9 +330,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -342,9 +346,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -354,9 +360,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -366,33 +374,33 @@
}
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 3e0c4bb..fb82b3b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.entity.User;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -22,7 +22,7 @@
/**
* 绫诲瀷
*/
- @ApiModelProperty(value= "绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷")
@TableId(value = "wrk_mk", type = IdType.INPUT)
@TableField("wrk_mk")
private Integer wrkMk;
@@ -30,62 +30,63 @@
/**
* 褰撳墠ID
*/
- @ApiModelProperty(value= "褰撳墠ID")
+ @ApiModelProperty(value = "褰撳墠ID")
@TableField("wrk_no")
private Integer wrkNo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
/**
* 璧峰ID
*/
- @ApiModelProperty(value= "璧峰ID")
+ @ApiModelProperty(value = "璧峰ID")
@TableField("s_no")
private Integer sNo;
/**
* 缁堟ID
*/
- @ApiModelProperty(value= "缁堟ID")
+ @ApiModelProperty(value = "缁堟ID")
@TableField("e_no")
private Integer eNo;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@TableField("memo_m")
private String memoM;
- public WrkLastno() {}
+ public WrkLastno() {
+ }
- public WrkLastno(Integer wrkNo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer sNo,Integer eNo,String memoM) {
+ public WrkLastno(Integer wrkNo, Long modiUser, Date modiTime, Long appeUser, Date appeTime, Integer sNo, Integer eNo, String memoM) {
this.wrkNo = wrkNo;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -127,10 +128,10 @@
return modiUser;
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -144,8 +145,8 @@
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
@@ -159,10 +160,10 @@
return appeUser;
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
@@ -176,8 +177,8 @@
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 8617128..f3fbc07 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -28,358 +28,361 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Integer wrkNo;
@ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
private String taskType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Date ymd;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("whs_type")
private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
/**
* 鍫嗗灈鏈�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("wrk_date")
private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
+ @ApiModelProperty(value = "鐩爣搴撲綅")
@TableField("loc_no")
private String locNo;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @ApiModelProperty(value = "鐩爣绔�")
@TableField("sta_no")
private String staNo;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @ApiModelProperty(value = "婧愮珯")
@TableField("source_sta_no")
private String sourceStaNo;
/**
* 婧愬簱浣�
*/
- @ApiModelProperty(value= "婧愬簱浣�")
+ @ApiModelProperty(value = "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡
*/
- @ApiModelProperty(value= "鎷ｆ枡")
+ @ApiModelProperty(value = "鎷ｆ枡")
private String picking;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�
*/
- @ApiModelProperty(value= "閫�鍑�")
+ @ApiModelProperty(value = "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘
*/
- @ApiModelProperty(value= "绌烘澘")
+ @ApiModelProperty(value = "绌烘澘")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String packed;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
private Date crnEndTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plc_str_time")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("crn_pos_time")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_wrkno")
private Double refWrkno;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @ApiModelProperty(value = "鎷ｆ枡鏃堕棿")
@TableField("ref_iotime")
private Date refIotime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("pause_mk")
private String pauseMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("manu_type")
private String manuType;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_time")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
// Y:閿�鍞鍗曞嚭搴撲换鍔�
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
/**
* 鍏堝叆鍝� / 鍙岄噸鍏ュ簱
*/
- @ApiModelProperty(value= "鍏堝叆鍝�")
+ @ApiModelProperty(value = "鍏堝叆鍝�")
@TableField("pre_have")
private String preHave;
/**
* 绌烘搷浣� / 鍙栬揣鏃犵
*/
- @ApiModelProperty(value= "绌烘搷浣�")
+ @ApiModelProperty(value = "绌烘搷浣�")
@TableField("take_none")
private String takeNone;
- public WrkMast() {}
+ public WrkMast() {
+ }
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
+ public String getYmd$() {
+ if (Cools.isEmpty(this.ymd)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getWrkSts$(){
+ public String getWrkSts$() {
BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
+ if (!Cools.isEmpty(basWrkStatus)) {
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
+ if (!Cools.isEmpty(basWrkIotype)) {
return String.valueOf(basWrkIotype.getIoDesc());
}
return null;
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
}
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
+ public String getWrkDate$() {
+ if (Cools.isEmpty(this.wrkDate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
- public String getLocNo$(){
+ public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getTaskType$(){
- if (Cools.isEmpty(this.taskType)){return null;}
+ public String getTaskType$() {
+ if (Cools.isEmpty(this.taskType)) {
+ return null;
+ }
if (taskType.equals("agv")) {
return "AGV浠诲姟";
} else {
@@ -388,109 +391,109 @@
}
- public String getStaNo$(){
+ public String getStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceStaNo$(){
+ public String getSourceStaNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
}
- public String getSourceLocNo$(){
+ public String getSourceLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
- if (!Cools.isEmpty(locMast)){
+ if (!Cools.isEmpty(locMast)) {
return String.valueOf(locMast.getLocNo());
}
return null;
}
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getCrnStrTime$(){
- if (Cools.isEmpty(this.crnStrTime)){
+ public String getCrnStrTime$() {
+ if (Cools.isEmpty(this.crnStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
}
- public String getCrnEndTime$(){
- if (Cools.isEmpty(this.crnEndTime)){
+ public String getCrnEndTime$() {
+ if (Cools.isEmpty(this.crnEndTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
}
- public String getPlcStrTime$(){
- if (Cools.isEmpty(this.plcStrTime)){
+ public String getPlcStrTime$() {
+ if (Cools.isEmpty(this.plcStrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
}
- public String getCrnPosTime$(){
- if (Cools.isEmpty(this.crnPosTime)){
+ public String getCrnPosTime$() {
+ if (Cools.isEmpty(this.crnPosTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
}
- public String getRefIotime$(){
- if (Cools.isEmpty(this.refIotime)){
+ public String getRefIotime$() {
+ if (Cools.isEmpty(this.refIotime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
}
- public String getModiUser$(){
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
- public String getAppeUser$(){
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public String getErrorTime$(){
- if (Cools.isEmpty(this.errorTime)){
+ public String getErrorTime$() {
+ if (Cools.isEmpty(this.errorTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
@@ -503,13 +506,12 @@
// this.errorMemo = errorMemo;
// }
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
+ public String getLogErrTime$() {
+ if (Cools.isEmpty(this.logErrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
-
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 820f59d..a45d330 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/src/main/java/com/zy/asrs/entity/param/ContainerParams.java b/src/main/java/com/zy/asrs/entity/param/ContainerParams.java
index e1ca331..8f5bfa4 100644
--- a/src/main/java/com/zy/asrs/entity/param/ContainerParams.java
+++ b/src/main/java/com/zy/asrs/entity/param/ContainerParams.java
@@ -9,7 +9,7 @@
@Data
@Accessors(chain = true)
-@ApiModel(value = "ContainerParams",description = "瀹瑰櫒鍒濆鍖栧弬鏁�")
+@ApiModel(value = "ContainerParams", description = "瀹瑰櫒鍒濆鍖栧弬鏁�")
public class ContainerParams implements Serializable {
@ApiModelProperty("璧风偣")
diff --git a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
index 298a252..ccb3419 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatSyncParam.java
@@ -12,14 +12,14 @@
public class MatSyncParam {
/**
- * 鍒涘缓鏃堕棿
+ * 鍒涘缓鏃堕棿
*/
public String createTime;
public List<MatParam> matDetails;
@Data
- public static class MatParam{
+ public static class MatParam {
/**
* 鍟嗗搧缂栧彿
*/
@@ -58,7 +58,7 @@
/**
* 棰滆壊
*/
- private String color;
+ private String color;
/**
* 鍝佺墝
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index b78ee02..c2da074 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -1,12 +1,8 @@
package com.zy.asrs.entity.param;
-import com.alibaba.fastjson.JSON;
-import com.core.common.DateUtils;
import com.zy.common.model.DetlDto;
import lombok.Data;
-import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/PickMatParam.java b/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
index 93f362c..8654fab 100644
--- a/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PickMatParam.java
@@ -24,39 +24,39 @@
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
diff --git a/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java b/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java
index 2e1bde1..c75ca77 100644
--- a/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java
@@ -110,25 +110,25 @@
this.typeDesc103 = typeDesc103;
}
- public List<Integer> getType(){
+ public List<Integer> getType() {
List<Integer> type = new ArrayList<>();
- if (this.typeDesc1==1){
+ if (this.typeDesc1 == 1) {
type.add(1);
}
- if (this.typeDesc10==1){
+ if (this.typeDesc10 == 1) {
type.add(10);
}
- if (this.typeDesc53==1){
+ if (this.typeDesc53 == 1) {
type.add(53);
type.add(57);
}
- if (this.typeDesc101==1){
+ if (this.typeDesc101 == 1) {
type.add(101);
}
- if (this.typeDesc110==1){
+ if (this.typeDesc110 == 1) {
type.add(110);
}
- if (this.typeDesc103==1){
+ if (this.typeDesc103 == 1) {
type.add(103);
type.add(107);
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index aa3524e..e3dcb7e 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -38,39 +38,39 @@
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
private String standby1 = "";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
private String standby2 = "";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
private String standby3 = "";
/**
* 澶囩敤1
*/
- @ApiModelProperty(value= "澶囩敤1")
+ @ApiModelProperty(value = "澶囩敤1")
@TableField("box_type1")
private String boxType1 = "1";
/**
* 澶囩敤2
*/
- @ApiModelProperty(value= "澶囩敤2")
+ @ApiModelProperty(value = "澶囩敤2")
@TableField("box_type2")
private String boxType2 = "1";
/**
* 澶囩敤3
*/
- @ApiModelProperty(value= "澶囩敤3")
+ @ApiModelProperty(value = "澶囩敤3")
@TableField("box_type3")
private String boxType3 = "1";
diff --git a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
index a0b3a9e..8732f46 100644
--- a/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/FindLocNoAttributeVo.java
@@ -200,20 +200,20 @@
}
- public boolean beSimilar(LocDetl locDetl){
+ public boolean beSimilar(LocDetl locDetl) {
return (this.matnr.equals(locDetl.getMatnr())
- && this.batch.equals(locDetl.getBatch())
- && this.brand.equals(locDetl.getBrand())
- && this.standby1.equals(locDetl.getStandby1())
- && this.standby2.equals(locDetl.getStandby2())
- && this.standby3.equals(locDetl.getStandby3())
- && this.boxType1.equals(locDetl.getBoxType1())
- && this.boxType2.equals(locDetl.getBoxType2())
- && this.boxType3.equals(locDetl.getBoxType3())
+ && this.batch.equals(locDetl.getBatch())
+ && this.brand.equals(locDetl.getBrand())
+ && this.standby1.equals(locDetl.getStandby1())
+ && this.standby2.equals(locDetl.getStandby2())
+ && this.standby3.equals(locDetl.getStandby3())
+ && this.boxType1.equals(locDetl.getBoxType1())
+ && this.boxType2.equals(locDetl.getBoxType2())
+ && this.boxType3.equals(locDetl.getBoxType3())
);
}
- public boolean beSimilar(WrkDetl wrkDetl){
+ public boolean beSimilar(WrkDetl wrkDetl) {
return (this.matnr.equals(wrkDetl.getMatnr())
&& this.batch.equals(wrkDetl.getBatch())
&& this.brand.equals(wrkDetl.getBrand())
diff --git a/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java b/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
index e5c80f5..02d2db1 100644
--- a/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
+++ b/src/main/java/com/zy/asrs/entity/result/LocDetlAll.java
@@ -30,18 +30,20 @@
private String meno;
private String manu;
- public String getOwner$(){
+ public String getOwner$() {
LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
LocOwner locOwner = service.selectById(this.owner);
- if (!Cools.isEmpty(locOwner)){
+ if (!Cools.isEmpty(locOwner)) {
return String.valueOf(locOwner.getOwner());
}
return null;
}
- public String getPayment$(){
- if (null == this.payment){ return null; }
- switch (this.payment){
+ public String getPayment$() {
+ if (null == this.payment) {
+ return null;
+ }
+ switch (this.payment) {
case 1:
return "浠撳偍";
case 0:
diff --git a/src/main/java/com/zy/asrs/entity/result/Pakin.java b/src/main/java/com/zy/asrs/entity/result/Pakin.java
index b1bc523..06a7443 100644
--- a/src/main/java/com/zy/asrs/entity/result/Pakin.java
+++ b/src/main/java/com/zy/asrs/entity/result/Pakin.java
@@ -13,7 +13,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -28,191 +27,192 @@
/**
* 鎵�灞為」鐩�
*/
- @ApiModelProperty(value= "鎵�灞為」鐩�")
+ @ApiModelProperty(value = "鎵�灞為」鐩�")
@TableField("host_id")
private Long hostId;
/**
* 浠诲姟鍙�
*/
- @ApiModelProperty(value= "浠诲姟鍙�")
+ @ApiModelProperty(value = "浠诲姟鍙�")
@TableField("wrk_no")
private String wrkNo;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鎵樼洏鍙�
*/
- @ApiModelProperty(value= "鎵樼洏鍙�")
+ @ApiModelProperty(value = "鎵樼洏鍙�")
private String zpallet;
/**
* 鍏ュ簱鏁伴噺
*/
- @ApiModelProperty(value= "鍏ュ簱鏁伴噺")
+ @ApiModelProperty(value = "鍏ュ簱鏁伴噺")
@ExcelProperty(value = "鍏ュ簱鎬婚噺")
private Double anfme;
/**
* 鍏宠仈璐т綅
*/
- @ApiModelProperty(value= "鍏宠仈璐т綅")
+ @ApiModelProperty(value = "鍏宠仈璐т綅")
@TableField("node_id")
private Long nodeId;
/**
* 璐т綅
*/
- @ApiModelProperty(value= "璐т綅")
+ @ApiModelProperty(value = "璐т綅")
@TableField("loc_no")
private String locNo;
/**
* 鍟嗗搧缂栫爜
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
@ExcelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
@ExcelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
@ExcelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
@ExcelProperty(value = "鍗曚綅")
private String unit;
/**
* SKC
*/
- @ApiModelProperty(value= "SKC")
+ @ApiModelProperty(value = "SKC")
@ExcelProperty(value = "SKC")
private String barcode;
/**
* 鍗曟嵁绫诲瀷
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
+ @ApiModelProperty(value = "鍗曟嵁绫诲瀷")
@TableField("doc_id")
private Long docId;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("doc_num")
private String docNum;
/**
* 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@TableField("cust_name")
private String custName;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private Integer itemNum;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Integer count;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- public Pakin() {}
+ public Pakin() {
+ }
public Pakin(Long hostId, String wrkNo, Long wrkSts, String zpallet, Double anfme, Long nodeId, String locNo, String matnr, String maktx, String name, String specs, String model, String batch, String unit, String barcode, Long docId, String docNum, String custName, Integer itemNum, Integer count, Double weight, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.hostId = hostId;
@@ -273,20 +273,21 @@
// null // 澶囨敞
// );
- public String getHostId$(){
+ public String getHostId$() {
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
+ if (!Cools.isEmpty(host)) {
return String.valueOf(host.getName());
}
return null;
}
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -296,33 +297,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getNickname());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
diff --git a/src/main/java/com/zy/asrs/enums/CommonEnum.java b/src/main/java/com/zy/asrs/enums/CommonEnum.java
index e2fcbf9..dbf327d 100644
--- a/src/main/java/com/zy/asrs/enums/CommonEnum.java
+++ b/src/main/java/com/zy/asrs/enums/CommonEnum.java
@@ -2,9 +2,9 @@
/**
* @author Ryan
+ * @version 1.0
* @date 2025/9/25
* @description: 閫氱敤绫诲瀷鏋氫妇
- * @version 1.0
*/
public enum CommonEnum {
diff --git a/src/main/java/com/zy/asrs/enums/ContainerType.java b/src/main/java/com/zy/asrs/enums/ContainerType.java
index 379d1aa..4a70222 100644
--- a/src/main/java/com/zy/asrs/enums/ContainerType.java
+++ b/src/main/java/com/zy/asrs/enums/ContainerType.java
@@ -22,6 +22,4 @@
}
-
-
}
diff --git a/src/main/java/com/zy/asrs/enums/MatTagType.java b/src/main/java/com/zy/asrs/enums/MatTagType.java
index dbf9a6d..9b97cc2 100644
--- a/src/main/java/com/zy/asrs/enums/MatTagType.java
+++ b/src/main/java/com/zy/asrs/enums/MatTagType.java
@@ -6,8 +6,7 @@
//灏忎欢
MAT_TAGT_YPE_SMALL("12", "灏忎欢"),
//婊よ姱
- MAT_TAGT_YPE_XIN("14", "婊よ姱")
- ;
+ MAT_TAGT_YPE_XIN("14", "婊よ姱");
public String id;
diff --git a/src/main/java/com/zy/asrs/mapper/AdjDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AdjDetlMapper.java
index 8fe7a9e..0e655ff 100644
--- a/src/main/java/com/zy/asrs/mapper/AdjDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AdjDetlMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.AdjDetl;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.AdjDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
index a520922..a20d98f 100644
--- a/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ApiLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.ApiLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.ApiLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/AppVersionMapper.java b/src/main/java/com/zy/asrs/mapper/AppVersionMapper.java
index db63066..b4b2f9a 100644
--- a/src/main/java/com/zy/asrs/mapper/AppVersionMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AppVersionMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.AppVersion;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.AppVersion;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasAreasMapper.java b/src/main/java/com/zy/asrs/mapper/BasAreasMapper.java
index bbbffaa..21b1efd 100644
--- a/src/main/java/com/zy/asrs/mapper/BasAreasMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasAreasMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasAreas;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasAreas;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasContainerMapper.java b/src/main/java/com/zy/asrs/mapper/BasContainerMapper.java
index c7b3df9..b3378ae 100644
--- a/src/main/java/com/zy/asrs/mapper/BasContainerMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasContainerMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasContainer;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasContainer;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
index 744c664..759120c 100644
--- a/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasCrnOpt;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasCrnOpt;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
index cd49855..ed77f10 100644
--- a/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasErrLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasErrLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
index eb5059e..93346b1 100644
--- a/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasPlcerrorMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasPlcerror;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasPlcerror;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasProcessProceduresMapper.java b/src/main/java/com/zy/asrs/mapper/BasProcessProceduresMapper.java
index 55ff281..ac6b49a 100644
--- a/src/main/java/com/zy/asrs/mapper/BasProcessProceduresMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasProcessProceduresMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasProcessProcedures;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasProcessProcedures;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasQualityTestingMapper.java b/src/main/java/com/zy/asrs/mapper/BasQualityTestingMapper.java
index 5a36c31..4ede4b7 100644
--- a/src/main/java/com/zy/asrs/mapper/BasQualityTestingMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasQualityTestingMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasQualityTesting;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasQualityTesting;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/BasStationMapper.java b/src/main/java/com/zy/asrs/mapper/BasStationMapper.java
index 9bb6da0..8709f71 100644
--- a/src/main/java/com/zy/asrs/mapper/BasStationMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasStationMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.BasStation;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.BasStation;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/DocTypeMapper.java b/src/main/java/com/zy/asrs/mapper/DocTypeMapper.java
index 09ff93c..86f273a 100644
--- a/src/main/java/com/zy/asrs/mapper/DocTypeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/DocTypeMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.DocType;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DocType;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/LocCacheMapper.java b/src/main/java/com/zy/asrs/mapper/LocCacheMapper.java
index cf539ae..88ad688 100644
--- a/src/main/java/com/zy/asrs/mapper/LocCacheMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocCacheMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.LocCache;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocCache;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java b/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java
index 226f138..8dee18c 100644
--- a/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.LocCheck;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.LocCheck;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index bbf8ac8..739e375 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -27,17 +27,17 @@
Integer listByPageCount(Map<String, Object> map);
- LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,
- @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
- @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3 );
+ LocDetl selectItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch,
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2,
+ @Param("standby3") String standby3, @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3);
- int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,
- @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
- @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3 );
+ int deleteItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch,
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2,
+ @Param("standby3") String standby3, @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3);
- int updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch,
- @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
- @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3 );
+ int updateAnfme(@Param("anfme") Double anfme, @Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch,
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2,
+ @Param("standby3") String standby3, @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3);
List<LocDetl> getStockOutPage(Map<String, Object> map);
@@ -49,7 +49,7 @@
@Select("SELECT ld.loc_no FROM asr_loc_detl ld LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no WHERE (1 = 1 AND ld.matnr = #{matnr} AND (lm.row1 >= #{start} AND lm.row1 <= #{end}) AND lm.loc_sts = 'F' AND DateDiff(dd, ld.appe_time, getdate()) = 0) ORDER BY ld.appe_time ASC")
List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
- List<String> selectSameDetlTodayBatch(@Param("matnr") String matnr,@Param("batch") String batch, @Param("start") Integer start, @Param("end") Integer end);
+ List<String> selectSameDetlTodayBatch(@Param("matnr") String matnr, @Param("batch") String batch, @Param("start") Integer start, @Param("end") Integer end);
List<LocDetl> getStockStatis(Map<String, Object> map);
@@ -70,10 +70,11 @@
// -------------------------------------------------
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
- List<LocDetl> queryStockAll(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("batch")String batch,
- @Param("brand")String brand,@Param("standby1")String standby1,@Param("standby2")String standby2,
- @Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
+ List<LocDetl> queryStock(@Param("matnr") String matnr, @Param("batch") String batch, @Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos);
+
+ List<LocDetl> queryStockAll(@Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr") String matnr, @Param("batch") String batch,
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2,
+ @Param("standby3") String standby3, @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3);
Double queryStockAnfme(String matnr, String batch);
@@ -86,14 +87,15 @@
Double selectLocDetlSumQty(String locNo);
- void updateMatTurn(@Param("matnrOld")String matnrOld,@Param("matnr")String matnr);
+ void updateMatTurn(@Param("matnrOld") String matnrOld, @Param("matnr") String matnr);
- List<Map<String,Object>> selectLocDetlUnilateralMoveShuttleMapY(Integer crnNo);
+ List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMapY(Integer crnNo);
- List<Map<String,Object>> selectLocDetlUnilateralMoveShuttleMapN(Integer crnNo);
+ List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMapN(Integer crnNo);
- List<LocDetl> selectLocDetlUnilateralMoveShuttleY(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
- List<LocDetl> selectLocDetlUnilateralMoveShuttleN(@Param("matnr")String matnr,@Param("batch")String batch,@Param("grade")String grade);
+ List<LocDetl> selectLocDetlUnilateralMoveShuttleY(@Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade);
+
+ List<LocDetl> selectLocDetlUnilateralMoveShuttleN(@Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade);
List<LocDetl> searchByLike(String orderNo, String matnr, String maktx, String specs, String locNo);//閫氳繃璁㈠崟鍙枫�佺墿鏂欏彿銆佺墿鏂欏悕绉般�佽鏍笺�佸簱浣嶅彿杩涜妯＄硦鎼滅储
@@ -104,9 +106,10 @@
/**
* 鍐荤粨/瑙ｅ喕搴撳瓨鏄庣粏
- * @param locNo 搴撲綅鍙�
- * @param matnr 鐗╂枡缂栫爜
- * @param batch 鎵规
+ *
+ * @param locNo 搴撲綅鍙�
+ * @param matnr 鐗╂枡缂栫爜
+ * @param batch 鎵规
* @param frozen 0瑙ｅ喕锛�1鍐荤粨
*/
void frozenInventory(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("frozen") int frozen);
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index f179d73..c897114 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -15,49 +15,51 @@
List<LocMast> selectLocByLev(Integer lev);
- LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1,@Param("whsType") Long whsType);
+ LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("whsType") Long whsType);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
- List<String> queryGroupEmptyStock(Integer crnNo,@Param("whsType") Long whsType);
+ List<String> queryGroupEmptyStock(Integer crnNo, @Param("whsType") Long whsType);
@Select("select count(*) as count from asr_loc_mast where 1=1 and loc_sts = 'O' and loc_type1 = #{locType1} and crn_no = #{crnNo}")
- Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo,@Param("whsType") Long whsType);
+ Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo, @Param("whsType") Long whsType);
- List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo,@Param("whsType") Long whsType);
+ List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo, @Param("whsType") Long whsType);
- List<LocMast> selectLocShuttleMoveUnilateralY(@Param("bay")Integer bay,@Param("lev")Integer lev,@Param("whsType") Long whsType);
- List<LocMast> selectLocShuttleMoveUnilateralN(@Param("bay")Integer bay,@Param("lev")Integer lev,@Param("whsType") Long whsType);
+ List<LocMast> selectLocShuttleMoveUnilateralY(@Param("bay") Integer bay, @Param("lev") Integer lev, @Param("whsType") Long whsType);
+
+ List<LocMast> selectLocShuttleMoveUnilateralN(@Param("bay") Integer bay, @Param("lev") Integer lev, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�>娴�
* */
// LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
- LocMast selectLocByLocStsPakInF1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
+ LocMast selectLocByLocStsPakInF1(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�<娴�
* */
// LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
- LocMast selectLocByLocStsPakInF2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
+ LocMast selectLocByLocStsPakInF2(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�>娴�
* */
// LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
- LocMast selectLocByLocStsPakInO1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
+ LocMast selectLocByLocStsPakInO1(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�<娴�
* */
// LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos,@Param("whsType") Long whsType);
- LocMast selectLocByLocStsPakInO2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
+ LocMast selectLocByLocStsPakInO2(@Param("crnNo") Integer crnNo, @Param("bay") Integer bay, @Param("lev") Integer lev, @Param("gro") Integer gro, @Param("whsType") Long whsType);
/**
* 鏌ユ壘绗竴涓喕缁撶殑搴撲綅
+ *
* @param locNoList 搴撲綅鍙烽泦鍚�
* @return 搴撲綅鍙�
*/
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index 250a289..3f2b4e5 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -20,11 +20,11 @@
Integer listByPageCount(Map<String, Object> map);
- ManLocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ ManLocDetl selectItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch);
- int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ int deleteItem(@Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch);
- int updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ int updateAnfme(@Param("anfme") Double anfme, @Param("locNo") String locNo, @Param("matnr") String matnr, @Param("batch") String batch);
List<ManLocDetl> getStockOutPage(Map<String, Object> map);
@@ -53,7 +53,7 @@
// -------------------------------------------------
- List<ManLocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos);
+ List<ManLocDetl> queryStock(@Param("matnr") String matnr, @Param("batch") String batch, @Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/mapper/MatMapper.java b/src/main/java/com/zy/asrs/mapper/MatMapper.java
index c8457c2..2a5e9ee 100644
--- a/src/main/java/com/zy/asrs/mapper/MatMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.zy.asrs.entity.Mat;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
-import com.zy.asrs.entity.Mat;
import java.util.List;
import java.util.Map;
@@ -14,12 +14,13 @@
@Repository
public interface MatMapper extends BaseMapper<Mat> {
- List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
- List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs);
+ List<Mat> listByPage(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx);
- Mat selectByMatnr(@Param("matnr")String matnr);
+ List<Mat> listByPage2(Page page, @Param("tagId") String tagId, @Param("matnr") Object matnr, @Param("maktx") Object maktx, @Param("specs") Object specs);
- List<Mat> selectByMatnrLink(@Param("matnr")String matnr);
+ Mat selectByMatnr(@Param("matnr") String matnr);
+
+ List<Mat> selectByMatnrLink(@Param("matnr") String matnr);
Mat selectNewUpdateTime();
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlLogMapper.java
new file mode 100644
index 0000000..1a191e7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlLogMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderDetlLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderDetlLogMapper extends BaseMapper<OrderDetlLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 2325909..84c14ea 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -13,17 +13,17 @@
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
- OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
- OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
List<OrderDetl> selectWorkingDetls(Long orderId);
@@ -31,35 +31,36 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increase(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int decrease(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ int modifyStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
int addToLogTable(OrderDetl orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch,
- @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch,
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("workQty") Double workQty);
+
int increaseWorkQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("workQty") Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinLogMapper.java
new file mode 100644
index 0000000..5500647
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinLogMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderDetlPakinLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderDetlPakinLogMapper extends BaseMapper<OrderDetlPakinLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
index dd0beb8..f65c663 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
@@ -13,15 +13,15 @@
@Repository
public interface OrderDetlPakinMapper extends BaseMapper<OrderDetlPakin> {
- OrderDetlPakin selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand
- , @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1, @Param("boxType2")String boxType2, @Param("boxType3")String boxType3);
+ OrderDetlPakin selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand
+ , @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3);
- OrderDetlPakin selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ OrderDetlPakin selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
List<OrderDetlPakin> selectWorkingDetls(Long orderId);
@@ -29,31 +29,31 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increase(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int decrease(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ int modifyStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
int addToLogTable(OrderDetlPakin orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("workQty") Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutLogMapper.java
new file mode 100644
index 0000000..5bf179d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutLogMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderDetlPakoutLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderDetlPakoutLogMapper extends BaseMapper<OrderDetlPakoutLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
index 70e2f1c..1fe536a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
@@ -13,15 +13,15 @@
@Repository
public interface OrderDetlPakoutMapper extends BaseMapper<OrderDetlPakout> {
- OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
OrderDetlPakout selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch,
- @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3);
+ @Param("brand") String brand, @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3);
List<OrderDetlPakout> selectWorkingDetls(Long orderId);
@@ -29,28 +29,28 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increase(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int decrease(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
+ int modifyStatus(@Param("orderId") Long orderId, @Param("status") Integer status);
int addToLogTable(OrderDetlPakout orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("qty") Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand,
- @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("boxType1")String boxType1,
- @Param("boxType2")String boxType2,
- @Param("boxType3")String boxType3, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand,
+ @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3, @Param("boxType1") String boxType1,
+ @Param("boxType2") String boxType2,
+ @Param("boxType3") String boxType3, @Param("workQty") Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderLogMapper.java
new file mode 100644
index 0000000..af0ef55
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderLogMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderLogMapper extends BaseMapper<OrderLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 69f50ce..4fe33d3 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -12,17 +12,21 @@
@Repository
public interface OrderMapper extends BaseMapper<Order> {
- int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+ int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);
List<Order> selectComplete();
+
List<Order> selectComplete1();
+
List<Order> selectComplete99();
+
List<Order> selectComplete8();
int addToLogTable(Order order);
- List<Order> selectorderNoL(@Param("orderNo")String orderNo);
+ List<Order> selectorderNoL(@Param("orderNo") String orderNo);
Order selectOrderMoveStatus();
+
Order selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakinLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakinLogMapper.java
new file mode 100644
index 0000000..c3a69aa
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakinLogMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderPakinLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderPakinLogMapper extends BaseMapper<OrderPakinLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java
index cee44b4..a9acc1a 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakinMapper.java
@@ -12,15 +12,17 @@
@Repository
public interface OrderPakinMapper extends BaseMapper<OrderPakin> {
- int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+ int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);
List<OrderPakin> selectComplete();
+
List<OrderPakin> selectComplete8();
int addToLogTable(OrderPakin order);
- List<OrderPakin> selectorderNoL(@Param("orderNo")String orderNo);
+ List<OrderPakin> selectorderNoL(@Param("orderNo") String orderNo);
OrderPakin selectOrderMoveStatus();
+
OrderPakin selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakoutLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakoutLogMapper.java
new file mode 100644
index 0000000..cc37ab6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakoutLogMapper.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderPakoutLog;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface OrderPakoutLogMapper extends BaseMapper<OrderPakoutLog> {
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
index 6682c7c..8a49a44 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderPakoutMapper.java
@@ -12,15 +12,17 @@
@Repository
public interface OrderPakoutMapper extends BaseMapper<OrderPakout> {
- int updateSettle(@Param("orderId")Long orderId, @Param("settle")Long settle, @Param("userId")Long userId);
+ int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId);
List<OrderPakout> selectComplete();
+
List<OrderPakout> selectComplete8();
int addToLogTable(OrderPakout order);
- List<OrderPakout> selectorderNoL(@Param("orderNo")String orderNo);
+ List<OrderPakout> selectorderNoL(@Param("orderNo") String orderNo);
OrderPakout selectOrderMoveStatus();
+
OrderPakout selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderSettleMapper.java b/src/main/java/com/zy/asrs/mapper/OrderSettleMapper.java
index 2efc47a..993355b 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderSettleMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderSettleMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.OrderSettle;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.OrderSettle;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/PackMapper.java b/src/main/java/com/zy/asrs/mapper/PackMapper.java
index 06197c4..dca3858 100644
--- a/src/main/java/com/zy/asrs/mapper/PackMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PackMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.Pack;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.Pack;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 6a804db..d836f6b 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -11,73 +11,85 @@
@Mapper
@Repository
public interface ReportQueryMapper {
-
- //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
- List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
- int getViewStockUseCount(ViewStockUseBean viewStockUse);
- List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
- //鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
- public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
- public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
- //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
- public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
+ //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
+ List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
-// // 搴撲綅Map
- @Select("select distinct row1 from asr_loc_mast order by row1 asc")
- List<Integer> getViewLocRowTotal();
+ int getViewStockUseCount(ViewStockUseBean viewStockUse);
- @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
- public List<String> getViewLocLevCount(@Param("row1") int row1);
-//
- @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
- public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
+ List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
- // 搴撲綅Map
- @Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
- public List<String> getViewLocBayCount(@Param("row1") int row1);
+ //鍒嗛〉鏌ヨ搴撳瓨婊炵暀鏃堕棿
+ public List<ViewStayTimeBean> queryViewStayTimeList(ViewStayTimeBean viewStayTime);
- @Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
- public List<ViewLocMapDto> getViewLocLevs(@Param("row1") int row1, @Param("bay1") int bay1);
+ public int getViewStayTimeCount(ViewStayTimeBean viewStayTime);
+
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewStayTimeBean> getViewStayTimeAll(ViewStayTimeBean viewStayTime);
+
+ // // 搴撲綅Map
+ @Select("select distinct row1 from asr_loc_mast order by row1 asc")
+ List<Integer> getViewLocRowTotal();
+
+ @Select("select distinct lev1 from asr_loc_mast where row1=#{row1} order by lev1 desc")
+ public List<String> getViewLocLevCount(@Param("row1") int row1);
+
+ //
+ @Select("select loc_no as locNo, bay1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and lev1=#{lev1} order by bay1")
+ public List<ViewLocMapDto> getViewLocBays(@Param("row1") int row1, @Param("lev1") int lev1);
+
+ // 搴撲綅Map
+ @Select("select distinct bay1 from asr_loc_mast where row1=#{row1} order by bay1")
+ public List<String> getViewLocBayCount(@Param("row1") int row1);
+
+ @Select("select lev1,loc_sts as locSts from asr_loc_mast where row1=#{row1} and bay1=#{bay1} order by bay1")
+ public List<ViewLocMapDto> getViewLocLevs(@Param("row1") int row1, @Param("bay1") int bay1);
- //鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
- public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
- public int getViewInOutCount(ViewInOutBean viewInOut);
- //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
- public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
+ //鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
+ public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
- //鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
- public List<ViewWorkInBean> queryViewWorkInList(ViewWorkInBean viewWorkIn);
- public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
- //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
- public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+ public int getViewInOutCount(ViewInOutBean viewInOut);
- //鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
- public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
- public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
- //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
- public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
+
+ //鍒嗛〉鏌ヨ鏃ュ叆搴撹褰�
+ public List<ViewWorkInBean> queryViewWorkInList(ViewWorkInBean viewWorkIn);
+
+ public int getViewWorkInCount(ViewWorkInBean viewWorkIn);
+
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewWorkInBean> getViewWorkInAll(ViewWorkInBean viewWorkIn);
+
+ //鍒嗛〉鏌ヨ鏃ュ嚭搴撹褰�
+ public List<ViewWorkInBean> queryViewWorkOutList(ViewWorkInBean viewWorkOut);
+
+ public int getViewWorkOutCount(ViewWorkInBean viewWorkOut);
+
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
+ public List<ViewWorkInBean> getViewWorkOutAll(ViewWorkInBean viewWorkOut);
- // ------鍥捐〃
- //楗肩姸鍥�
- @Select("select * from asr_loc_use_view")
- public LocChartPie getLocUseRate();
- //鏇茬嚎鍥�
- @Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
- + "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
- public List<WorkChartAxis> getChartAxis();
+ // ------鍥捐〃
+ //楗肩姸鍥�
+ @Select("select * from asr_loc_use_view")
+ public LocChartPie getLocUseRate();
- List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr")String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ //鏇茬嚎鍥�
+ @Select("select ymd,SUM(sto_qty) inqty,SUM(ret_qty) outqty from asr_sta_inout_view "
+ + "where ymd>CONVERT(char(10), DATEADD(DAY,-12,GETDATE()), 120) group by ymd order by ymd")
+ public List<WorkChartAxis> getChartAxis();
- Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ List<ViewWorkCountInView> selectWorkCountIn(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("matnr") String matnr, @Param("start") String startTime, @Param("end") String endTime);
- List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ Integer selectWorkCountInTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
- Integer selectWorkCountOutTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ List<ViewWorkCountInView> selectWorkCountOut(@Param("curr") Integer pageNumber, @Param("limit") Integer pageSize, String matnr, @Param("start") String startTime, @Param("end") String endTime);
- Integer selectWorkCountInSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ Integer selectWorkCountOutTotal(String matnr, @Param("start") String startTime, @Param("end") String endTime);
- Integer selectWorkCountOutSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+ Integer selectWorkCountInSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ Integer selectWorkCountOutSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
}
diff --git a/src/main/java/com/zy/asrs/mapper/RowLastnoTypeMapper.java b/src/main/java/com/zy/asrs/mapper/RowLastnoTypeMapper.java
index 08f879e..d7f0242 100644
--- a/src/main/java/com/zy/asrs/mapper/RowLastnoTypeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/RowLastnoTypeMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.RowLastnoType;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.RowLastnoType;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/TagMapper.java b/src/main/java/com/zy/asrs/mapper/TagMapper.java
index 56a9292..4133bea 100644
--- a/src/main/java/com/zy/asrs/mapper/TagMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TagMapper.java
@@ -1,9 +1,9 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.Tag;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
-import com.zy.asrs.entity.Tag;
@Mapper
@Repository
diff --git a/src/main/java/com/zy/asrs/mapper/TaskDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskDetlLogMapper.java
index b87af4b..07621c2 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskDetlLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TaskDetlLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TaskDetlLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/TaskDetlMapper.java b/src/main/java/com/zy/asrs/mapper/TaskDetlMapper.java
index 891f5a0..5dde3fb 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskDetlMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TaskDetl;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TaskDetl;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/TaskLogMapper.java b/src/main/java/com/zy/asrs/mapper/TaskLogMapper.java
index 94c1de5..d931f03 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TaskLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TaskLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/TaskMapper.java b/src/main/java/com/zy/asrs/mapper/TaskMapper.java
index 1d11dfa..4fd8345 100644
--- a/src/main/java/com/zy/asrs/mapper/TaskMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TaskMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.Task;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.Task;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/TrayCodeMapper.java b/src/main/java/com/zy/asrs/mapper/TrayCodeMapper.java
index 9a90105..9e54805 100644
--- a/src/main/java/com/zy/asrs/mapper/TrayCodeMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/TrayCodeMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.TrayCode;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.TrayCode;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
index 1ab9a07..cbca94b 100644
--- a/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WaitPakinMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.WaitPakin;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.WaitPakin;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
index 67a4a26..72d109e 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.WrkDetlLog;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index e10e894..bf79a8b 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -14,15 +14,15 @@
List<WrkDetl> selectByWrkNo(Integer wrkNo);
- int deleteItem(@Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ int deleteItem(@Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
- int updateAnfme(@Param("anfme")Double anfme, @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ int updateAnfme(@Param("anfme") Double anfme, @Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
List<WrkDetl> selectAndLogByOrderNo(String orderNo);
- int updateInspect( @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ int updateInspect(@Param("wrkNo") Integer wrkNo, @Param("matnr") String matnr, @Param("batch") String batch);
- List<WrkDetl> selectPakoutQuery(@Param("staNo")Integer staNo, @Param("matnr")String matnr);
+ List<WrkDetl> selectPakoutQuery(@Param("staNo") Integer staNo, @Param("matnr") String matnr);
List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo);
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
index 15c5c77..002fd0d 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
@@ -21,7 +21,7 @@
/**
* 鏌ヨ搴撳瓨绉诲姩娴佹按璁板綍
*/
- List<InventoryFlowDto> inventoryFlowList(@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("param") Map<String, Object> param);
+ List<InventoryFlowDto> inventoryFlowList(@Param("curr") Integer curr, @Param("limit") Integer limit, @Param("param") Map<String, Object> param);
/**
* 缁熻搴撳瓨绉诲姩娴佹按璁板綍鏁�
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 8d0111e..1bb2ac3 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -13,16 +13,16 @@
@Repository
public interface WrkMastMapper extends BaseMapper<WrkMast> {
-// @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
+ // @Select("select * from asr_wrk_mast where ((wrk_sts = 4 Or wrk_sts = 14 ) and io_type <> 103 and io_type <> 104 and io_type <> 107 ) or (wrk_sts = 2 and io_type=6) order by upd_mk,io_time,wrk_no")
List<WrkMast> selectToBeCompleteData();
List<WrkMast> selectToBeHistoryData();
@Select("select count(1) from asr_wrk_mast where 1=1 and io_type = #{ioType} and sta_no = #{staNo}")
- int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
+ int selectWrkMastBareBoardStaNo(Integer ioType, Integer staNo);
- List<WrkMast> selectWrkMastWrkDetl(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("brand") String brand
- , @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3
- , @Param("boxType1")String boxType1, @Param("boxType2")String boxType2, @Param("boxType3")String boxType3, @Param("crnNo") Integer crnNo);
+ List<WrkMast> selectWrkMastWrkDetl(@Param("ioType") Integer ioType, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand") String brand
+ , @Param("standby1") String standby1, @Param("standby2") String standby2, @Param("standby3") String standby3
+ , @Param("boxType1") String boxType1, @Param("boxType2") String boxType2, @Param("boxType3") String boxType3, @Param("crnNo") Integer crnNo);
}
diff --git a/src/main/java/com/zy/asrs/service/AdjDetlService.java b/src/main/java/com/zy/asrs/service/AdjDetlService.java
index 61ca75c..0b326b5 100644
--- a/src/main/java/com/zy/asrs/service/AdjDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AdjDetlService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.AdjDetl;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.AdjDetl;
public interface AdjDetlService extends IService<AdjDetl> {
diff --git a/src/main/java/com/zy/asrs/service/ApiLogService.java b/src/main/java/com/zy/asrs/service/ApiLogService.java
index 43e45d5..8e3c698 100644
--- a/src/main/java/com/zy/asrs/service/ApiLogService.java
+++ b/src/main/java/com/zy/asrs/service/ApiLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.ApiLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.ApiLog;
public interface ApiLogService extends IService<ApiLog> {
diff --git a/src/main/java/com/zy/asrs/service/AppVersionService.java b/src/main/java/com/zy/asrs/service/AppVersionService.java
index 25b4288..0a066bc 100644
--- a/src/main/java/com/zy/asrs/service/AppVersionService.java
+++ b/src/main/java/com/zy/asrs/service/AppVersionService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.AppVersion;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.AppVersion;
public interface AppVersionService extends IService<AppVersion> {
diff --git a/src/main/java/com/zy/asrs/service/BasAreasService.java b/src/main/java/com/zy/asrs/service/BasAreasService.java
index 33f0141..76d7ab2 100644
--- a/src/main/java/com/zy/asrs/service/BasAreasService.java
+++ b/src/main/java/com/zy/asrs/service/BasAreasService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasAreas;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasAreas;
public interface BasAreasService extends IService<BasAreas> {
diff --git a/src/main/java/com/zy/asrs/service/BasContainerService.java b/src/main/java/com/zy/asrs/service/BasContainerService.java
index a60a428..713427b 100644
--- a/src/main/java/com/zy/asrs/service/BasContainerService.java
+++ b/src/main/java/com/zy/asrs/service/BasContainerService.java
@@ -1,9 +1,7 @@
package com.zy.asrs.service;
-import com.core.common.R;
-import com.zy.asrs.entity.BasContainer;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.param.ContainerParams;
+import com.zy.asrs.entity.BasContainer;
public interface BasContainerService extends IService<BasContainer> {
diff --git a/src/main/java/com/zy/asrs/service/BasCrnOptService.java b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
index 7538c73..fa300cf 100644
--- a/src/main/java/com/zy/asrs/service/BasCrnOptService.java
+++ b/src/main/java/com/zy/asrs/service/BasCrnOptService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasCrnOpt;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasCrnOpt;
public interface BasCrnOptService extends IService<BasCrnOpt> {
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 00b3589..254d58b 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -9,36 +9,42 @@
/**
* 鍏ュ簱绔�
+ *
* @return
*/
List<Integer> getAvailableInSite();
/**
* 绌烘澘鍏ュ簱绔�
+ *
* @return
*/
List<Integer> getAvailableEmptyInSite();
/**
* 鍑哄簱绔�
+ *
* @return
*/
List<Integer> getAvailableOutSite(Integer typeNo);
/**
* 绌烘澘鍑哄簱绔�
+ *
* @return
*/
List<Integer> getAvailableEmptyOutSite();
/**
* 鐩爣绔欑偣鐘舵�佹娴�
+ *
* @param devpNo
*/
BasDevp checkSiteStatus(Integer devpNo);
/**
* 鐩爣绔欑偣鐘舵�佹娴�
+ *
* @param pakin 鏄惁鍏ュ簱鎿嶄綔 true 鏄� 锛� false 涓嶆槸
*/
BasDevp checkSiteStatus(Integer devpNo, boolean pakin);
diff --git a/src/main/java/com/zy/asrs/service/BasErrLogService.java b/src/main/java/com/zy/asrs/service/BasErrLogService.java
index 5455fb2..b249a16 100644
--- a/src/main/java/com/zy/asrs/service/BasErrLogService.java
+++ b/src/main/java/com/zy/asrs/service/BasErrLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasErrLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasErrLog;
public interface BasErrLogService extends IService<BasErrLog> {
diff --git a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
index 1f7b153..45c6c91 100644
--- a/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
+++ b/src/main/java/com/zy/asrs/service/BasPlcerrorService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasPlcerror;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasPlcerror;
public interface BasPlcerrorService extends IService<BasPlcerror> {
diff --git a/src/main/java/com/zy/asrs/service/BasProcessProceduresService.java b/src/main/java/com/zy/asrs/service/BasProcessProceduresService.java
index 0cc81eb..eba3f30 100644
--- a/src/main/java/com/zy/asrs/service/BasProcessProceduresService.java
+++ b/src/main/java/com/zy/asrs/service/BasProcessProceduresService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasProcessProcedures;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasProcessProcedures;
public interface BasProcessProceduresService extends IService<BasProcessProcedures> {
diff --git a/src/main/java/com/zy/asrs/service/BasQualityTestingService.java b/src/main/java/com/zy/asrs/service/BasQualityTestingService.java
index 87cf2aa..40b21f4 100644
--- a/src/main/java/com/zy/asrs/service/BasQualityTestingService.java
+++ b/src/main/java/com/zy/asrs/service/BasQualityTestingService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasQualityTesting;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasQualityTesting;
public interface BasQualityTestingService extends IService<BasQualityTesting> {
diff --git a/src/main/java/com/zy/asrs/service/BasStationService.java b/src/main/java/com/zy/asrs/service/BasStationService.java
index 96eceb3..e335c32 100644
--- a/src/main/java/com/zy/asrs/service/BasStationService.java
+++ b/src/main/java/com/zy/asrs/service/BasStationService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.BasStation;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.BasStation;
public interface BasStationService extends IService<BasStation> {
diff --git a/src/main/java/com/zy/asrs/service/DocTypeService.java b/src/main/java/com/zy/asrs/service/DocTypeService.java
index 35e585d..894a701 100644
--- a/src/main/java/com/zy/asrs/service/DocTypeService.java
+++ b/src/main/java/com/zy/asrs/service/DocTypeService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.DocType;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DocType;
public interface DocTypeService extends IService<DocType> {
diff --git a/src/main/java/com/zy/asrs/service/LocCacheService.java b/src/main/java/com/zy/asrs/service/LocCacheService.java
index f5b03fb..1696d09 100644
--- a/src/main/java/com/zy/asrs/service/LocCacheService.java
+++ b/src/main/java/com/zy/asrs/service/LocCacheService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.service;
+import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
import com.zy.asrs.entity.LocCache;
-import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.param.LocMastInitParam;
public interface LocCacheService extends IService<LocCache> {
diff --git a/src/main/java/com/zy/asrs/service/LocCheckService.java b/src/main/java/com/zy/asrs/service/LocCheckService.java
index db3fe91..4265188 100644
--- a/src/main/java/com/zy/asrs/service/LocCheckService.java
+++ b/src/main/java/com/zy/asrs/service/LocCheckService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.LocCheck;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.LocCheck;
public interface LocCheckService extends IService<LocCheck> {
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 2bdc4f2..ea501dc 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -22,7 +22,7 @@
int selectAllCount(LocDetlDTO locDetlDTO);
- LocDetl selectItem(String locNo, String matnr, String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3);
+ LocDetl selectItem(String locNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
Page<LocDetl> getStockOut(Page<LocDetl> page);
@@ -34,12 +34,13 @@
* 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
*/
boolean updateAnfme(Double anfme, String locNo, String matnr
- ,String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3);
+ , String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
boolean updateLocNo(String newLocNo, String oldLocNo);
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @return locNo 搴撲綅鍙�
*/
@@ -47,6 +48,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @param batch 鎵规鍙�
* @return locNo 搴撲綅鍙�
@@ -67,7 +69,7 @@
List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos);
- List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
+ List<LocDetl> queryStockAll(String orderNo, Set<String> locNos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
Double queryStockAnfme(String matnr, String batch);
@@ -80,11 +82,11 @@
Double getLocDetlSumQty(String locNo);
- void updateMatTurn(String matnrOld,String matnr);
+ void updateMatTurn(String matnrOld, String matnr);
List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo);
- List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo);
+ List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr, String batch, String grade, Integer crnNo);
/**
* 鍐荤粨搴撳瓨
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index a0677de..5bda6d9 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -12,53 +12,62 @@
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
LocMast queryFreeLocMast(Integer row, Short locType1);
+
LocMast queryFreeLocMast(Integer row, Short locType1, Long whsType);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
+ *
* @param sourceLocNo 婧愬簱浣�
* @return 鍚岀粍绌哄簱浣嶉泦鍚�
*/
List<String> queryGroupEmptyStock(String sourceLocNo);
+
List<String> queryGroupEmptyStock(String sourceLocNo, Long whsType);
/**
* 妫�鏌ュ綋鍓嶅簱浣嶆墍灞炲贩閬撶殑绌哄簱浣嶆暟閲�
+ *
* @param locMast
* @return
*/
Boolean checkEmptyCount(LocMast locMast);
+
Boolean checkEmptyCount(LocMast locMast, Long whsType);
/**
* 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
*/
Boolean checkWhole(List<LocDetl> locDetls);
+
Boolean checkWhole(List<LocDetl> locDetls, Long whsType);
/**
* 鏌ヨ娴呭簱浣嶅湪搴擄紝娣卞簱浣嶄负O鐨勬暟鎹�
+ *
* @return
*/
List<LocMast> queryShallowLocFMast(Integer crnNo);
+
List<LocMast> queryShallowLocFMast(Integer crnNo, Long whsType);
- List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo);
- List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo, Long whsType);
+ List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo);
+
+ List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo, Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
* */
// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
// LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
- LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
+ LocMast selectLocByLocStsPakInF(Integer curRow, Integer nearRow, LocMast locNo, Long whsType);
/*
* 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
* */
// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos);
// LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos, Long whsType);
- LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locNoo, Long whsType);
+ LocMast selectLocByLocStsPakInO(Integer curRow, Integer nearRow, LocMast locNoo, Long whsType);
//鏌ヨ鎸囧畾妤煎眰鐨勫簱浣嶆暟鎹�
List<LocMast> selectLocByLev(Integer lev);
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
index 4530bbc..7863f35 100644
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
@@ -9,7 +9,7 @@
import java.util.List;
import java.util.Set;
-public interface ManLocDetlService extends IService<ManLocDetl> {
+public interface ManLocDetlService extends IService<ManLocDetl> {
Page<ManLocDetl> getPage(Page<ManLocDetl> page);
ManLocDetl selectItem(String locNo, String matnr, String batch);
@@ -25,6 +25,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @return locNo 搴撲綅鍙�
*/
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index dbfd443..3d69566 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -11,9 +11,11 @@
public interface MatService extends IService<Mat> {
Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx);
+
Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs);
Mat selectByMatnr(String matnr);
+
List<Mat> selectByMatnrLink(String matnr);
Page<Mat> getMatTurnPage(Page<Mat> page);
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 2455c90..1ee220b 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -4,7 +4,7 @@
import com.core.common.R;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.param.*;
import java.util.Date;
@@ -37,7 +37,7 @@
R orderOutListOrderPick(String barcode, Long userId);
/**
- *鑾峰彇骞舵澘鐗╂枡
+ * 鑾峰彇骞舵澘鐗╂枡
*/
R pickMats(String matnr, String orderNo);
@@ -65,7 +65,7 @@
void pakoutByOrder(JSONObject param, Long userId);
- void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
+ void stockOut(OrderDetlPakout orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now);
/**
diff --git a/src/main/java/com/zy/asrs/service/NodeService.java b/src/main/java/com/zy/asrs/service/NodeService.java
index 2de56d4..017e5e8 100644
--- a/src/main/java/com/zy/asrs/service/NodeService.java
+++ b/src/main/java/com/zy/asrs/service/NodeService.java
@@ -10,19 +10,19 @@
public interface NodeService extends IService<Node> {
- Node getTop();
+ Node getTop();
- Node selectByUuid(String uuid);
+ Node selectByUuid(String uuid);
- Node selectByUuid(String uuid, Long hostId);
+ Node selectByUuid(String uuid, Long hostId);
- Node selectByUuid(String uuid, Long hostId, Integer type);
+ Node selectByUuid(String uuid, Long hostId, Integer type);
- Node selectByUuid(String uuid, Long hostId, Integer type, Long parentId);
+ Node selectByUuid(String uuid, Long hostId, Integer type, Long parentId);
R stockPakin(PakinParam number, Long userId, Long hostId);
- R initPakout(List<InitPakoutParam> params, Long userId, Long hostId);
+ R initPakout(List<InitPakoutParam> params, Long userId, Long hostId);
void locMove(String sourceLocNo, String targetLocNo, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index afd90b1..0d2fa0e 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -40,6 +40,7 @@
/**
* 鍚屾鍟嗗搧淇℃伅
+ *
* @param param
*/
void syncMat(MatSyncParam param);
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
index 9527f19..1b00979 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
@@ -36,6 +36,7 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
index a9f8ffc..5851700 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
@@ -30,6 +30,7 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index f8e50b0..69330bf 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -30,6 +30,7 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
diff --git a/src/main/java/com/zy/asrs/service/OrderPakinService.java b/src/main/java/com/zy/asrs/service/OrderPakinService.java
index 34fd21b..6828562 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakinService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.OrderPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -25,6 +25,7 @@
void remove(Long orderId);
List<OrderPakin> selectComplete();
+
List<OrderPakin> selectComplete8();
boolean addToLogTable(OrderPakin order);
@@ -32,6 +33,7 @@
List<OrderPakin> selectorderNoL(String orderNo);
OrderPakin selectOrderMoveStatus();
+
OrderPakin selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/service/OrderPakoutService.java b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
index 60a6c8e..857fb5e 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -25,6 +25,7 @@
void remove(Long orderId);
List<OrderPakout> selectComplete();
+
List<OrderPakout> selectComplete8();
boolean addToLogTable(OrderPakout order);
@@ -32,6 +33,7 @@
List<OrderPakout> selectorderNoL(String orderNo);
OrderPakout selectOrderMoveStatus();
+
OrderPakout selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 878002f..003d867 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
@@ -25,8 +25,11 @@
void remove(Long orderId);
List<Order> selectComplete();
+
List<Order> selectComplete1();
+
List<Order> selectComplete99();
+
List<Order> selectComplete8();
boolean addToLogTable(Order order);
@@ -34,6 +37,7 @@
List<Order> selectorderNoL(String orderNo);
Order selectOrderMoveStatus();
+
Order selectOrderMoveStatusInitial();
}
diff --git a/src/main/java/com/zy/asrs/service/OrderSettleService.java b/src/main/java/com/zy/asrs/service/OrderSettleService.java
index d5456ea..3aa47b7 100644
--- a/src/main/java/com/zy/asrs/service/OrderSettleService.java
+++ b/src/main/java/com/zy/asrs/service/OrderSettleService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.OrderSettle;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.OrderSettle;
public interface OrderSettleService extends IService<OrderSettle> {
diff --git a/src/main/java/com/zy/asrs/service/PackService.java b/src/main/java/com/zy/asrs/service/PackService.java
index c7675f9..6a8ec9a 100644
--- a/src/main/java/com/zy/asrs/service/PackService.java
+++ b/src/main/java/com/zy/asrs/service/PackService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Pack;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Pack;
public interface PackService extends IService<Pack> {
diff --git a/src/main/java/com/zy/asrs/service/RowLastnoTypeService.java b/src/main/java/com/zy/asrs/service/RowLastnoTypeService.java
index bc03f13..a6cde96 100644
--- a/src/main/java/com/zy/asrs/service/RowLastnoTypeService.java
+++ b/src/main/java/com/zy/asrs/service/RowLastnoTypeService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.RowLastnoType;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.RowLastnoType;
public interface RowLastnoTypeService extends IService<RowLastnoType> {
diff --git a/src/main/java/com/zy/asrs/service/TaskDetlLogService.java b/src/main/java/com/zy/asrs/service/TaskDetlLogService.java
index 5bda2b4..46aa39e 100644
--- a/src/main/java/com/zy/asrs/service/TaskDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/TaskDetlLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.TaskDetlLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskDetlLog;
public interface TaskDetlLogService extends IService<TaskDetlLog> {
diff --git a/src/main/java/com/zy/asrs/service/TaskDetlService.java b/src/main/java/com/zy/asrs/service/TaskDetlService.java
index 97c6dde..bdb8e05 100644
--- a/src/main/java/com/zy/asrs/service/TaskDetlService.java
+++ b/src/main/java/com/zy/asrs/service/TaskDetlService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.TaskDetl;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskDetl;
public interface TaskDetlService extends IService<TaskDetl> {
diff --git a/src/main/java/com/zy/asrs/service/TaskLogService.java b/src/main/java/com/zy/asrs/service/TaskLogService.java
index b855a03..4936fd8 100644
--- a/src/main/java/com/zy/asrs/service/TaskLogService.java
+++ b/src/main/java/com/zy/asrs/service/TaskLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.TaskLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TaskLog;
public interface TaskLogService extends IService<TaskLog> {
diff --git a/src/main/java/com/zy/asrs/service/TaskService.java b/src/main/java/com/zy/asrs/service/TaskService.java
index e510b48..3caf9c7 100644
--- a/src/main/java/com/zy/asrs/service/TaskService.java
+++ b/src/main/java/com/zy/asrs/service/TaskService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Task;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Task;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/service/TrayCodeService.java b/src/main/java/com/zy/asrs/service/TrayCodeService.java
index c29772d..e6d9b3a 100644
--- a/src/main/java/com/zy/asrs/service/TrayCodeService.java
+++ b/src/main/java/com/zy/asrs/service/TrayCodeService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.TrayCode;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.TrayCode;
public interface TrayCodeService extends IService<TrayCode> {
diff --git a/src/main/java/com/zy/asrs/service/WaitPakinLogService.java b/src/main/java/com/zy/asrs/service/WaitPakinLogService.java
index c68935b..4f2b86b 100644
--- a/src/main/java/com/zy/asrs/service/WaitPakinLogService.java
+++ b/src/main/java/com/zy/asrs/service/WaitPakinLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.WaitPakinLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.WaitPakinLog;
public interface WaitPakinLogService extends IService<WaitPakinLog> {
diff --git a/src/main/java/com/zy/asrs/service/WaitPakinService.java b/src/main/java/com/zy/asrs/service/WaitPakinService.java
index b09602a..7b1d782 100644
--- a/src/main/java/com/zy/asrs/service/WaitPakinService.java
+++ b/src/main/java/com/zy/asrs/service/WaitPakinService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.WaitPakin;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.WaitPakin;
public interface WaitPakinService extends IService<WaitPakin> {
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index 8d34c6e..e9b91c0 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -18,6 +18,7 @@
/**
* 鍏ㄦ澘鍏ュ簱
+ *
* @return 搴撲綅鍙�
*/
String startupFullPutStore(FullStoreParam param, Long userId);
@@ -34,9 +35,10 @@
/**
* 鍑哄簱浣滀笟
- * @param staNo 鐩爣绔欑偣
+ *
+ * @param staNo 鐩爣绔欑偣
* @param locDetls 寰呭嚭搴撶墿鏂�
- * @param ioType 鍏ュ嚭搴撶被鍨�
+ * @param ioType 鍏ュ嚭搴撶被鍨�
*/
void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, IoWorkType ioWorkType, Long userId);
@@ -44,6 +46,7 @@
/**
* 绌烘澘鍏ュ簱
+ *
* @return 搴撲綅鍙�
*/
String emptyPlateIn(Integer sourceStaNo, Long userId);
@@ -55,6 +58,7 @@
/**
* 鑷姩绌烘澘鍑哄簱
+ *
* @param param
* @return
*/
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
index 687da0e..173538a 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlLogService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.WrkDetlLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.WrkDetlLog;
import java.util.Date;
import java.util.List;
@@ -10,8 +10,8 @@
boolean save(Integer workNo);
- List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
+ List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
- Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd);
+ Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, Date modiTimeStart, Date modiTimeEnd);
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 0329de3..01ae7b8 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -18,12 +18,13 @@
/**
* 浠庡伐浣滄。寰楀埌绔欑偣鍏ュ簱鏆傚瓨鏁�
+ *
* @param crnNo
* @return
*/
int getStoreCount(Integer crnNo);
- int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
+ int selectWrkMastBareBoardStaNo(Integer ioType, Integer staNo);
List<WrkMast> selectWrkMastWrkDetl(Integer ioType, FindLocNoAttributeVo findLocNoAttributeVo, Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/AdjDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AdjDetlServiceImpl.java
index 3f50d5f..f909652 100644
--- a/src/main/java/com/zy/asrs/service/impl/AdjDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AdjDetlServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.AdjDetlMapper;
-import com.zy.asrs.entity.AdjDetl;
-import com.zy.asrs.service.AdjDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.AdjDetl;
+import com.zy.asrs.mapper.AdjDetlMapper;
+import com.zy.asrs.service.AdjDetlService;
import org.springframework.stereotype.Service;
import java.util.Date;
diff --git a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
index 30a725f..6977b08 100644
--- a/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ApiLogServiceImpl.java
@@ -33,7 +33,7 @@
request, // 璇锋眰鍐呭
response,
null, // 寮傚父鍐呭
- success?1:0 , // 缁撴灉
+ success ? 1 : 0, // 缁撴灉
1, // 鐘舵��
now, // 娣诲姞鏃堕棿
null, // 淇敼鏃堕棿
diff --git a/src/main/java/com/zy/asrs/service/impl/AppVersionServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AppVersionServiceImpl.java
index ec3f2dd..ed14d0e 100644
--- a/src/main/java/com/zy/asrs/service/impl/AppVersionServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AppVersionServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.AppVersionMapper;
-import com.zy.asrs.entity.AppVersion;
-import com.zy.asrs.service.AppVersionService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.AppVersion;
+import com.zy.asrs.mapper.AppVersionMapper;
+import com.zy.asrs.service.AppVersionService;
import org.springframework.stereotype.Service;
@Service("appVersionService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasAreasServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasAreasServiceImpl.java
index 04e1e93..6e8381b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasAreasServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasAreasServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasAreasMapper;
-import com.zy.asrs.entity.BasAreas;
-import com.zy.asrs.service.BasAreasService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasAreas;
+import com.zy.asrs.mapper.BasAreasMapper;
+import com.zy.asrs.service.BasAreasService;
import org.springframework.stereotype.Service;
@Service("basAreasService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
index d728f76..4b51045 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasContainerServiceImpl.java
@@ -1,23 +1,10 @@
package com.zy.asrs.service.impl;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.R;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.ContainerParams;
-import com.zy.asrs.enums.CommonEnum;
-import com.zy.asrs.enums.ContainerType;
-import com.zy.asrs.mapper.BasContainerMapper;
-import com.zy.asrs.entity.BasContainer;
-import com.zy.asrs.service.BasContainerService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasContainer;
+import com.zy.asrs.mapper.BasContainerMapper;
+import com.zy.asrs.service.BasContainerService;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
@Service("basContainerService")
public class BasContainerServiceImpl extends ServiceImpl<BasContainerMapper, BasContainer> implements BasContainerService {
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
index 299afa8..bff0979 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnOptServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasCrnOptMapper;
-import com.zy.asrs.entity.BasCrnOpt;
-import com.zy.asrs.service.BasCrnOptService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasCrnOpt;
+import com.zy.asrs.mapper.BasCrnOptMapper;
+import com.zy.asrs.service.BasCrnOptService;
import org.springframework.stereotype.Service;
@Service("basCrnOptService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index d1a6e17..9e8af27 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,7 +4,6 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasCrnpMapper;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
@@ -44,7 +43,7 @@
// log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
return false;
}
- if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3){
+ if (crnp.getCrnErr() != null && crnp.getCrnSts() != 3) {
log.error("{}鍙峰爢鍨涙満闈炶嚜鍔ㄨ繛绾跨姸鎬侊紝鏃犳硶浣滀笟!", crnNo);
return false;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index babb339..56573d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -45,24 +45,24 @@
@Override
public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
BasDevp station = selectById(devpNo);
- if (station == null){
- throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
+ if (station == null) {
+ throw new CoolException(devpNo + "绔欑偣涓嶅瓨鍦�");
}
if (pakin) {
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+ if (station.getAutoing() == null || !station.getAutoing().equals("Y")) {
+ throw new CoolException(devpNo + "绔欑偣涓嶆槸鑷姩鐘舵��");
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+ if (station.getLoading() == null || !station.getLoading().equals("Y")) {
+ throw new CoolException(devpNo + "绔欑偣鏃犵墿");
}
- if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
- throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+ if (station.getWrkNo() != null && station.getWrkNo() > 0 && station.getWrkNo() < 9990) {
+ throw new CoolException(devpNo + "绔欑偣宸叉湁宸ヤ綔鍙�");
}
// if(!station.getInEnable().equals("Y")) {
// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
// }
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ if (wrkMastService.getWorkingMast(devpNo) > 0) {
+ throw new CoolException(devpNo + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
}
}
return station;
diff --git a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
index 4170173..6b8b42c 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasErrLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasErrLogMapper;
-import com.zy.asrs.entity.BasErrLog;
-import com.zy.asrs.service.BasErrLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasErrLog;
+import com.zy.asrs.mapper.BasErrLogMapper;
+import com.zy.asrs.service.BasErrLogService;
import org.springframework.stereotype.Service;
@Service("basErrLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
index 7b5b78c..0d48f6f 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasPlcerrorServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasPlcerrorMapper;
-import com.zy.asrs.entity.BasPlcerror;
-import com.zy.asrs.service.BasPlcerrorService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasPlcerror;
+import com.zy.asrs.mapper.BasPlcerrorMapper;
+import com.zy.asrs.service.BasPlcerrorService;
import org.springframework.stereotype.Service;
@Service("basPlcerrorService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasProcessProceduresServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasProcessProceduresServiceImpl.java
index e139f1f..8b7c824 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasProcessProceduresServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasProcessProceduresServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasProcessProceduresMapper;
-import com.zy.asrs.entity.BasProcessProcedures;
-import com.zy.asrs.service.BasProcessProceduresService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasProcessProcedures;
+import com.zy.asrs.mapper.BasProcessProceduresMapper;
+import com.zy.asrs.service.BasProcessProceduresService;
import org.springframework.stereotype.Service;
@Service("basProcessProceduresService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasQualityTestingServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasQualityTestingServiceImpl.java
index dca855d..e60b97e 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasQualityTestingServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasQualityTestingServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasQualityTestingMapper;
-import com.zy.asrs.entity.BasQualityTesting;
-import com.zy.asrs.service.BasQualityTestingService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasQualityTesting;
+import com.zy.asrs.mapper.BasQualityTestingMapper;
+import com.zy.asrs.service.BasQualityTestingService;
import org.springframework.stereotype.Service;
@Service("basQualityTestingService")
diff --git a/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java
index 272a9bd..446dda5 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasStationServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.BasStationMapper;
-import com.zy.asrs.entity.BasStation;
-import com.zy.asrs.service.BasStationService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.BasStation;
+import com.zy.asrs.mapper.BasStationMapper;
+import com.zy.asrs.service.BasStationService;
import org.springframework.stereotype.Service;
@Service("basStationService")
diff --git a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
index 4f2a66d..a813956 100644
--- a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
@@ -1,12 +1,12 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
-import com.zy.asrs.mapper.DocTypeMapper;
import com.zy.asrs.entity.DocType;
+import com.zy.asrs.mapper.DocTypeMapper;
import com.zy.asrs.service.DocTypeService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import java.util.Date;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocCacheServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocCacheServiceImpl.java
index a596978..7b43fde 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocCacheServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocCacheServiceImpl.java
@@ -1,24 +1,19 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasAreas;
-import com.zy.asrs.entity.BasWhsType;
-import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.LocCache;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.mapper.LocCacheMapper;
-import com.zy.asrs.entity.LocCache;
import com.zy.asrs.service.BasAreasService;
-import com.zy.asrs.service.BasWhsTypeService;
import com.zy.asrs.service.LocCacheService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.common.model.Shelves;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
index d1e91e5..ad8b390 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service.impl;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.mapper.LocCheckMapper;
-import com.zy.asrs.entity.LocCheck;
import com.zy.asrs.service.LocCheckService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.service.ManLocDetlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 2e14e9b..a129b29 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -54,7 +54,7 @@
@Override
public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch,
- String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
+ String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
if (anfme <= 0) {
return this.baseMapper.deleteItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3) > 0;
} else {
@@ -74,8 +74,8 @@
}
@Override
- public List<String> getSameDetlToday(String matnr,String batch, Integer start, Integer end) {
- return this.baseMapper.selectSameDetlTodayBatch(matnr,batch, start, end);
+ public List<String> getSameDetlToday(String matnr, String batch, Integer start, Integer end) {
+ return this.baseMapper.selectSameDetlTodayBatch(matnr, batch, start, end);
}
@@ -112,10 +112,9 @@
}
-
@Override
- public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.queryStockAll(orderNo,locNos, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ public List<LocDetl> queryStockAll(String orderNo, Set<String> locNos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ return this.baseMapper.queryStockAll(orderNo, locNos, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
@@ -130,6 +129,7 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@Override
@@ -145,8 +145,8 @@
@Override
- public LocDetl selectItem(String locNo, String matnr, String batch,String brand,String standby1,String standby2,String standby3,String boxType1,String boxType2,String boxType3) {
- return this.baseMapper.selectItem(locNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ public LocDetl selectItem(String locNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
+ return this.baseMapper.selectItem(locNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
@@ -155,24 +155,24 @@
}
@Override
- public void updateMatTurn(String matnrOld,String matnr){
- this.baseMapper.updateMatTurn(matnrOld,matnr);
+ public void updateMatTurn(String matnrOld, String matnr) {
+ this.baseMapper.updateMatTurn(matnrOld, matnr);
}
@Override
public List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo) {
- if (crnNo==1){
+ if (crnNo == 1) {
return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapY(crnNo);
}
return this.baseMapper.selectLocDetlUnilateralMoveShuttleMapN(crnNo);
}
@Override
- public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr,String batch,String grade,Integer crnNo) {
- if (crnNo==1){
- return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr,batch,grade);
+ public List<LocDetl> selectLocDetlUnilateralMoveShuttle(String matnr, String batch, String grade, Integer crnNo) {
+ if (crnNo == 1) {
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleY(matnr, batch, grade);
}
- return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr,batch,grade);
+ return this.baseMapper.selectLocDetlUnilateralMoveShuttleN(matnr, batch, grade);
}
@Override
@@ -186,7 +186,7 @@
@Override
public R frozenInventory(List<FrozenParam> param) {
- for(FrozenParam obj : param) {
+ for (FrozenParam obj : param) {
this.baseMapper.frozenInventory(obj.getLocNo(), obj.getMatnr(), obj.getBatch(), 1);
}
@@ -196,7 +196,7 @@
@Override
public R unfreezeInventory(List<FrozenParam> param) {
- for(FrozenParam obj : param) {
+ for (FrozenParam obj : param) {
this.baseMapper.frozenInventory(obj.getLocNo(), obj.getMatnr(), obj.getBatch(), 0);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index b94df0c..e8a4302 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -20,12 +20,12 @@
@Override
public LocMast queryFreeLocMast(Integer row, Short locType1) {
- return this.baseMapper.queryFreeLocMast(row, locType1,1L);
+ return this.baseMapper.queryFreeLocMast(row, locType1, 1L);
}
@Override
- public LocMast queryFreeLocMast(Integer row, Short locType1,Long type) {
- return this.baseMapper.queryFreeLocMast(row, locType1,type);
+ public LocMast queryFreeLocMast(Integer row, Short locType1, Long type) {
+ return this.baseMapper.queryFreeLocMast(row, locType1, type);
}
@Override
@@ -41,7 +41,7 @@
}
@Override
- public List<String> queryGroupEmptyStock(String sourceLocNo,Long type) {
+ public List<String> queryGroupEmptyStock(String sourceLocNo, Long type) {
if (Cools.isEmpty(sourceLocNo)) {
return null;
}
@@ -57,15 +57,15 @@
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(), 1L) > 1;
}
@Override
- public Boolean checkEmptyCount(LocMast locMast,Long type) {
+ public Boolean checkEmptyCount(LocMast locMast, Long type) {
if (locMast == null) {
return false;
}
- return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),type) > 1;
+ return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(), type) > 1;
}
/*
@@ -88,11 +88,11 @@
// }
@Override
- public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
- if (curRow>nearRow){
- return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ public LocMast selectLocByLocStsPakInF(Integer curRow, Integer nearRow, LocMast locMast, Long type) {
+ if (curRow > nearRow) {
+ return this.baseMapper.selectLocByLocStsPakInF1(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
}
- return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ return this.baseMapper.selectLocByLocStsPakInF2(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
}
/*
@@ -106,11 +106,11 @@
// return this.baseMapper.selectLocByLocStsPakInO2(locNos,1L);
// }
@Override
- public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,LocMast locMast,Long type) {
- if (curRow>nearRow){
- return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ public LocMast selectLocByLocStsPakInO(Integer curRow, Integer nearRow, LocMast locMast, Long type) {
+ if (curRow > nearRow) {
+ return this.baseMapper.selectLocByLocStsPakInO1(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
}
- return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(),locMast.getBay1(),locMast.getLev1(),locMast.getGro1(),type);
+ return this.baseMapper.selectLocByLocStsPakInO2(locMast.getCrnNo(), locMast.getBay1(), locMast.getLev1(), locMast.getGro1(), type);
}
@Override
@@ -124,33 +124,33 @@
}
@Override
- public Boolean checkWhole(List<LocDetl> locDetls,Long type) {
+ public Boolean checkWhole(List<LocDetl> locDetls, Long type) {
return null;
}
@Override
public List<LocMast> queryShallowLocFMast(Integer crnNo) {
- return this.baseMapper.queryShallowLocFMast(crnNo,1L);
+ return this.baseMapper.queryShallowLocFMast(crnNo, 1L);
}
@Override
- public List<LocMast> queryShallowLocFMast(Integer crnNo,Long type) {
- return this.baseMapper.queryShallowLocFMast(crnNo,type);
+ public List<LocMast> queryShallowLocFMast(Integer crnNo, Long type) {
+ return this.baseMapper.queryShallowLocFMast(crnNo, type);
}
@Override
- public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo) {
- if (crnNo==1){
- return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,1L);
+ public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo) {
+ if (crnNo == 1) {
+ return this.baseMapper.selectLocShuttleMoveUnilateralY(bay, lev, 1L);
}
- return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,1L);
+ return this.baseMapper.selectLocShuttleMoveUnilateralN(bay, lev, 1L);
}
@Override
- public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay,Integer lev,Integer crnNo,Long type) {
- if (crnNo==1){
- return this.baseMapper.selectLocShuttleMoveUnilateralY(bay,lev,type);
+ public List<LocMast> selectLocMastShuttleMoveUnilateral(Integer bay, Integer lev, Integer crnNo, Long type) {
+ if (crnNo == 1) {
+ return this.baseMapper.selectLocShuttleMoveUnilateralY(bay, lev, type);
}
- return this.baseMapper.selectLocShuttleMoveUnilateralN(bay,lev,type);
+ return this.baseMapper.selectLocShuttleMoveUnilateralN(bay, lev, type);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 1f566fe..690ca25 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.ManLocDetl;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Node;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.result.StockVo;
import com.zy.asrs.mapper.ManLocDetlMapper;
@@ -16,7 +18,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
@Service("manLocDetlService")
public class ManLocDetlServiceImpl extends ServiceImpl<ManLocDetlMapper, ManLocDetl> implements ManLocDetlService {
@@ -172,7 +177,7 @@
manLocDetl.setUnit(mat.getUnit());
manLocDetl.setBarcode(mat.getBarcode());
manLocDetl.setPrice(mat.getPrice());
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
+ SaasUtils.insertLog(3, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme());
this.baseMapper.insert(manLocDetl);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
index f2fddbd..b3bd4e6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -5,11 +5,11 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.BatchMatsUpdateParam;
-import org.springframework.stereotype.Service;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.BatchMatsUpdateParam;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.service.MatService;
+import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -21,6 +21,7 @@
public Page<Mat> getPage(Page page, String tagId, Object matnr, Object maktx) {
return page.setRecords(baseMapper.listByPage(page, tagId, matnr, maktx));
}
+
@Override
public Page<Mat> getPage2(Page page, String tagId, Object matnr, Object maktx, Object specs) {
return page.setRecords(baseMapper.listByPage2(page, tagId, matnr, maktx, specs));
@@ -64,13 +65,14 @@
}
@Override
- public Page<Mat> getMatTurnPage(Page<Mat> page){
+ public Page<Mat> getMatTurnPage(Page<Mat> page) {
page.setRecords(baseMapper.getMatTurnPage(page.getCondition()));
// page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
page.setTotal(16);
return page;
- };
+ }
+ ;
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2c9a489..1867759 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,13 +8,11 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
-import com.zy.asrs.enums.CommonEnum;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.constant.MesConstant;
import com.zy.common.entity.Parameter;
import com.zy.common.model.DetlDto;
@@ -46,10 +44,7 @@
private MatService matService;
@Autowired
private WaitPakinService waitPakinService;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
+
@Autowired
private BasDevpService basDevpService;
@Autowired
@@ -364,7 +359,7 @@
continue;
}
if (orderPakout.getSettle() == 1) {
- OrderInAndOutUtil.updateOrder(false, orderPakout.getId(), 2L, 9527L);
+ orderPakoutService.updateSettle(orderPakout.getId(), 2L, 9527L);
}
OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderPakout.getId(), combMat.getMatnr(), combMat.getBatch(),
combMat.getBrand(), combMat.getStandby1(), combMat.getStandby2(), combMat.getStandby3(), combMat.getBoxType1(), combMat.getBoxType2(), combMat.getBoxType3());
@@ -514,18 +509,18 @@
typeList.add(docType.getDocId());
}
- Wrapper<Order> wrapper = new EntityWrapper<>();
+ Wrapper<OrderPakin> wrapper = new EntityWrapper<>();
wrapper.eq("status", 1);
wrapper.in("doc_type", typeList);
- List<Order> orders = orderService.selectList(wrapper);
+ List<OrderPakin> orders = orderPakinService.selectList(wrapper);
ArrayList<Long> orderIds = new ArrayList<>();
- for (Order order : orders) {
+ for (OrderPakin order : orders) {
orderIds.add(order.getId());
}
//鎼滅储鏄庣粏
- Wrapper<OrderDetl> wrapper1 = new EntityWrapper<>();
+ Wrapper<OrderDetlPakin> wrapper1 = new EntityWrapper<>();
wrapper1.eq("status", 1);
wrapper1.in("order_id", orderIds);
wrapper1.orderBy("create_time", false);
@@ -535,10 +530,10 @@
if (!Cools.isEmpty(orderNo)) {
wrapper1.like("order_no", orderNo);
}
- List<OrderDetl> list = orderDetlService.selectList(wrapper1);
+ List<OrderDetlPakin> list = orderDetlPakinService.selectList(wrapper1);
ArrayList<PickMatParam> maps = new ArrayList<>();
- for (OrderDetl orderDetl : list) {
+ for (OrderDetlPakin orderDetl : list) {
//鍓╀綑鍙敤鏁伴噺
double count = orderDetl.getAnfme() - orderDetl.getWorkQty();
if (count <= 0) {
@@ -626,17 +621,14 @@
}
// 鍏宠仈缁勬墭
} else {
-// Order order = orderService.selectByNo(param.getOrderNo());
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, elem.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(elem.getOrderNo());
if (Cools.isEmpty(order) || order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
}
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
-// elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
.eq("order_id", order.getId())
.eq("matnr", elem.getMatnr()));
@@ -648,7 +640,7 @@
if (elem.getAnfme() > detls.getEnableQty()) {
throw new CoolException(detls.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
+ orderDetlPakinService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
@@ -717,8 +709,8 @@
Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
stringSet.forEach(orderNo -> {
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
+ OrderPakin order = orderPakinService.selectByNo(orderNo);
+ orderPakinService.updateSettle(order.getId(), 2L, userId);
});
}
@@ -967,34 +959,28 @@
openParam.setOrderType("鎵撳寘鍏ュ簱鍗�");
openParam.setOrderDetails(detlDtos);
openService.pakinOrderCreate(openParam);
-// Order order = orderService.selectByNo(orderNo);
- Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (null == order) {
throw new CoolException("鐢熸垚鍗曟嵁澶辫触");
}
-// if (!orderService.updateSettle(order.getId(), 2L, userId)) {
-// throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
-
+ if (!orderPakinService.updateSettle(order.getId(), 2L, userId)) {
+ throw new CoolException("淇敼鍗曟嵁鐘舵�佸け璐�");
+ }
// 鐢熸垚鍏ュ簱閫氱煡妗�
for (DetlDto detlDto : detlDtos) {
- // 淇敼浣滀笟鏁伴噺 ----------------------------------------
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
-// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
, detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3());
- if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ if (detlDto.getAnfme() > orderDetlPakin.getEnableQty()) {
+ throw new CoolException(orderDetlPakin.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
-// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
-// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
-// }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
- , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme());
+ if (!orderDetlPakinService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
// 淇濆瓨鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -1036,17 +1022,15 @@
BasDevp sta = basDevpService.checkSiteStatus(staNo);
//鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, orderNo);
-// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
+ OrderPakout order = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", orderNo));
if (order.getSettle() != 1 && order.getSettle() != 2) {
throw new CoolException("璇ヨ鍗曞凡澶勭悊");
}
-// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", orderNo));
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
Date now = new Date();
- for (OrderDetl orderDetl : orderDetls) {
+ for (OrderDetlPakout orderDetl : orderDetls) {
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), null, null);
if (locDetls.size() == 0) {
@@ -1079,10 +1063,9 @@
order.setSettle(2L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
-// if(!orderService.update(order, new EntityWrapper<Order>().eq("order_no", orderNo))){
-// throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(), order.getId(), 2L, userId);
+ if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", orderNo))) {
+ throw new CoolException("鏇存柊璁㈠崟鐘舵�佸け璐�");
+ }
orderDetl.setWorkQty(orderDetl.getWorkQty() + curOutQty);
orderDetl.setUpdateBy(userId);
orderDetl.setUpdateTime(now);
@@ -1091,10 +1074,9 @@
if (!Cools.isEmpty(orderDetl.getBatch())) {
wrapper.eq("batch", orderDetl.getBatch());
}
-// if(!orderDetlService.update(orderDetl, wrapper)){
-// throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
-// }
- OrderInAndOutUtil.updateOrderDetl(order.getPakinPakoutStatus$(), order, orderDetl);
+ if (!orderDetlPakoutService.update(orderDetl, wrapper)) {
+ throw new CoolException("鏇存柊璁㈠崟鏄庣粏澶辫触");
+ }
}
@@ -1103,7 +1085,7 @@
@Override
@Transactional
- public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
+ public void stockOut(OrderDetlPakout orderDetl, BasDevp staNo, LocDetl locDetl,
Double curOutQty, Integer ioType, Long userId, Date now) {
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locDetl.getLocNo());
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index bd47225..467ecd8 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -12,18 +12,15 @@
import com.zy.asrs.entity.param.InitPakoutParam;
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.PakinParam;
-import com.zy.asrs.entity.result.Pakin;
import com.zy.asrs.mapper.NodeMapper;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.NodeService;
import com.zy.asrs.utils.SaasUtils;
-import com.zy.asrs.utils.VersionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.beans.Transient;
import java.util.Date;
import java.util.List;
@@ -37,6 +34,7 @@
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
private ManLocDetlService manLocDetlService;
+
@Override
public Node getTop() {
Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -115,11 +113,11 @@
manLocDetl.setCreateTime(now);
manLocDetl.setModiTime(now);
manLocDetl.setCreateBy(userId);
- SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
+ SaasUtils.insertLog(0, manLocDetl.getLocNo(), manLocDetl.getMatnr(), manLocDetl.getAnfme());
manLocDetlService.insert(manLocDetl);
- }else {
+ } else {
check.setAnfme(dto.getCount() + check.getAnfme());
- manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+ manLocDetlService.update(check, new EntityWrapper<ManLocDetl>()
.eq("loc_no", node.getUuid())
.eq("matnr", dto.getMatnr()));
}
@@ -141,25 +139,25 @@
Node node = nodeService.selectOne(new EntityWrapper<Node>()
.eq("id", param.getNodeId()));
if (node == null) {
- return R.error("鎵句笉鍒拌搴撲綅,璇疯仈绯荤鐞嗗憳:" + param.getNodeId() );
+ return R.error("鎵句笉鍒拌搴撲綅,璇疯仈绯荤鐞嗗憳:" + param.getNodeId());
}
if (manLocDetl == null) {
- return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑涓嶅瓨鍦�");
+ return R.error("鐗╂枡:" + param.getMatnr() + " 鍦ㄥ簱浣嶄腑涓嶅瓨鍦�");
}
if (manLocDetl.getAnfme() - param.getCount() < 0) {
- return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
+ return R.error("鐗╂枡:" + param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
} else if (manLocDetl.getAnfme() - param.getCount() == 0) {
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
+ SaasUtils.insertLog(1, manLocDetl.getLocNo(), manLocDetl.getMatnr(), param.getCount());
manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no",node.getUuid())
- .eq("matnr",param.getMatnr()));
+ .eq("loc_no", node.getUuid())
+ .eq("matnr", param.getMatnr()));
} else {
manLocDetl.setAnfme(manLocDetl.getAnfme() - param.getCount());
- manLocDetlService.update(manLocDetl,new EntityWrapper<ManLocDetl>()
- .eq("loc_no",node.getUuid())
- .eq("matnr",param.getMatnr()));
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
+ manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>()
+ .eq("loc_no", node.getUuid())
+ .eq("matnr", param.getMatnr()));
+ SaasUtils.insertLog(1, manLocDetl.getLocNo(), manLocDetl.getMatnr(), param.getCount());
}
}
}
@@ -187,11 +185,11 @@
source.setLocNo(targetNode.getUuid());
source.setNodeId(targetNode.getId());
- SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
+ SaasUtils.insertLog(2, source.getLocNo(), source.getMatnr(), source.getAnfme());
manLocDetlService.insert(source);
- }else {
+ } else {
check.setAnfme(check.getAnfme() + source.getAnfme());
- manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
+ manLocDetlService.update(check, new EntityWrapper<ManLocDetl>()
.eq("loc_no", targetNode.getUuid())
.eq("matnr", check.getMatnr()));
manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5277f6f..4fe2a16 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -12,7 +12,6 @@
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -32,9 +31,13 @@
public class OpenServiceImpl implements OpenService {
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
@Autowired
- private OrderDetlService orderDetlService;
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
@@ -53,14 +56,14 @@
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (!Cools.isEmpty(order)) {
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
+ order = new OrderPakin(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -94,19 +97,18 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null, // 澶囨敞
- 1
+ null // 澶囨敞
);
- if (!orderService.insert(order)) {
+ if (!orderPakinService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -118,7 +120,7 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl = new OrderDetl();
+ OrderDetlPakin orderDetl = new OrderDetlPakin();
orderDetl.sync(mat);
orderDetl.setLineNumber(detlDto.getLineNumber());
orderDetl.setBatch(detlDto.getBatch());
@@ -136,7 +138,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
orderDetl.setPakinPakoutStatus(1);
- if (!orderDetlService.insert(orderDetl)) {
+ if (!orderDetlPakinService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -148,9 +150,7 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
-
-// Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE,param.getOrderNo());
+ OrderPakin order = orderPakinService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
@@ -158,48 +158,43 @@
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
+ for (OrderDetlPakin orderDetl : orderDetls) {
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(), 6L, null);
+ if (!orderPakinService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
} else {
// 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectBySettle(4L);
- List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- if (orders.isEmpty()){
+ List<OrderPakin> orders = orderPakinService.selectBySettle(4L);
+ if (orders.isEmpty()) {
orders = new ArrayList<>();
}
- for (Order order : orders) {
+ for (OrderPakin order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(),
+ for (OrderDetlPakin orderDetl : orderDetls) {
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(),
orderDetl.getQty()));
}
// // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderPakinService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
@@ -209,18 +204,18 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- orderService.remove(order.getId());
+ orderPakoutService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
- order = new Order(
+ order = new OrderPakout(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
param.getOrderNo(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
@@ -254,21 +249,20 @@
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
- null, // 澶囨敞
- 2
+ null // 澶囨敞
);
- if (!orderService.insert(order)) {
+ if (!orderPakoutService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getLineNumber(),
+ detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getLineNumber(),
+ dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -280,7 +274,7 @@
if (Cools.isEmpty(mat)) {
throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
- OrderDetl orderDetl = new OrderDetl();
+ OrderDetlPakout orderDetl = new OrderDetlPakout();
orderDetl.sync(mat);
orderDetl.setLineNumber(detlDto.getLineNumber());
orderDetl.setBatch(detlDto.getBatch());
@@ -298,7 +292,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
orderDetl.setPakinPakoutStatus(2);
- if (!orderDetlService.insert(orderDetl)) {
+ if (!orderDetlPakoutService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -309,51 +303,46 @@
List<OpenOrderCompeteResult> results = new ArrayList<>();
if (!Cools.isEmpty(param) && !Cools.isEmpty(param.getOrderNo())) {
// 鎸囧畾璁㈠崟
- Order order = orderService.selectByNo(param.getOrderNo());
-// Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, param.getOrderNo());
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
if (null != order) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(),order.getId());
- for (OrderDetl orderDetl : orderDetls) {
+ for (OrderDetlPakout orderDetl : orderDetls) {
result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
if (order.getSettle() == 4L) {
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderPakoutService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
} else {
// 鎵�鏈夎鍗�
-// List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
- List<Order> orders = OrderInAndOutUtil.selectBySettle(null, 4L);
- for (Order order : orders) {
+ List<OrderPakout> orders = orderPakoutService.selectList(new EntityWrapper<OrderPakout>().eq("settle", 4L));
+ for (OrderPakout order : orders) {
OpenOrderCompeteResult result = new OpenOrderCompeteResult();
results.add(result);
result.setOrderNo(order.getOrderNo());
result.setOrderTime(order.getOrderTime());
result.setOrderType(order.getDocType$());
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- for (OrderDetl orderDetl : orderDetls) {
- result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
- orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getLineNumber(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getQty()));
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
+ for (OrderDetlPakout orderDetl : orderDetls) {
+ result.getOrderDetails().add(new DetlDto(orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(),
+ orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(), orderDetl.getLineNumber(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), orderDetl.getQty()));
}
// 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
-// if (!orderService.updateSettle(order.getId(), 6L, null)) {
-// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
-// }
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
+ if (!orderPakoutService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
+ }
}
}
return results;
@@ -484,12 +473,12 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
- if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <=0 ) {
+ if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
}
- for(MatSyncParam.MatParam matParam : param.getMatDetails()){
- if(Cools.isEmpty(matParam.getMatnr())){
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ if (Cools.isEmpty(matParam.getMatnr())) {
throw new CoolException("鍟嗗搧缂栫爜涓嶈兘涓虹┖");
}
@@ -583,7 +572,7 @@
}
} else {
mat.sync(matParam);
- if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
+ if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
index e6a8859..ec14052 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
@@ -29,22 +29,22 @@
@Override
public OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand,
String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ return this.baseMapper.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
public OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand,
String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
public OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch, String brand,
String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
for (OrderDetlPakin orderDetl : orderDetls) {
- if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand)
- && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
- && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
+ if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand)
+ && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
+ && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
@@ -57,15 +57,15 @@
@Override
public boolean increase(Long orderId, String matnr, String batch, String brand,
String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.increase(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
}
@Override
public boolean decrease(String orderNo, String matnr, String batch, String brand,
String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "", brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
} else {
return true;
}
@@ -84,11 +84,12 @@
@Override
public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand,
String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
}
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
@@ -97,6 +98,6 @@
*/
@Override
public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
index cd2e894..35d6711 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
@@ -28,20 +28,20 @@
@Override
public OrderDetlPakout selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ return this.baseMapper.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
public OrderDetlPakout selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
for (OrderDetlPakout orderDetl : orderDetls) {
- if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand)
- && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
- && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
+ if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand)
+ && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
+ && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
@@ -53,14 +53,14 @@
@Override
public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.increase(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
}
@Override
public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "", brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
} else {
return true;
}
@@ -78,11 +78,12 @@
@Override
public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
}
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
@@ -91,6 +92,6 @@
*/
@Override
public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 79f959c..6626318 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.service.OrderDetlService;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -28,12 +28,12 @@
@Override
public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ return this.baseMapper.selectItem(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3);
}
@Override
@@ -41,8 +41,8 @@
for (OrderDetl orderDetl : orderDetls) {
if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)
&& orderDetl.getBrand().equals(brand)
- && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
- && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
+ && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)
+ && orderDetl.getBoxType1().equals(boxType1) && orderDetl.getBoxType2().equals(boxType2) && orderDetl.getBoxType3().equals(boxType3)
) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
@@ -54,14 +54,14 @@
@Override
public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.increase(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
}
@Override
public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "", brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
} else {
return true;
}
@@ -79,11 +79,12 @@
@Override
public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty) > 0;
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, qty) > 0;
}
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
@@ -92,6 +93,6 @@
*/
@Override
public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty) > 0;
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch, brand, standby1, standby2, standby3, boxType1, boxType2, boxType3, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
index 2437d39..f134433 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
@@ -116,8 +116,8 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -147,13 +147,13 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),
- detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(),
+ detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),
- detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(),
+ detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -196,6 +196,7 @@
public OrderPakin selectOrderMoveStatus() {
return this.baseMapper.selectOrderMoveStatus();
}
+
@Override
public OrderPakin selectOrderMoveStatusInitial() {
return this.baseMapper.selectOrderMoveStatusInitial();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 592f297..b85aa30 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -116,7 +116,7 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -146,13 +146,13 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
- ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3()
- ,detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3()
+ , detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -195,6 +195,7 @@
public OrderPakout selectOrderMoveStatus() {
return this.baseMapper.selectOrderMoveStatus();
}
+
@Override
public OrderPakout selectOrderMoveStatusInitial() {
return this.baseMapper.selectOrderMoveStatusInitial();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ba05f58..8ca5755 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -11,7 +12,6 @@
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.common.model.DetlDto;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -116,8 +116,8 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(),wrkDetl.getBoxType2(),wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -147,11 +147,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(), detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(),detlDto.getBoxType1(),detlDto.getBoxType2(),detlDto.getBoxType3(), detlDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getBrand(), detlDto.getStandby1(), detlDto.getStandby2(), detlDto.getStandby3(), detlDto.getBoxType1(), detlDto.getBoxType2(), detlDto.getBoxType3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
@@ -204,6 +204,7 @@
public Order selectOrderMoveStatus() {
return this.baseMapper.selectOrderMoveStatus();
}
+
@Override
public Order selectOrderMoveStatusInitial() {
return this.baseMapper.selectOrderMoveStatusInitial();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderSettleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderSettleServiceImpl.java
index 19e9c4f..0ed3b4b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderSettleServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderSettleServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.OrderSettleMapper;
-import com.zy.asrs.entity.OrderSettle;
-import com.zy.asrs.service.OrderSettleService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.OrderSettle;
+import com.zy.asrs.mapper.OrderSettleMapper;
+import com.zy.asrs.service.OrderSettleService;
import org.springframework.stereotype.Service;
@Service("orderSettleService")
diff --git a/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java
index 04becc9..b526d92 100644
--- a/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java
@@ -1,11 +1,11 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.PackMapper;
-import com.zy.asrs.entity.Pack;
-import com.zy.asrs.service.PackService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.Pack;
+import com.zy.asrs.mapper.PackMapper;
+import com.zy.asrs.service.PackService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
index 49bc63f..b38dbdb 100644
--- a/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RowLastnoServiceImpl.java
@@ -23,18 +23,18 @@
if (Cools.isEmpty(wrk_mk)) {
this.baseMapper.updateInitWrkMk();
return 1;
- }else {
+ } else {
int i = this.selectCount(null);
- if (wrk_mk.getWhsType() >= i){
+ if (wrk_mk.getWhsType() >= i) {
this.baseMapper.updateInitWrkMk();
wrk_mk.setWrkMk("0");
- this.update(wrk_mk,new EntityWrapper<RowLastno>()
- .eq("whs_type",wrk_mk.getWhsType()));
- }else {
- this.baseMapper.updateNextWrkMk(wrk_mk.getWhsType()+1);
+ this.update(wrk_mk, new EntityWrapper<RowLastno>()
+ .eq("whs_type", wrk_mk.getWhsType()));
+ } else {
+ this.baseMapper.updateNextWrkMk(wrk_mk.getWhsType() + 1);
wrk_mk.setWrkMk("0");
- this.update(wrk_mk,new EntityWrapper<RowLastno>()
- .eq("whs_type",wrk_mk.getWhsType()));
+ this.update(wrk_mk, new EntityWrapper<RowLastno>()
+ .eq("whs_type", wrk_mk.getWhsType()));
}
return wrk_mk.getWhsType();
}
diff --git a/src/main/java/com/zy/asrs/service/impl/RowLastnoTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/RowLastnoTypeServiceImpl.java
index 92c58b9..14aba93 100644
--- a/src/main/java/com/zy/asrs/service/impl/RowLastnoTypeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/RowLastnoTypeServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.RowLastnoTypeMapper;
-import com.zy.asrs.entity.RowLastnoType;
-import com.zy.asrs.service.RowLastnoTypeService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.RowLastnoType;
+import com.zy.asrs.mapper.RowLastnoTypeMapper;
+import com.zy.asrs.service.RowLastnoTypeService;
import org.springframework.stereotype.Service;
@Service("rowLastnoTypeService")
diff --git a/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
index e8255ae..f8ff3cf 100644
--- a/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
@@ -3,10 +3,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
-import org.springframework.stereotype.Service;
import com.zy.asrs.entity.Tag;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.TagService;
+import org.springframework.stereotype.Service;
@Service("tagService")
public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements TagService {
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java
index 5c2334e..e585aa6 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskDetlLogServiceImpl.java
@@ -1,21 +1,18 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.Task;
-import com.zy.asrs.entity.TaskDetl;
-import com.zy.asrs.entity.TaskLog;
-import com.zy.asrs.mapper.TaskDetlLogMapper;
-import com.zy.asrs.entity.TaskDetlLog;
-import com.zy.asrs.service.TaskDetlLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.TaskDetl;
+import com.zy.asrs.entity.TaskDetlLog;
+import com.zy.asrs.mapper.TaskDetlLogMapper;
+import com.zy.asrs.service.TaskDetlLogService;
import com.zy.asrs.service.TaskDetlService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskDetlServiceImpl.java
index 39a2b73..7bc5c76 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskDetlServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.TaskDetlMapper;
-import com.zy.asrs.entity.TaskDetl;
-import com.zy.asrs.service.TaskDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.TaskDetl;
+import com.zy.asrs.mapper.TaskDetlMapper;
+import com.zy.asrs.service.TaskDetlService;
import org.springframework.stereotype.Service;
@Service("taskDetlService")
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java
index cd66568..d762b67 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskLogServiceImpl.java
@@ -1,14 +1,12 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.Task;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.entity.WrkMastLog;
-import com.zy.asrs.mapper.TaskLogMapper;
import com.zy.asrs.entity.TaskLog;
+import com.zy.asrs.mapper.TaskLogMapper;
import com.zy.asrs.service.TaskLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.asrs.service.TaskService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index a983123..18c2ae7 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -1,20 +1,17 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.TaskMapper;
import com.zy.asrs.service.*;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -34,6 +31,10 @@
private TaskService taskService;
@Autowired
private TaskDetlLogService taskDetlLogService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -201,34 +202,31 @@
List<TaskDetl> wrkDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", wrkMast.getWrkNo()));
for (TaskDetl wrkDetl : wrkDetls) {
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
-// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
-// }
- OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
+ if (!orderDetlPakoutService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme());
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
//淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
boolean flag = true;
// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
- for (OrderDetl orderDetl : orderDetls) {
+ OrderPakout order = orderPakoutService.selectByNo(wrkDetl.getOrderNo());
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
+ for (OrderDetlPakout orderDetl : orderDetls) {
if (orderDetl.getWorkQty() > 0) {
flag = false;
}
}
if (flag) {
-// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
if (!Cools.isEmpty(order) && order.getSettle() == 2) {
order.setSettle(1L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
}
-// if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
-// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(Boolean.FALSE, order.getId(), order.getSettle(), userId);
+ if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", wrkDetl.getOrderNo()))) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/TrayCodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TrayCodeServiceImpl.java
index 4f96791..e91c42c 100644
--- a/src/main/java/com/zy/asrs/service/impl/TrayCodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TrayCodeServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.TrayCodeMapper;
-import com.zy.asrs.entity.TrayCode;
-import com.zy.asrs.service.TrayCodeService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.TrayCode;
+import com.zy.asrs.mapper.TrayCodeMapper;
+import com.zy.asrs.service.TrayCodeService;
import org.springframework.stereotype.Service;
@Service("trayCodeService")
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinLogServiceImpl.java
index ec4b86e..2753989 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.WaitPakinLogMapper;
-import com.zy.asrs.entity.WaitPakinLog;
-import com.zy.asrs.service.WaitPakinLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.WaitPakinLog;
+import com.zy.asrs.mapper.WaitPakinLogMapper;
+import com.zy.asrs.service.WaitPakinLogService;
import org.springframework.stereotype.Service;
@Service("waitPakinLogService")
diff --git a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
index fada025..325051d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WaitPakinServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.WaitPakinMapper;
-import com.zy.asrs.entity.WaitPakin;
-import com.zy.asrs.service.WaitPakinService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.WaitPakin;
+import com.zy.asrs.mapper.WaitPakinMapper;
+import com.zy.asrs.service.WaitPakinService;
import org.springframework.stereotype.Service;
@Service("waitPakinService")
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 86a7212..9ebdf73 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -12,10 +12,9 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
-import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
+import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.*;
import com.zy.common.model.enums.IoWorkType;
@@ -70,10 +69,6 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
private WcsController wcsController;
@Autowired
private RowLastnoService rowLastnoService;
@@ -91,8 +86,17 @@
@Resource
private LocMastMapper locMastMapper;
- @Resource
- private OrderPakoutService orderPakOutService;
+ @Autowired
+ private OrderPakinService orderPakinService;
+
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
@Override
@Transactional
@@ -403,7 +407,7 @@
LocMast locMast = locMastService.selectById(taskDto.getLocNo());
// 鍒ゆ柇鏄惁鏄洏鐐瑰崟
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
- OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
+ OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo());
// 鐢熸垚宸ヤ綔鍙�
@@ -437,13 +441,11 @@
if (locDto.getAnfme() == null || locDto.getAnfme() <= 0.0D) {
continue;
}
-// OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
+ OrderDetlPakout orderDetl = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getBrand()
, locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
// if (orderDetl == null) {
-//// orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
-// orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);
-//
+// orderDetl = orderDetlPakoutService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null, locDto.getBrand()
+// , locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3());
// }
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(orderDetl);
@@ -461,15 +463,11 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
// // 淇敼璁㈠崟鏄庣粏
-// if (!orderDetlService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
-// throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
-// }
-// orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
- OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE, orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),
- orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
- orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3()
- , locDto.getAnfme());
- OrderInAndOutUtil.updateOrder(Boolean.FALSE, orderDetl.getOrderId(), 2L, userId);
+ if (!orderDetlPakoutService.increaseWorkQty(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getBrand(), orderDetl.getStandby1(), orderDetl.getStandby2(), orderDetl.getStandby3(),
+ orderDetl.getBoxType1(), orderDetl.getBoxType2(), orderDetl.getBoxType3(), locDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ orderPakoutService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(taskDto.getLocNo());
@@ -1138,34 +1136,29 @@
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
-// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
-// }
- OrderInAndOutUtil.decrease(Boolean.FALSE, wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
+ if (!orderDetlPakoutService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(),
wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
- wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme());
-
+ wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
//淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
boolean flag = true;
-// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
- Order order = OrderInAndOutUtil.selectByNo(Boolean.FALSE, wrkDetl.getOrderNo());
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(Boolean.FALSE, order.getId());
- for (OrderDetl orderDetl : orderDetls) {
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>().eq("order_no", wrkDetl.getOrderNo()));
+ for (OrderDetlPakout orderDetl : orderDetls) {
if (orderDetl.getWorkQty() > 0) {
flag = false;
}
}
if (flag) {
-// Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()));
+ OrderPakout order = orderPakoutService.selectOne(new EntityWrapper<OrderPakout>().eq("order_no", wrkDetl.getOrderNo()));
if (!Cools.isEmpty(order) && order.getSettle() == 2) {
order.setSettle(1L);
order.setUpdateBy(userId);
order.setUpdateTime(now);
}
-// if(!orderService.update(order,new EntityWrapper<Order>().eq("order_no",wrkDetl.getOrderNo()))){
-// throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
-// }
- OrderInAndOutUtil.updateOrder(Boolean.FALSE, order.getId(), order.getSettle(), userId);
+ if (!orderPakoutService.update(order, new EntityWrapper<OrderPakout>().eq("order_no", wrkDetl.getOrderNo()))) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
+ }
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
index 69f5ead..d43a949 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
-import com.zy.asrs.mapper.WrkDetlLogMapper;
-import com.zy.asrs.entity.WrkDetlLog;
-import com.zy.asrs.service.WrkDetlLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.WrkDetlLog;
+import com.zy.asrs.mapper.WrkDetlLogMapper;
+import com.zy.asrs.service.WrkDetlLogService;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -18,12 +18,12 @@
}
@Override
- public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
- return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd, curr, limit);
+ public List<WrkDetlLog> selectWrkDetlLogs(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
+ return this.baseMapper.selectWrkDetlLogs(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, modiTimeStart, modiTimeEnd, curr, limit);
}
@Override
- public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo,String matnr,String specs,String zpallet,String batch,Double anfme, Date modiTimeStart, Date modiTimeEnd) {
- return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,anfme, modiTimeStart, modiTimeEnd);
+ public Long selectWrkDetlLogsTotal(Integer wrkNo, String orderNo, String matnr, String specs, String zpallet, String batch, Double anfme, Date modiTimeStart, Date modiTimeEnd) {
+ return this.baseMapper.selectWrkDetlLogsTotal(wrkNo, orderNo, matnr, specs, zpallet, batch, anfme, modiTimeStart, modiTimeEnd);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 3eaaa7a..e3fb481 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -25,12 +25,12 @@
@Override
@Transactional
public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId, Date now) {
- if (detlDtos.isEmpty()){
+ if (detlDtos.isEmpty()) {
return;
}
for (DetlDto dto : detlDtos) {
Mat mat = matService.selectByMatnr(dto.getMatnr());
- if (Cools.isEmpty(mat)){
+ if (Cools.isEmpty(mat)) {
throw new CoolException(dto.getMatnr() + "鍟嗗搧缁存姢澶辫触");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index d8ad458..18af8bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -47,15 +47,15 @@
}
@Override
- public int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo) {
- return this.baseMapper.selectWrkMastBareBoardStaNo(ioType,staNo);
+ public int selectWrkMastBareBoardStaNo(Integer ioType, Integer staNo) {
+ return this.baseMapper.selectWrkMastBareBoardStaNo(ioType, staNo);
}
@Override
public List<WrkMast> selectWrkMastWrkDetl(Integer ioType, FindLocNoAttributeVo findLocNoAttributeVo, Integer crnNo) {
- return this.baseMapper.selectWrkMastWrkDetl(ioType,findLocNoAttributeVo.getMatnr(),findLocNoAttributeVo.getBatch(),findLocNoAttributeVo.getBrand()
- ,findLocNoAttributeVo.getStandby1(),findLocNoAttributeVo.getStandby2(),findLocNoAttributeVo.getStandby3()
- ,findLocNoAttributeVo.getBoxType1(),findLocNoAttributeVo.getBoxType2(),findLocNoAttributeVo.getBoxType3()
- ,crnNo);
+ return this.baseMapper.selectWrkMastWrkDetl(ioType, findLocNoAttributeVo.getMatnr(), findLocNoAttributeVo.getBatch(), findLocNoAttributeVo.getBrand()
+ , findLocNoAttributeVo.getStandby1(), findLocNoAttributeVo.getStandby2(), findLocNoAttributeVo.getStandby3()
+ , findLocNoAttributeVo.getBoxType1(), findLocNoAttributeVo.getBoxType2(), findLocNoAttributeVo.getBoxType3()
+ , crnNo);
}
}
diff --git a/src/main/java/com/zy/asrs/task/AbstractHandler.java b/src/main/java/com/zy/asrs/task/AbstractHandler.java
index 5a6e371..9ba819b 100644
--- a/src/main/java/com/zy/asrs/task/AbstractHandler.java
+++ b/src/main/java/com/zy/asrs/task/AbstractHandler.java
@@ -1,7 +1,6 @@
package com.zy.asrs.task;
import com.core.exception.CoolException;
-import com.zy.asrs.task.core.AsrsException;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -18,12 +17,12 @@
// protected abstract ReturnT<T> start();
- protected void exceptionHandle(String errorMsg){
+ protected void exceptionHandle(String errorMsg) {
log.error(errorMsg);
exceptionHandle(errorMsg, (Object) null);
}
- protected void exceptionHandle(String errorMsg, Object... args){
+ protected void exceptionHandle(String errorMsg, Object... args) {
log.error(errorMsg);
throw new CoolException(MessageFormat.format(errorMsg, args));
}
diff --git a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
index d45fce2..f761770 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -2,10 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
-import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.AutoLocMoveHandler;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.properties.SlaveWmsParameterProperties;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
@@ -41,18 +42,18 @@
//瀹氭椂鍑哄簱 缁忓吀鍙屼几
@Scheduled(cron = "0/3 * * * * ? ")
- public void locToLocAutoLocMove(){
- if (slaveWmsParameterProperties.isAutoLocMoveBoolean()){
+ public void locToLocAutoLocMove() {
+ if (slaveWmsParameterProperties.isAutoLocMoveBoolean()) {
Config config = configService.selectConfigByCode("AutoLocMove");
if (Cools.isEmpty(config) || config.getValue().equals("false")) {
return;
}
OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
- if (!Cools.isEmpty(orderPakout)){
+ if (!Cools.isEmpty(orderPakout)) {
// autoMoveService.selectList()
- }else {
+ } else {
orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
- if (Cools.isEmpty(orderPakout)){
+ if (Cools.isEmpty(orderPakout)) {
return;
}
orderPakout.setMoveStatus(2);
@@ -63,18 +64,18 @@
//瀹氭椂鍑哄簱
@Scheduled(cron = "0/3 * * * * ? ")
- public void locToLoc11(){
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
+ public void locToLoc11() {
+ if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()) {
Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
if (Cools.isEmpty(config) || config.getValue().equals("false")) {
return;
}
int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- for (int crnNo = 1;crnNo < crnCount;crnNo++){
+ for (int crnNo = 1; crnNo < crnCount; crnNo++) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
- if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
- autoLocMoveHandler.start(crnNo,11);
+ if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)) {
+ autoLocMoveHandler.start(crnNo, 11);
}
}
}
@@ -83,21 +84,21 @@
//瀹氭椂鍏ュ簱
@Scheduled(cron = "0/3 * * * * ? ")
public void locToLoc111() {
- if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()){
+ if (slaveWmsParameterProperties.isAutoLocMoveUnilateralBoolean()) {
Config config = configService.selectConfigByCode("AutoLocMoveUnilateral");
if (Cools.isEmpty(config) || config.getValue().equals("false")) {
return;
}
int crnCount = basCrnpService.selectCount(new EntityWrapper<>());
- for (int crnNo = 1;crnNo < crnCount;crnNo++){
+ for (int crnNo = 1; crnNo < crnCount; crnNo++) {
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
if (basCrnp == null) {
continue;
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 111).eq("crn_no", crnNo));
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type", 11).eq("crn_no", crnNo));
- if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)){
- autoLocMoveHandler.start(crnNo,111);
+ if (Cools.isEmpty(wrkMast) && Cools.isEmpty(wrkMast1)) {
+ autoLocMoveHandler.start(crnNo, 111);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
index 498483b..9fe4ff7 100644
--- a/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
+++ b/src/main/java/com/zy/asrs/task/BareBoardScheduler.java
@@ -9,8 +9,6 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.util.List;
-
/**
* Created by Monkey D. Luffy on 2023.10.25
* 骞垮痉瀹滅..............浠ヤ笅.............骞垮痉瀹滅.............鑷姩琛ョ┖鏉垮啀浼樺寲
@@ -26,15 +24,15 @@
private SlaveWmsParameterProperties slaveWmsParameterProperties;
/*
- * 鑷姩璋冪┖鏉垮嚭搴�
- * */
+ * 鑷姩璋冪┖鏉垮嚭搴�
+ * */
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
- if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()){
+ private void execute() {
+ if (slaveWmsParameterProperties.isAutomaticFillingBoardStaNosBoolean()) {
Config config = configService.selectConfigByCode("AutomaticFillingBoard");
- if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("true")){
- for (Integer staNo : slaveWmsParameterProperties.getAutomaticFillingBoardStaNos()){
- bareBoardHandler.start(110,staNo,"D");
+ if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("true")) {
+ for (Integer staNo : slaveWmsParameterProperties.getAutomaticFillingBoardStaNos()) {
+ bareBoardHandler.start(110, staNo, "D");
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
index d5c566b..766e6f5 100644
--- a/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
+++ b/src/main/java/com/zy/asrs/task/CheckDeepScheduler.java
@@ -1,27 +1,18 @@
package com.zy.asrs.task;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.CheckDeepHandler;
-import com.zy.asrs.utils.Utils;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
@Component
@Slf4j
diff --git a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
index 917cfc4..97c0c54 100644
--- a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
@@ -20,7 +20,7 @@
private ErrorStockHandler errorStockHandler;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
ReturnT<String> returnT = errorStockHandler.start();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
diff --git a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
index 935343e..c3ad608 100644
--- a/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
+++ b/src/main/java/com/zy/asrs/task/LocMoveAllScheduler.java
@@ -14,7 +14,6 @@
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -29,11 +28,11 @@
public class LocMoveAllScheduler {
//@Value("${loc-move.enable}")
- private boolean enable =false;
+ private boolean enable = false;
//@Value("${loc-move.crn1}")
- private boolean crn1=false;
+ private boolean crn1 = false;
//@Value("${loc-move.crn2}")
- private boolean crn2=false;
+ private boolean crn2 = false;
@Autowired
diff --git a/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java b/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
index 93799d9..9d51ef4 100644
--- a/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/NotifyLogScheduler.java
@@ -20,7 +20,7 @@
private NotifyLogHandler notifyLogHandler;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
ReturnT<String> returnT = notifyLogHandler.start();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
diff --git a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
index c2a7f49..25ce9ea 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -1,6 +1,7 @@
package com.zy.asrs.task;
-import com.zy.asrs.task.handler.OrderMoveHistoryHandler;
+import com.zy.asrs.task.handler.OrderPakinMoveHistoryHandler;
+import com.zy.asrs.task.handler.OrderPakoutMoveHistoryHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -9,21 +10,24 @@
@Component
public class OrderMoveHistoryScheduler {
@Autowired
- private OrderMoveHistoryHandler orderMoveHistoryHandler;
+ private OrderPakinMoveHistoryHandler orderPakinMoveHistoryHandler;
+
+ @Autowired
+ private OrderPakoutMoveHistoryHandler orderPakoutMoveHistoryHandler;
/**
* 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
*/
@Scheduled(cron = "0/30 * * * * ?")
- public void execute(){
- orderMoveHistoryHandler.start();
+ public void execute() {
+ orderPakinMoveHistoryHandler.start();
}
/**
* 灏嗗凡涓婃姤order鍜宱rderDetl绉诲姩鍒發og琛�
*/
@Scheduled(cron = "0/30 * * * * ?")
- public void executeOrder(){
- orderMoveHistoryHandler.startOrder();
+ public void executeOrder() {
+ orderPakoutMoveHistoryHandler.start();
}
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index bad7062..382c7fb 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,16 +1,16 @@
package com.zy.asrs.task;
-import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.OrderPakinService;
+import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.OrderSyncHandler;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.entity.Parameter;
+import com.zy.asrs.task.handler.OrderPakinSyncHandler;
+import com.zy.asrs.task.handler.OrderPakoutSyncHandler;
+import com.zy.system.timer.LoadingConfigTimer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -25,11 +25,17 @@
public class OrderSyncScheduler {
@Autowired
- private OrderSyncHandler orderSyncHandler;
+ private OrderPakinSyncHandler orderPakinSyncHandler;
@Autowired
- private OrderService orderService;
+ private OrderPakoutSyncHandler orderPakoutSyncHandler;
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
@Scheduled(cron = "0 0 1 * * ? ")
@@ -41,74 +47,35 @@
}
}
- @Scheduled(cron = "0 1 * * * ? ")
+
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReportOrderIssuedOnceMore() {
- List<Order> orderList = orderService.selectComplete99();
- for (Order order : orderList) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(),result.getMsg());
+ public void completeOrderPakin() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderPakin> orders = orderPakinService.selectComplete();
+ for (OrderPakin order : orders) {
+ try {
+ ReturnT<String> result = orderPakinSyncHandler.startOrderReport(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
- } catch (Exception e){
- log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触", order.getOrderNo());
}
}
}
+
@Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReportOrderIssued() {
-// String erpReport = Parameter.get().getErpReport();
-// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orderList = orderService.selectComplete1();
-// List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
- for (Order order : orderList) {
+ public void completeOrderPakout() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderPakout> orders = orderPakoutService.selectComplete();
+ for (OrderPakout order : orders) {
try {
- ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
- }
- } catch (Exception e){
- log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
- }
- }
-// }
- }
-
-// @Scheduled(cron = "0/5 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReportOrderInAndOutUtil() {
-// String erpReport = Parameter.get().getErpReport();
-// if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = OrderInAndOutUtil.selectComplete(null);
- for (Order order : orders) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
- }
- } catch (Exception e){
- log.error(e.getMessage());
- log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
- }
- }
-// }
- }
-
-// @Scheduled(cron = "0/30 * * * * ? ")
- @Async("orderThreadPool")
- public void completeAndReportOrderReport() {
-
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
- try {
- ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+ ReturnT<String> result = orderPakoutSyncHandler.startOrderReport(order);
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
index 2865cc3..b2a03d7 100644
--- a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
@@ -20,7 +20,7 @@
private OverYearLogHandler overYearLogHandler;
@Scheduled(cron = "0 0 1 * * ? ")
- private void execute(){
+ private void execute() {
ReturnT<String> returnT = overYearLogHandler.start();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
diff --git a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
index 708392f..4a8b718 100644
--- a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
@@ -20,7 +20,7 @@
private PlcLogHandler plcLogHandler;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
ReturnT<String> returnT = plcLogHandler.start();
if (!returnT.isSuccess()) {
log.error(returnT.getMsg());
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 06a0624..01a611d 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -24,7 +24,7 @@
private WrkMastService wrkMastService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
if (wrkMasts.isEmpty()) {
return;
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 0d39e15..42f11d2 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -31,7 +31,7 @@
private TaskService taskService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ private void execute() {
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
@@ -50,7 +50,7 @@
}
@Scheduled(cron = "0/3 * * * * ? ")
- private void executeTask(){
+ private void executeTask() {
List<Task> wrkMasts = taskService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
diff --git a/src/main/java/com/zy/asrs/task/core/ReturnT.java b/src/main/java/com/zy/asrs/task/core/ReturnT.java
index 26b8c12..f4fcede 100644
--- a/src/main/java/com/zy/asrs/task/core/ReturnT.java
+++ b/src/main/java/com/zy/asrs/task/core/ReturnT.java
@@ -27,7 +27,7 @@
this.content = content;
}
- public boolean isSuccess(){
+ public boolean isSuccess() {
return this.code == 200;
}
diff --git a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
index 64f09f0..f11a940 100644
--- a/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
+++ b/src/main/java/com/zy/asrs/task/core/WcsDispatcher.java
@@ -30,7 +30,7 @@
private ConfigService configService;
@PostConstruct
- private void start(){
+ private void start() {
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
@@ -50,7 +50,7 @@
}
@PreDestroy
- public void shutDown(){
+ public void shutDown() {
if (thread != null)
thread.interrupt();
log.info("浠诲姟涓績璋冨害鍣ㄥ凡鍋滄......");
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
index d1f7212..25ad6e2 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
@@ -41,29 +41,29 @@
public ReturnT<String> start(Integer crnNo, Integer ioType) {
try {
//11 绌挎绉诲崟杈�
- if (ioType==11){
- for (int bay = 1;bay < 27;bay++){
- for (int lev = 1 ; lev <6 ; lev++){
- List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay,lev,crnNo);
- if (!Cools.isEmpty(locMasts) && locMasts.size()<4){
- for (LocMast locMast:locMasts){
+ if (ioType == 11) {
+ for (int bay = 1; bay < 27; bay++) {
+ for (int lev = 1; lev < 6; lev++) {
+ List<LocMast> locMasts = locMastService.selectLocMastShuttleMoveUnilateral(bay, lev, crnNo);
+ if (!Cools.isEmpty(locMasts) && locMasts.size() < 4) {
+ for (LocMast locMast : locMasts) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 6 : 5, ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null);
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl);
- StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 917 : 918, findLocNoAttributeVo, null);
- workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
+ StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 917 : 918, findLocNoAttributeVo, null);
+ workService.locMove(locMast.getLocNo(), startupDto.getLocNo(), 9527L);
}
return SUCCESS;
}
}
}
- }else {//11 鍗曡竟绉荤┛姊�
+ } else {//11 鍗曡竟绉荤┛姊�
List<Map<String, Object>> list = locDetlService.selectLocDetlUnilateralMoveShuttleMap(crnNo);//111 鍗曡竟绉荤┛姊�
for (Map<String, Object> map : list) {
- String matnr = map.getOrDefault("matnr","").toString();//鐗╂枡鍙�
- String batch = map.getOrDefault("batch","").toString();//鎵瑰彿
- String grade = map.getOrDefault("brand","").toString();//绛夌骇
+ String matnr = map.getOrDefault("matnr", "").toString();//鐗╂枡鍙�
+ String batch = map.getOrDefault("batch", "").toString();//鎵瑰彿
+ String grade = map.getOrDefault("brand", "").toString();//绛夌骇
int count = Integer.parseInt(map.get("count").toString());//鍗曡竟搴撴暟閲�
if (count < 4) {
continue;
@@ -74,14 +74,14 @@
// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(locDetl);
- StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 901 : 932, findLocNoAttributeVo, null);
+ StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 901 : 932, findLocNoAttributeVo, null);
workService.locMove(locDetl.getLocNo(), startupDto.getLocNo(), 9527L);
}
}
return SUCCESS;
}
- }catch (Exception e){
- log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}",crnNo,ioType);
+ } catch (Exception e) {
+ log.error("鑷姩绉诲簱鍑洪敊,鍫嗗灈鏈哄彿{}锛屽伐浣滅被鍨媨}", crnNo, ioType);
}
return SUCCESS;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index f3dbcfd..5dd3767 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -45,47 +45,47 @@
@Autowired
private BasCrnpService basCrnpService;
- public ReturnT<String> start(Integer ioType,Integer staNo,String locStsTarget) {
+ public ReturnT<String> start(Integer ioType, Integer staNo, String locStsTarget) {
try {
- if (wrkMastService.selectWrkMastBareBoardStaNo(ioType,staNo)!=0){
+ if (wrkMastService.selectWrkMastBareBoardStaNo(ioType, staNo) != 0) {
return null;
}
// 鑾峰彇宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- ArrayList<Integer> crns =new ArrayList<>();
+ ArrayList<Integer> crns = new ArrayList<>();
List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().eq("crn_sts", 3).eq("out_enable", "Y").eq("wrk_no", 0));
- for (BasCrnp basCrnp : basCrnps){
+ for (BasCrnp basCrnp : basCrnps) {
crns.add(basCrnp.getCrnNo());
}
- for (BasCrnp basCrnp : basCrnpService.selectList(new EntityWrapper<>())){
+ for (BasCrnp basCrnp : basCrnpService.selectList(new EntityWrapper<>())) {
crns.add(basCrnp.getCrnNo());
}
- if (Cools.isEmpty(crns) || crns.size()==0){
+ if (Cools.isEmpty(crns) || crns.size() == 0) {
return null;
}
boolean sign = true;
- for (Integer crnNo : crns){
+ for (Integer crnNo : crns) {
sign = true;
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", locStsTarget).eq("crn_no", crnNo));
if (Cools.isEmpty(locMast)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
- sign=false;
+ sign = false;
}
- if (sign && !locMast.getLocSts().equals(locStsTarget)){
+ if (sign && !locMast.getLocSts().equals(locStsTarget)) {
// throw new CoolException("鎵�閫夊簱浣嶅瓨鍦ㄧ姸鎬佷笉涓篋鐨勫簱浣嶏紝搴撲綅鍙凤細"+locMast.getLocNo()+" 銆佸綋鍓嶇姸鎬侊細"+locMast.getLocSts()+"-"+locMast.getLocSts$());
- sign=false;
+ sign = false;
}
- if (sign){
+ if (sign) {
// 鑾峰彇婧愮珯
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", ioType)
.eq("stn_no", staNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)){
+ if (Cools.isEmpty(staDesc)) {
sign = false;
continue;
}
@@ -94,7 +94,7 @@
// throw new CoolException("妫�绱㈡簮绔欏け璐�");
sign = false;
}
- if (sign){
+ if (sign) {
Date now = new Date();
// 淇濆瓨宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -107,10 +107,10 @@
wrkMast.setStaNo(staNo + ""); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locMast.getLocNo()); // 婧愬簱浣�
- wrkMast.setFullPlt(ioType.equals(110)? "N" : "Y"); // 婊℃澘锛歒
+ wrkMast.setFullPlt(ioType.equals(110) ? "N" : "Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk(ioType.equals(110)? "Y" : "N"); // 绌烘澘
+ wrkMast.setEmptyMk(ioType.equals(110) ? "Y" : "N"); // 绌烘澘
wrkMast.setLinkMis("N");
wrkMast.setAppeUser(9999L);
wrkMast.setAppeTime(now);
@@ -121,25 +121,25 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
// 鏇存柊搴撲綅鐘舵�� D.绌烘澘 -> R.鍑哄簱棰勭害
- if (locMast.getLocSts().equals(locStsTarget)){
+ if (locMast.getLocSts().equals(locStsTarget)) {
locMast.setLocSts("R");
locMast.setModiUser(9999L);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
- }else {
+ } else {
return SUCCESS;
}
}
}
}
}
- if (!sign){
+ if (!sign) {
log.error("鏈煡鍒板彲鍑哄簱鐨勭┖鏉匡紒锛侊紒");
return null;
}
- }catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+e);
+ } catch (Exception e) {
+ log.error("寮傚父锛侊紒锛�" + e);
return null;
}
return SUCCESS;
diff --git a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
index 9eb6b97..44ac08e 100644
--- a/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/CheckDeepHandler.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.BasCrnp;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
@@ -45,27 +44,27 @@
@Transactional
public synchronized ReturnT<String> start() {
try {
- for (int crnNo = 1; crnNo < 3; crnNo++){
+ for (int crnNo = 1; crnNo < 3; crnNo++) {
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
- .eq("crn_no",crnNo)
+ .eq("crn_no", crnNo)
.last(" and wrk_sts in (2,3,4,11,12)")
);
if (wrkMasts.size() > 0) continue;
//鏆傚仠绉诲簱
BasCrnp crnp = basCrnpService.selectById(crnNo);
- if(!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty()==0){
+ if (!Cools.isEmpty(crnp) && !Cools.isEmpty(crnp.getTankQty()) && crnp.getTankQty() == 0) {
continue;
}
List<LocMast> locMasts = locMastService.queryShallowLocFMast(crnNo);
if (null == locMasts) continue;
- for (LocMast sourceLoc : locMasts){
+ for (LocMast sourceLoc : locMasts) {
String deep = Utils.getDeepLoc(slaveProperties, sourceLoc.getLocNo());
LocMast destLoc = locMastService.selectById(deep);
- if(!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
+ if (!Cools.isEmpty(sourceLoc) && !Cools.isEmpty(destLoc)) {
//鏌ユ壘婧愬簱浣嶆槸鍚︽湁杞Щ浠诲姟,濡傛灉鏈�,涓嶇敓鎴愬簱浣嶇Щ杞�
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no", sourceLoc.getLocNo()));
@@ -233,21 +232,22 @@
/**
* 灏嗘繁搴撲綅杞负瀵瑰簲娴呭簱浣�
+ *
* @param deep
* @return
*/
- private String convertShallow(String deep){
+ private String convertShallow(String deep) {
String shallLoc = "";
Integer mastInt = Integer.parseInt(deep.substring(0, 2));
- if (mastInt % 2 == 0){
+ if (mastInt % 2 == 0) {
mastInt -= 1;
- }else if (mastInt % 2 == 1){
+ } else if (mastInt % 2 == 1) {
mastInt += 1;
}
- if (mastInt <10){
- shallLoc = "0" + mastInt+ deep.substring(2,7);
- }else {
- shallLoc = mastInt+ deep.substring(2,7);
+ if (mastInt < 10) {
+ shallLoc = "0" + mastInt + deep.substring(2, 7);
+ } else {
+ shallLoc = mastInt + deep.substring(2, 7);
}
return shallLoc;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
deleted file mode 100644
index 11c0b25..0000000
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
-import com.zy.asrs.service.impl.OrderPakinServiceImpl;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service
-@Slf4j
-public class OrderMoveHistoryHandler extends AbstractHandler<String> {
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderPakinService orderPakinService;
- @Autowired
- private OrderPakoutService orderPakoutService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private OrderDetlPakinServiceImpl orderDetlPakinService;
- @Autowired
- private OrderDetlPakoutService orderDetlPakoutService;
-
- public ReturnT<String> start(){
-// List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
-// .eq("settle", 6));
- List<Order> settleEqual6 = OrderInAndOutUtil.selectBySettle(null, 6L);
- for (Order order : settleEqual6) {
-// List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
-// .eq("order_no", order.getOrderNo()));
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- moveBoth(order,orderDetls);
- log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
- }
- return SUCCESS;
- }
-
- public ReturnT<String> startOrder(){
- List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
- .eq("settle", 6));
-// List<Order> settleEqual6 = OrderInAndOutUtil.selectBySettle(null, 6L);
- for (Order order : settleEqual6) {
- List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
- .eq("order_no", order.getOrderNo()));
-// List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- moveBothOrder(order,orderDetls);
- log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
- }
- return SUCCESS;
- }
-
- private void moveBoth(Order order, List<OrderDetl> orderDetls){
- Date now = new Date();
- if (!Cools.isEmpty(orderDetls)) {
- for (OrderDetl orderDetl : orderDetls) {
- orderDetl.setUpdateBy(0L);
- orderDetl.setUpdateTime(now);
-// orderDetlService.addToLogTable(orderDetl);
- OrderInAndOutUtil.addToLogTableOrderDetl(order.getPakinPakoutStatus$(),orderDetl);
- if (order.getPakinPakoutStatus() == 1){
- orderDetlPakinService.delete(new EntityWrapper<OrderDetlPakin>()
- .eq("id",orderDetl.getId()));
- } else {
- orderDetlPakoutService.delete(new EntityWrapper<OrderDetlPakout>()
- .eq("id",orderDetl.getId()));
- }
- }
- }
- if (!Cools.isEmpty(order)){
- order.setUpdateBy(0L);
- order.setUpdateTime(now);
-// orderService.addToLogTable(order);
- OrderInAndOutUtil.addToLogTableOrder(order.getPakinPakoutStatus$(),order);
-// orderService.delete(new EntityWrapper<Order>()
-// .eq("id",order.getId()));
- if (order.getPakinPakoutStatus() == 1){
- orderPakinService.delete(new EntityWrapper<OrderPakin>()
- .eq("id",order.getId()));
- } else {
- orderPakoutService.delete(new EntityWrapper<OrderPakout>()
- .eq("id",order.getId()));
- }
- }
- }
-
- private void moveBothOrder(Order order, List<OrderDetl> orderDetls){
- Date now = new Date();
- if (!Cools.isEmpty(orderDetls)) {
- for (OrderDetl orderDetl : orderDetls) {
- orderDetl.setUpdateBy(0L);
- orderDetl.setUpdateTime(now);
- orderDetlService.addToLogTable(orderDetl);
- orderDetlService.delete(new EntityWrapper<OrderDetl>()
- .eq("id",orderDetl.getId()));
- }
- }
- if (!Cools.isEmpty(order)){
- order.setUpdateBy(0L);
- order.setUpdateTime(now);
- orderService.addToLogTable(order);
- orderService.delete(new EntityWrapper<Order>()
- .eq("id",order.getId()));
- }
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakinMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakinMoveHistoryHandler.java
new file mode 100644
index 0000000..b056247
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakinMoveHistoryHandler.java
@@ -0,0 +1,76 @@
+package com.zy.asrs.task.handler;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.OrderDetlPakinLog;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderPakinLog;
+import com.zy.asrs.mapper.OrderDetlPakinLogMapper;
+import com.zy.asrs.mapper.OrderPakinLogMapper;
+import com.zy.asrs.service.OrderPakinService;
+import com.zy.asrs.service.impl.OrderDetlPakinServiceImpl;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.Synchro;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class OrderPakinMoveHistoryHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private OrderPakinService orderPakinService;
+
+ @Autowired
+ private OrderDetlPakinServiceImpl orderDetlPakinService;
+
+ @Autowired
+ private OrderPakinLogMapper orderPakinLogMapper;
+
+ @Autowired
+ private OrderDetlPakinLogMapper orderDetlPakinLogMapper;
+
+
+ public ReturnT<String> start() {
+ List<OrderPakin> settleEqual6 = orderPakinService.selectList(new EntityWrapper<OrderPakin>()
+ .eq("settle", 6));
+ for (OrderPakin order : settleEqual6) {
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
+ moveBoth(order, orderDetls);
+ log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order);
+ }
+ return SUCCESS;
+ }
+
+
+ private void moveBoth(OrderPakin order, List<OrderDetlPakin> orderDetls) {
+ Date now = new Date();
+ if (!Cools.isEmpty(orderDetls)) {
+ for (OrderDetlPakin orderDetl : orderDetls) {
+ orderDetl.setUpdateBy(0L);
+ orderDetl.setUpdateTime(now);
+ OrderDetlPakinLog orderDetlLog = new OrderDetlPakinLog();
+ Synchro.Copy(orderDetl, orderDetlLog);
+ orderDetlLog.setId(null);
+ orderDetlPakinLogMapper.insert(orderDetlLog);
+ orderDetlPakinService.deleteById(orderDetl.getId());
+ }
+ }
+ if (!Cools.isEmpty(order)) {
+ order.setUpdateBy(0L);
+ order.setUpdateTime(now);
+ OrderPakinLog orderPakinLog = new OrderPakinLog();
+ Synchro.Copy(order, orderPakinLog);
+ orderPakinLog.setId(null);
+ orderPakinLogMapper.insert(orderPakinLog);
+ orderPakinService.deleteById(order.getId());
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
new file mode 100644
index 0000000..2797bac
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlPakinService;
+import com.zy.asrs.service.OrderPakinService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Service
+public class OrderPakinSyncHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderDetlPakinService orderDetlPakinService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private DocTypeService docTypeService;
+
+
+ @Transactional
+ public ReturnT<String> startOrderReport(OrderPakin order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ long settle = 6L;
+ List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
+
+ return SUCCESS;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakoutMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakoutMoveHistoryHandler.java
new file mode 100644
index 0000000..597f17f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakoutMoveHistoryHandler.java
@@ -0,0 +1,78 @@
+package com.zy.asrs.task.handler;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.OrderDetlPakoutLog;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.entity.OrderPakoutLog;
+import com.zy.asrs.mapper.OrderDetlPakoutLogMapper;
+import com.zy.asrs.mapper.OrderPakoutLogMapper;
+import com.zy.asrs.service.OrderDetlPakoutService;
+import com.zy.asrs.service.OrderPakoutService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.Synchro;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class OrderPakoutMoveHistoryHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+
+
+ @Autowired
+ private OrderPakoutLogMapper orderPakoutLogMapper;
+
+ @Autowired
+ private OrderDetlPakoutLogMapper orderDetlPakoutLogMapper;
+
+ public ReturnT<String> start() {
+ List<OrderPakout> settleEqual6 = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
+ .eq("settle", 6));
+ for (OrderPakout order : settleEqual6) {
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectList(new EntityWrapper<OrderDetlPakout>()
+ .eq("order_no", order.getOrderNo()));
+ moveBoth(order, orderDetls);
+ log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order);
+ }
+ return SUCCESS;
+ }
+
+
+ private void moveBoth(OrderPakout order, List<OrderDetlPakout> orderDetls) {
+ Date now = new Date();
+ if (!Cools.isEmpty(orderDetls)) {
+ for (OrderDetlPakout orderDetl : orderDetls) {
+ orderDetl.setUpdateBy(0L);
+ orderDetl.setUpdateTime(now);
+ OrderDetlPakoutLog orderDetlLog = new OrderDetlPakoutLog();
+ Synchro.Copy(orderDetl, orderDetlLog);
+ orderDetlLog.setId(null);
+ orderDetlPakoutLogMapper.insert(orderDetlLog);
+ orderDetlPakoutService.deleteById(orderDetl.getId());
+ }
+ }
+ if (!Cools.isEmpty(order)) {
+ order.setUpdateBy(0L);
+ order.setUpdateTime(now);
+ OrderPakoutLog orderPakinLog = new OrderPakoutLog();
+ Synchro.Copy(order, orderPakinLog);
+ orderPakinLog.setId(null);
+ orderPakoutLogMapper.insert(orderPakinLog);
+ orderPakoutService.deleteById(order.getId());
+ }
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
new file mode 100644
index 0000000..0e15d5f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
@@ -0,0 +1,48 @@
+package com.zy.asrs.task.handler;
+
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.OrderDetlPakout;
+import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlPakoutService;
+import com.zy.asrs.service.OrderPakoutService;
+import com.zy.asrs.task.AbstractHandler;
+import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/7/7
+ */
+@Slf4j
+@Service
+public class OrderPakoutSyncHandler extends AbstractHandler<String> {
+
+ @Autowired
+ private OrderPakoutService orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutService orderDetlPakoutService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private DocTypeService docTypeService;
+
+
+ @Transactional
+ public ReturnT<String> startOrderReport(OrderPakout order) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (null == docType) {
+ return SUCCESS;
+ }
+ long settle = 6L;
+ List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
+
+ return SUCCESS;
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
deleted file mode 100644
index 002d171..0000000
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.model.DetlDto;
-import com.zy.common.model.MesPakinParam;
-import com.zy.common.model.MesPakoutParam;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Slf4j
-@Service
-public class OrderSyncHandler extends AbstractHandler<String> {
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
- @Autowired
- private OrderService orderService;
- @Autowired
- private OrderDetlService orderDetlService;
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private DocTypeService docTypeService;
-
- @Transactional
- public ReturnT<String> startOrderIssuedOnceMore(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
-
- Order order1 = OrderInAndOutUtil.selectByNo(order.getPakinPakoutStatus$(), order.getOrderNo());
- if (!Cools.isEmpty(order1)){
- return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
- }
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
- if (!Cools.isEmpty(orderDetls) || !orderDetls.isEmpty()) {
- return FAIL.setMsg("璇风瓑寰�...璁㈠崟鎵ц鏄庣粏妗ｆ姝ｅ湪杞巻鍙叉。妗堬紒锛侊紒");
- }
-
- // 鍗曟嵁鏄庣粏妗�
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- for (OrderDetl orderDetl : orderDetlList){
- if (orderDetl.getQty().equals(0D)){
- continue;
- }
- orderDetl.setWorkQty(orderDetl.getQty());
- orderDetl.setAnfme(orderDetl.getAnfme()-orderDetl.getQty());
- orderDetl.setQty(0D);
- orderDetlService.updateById(orderDetl);
- }
-
- // 淇敼璁㈠崟鐘舵�� 99.鍐嶆浣滀笟 ===>> 1.寰呬綔涓�
- if (!orderService.updateSettle(order.getId(), 1L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- return SUCCESS;
- }
-
- @Transactional
- public ReturnT<String> startOrderIssued(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
-
- OrderInAndOutUtil.insertOrder(order.getPakinPakoutStatus$(),order);
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<OrderDetl> orderDetlList = new ArrayList<>();
-
- for (OrderDetl detail : orderDetls) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
-
- OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
- assert orderDetl != null;
- orderDetl.setAnfme(orderDetl.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- orderDetlList.add(detail);
- }
- }
- for (OrderDetl orderDetl : orderDetlList){
- orderDetl.setWorkQty(0D);
- OrderInAndOutUtil.insertOrderDetl(order.getPakinPakoutStatus$(),order,orderDetl);
- }
- // 淇敼璁㈠崟鐘舵�� 1.鏈綔涓� ===>> 2.浣滀笟涓�
- if (!orderService.updateSettle(order.getId(), 2L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- return SUCCESS;
- }
-
- @Transactional
- public ReturnT<String> startOrderInAndOutUtil(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- Order orderSou = orderService.selectByNo(order.getOrderNo());
- if (!orderSou.getSettle().equals(2L)){
- return FAIL.setMsg("璁㈠崟鐘舵�佷笉姝ｇ‘锛岃鑱旂郴绠＄悊鍛�");
- }
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(orderSou.getId());
-
- List<OrderDetl> orderDetls = OrderInAndOutUtil.selectByOrderId(order.getPakinPakoutStatus$(), order.getId());
-
- for (OrderDetl orderDetlSou : orderDetlList){
- for (OrderDetl orderDetl : orderDetls){
- if (orderDetl.getQty().equals(0D)){
- continue;
- }
- if (orderDetlSou.beSimilar(orderDetl)){
- double v = orderDetlSou.getAnfme() - orderDetlSou.getQty();
- if (v<orderDetl.getQty() || orderDetl.getQty().equals(v)){
- orderDetlSou.setQty(orderDetlSou.getAnfme());
- orderDetl.setQty(orderDetl.getQty() - v);
- break;
- } else {
- orderDetlSou.setQty(orderDetlSou.getQty()+orderDetl.getQty());
- orderDetl.setQty(0D);
- }
- }
- }
- }
- for (OrderDetl orderDetlSou : orderDetlList){
- orderDetlService.updateById(orderDetlSou);
- }
- // 淇敼璁㈠崟鐘舵�� 2.浣滀笟涓� ===>> 4.寰呬笂鎶�
- if (!orderService.updateSettle(orderSou.getId(), 4L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.缁撴潫
- OrderInAndOutUtil.updateOrder(order.getPakinPakoutStatus$(),order.getId(),6L,null);
- return SUCCESS;
- }
- @Transactional
- public ReturnT<String> startOrderReport(Order order) {
- DocType docType = docTypeService.selectById(order.getDocType());
- if (null == docType) {
- return SUCCESS;
- }
- long settle = 6L;
- List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
- // 鍏ュ簱瀹屾垚涓婃姤
- if (docType.getPakin() == 1) {
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
- for (OrderDetl orderDetl : orderDetls) {
- if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
- settle = 99L;//浜屾鐢熸垚鍗曟嵁
- }
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
- }
-
- String response = "";
- boolean success = false;
- try {
-// response = new HttpHandler.Builder()
-// .setUri(MesConstant.URL)
-// .setPath(MesConstant.PAKIN_URL)
-// .setJson(JSON.toJSONString(pakinParam))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
- if (true) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), settle, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakinParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
- }
- // 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
- MesPakoutParam pakoutParam = new MesPakoutParam();
- pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
- pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
- pakoutParam.setLgortFrom("5006");
- pakoutParam.setLgortTo("1111");
- if (!pakoutParam.isTag()) {
- pakoutParam.setKunnr("C1000");
- }
- pakoutParam.setOrderNo(order.getOrderNo());
- for (OrderDetl orderDetl : orderDetls) {
- if (!orderDetl.getQty().equals(orderDetl.getAnfme())){
- settle = 99L;//浜屾鐢熸垚鍗曟嵁
- }
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
-// response = new HttpHandler.Builder()
-// .setUri(MesConstant.URL)
-// .setPath(MesConstant.PAKOUT_URL)
-// .setJson(JSON.toJSONString(pakoutParam))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("code").equals(200)) {
- if (true) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), settle, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
- }
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳嚭搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKOUT_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakoutParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
- }
- }
- return SUCCESS;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
index 2af6104..c380944 100644
--- a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
@@ -19,7 +19,6 @@
private JdbcTemplate jdbcTemplate;
-
@Autowired
private LoadingConfigTimer loadingConfigTimer;
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index dc6f573..173d232 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -8,7 +8,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.utils.OrderInAndOutUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,7 +37,9 @@
@Autowired
private WaitPakinLogService waitPakinLogService;
@Autowired
- private OrderService orderService;
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -50,11 +51,10 @@
while (iterator.hasNext()) {
WrkDetl wrkDetl = iterator.next();
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
-// orderService.checkComplete(wrkDetl.getOrderNo());
- if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 8 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 104){
- OrderInAndOutUtil.checkComplete(Boolean.TRUE,wrkDetl.getOrderNo());
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 8 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 104) {
+ orderPakinService.checkComplete(wrkDetl.getOrderNo());
} else {
- OrderInAndOutUtil.checkComplete(Boolean.FALSE,wrkDetl.getOrderNo());
+ orderPakoutService.checkComplete(wrkDetl.getOrderNo());
}
iterator.remove();
}
@@ -82,7 +82,7 @@
// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
// }
// }
- // 鎷ｆ枡鍐嶅叆搴�
+ // 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
@@ -91,7 +91,7 @@
// }
}
- // 鍑哄簱 --------------------------------------------------------------------------------
+ // 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 2d3edb0..bc20503 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -7,9 +7,6 @@
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.BasStationServiceImpl;
-import com.zy.asrs.service.impl.LocCacheServiceImpl;
-import com.zy.asrs.service.impl.OrderPakinServiceImpl;
-import com.zy.asrs.service.impl.TaskDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -19,7 +16,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -598,7 +598,7 @@
public ReturnT<String> agvDoOut(Task task) {
if (task.getIoType().equals(101)) {
Date now = new Date();
- LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no" ,task.getSourceLocNo()));
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", task.getSourceLocNo()));
if (Objects.isNull(locMast)) {
throw new RuntimeException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉鑳戒负绌猴紒锛�");
}
diff --git a/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java b/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java
deleted file mode 100644
index 35958da..0000000
--- a/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zy.asrs.utils;
-
-import java.util.Arrays;
-
-public class DigitAndSortUrils {
-
- public static void main(String[] args) {
- int[] numbers = {5, 10, 15, 3, 8}; // 鍋囪杩欐槸浣犵殑涓�缁勬暟瀛�
-
- System.out.println(digitMax(numbers)+":max");
- System.out.println(digitMin(numbers)+":min");
- }
-
- public static Integer digitMax(int[] numbers) {
- int max = Arrays.stream(numbers).max().getAsInt();
- return max;
- }
-
- public static Integer digitMin(int[] numbers) {
- int min = Arrays.stream(numbers).min().getAsInt();
- return min;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/utils/InitStaDesc.java b/src/main/java/com/zy/asrs/utils/InitStaDesc.java
deleted file mode 100644
index 934d92b..0000000
--- a/src/main/java/com/zy/asrs/utils/InitStaDesc.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package com.zy.asrs.utils;
-
-import com.zy.asrs.entity.StaDesc;
-import com.zy.asrs.service.StaDescService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Created by vincent on 2022/5/8
- */
-//@Component
-@RestController
-public class InitStaDesc {
-
- @Autowired
- private StaDescService staDescService;
-
-// @PostConstruct
- @GetMapping("/init/staDesc")
- public void initStaDesc() {
- in();
- out();
- }
-
- public void in() {
- // 鍏ㄧ彮鍏ュ簱
- int[] stnNos = new int[] {305, 303, 301};
- int[] crnStns = new int[] {321, 320, 319, 318, 317, 316, 315, 314, 313, 311, 309, 307};
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(1);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 绌烘澘鍏ュ簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(10);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鎷ｆ枡鍏ュ簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(53);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鐩樼偣鍏ュ簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(57);
- staDesc.setStnNo(stnNo);
- staDesc.setCrnNo(i + 1);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- }
-
- public void out() {
- // 鍏ㄧ彮鍑哄簱
- int[] stnNos = new int[] {304, 302, 300};
-// int[] crnStns = new int[] {321, 320, 319, 318, 317, 316, 315, 314};
- int[] crnStns = new int[] {312, 310, 308, 306};
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(101);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 绌烘澘鍑哄簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(110);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鎷ｆ枡鍑哄簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(103);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- // 鐩樼偣鍑哄簱
- for (int stnNo : stnNos) {
- for (int i = 0; i < crnStns.length; i++) {
- StaDesc staDesc = new StaDesc();
- staDesc.setTypeNo(107);
- staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
- staDesc.setCrnNo(i + 9);
- staDesc.setCrnStn(crnStns[i]);
- staDescService.insert(staDesc);
- }
- }
- }
-
-
-// public void in() {
-// // 鍏ㄧ彮鍏ュ簱
-// int[] stnNos = new int[] {173, 176, 180, 185, 189, 194, 198, 202, 206, 211, 215, 219, 223, 226};
-// int[] crnStns = new int[] {123, 121, 119, 117, 115, 113, 111, 109, 107, 105, 103, 101};
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(1);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 绌烘澘鍏ュ簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(10);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鎷ｆ枡鍏ュ簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(53);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鐩樼偣鍏ュ簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(57);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// }
-//
-// public void out() {
-// // 鍏ㄧ彮鍑哄簱
-// int[] stnNos = new int[] {174, 177, 181, 186, 190, 195, 199, 203, 207, 212, 216, 220, 224, 227};
-// int[] crnStns = new int[] {122, 120, 118, 116, 114, 112, 110, 108, 106, 104, 102, 100};
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(101);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 绌烘澘鍑哄簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(110);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鎷ｆ枡鍑哄簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(103);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// // 鐩樼偣鍑哄簱
-// for (int stnNo : stnNos) {
-// for (int i = 0; i < crnStns.length; i++) {
-// StaDesc staDesc = new StaDesc();
-// staDesc.setTypeNo(107);
-// staDesc.setStnNo(stnNo);
-// staDesc.setCrnNo(i + 1);
-// staDesc.setCrnStn(crnStns[i]);
-// staDescService.insert(staDesc);
-// }
-// }
-// }
-
-}
diff --git a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
deleted file mode 100644
index 3e6b2d5..0000000
--- a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
+++ /dev/null
@@ -1,689 +0,0 @@
-package com.zy.asrs.utils;
-
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.common.model.enumUtils.OrderEnumVo;
-import com.zy.common.model.enumUtils.OrderInAndOutType;
-import com.zy.common.model.enumUtils.OrderMethodVo;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by IX on 2024/12/14
- */
-public class OrderInAndOutUtil {
-
- public static String enumUtil(boolean sign) {
- if (sign){
- return OrderEnumVo.PAKIN.getCode();
- }
- return OrderEnumVo.PAKOUT.getCode();
- }
- public static String enumUtil(String sign) {
- if (Cools.isEmpty(sign)){
- return OrderEnumVo.PAKALL.getCode();
- } else if (sign.equals("Y")){
- return OrderEnumVo.PAKIN.getCode();
- } else if (sign.equals("N")){
- return OrderEnumVo.PAKOUT.getCode();
- }
- return OrderEnumVo.PAKALL.getCode();
- }
-
- public static OrderInAndOutType getOrderInAndOutType(String sign) {
- return OrderInAndOutType.valueOf(enumUtil(sign));
- }
-
- public static OrderInAndOutType getOrderInAndOutType(boolean sign) {
- return OrderInAndOutType.valueOf(enumUtil(sign));
- }
-
- public static boolean aBoolean(Object object){
- if (Cools.isEmpty(object)){
- throw new CoolException("null");
- } else if (object instanceof Boolean) {
- return (boolean) object;
- } else {
- throw new CoolException("Unexpected return type");
- }
- }
-
- public static Order aOrder(Object object){
- if (Cools.isEmpty(object)){
- return null;
- } else if (object instanceof Order) {
- return (Order) object;
- } else {
- throw new CoolException("Unexpected return type");
- }
- }
-
- public static OrderDetl aOrderDetl(Object object){
- if (Cools.isEmpty(object)){
- return null;
- } else if (object instanceof OrderDetl) {
- return (OrderDetl) object;
- } else {
- throw new CoolException("Unexpected return type");
- }
- }
-
- public static Method implement(OrderMethodVo orderMethodVo){
- Class<OrderInAndOutType> casual = OrderInAndOutType.class;
- try{
- switch (orderMethodVo){
- case QUERY:
- return casual.getDeclaredMethod(OrderMethodVo.QUERY.getCode(), String.class);
- case SELECT_BY_NO:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_BY_NO.getCode(), String.class);
- case SELECT_SETTLE:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_SETTLE.getCode(), Long.class);
- case SELECT_BY_ORDER_ID:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_BY_ORDER_ID.getCode(), Long.class);
- case SELECT_WORKING_DETLS:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_WORKING_DETLS.getCode(), Long.class);
- case CHECK_COMPLETE:
- return casual.getDeclaredMethod(OrderMethodVo.CHECK_COMPLETE.getCode(), String.class);
- case SAVE_HANDLER_ORDER:
- return casual.getDeclaredMethod(OrderMethodVo.SAVE_HANDLER_ORDER.getCode(), Boolean.class, WrkMast.class, List.class);
- case INSERT_ORDER:
- return casual.getDeclaredMethod(OrderMethodVo.INSERT_ORDER.getCode(), Order.class);
- case INSERT_ORDERDETL:
- return casual.getDeclaredMethod(OrderMethodVo.INSERT_ORDERDETL.getCode(), Order.class, OrderDetl.class);
- case UPDATE_ORDER:
- return casual.getDeclaredMethod(OrderMethodVo.UPDATE_ORDER.getCode(), Long.class,Long.class,Long.class);
- case UPDATE_ORDERDETL:
- return casual.getDeclaredMethod(OrderMethodVo.UPDATE_ORDERDETL.getCode(), Order.class,OrderDetl.class);
- case REMOVE:
- return casual.getDeclaredMethod(OrderMethodVo.REMOVE.getCode(), Long.class);
- case SELECT_COMPLETE:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_COMPLETE.getCode());
- case SELECT_COMPLETE8:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_COMPLETE8.getCode());
- case ADD_TO_LOG_TABLE_ORDER:
- return casual.getDeclaredMethod(OrderMethodVo.ADD_TO_LOG_TABLE_ORDER.getCode(), Order.class);
- case SELECT_ORDER_NO_L:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_NO_L.getCode(), String.class);
- case SELECT_ORDER_MOVE_STATUS:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_MOVE_STATUS.getCode());
- case SELECT_ORDER_MOVE_STATUS_INITIAL:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_MOVE_STATUS_INITIAL.getCode());
- case SELECT_ITEM1:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM1.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class);
- case SELECT_ITEM2:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM2.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class);
- case FIND_BY_LOOK:
- return casual.getDeclaredMethod(OrderMethodVo.FIND_BY_LOOK.getCode(), List.class, Long.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class);
- case INCREASE:
- return casual.getDeclaredMethod(OrderMethodVo.INCREASE.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
- case DECREASE:
- return casual.getDeclaredMethod(OrderMethodVo.DECREASE.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
- case MODIFY_STATUS:
- return casual.getDeclaredMethod(OrderMethodVo.MODIFY_STATUS.getCode(), Long.class,Integer.class);
- case ADD_TO_LOG_TABLE_ORDERDETL:
- return casual.getDeclaredMethod(OrderMethodVo.ADD_TO_LOG_TABLE_ORDERDETL.getCode(), OrderDetl.class);
- case INCREASE_QTY_BY_ORDER_NO:
- return casual.getDeclaredMethod(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
- case INCREASE_WORKING_QTY:
- return casual.getDeclaredMethod(OrderMethodVo.INCREASE_WORKING_QTY.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
- default:
- break;
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- throw new CoolException("鏈煡寮傚父");
- }
-
- public static void query(Boolean sign,String orderNo){
- try{
- implement(OrderMethodVo.QUERY).invoke(getOrderInAndOutType(sign),orderNo);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void query(String sign,String orderNo){
- try{
- implement(OrderMethodVo.QUERY).invoke(getOrderInAndOutType(sign),orderNo);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static Order selectByNo(boolean sign,String orderNo){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_BY_NO).invoke(getOrderInAndOutType(sign), orderNo);
- return aOrder(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static Order selectByNo(String sign,String orderNo){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_BY_NO).invoke(getOrderInAndOutType(sign), orderNo);
- return aOrder(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectBySettle(boolean sign,long settle){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_SETTLE).invoke(getOrderInAndOutType(sign), settle);
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectBySettle(String sign,long settle){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_SETTLE).invoke(getOrderInAndOutType(sign), settle);
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<OrderDetl> selectByOrderId(boolean sign,Long orderId){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_BY_ORDER_ID).invoke(getOrderInAndOutType(sign), orderId);
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<OrderDetl>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<OrderDetl> selectByOrderId(String sign,Long orderId){
- try{
- Object result = implement(OrderMethodVo.SELECT_BY_ORDER_ID).invoke(getOrderInAndOutType(sign), orderId);
- if (Cools.isEmpty(result)){
- return new ArrayList<>();
- } else if (result instanceof List) {
- return (List<OrderDetl>) result;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<OrderDetl> selectWorkingDetls(boolean sign,Long orderId){
- try{
- Object result = implement(OrderMethodVo.SELECT_WORKING_DETLS).invoke(getOrderInAndOutType(sign), orderId);
- if (Cools.isEmpty(result)){
- return new ArrayList<>();
- } else if (result instanceof List) {
- return (List<OrderDetl>) result;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<OrderDetl> selectWorkingDetls(String sign,Long orderId){
- try{
- Object result = implement(OrderMethodVo.SELECT_WORKING_DETLS).invoke(getOrderInAndOutType(sign), orderId);
- if (Cools.isEmpty(result)){
- return new ArrayList<>();
- } else if (result instanceof List) {
- return (List<OrderDetl>) result;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void checkComplete(boolean sign,String orderNo){
- try{
- implement(OrderMethodVo.CHECK_COMPLETE).invoke(getOrderInAndOutType(sign),orderNo);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void checkComplete(String sign,String orderNo){
- try{
- implement(OrderMethodVo.CHECK_COMPLETE).invoke(getOrderInAndOutType(sign),orderNo);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean saveHandlerOrder(boolean sign,Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls){
- try{
- Object invoke = implement(OrderMethodVo.SAVE_HANDLER_ORDER).invoke(getOrderInAndOutType(sign), pakin, wrkMast, wrkDetls);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean saveHandlerOrder(String sign,Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls){
- try{
- Object invoke = implement(OrderMethodVo.SAVE_HANDLER_ORDER).invoke(getOrderInAndOutType(sign), pakin, wrkMast, wrkDetls);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void insertOrder(boolean sign,Order order){
- try{
- implement(OrderMethodVo.INSERT_ORDER).invoke(getOrderInAndOutType(sign),order);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void insertOrder(String sign,Order order){
- try{
- implement(OrderMethodVo.INSERT_ORDER).invoke(getOrderInAndOutType(sign),order);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void insertOrderDetl(boolean sign,Order order, OrderDetl orderDetl){
- try{
- implement(OrderMethodVo.INSERT_ORDERDETL).invoke(getOrderInAndOutType(sign),order,orderDetl);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void insertOrderDetl(String sign,Order order, OrderDetl orderDetl){
- try{
- implement(OrderMethodVo.INSERT_ORDERDETL).invoke(getOrderInAndOutType(sign),order,orderDetl);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void updateOrder(boolean sign,Long id, Long settle, Long userId){
- try{
- implement(OrderMethodVo.UPDATE_ORDER).invoke(getOrderInAndOutType(sign),id,settle,userId);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void updateOrder(String sign,Long id, Long settle, Long userId){
- try{
- implement(OrderMethodVo.UPDATE_ORDER).invoke(getOrderInAndOutType(sign),id,settle,userId);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void updateOrderDetl(boolean sign,Order order, OrderDetl orderDetl){
- try{
- implement(OrderMethodVo.UPDATE_ORDERDETL).invoke(getOrderInAndOutType(sign),order,orderDetl);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void updateOrderDetl(String sign,Order order, OrderDetl orderDetl){
- try{
- implement(OrderMethodVo.UPDATE_ORDERDETL).invoke(getOrderInAndOutType(sign),order,orderDetl);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void remove(boolean sign,Long orderId){
- try{
- implement(OrderMethodVo.REMOVE).invoke(getOrderInAndOutType(sign),orderId);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static void remove(String sign,Long orderId){
- try{
- implement(OrderMethodVo.REMOVE).invoke(getOrderInAndOutType(sign),orderId);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectComplete(boolean sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_COMPLETE).invoke(getOrderInAndOutType(sign));
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectComplete(String sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_COMPLETE).invoke(getOrderInAndOutType(sign));
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectComplete8(boolean sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_COMPLETE8).invoke(getOrderInAndOutType(sign));
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectComplete8(String sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_COMPLETE8).invoke(getOrderInAndOutType(sign));
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean addToLogTableOrder(boolean sign,Order order){
- try{
- Object invoke = implement(OrderMethodVo.ADD_TO_LOG_TABLE_ORDER).invoke(getOrderInAndOutType(sign), order);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean addToLogTableOrder(String sign,Order order){
- try{
- Object invoke = implement(OrderMethodVo.ADD_TO_LOG_TABLE_ORDER).invoke(getOrderInAndOutType(sign), order);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectOrderNoL(boolean sign,String orderNo){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ORDER_NO_L).invoke(getOrderInAndOutType(sign),orderNo);
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static List<Order> selectOrderNoL(String sign,String orderNo){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ORDER_NO_L).invoke(getOrderInAndOutType(sign),orderNo);
- if (Cools.isEmpty(invoke)){
- return new ArrayList<>();
- } else if (invoke instanceof List) {
- return (List<Order>) invoke;
- } else {
- throw new CoolException("Unexpected return type");
- }
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static Order selectOrderMoveStatus(boolean sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ORDER_MOVE_STATUS).invoke(getOrderInAndOutType(sign));
- return aOrder(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static Order selectOrderMoveStatus(String sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ORDER_MOVE_STATUS).invoke(getOrderInAndOutType(sign));
- return aOrder(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static Order selectOrderMoveStatusInitial(boolean sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ORDER_MOVE_STATUS_INITIAL).invoke(getOrderInAndOutType(sign));
- return aOrder(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static Order selectOrderMoveStatusInitial(String sign){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ORDER_MOVE_STATUS_INITIAL).invoke(getOrderInAndOutType(sign));
- return aOrder(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static OrderDetl selectItem(boolean sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return aOrderDetl(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static OrderDetl selectItem(String sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return aOrderDetl(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static OrderDetl selectItem(boolean sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return aOrderDetl(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static OrderDetl selectItem(String sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3){
- try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return aOrderDetl(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static OrderDetl findByLook(boolean sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3){
- try{
- Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return aOrderDetl(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static OrderDetl findByLook(String sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3){
- try{
- Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return aOrderDetl(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean increase(boolean sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty){
- try{
- Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean increase(String sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty){
- try{
- Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean decrease(boolean sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty){
- try{
- Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean decrease(String sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty){
- try{
- Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean modifyStatus(boolean sign,Long orderId, Integer status){
- try{
- Object invoke = implement(OrderMethodVo.MODIFY_STATUS).invoke(getOrderInAndOutType(sign), orderId, status);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean modifyStatus(String sign,Long orderId, Integer status){
- try{
- Object invoke = implement(OrderMethodVo.MODIFY_STATUS).invoke(getOrderInAndOutType(sign), orderId, status);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean addToLogTableOrderDetl(boolean sign,OrderDetl orderDetl){
- try{
- Object invoke = implement(OrderMethodVo.ADD_TO_LOG_TABLE_ORDERDETL).invoke(getOrderInAndOutType(sign), orderDetl);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean addToLogTableOrderDetl(String sign,OrderDetl orderDetl){
- try{
- Object invoke = implement(OrderMethodVo.ADD_TO_LOG_TABLE_ORDERDETL).invoke(getOrderInAndOutType(sign), orderDetl);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean increaseQtyByOrderNo(boolean sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty){
- try{
- Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean increaseQtyByOrderNo(String sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty){
- try{
- Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean increaseWorkQty(boolean sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty){
- try{
- Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
- public static boolean increaseWorkQty(String sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty){
- try{
- Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty);
- return aBoolean(invoke);
- } catch (Exception e) {
- throw new CoolException(e.getCause().getMessage());
- }
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/utils/OrderTransFormationUtil.java b/src/main/java/com/zy/asrs/utils/OrderTransFormationUtil.java
deleted file mode 100644
index bdf3679..0000000
--- a/src/main/java/com/zy/asrs/utils/OrderTransFormationUtil.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.zy.asrs.utils;
-
-import com.zy.asrs.entity.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by IX on 2024/12/14
- */
-public class OrderTransFormationUtil {
-
- public static Order transformationOrderPakin(OrderPakin orderPakin){
- Order order = new Order();
- order.sync(orderPakin);
- return order;
- }
- public static List<Order> transformationOrderListPakin(List<OrderPakin> orderPakinList){
- List<Order> orderList = new ArrayList<>();
- for (OrderPakin orderPakin : orderPakinList){
- Order order = new Order();
- order.sync(orderPakin);
- orderList.add(order);
- }
- return orderList;
- }
- public static OrderDetl transformationOrderDetlPakin(OrderDetlPakin orderDetlPakin){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakin);
- return orderDetl;
- }
- public static List<OrderDetl> transformationOrderDetlListPakin(List<OrderDetlPakin> orderDetlPakinList){
- List<OrderDetl> orderDetlList = new ArrayList<>();
- for (OrderDetlPakin orderDetlPakin : orderDetlPakinList){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakin);
- orderDetlList.add(orderDetl);
- }
- return orderDetlList;
- }
-
- public static OrderPakin transformationPakin(Order order){
- OrderPakin orderPakin = new OrderPakin();
- orderPakin.sync(order);
- return orderPakin;
- }
- public static List<OrderPakin> transformationListPakin(List<Order> orderList){
- List<OrderPakin> orderPakinList = new ArrayList<>();
- for (Order order : orderList){
- OrderPakin orderPakin = new OrderPakin();
- orderPakin.sync(order);
- orderPakinList.add(orderPakin);
- }
- return orderPakinList;
- }
- public static OrderDetlPakin transformationDetlPakin(OrderDetl orderDetl){
- OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
- orderDetlPakin.sync(orderDetl);
- return orderDetlPakin;
- }
- public static List<OrderDetlPakin> transformationDetlListPakin(List<OrderDetl> orderDetlList){
- List<OrderDetlPakin> orderDetlPakinList = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetlList){
- OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
- orderDetlPakin.sync(orderDetl);
- orderDetlPakinList.add(orderDetlPakin);
- }
- return orderDetlPakinList;
- }
-
- public static Order transformationOrderPakout(OrderPakout orderPakout){
- Order order = new Order();
- order.sync(orderPakout);
- return order;
- }
- public static List<Order> transformationOrderListPakout(List<OrderPakout> orderPakoutList){
- List<Order> orderList = new ArrayList<>();
- for (OrderPakout orderPakout : orderPakoutList){
- Order order = new Order();
- order.sync(orderPakout);
- orderList.add(order);
- }
- return orderList;
- }
- public static OrderDetl transformationOrderDetlPakout(OrderDetlPakout orderDetlPakout){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakout);
- return orderDetl;
- }
- public static List<OrderDetl> transformationOrderDetlListPakout(List<OrderDetlPakout> orderDetlPakoutList){
- List<OrderDetl> orderDetlList = new ArrayList<>();
- for (OrderDetlPakout orderDetlPakout : orderDetlPakoutList){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakout);
- orderDetlList.add(orderDetl);
- }
- return orderDetlList;
- }
-
- public static OrderPakout transformationPakout(Order order){
- OrderPakout orderPakout = new OrderPakout();
- orderPakout.sync(order);
- return orderPakout;
- }
- public static List<OrderPakout> transformationListPakout(List<Order> orderList){
- List<OrderPakout> orderPakoutList = new ArrayList<>();
- for (Order order : orderList){
- OrderPakout orderPakout = new OrderPakout();
- orderPakout.sync(order);
- orderPakoutList.add(orderPakout);
- }
- return orderPakoutList;
- }
- public static OrderDetlPakout transformationDetlPakout(OrderDetl orderDetl){
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
- orderDetlPakout.sync(orderDetl);
- return orderDetlPakout;
- }
- public static List<OrderDetlPakout> transformationDetlListPakout(List<OrderDetl> orderDetlList){
- List<OrderDetlPakout> orderDetlPakoutList = new ArrayList<>();
- for (OrderDetl orderDetl : orderDetlList){
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
- orderDetlPakout.sync(orderDetl);
- orderDetlPakoutList.add(orderDetlPakout);
- }
- return orderDetlPakoutList;
- }
-
- public static Order transformationOrder(OrderPakin orderPakin,OrderPakout orderPakout){
- Order order = new Order();
- if (orderPakin!=null){
- order.sync(orderPakin);
- } else if (orderPakout!=null){
- order.sync(orderPakout);
- } else {
- return null;
- }
- return order;
- }
- public static List<Order> transformationOrderList(List<OrderPakin> orderPakinList,List<OrderPakout> orderPakoutList){
- List<Order> orderList = transformationOrderListPakin(orderPakinList);
- for (OrderPakout orderPakout : orderPakoutList){
- Order order = new Order();
- order.sync(orderPakout);
- orderList.add(order);
- }
- return orderList;
- }
- public static OrderDetl transformationOrderDetl(OrderDetlPakin orderDetlPakin,OrderDetlPakout orderDetlPakout){
- OrderDetl orderDetl = new OrderDetl();
- if (orderDetlPakin!=null){
- orderDetl.sync(orderDetlPakin);
- } else if (orderDetlPakout!=null){
- orderDetl.sync(orderDetlPakout);
- } else {
- return null;
- }
- return orderDetl;
- }
- public static List<OrderDetl> transformationOrderDetlList(List<OrderDetlPakin> orderDetlPakinList,List<OrderDetlPakout> orderDetlPakoutList){
- List<OrderDetl> orderDetlList = transformationOrderDetlListPakin(orderDetlPakinList);
- for (OrderDetlPakout orderDetlPakout : orderDetlPakoutList){
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(orderDetlPakout);
- orderDetlList.add(orderDetl);
- }
- return orderDetlList;
- }
-}
diff --git a/src/main/java/com/zy/asrs/utils/SaasUtils.java b/src/main/java/com/zy/asrs/utils/SaasUtils.java
index 555ec87..f6839f8 100644
--- a/src/main/java/com/zy/asrs/utils/SaasUtils.java
+++ b/src/main/java/com/zy/asrs/utils/SaasUtils.java
@@ -1,14 +1,13 @@
package com.zy.asrs.utils;
import com.core.common.SpringUtils;
-import com.fasterxml.jackson.databind.util.BeanUtil;
import com.zy.system.entity.SaasLog;
import com.zy.system.service.SaasLogService;
import java.util.Date;
public class SaasUtils {
- public static void insertLog(Integer type, String locNo, String matnr,Double anfme){
+ public static void insertLog(Integer type, String locNo, String matnr, Double anfme) {
SaasLogService bean = SpringUtils.getBean(SaasLogService.class);
SaasLog saasLog = new SaasLog();
saasLog.setType(type);
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 4ead5ce..3cc7605 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -8,17 +8,10 @@
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.RowLastno;
import com.zy.asrs.service.RowLastnoService;
-import com.zy.common.CodeBuilder;
-import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
-import com.zy.common.service.CommonService;
-import com.zy.system.service.UserService;
-
import java.text.DecimalFormat;
import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
/**
@@ -489,6 +482,7 @@
return necessaryParameters;
}
+
//鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -498,7 +492,7 @@
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
- switch (curRow){
+ switch (curRow) {
case 1:
necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
@@ -544,7 +538,7 @@
Integer sCrnNo = rowLastno.getsCrnNo();//璧峰鍫嗗灈鏈哄彿
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(rowLastno.geteRow())){
+ if (curRow.equals(rowLastno.geteRow())) {
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
@@ -619,12 +613,12 @@
// 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
public static List<String> getGroupOutLocCrn(Integer curRow, Integer nearRow, String locNo, boolean pakin) {
List<String> result = new ArrayList<>();
- if (pakin){
- for (int row = curRow;row>=nearRow;row--){
+ if (pakin) {
+ for (int row = curRow; row >= nearRow; row--) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
- }else {
- for (int row = curRow;row<=nearRow;row++){
+ } else {
+ for (int row = curRow; row <= nearRow; row++) {
result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
}
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bdf8dd8..2d71873 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,8 +1,6 @@
package com.zy.asrs.utils;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.result.Pakin;
import com.zy.common.model.LocTypeDto;
/**
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index ed14c1d..0996236 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,11 +17,11 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="127.0.0.1:1433;databasename=jsxswms";
- generator.username="sa";
- generator.password="Skyouc#23";
- generator.table="asr_bas_container";
- generator.packagePath="com.zy.asrs";
+ generator.url = "127.0.0.1:1433;databasename=jsxswms";
+ generator.username = "sa";
+ generator.password = "Skyouc#23";
+ generator.table = "asr_bas_container";
+ generator.packagePath = "com.zy.asrs";
generator.build();
}
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 795e7a1..93de709 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -1,6 +1,5 @@
package com.zy.common.config;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.annotations.ManagerAuth;
@@ -53,12 +52,12 @@
}
// super璐﹀彿
String token = request.getHeader("token");
- if (token!=null) {
+ if (token != null) {
String deToken = Cools.deTokn(token, superPwd);
- if (deToken!=null){
+ if (deToken != null) {
long timestamp = Long.parseLong(deToken.substring(0, 13));
// 1澶╁悗杩囨湡
- if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()){
+ if (System.currentTimeMillis() - timestamp > loadingConfigTimer.getTokenExpire()) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -77,15 +76,15 @@
// response.setHeader("Access-Control-Allow-Origin", "*");
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
- if (method.isAnnotationPresent(AppAuth.class)){
+ if (method.isAnnotationPresent(AppAuth.class)) {
AppAuth annotation = method.getAnnotation(AppAuth.class);
- if (annotation.value().equals(AppAuth.Auth.CHECK)){
+ if (annotation.value().equals(AppAuth.Auth.CHECK)) {
request.setAttribute("appAuth", annotation.memo());
}
}
- if (method.isAnnotationPresent(ManagerAuth.class)){
+ if (method.isAnnotationPresent(ManagerAuth.class)) {
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
- if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
+ if (annotation.value().equals(ManagerAuth.Auth.CHECK)) {
return check(request, response, annotation.memo());
}
}
@@ -111,11 +110,11 @@
try {
String token = new String();
token = request.getHeader("token");
- if (Cools.isEmpty(token)){
+ if (Cools.isEmpty(token)) {
return true;
}
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token));
- if (null == userLogin){
+ if (null == userLogin) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -123,7 +122,7 @@
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -153,7 +152,7 @@
// request.setAttribute("operateLog", operateLog);
}
return true;
- } catch (Exception e){
+ } catch (Exception e) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -162,6 +161,7 @@
/**
* 鏉冮檺鎷︽埅
+ *
* @return false:鏃犳潈闄�; true:璁よ瘉閫氳繃
*/
private boolean limit(String action, User user) {
@@ -179,7 +179,7 @@
/**
* 璺ㄥ煙
*/
- public static void cors(HttpServletResponse response){
+ public static void cors(HttpServletResponse response) {
// 璺ㄥ煙璁剧疆
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Credentials", "true");
diff --git a/src/main/java/com/zy/common/config/AspectConfig.java b/src/main/java/com/zy/common/config/AspectConfig.java
index 780eb46..df3ddf2 100644
--- a/src/main/java/com/zy/common/config/AspectConfig.java
+++ b/src/main/java/com/zy/common/config/AspectConfig.java
@@ -47,7 +47,7 @@
@Around("@within(org.springframework.web.bind.annotation.RestController)" +
"||@within(org.springframework.stereotype.Controller)")
- public Object after(ProceedingJoinPoint joinPoint) throws Throwable{
+ public Object after(ProceedingJoinPoint joinPoint) throws Throwable {
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
//if(requestAttributes != null){
// return joinPoint.proceed();
@@ -58,11 +58,11 @@
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
- if (method.isAnnotationPresent(ManagerAuth.class)){
+ if (method.isAnnotationPresent(ManagerAuth.class)) {
ManagerAuth annotation = method.getAnnotation(ManagerAuth.class);
- if (annotation.value().equals(ManagerAuth.Auth.CHECK)){
+ if (annotation.value().equals(ManagerAuth.Auth.CHECK)) {
if (!Cools.isEmpty(annotation.memo())) {
- saveLog(joinPoint, request, result,annotation.memo());
+ saveLog(joinPoint, request, result, annotation.memo());
}
}
}
@@ -86,7 +86,7 @@
&& !(obj instanceof HttpServletRequest)).collect(Collectors.toList());
}
- private void saveLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object result,String memo) {
+ private void saveLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object result, String memo) {
Long userId = 9527L;
String token = request.getHeader("token");
UserLogin userLogin = userLoginService.selectOne(new EntityWrapper<UserLogin>().eq("token", token).eq("system", "WMS"));
@@ -99,7 +99,7 @@
// 璁板綍鎿嶄綔鏃ュ織
OperateLog operateLog = new OperateLog();
- operateLog.setAction(Cools.isEmpty(memo)?request.getRequestURI():memo);
+ operateLog.setAction(Cools.isEmpty(memo) ? request.getRequestURI() : memo);
operateLog.setIp(request.getRemoteAddr());
operateLog.setUserId(userId);
operateLog.setRequest(JSONObject.toJSONString(filterArgs(joinPoint.getArgs())));
diff --git a/src/main/java/com/zy/common/config/ControllerResAdvice.java b/src/main/java/com/zy/common/config/ControllerResAdvice.java
index a4cdc97..235cf45 100644
--- a/src/main/java/com/zy/common/config/ControllerResAdvice.java
+++ b/src/main/java/com/zy/common/config/ControllerResAdvice.java
@@ -53,7 +53,7 @@
request.getRequestURI(),
appkey,
IpTools.gainRealIp(request),
- reqCache==null?"": JSON.toJSONString(reqCache),
+ reqCache == null ? "" : JSON.toJSONString(reqCache),
JSON.toJSONString(o),
String.valueOf(((R) o).get("code")).equalsIgnoreCase("200")
);
@@ -66,7 +66,7 @@
public static String json(HttpServletRequest request) {
try {
- BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8));
+ BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8));
StringBuilder sb = new StringBuilder();
String inputStr;
while ((inputStr = streamReader.readLine()) != null) {
diff --git a/src/main/java/com/zy/common/config/SwaggerConfig.java b/src/main/java/com/zy/common/config/SwaggerConfig.java
index 81782ea..d1f6b1c 100644
--- a/src/main/java/com/zy/common/config/SwaggerConfig.java
+++ b/src/main/java/com/zy/common/config/SwaggerConfig.java
@@ -1,9 +1,9 @@
package com.zy.common.config;
-import com.zy.common.properties.SwaggerProperties;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.common.properties.SwaggerProperties;
import io.swagger.annotations.ApiOperation;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
@@ -51,7 +51,8 @@
.responseModel(new ModelRef(String.valueOf(r.get("msg"))))
.build()
);
- }catch (IllegalAccessException ignore){}
+ } catch (IllegalAccessException ignore) {
+ }
});
return new Docket(DocumentationType.SWAGGER_2)
diff --git a/src/main/java/com/zy/common/config/WebConfig.java b/src/main/java/com/zy/common/config/WebConfig.java
index 91f0c82..1613847 100644
--- a/src/main/java/com/zy/common/config/WebConfig.java
+++ b/src/main/java/com/zy/common/config/WebConfig.java
@@ -1,7 +1,5 @@
package com.zy.common.config;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.utils.Http;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
@@ -10,14 +8,9 @@
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.servlet.AsyncHandlerInterceptor;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
* Created by vincent on 2019-06-13
diff --git a/src/main/java/com/zy/common/entity/NodeExcelListener.java b/src/main/java/com/zy/common/entity/NodeExcelListener.java
index 7cd45bf..daebcc2 100644
--- a/src/main/java/com/zy/common/entity/NodeExcelListener.java
+++ b/src/main/java/com/zy/common/entity/NodeExcelListener.java
@@ -73,7 +73,7 @@
if (nodeMapper.insert(wareHouse) == 0) {
throw new CoolException("淇濆瓨浠撳簱鏁版嵁澶辫触");
}
- total ++;
+ total++;
}
// 搴撳尯
@@ -98,7 +98,7 @@
if (nodeMapper.insert(area) == 0) {
throw new CoolException("淇濆瓨搴撳尯鏁版嵁澶辫触");
}
- total ++;
+ total++;
}
// 璐т綅
@@ -123,7 +123,7 @@
if (nodeMapper.insert(allo) == 0) {
throw new CoolException("淇濆瓨璐т綅鏁版嵁澶辫触");
}
- total ++;
+ total++;
}
}
diff --git a/src/main/java/com/zy/common/entity/Parameter.java b/src/main/java/com/zy/common/entity/Parameter.java
index d42c3d9..6e5f396 100644
--- a/src/main/java/com/zy/common/entity/Parameter.java
+++ b/src/main/java/com/zy/common/entity/Parameter.java
@@ -2,10 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.system.entity.Config;
-import com.zy.system.service.ConfigService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.Data;
import java.util.HashMap;
@@ -20,12 +20,12 @@
private volatile static Parameter instance = null;
- private Parameter(){
+ private Parameter() {
}
- public static Parameter get(){
- if (instance == null){
- synchronized (Parameter.class){
+ public static Parameter get() {
+ if (instance == null) {
+ synchronized (Parameter.class) {
instance = reset();
return instance;
}
@@ -33,10 +33,10 @@
return instance;
}
- /**
- * 閲嶇疆
- */
- public static Parameter reset() {
+ /**
+ * 閲嶇疆
+ */
+ public static Parameter reset() {
ConfigService configService = SpringUtils.getBean(ConfigService.class);
List<Config> configs = configService.selectList(new EntityWrapper<Config>().eq("status", "1"));
Map<String, Object> data = new HashMap<>();
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index f3e11a4..f46b226 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -135,7 +135,7 @@
&& Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
// }
@@ -161,7 +161,7 @@
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& dto.getLineNumber().equals(orderDetl.getLineNumber())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
// }
@@ -176,7 +176,7 @@
&& Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
}
@@ -189,7 +189,7 @@
&& Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
&& Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())
&& Cools.eq(dto.getBoxType1(), orderDetl.getBoxType1()) && Cools.eq(dto.getBoxType2(), orderDetl.getBoxType2())
- && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), orderDetl.getBoxType3())) {
return true;
}
}
@@ -202,7 +202,7 @@
&& Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
&& Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
&& Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
- && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3())) {
return true;
}
}
@@ -216,7 +216,7 @@
&& Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())
&& dto.getLineNumber().equals(detlDto.getLineNumber())
&& Cools.eq(dto.getBoxType1(), detlDto.getBoxType1()) && Cools.eq(dto.getBoxType2(), detlDto.getBoxType2())
- && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3()) ) {
+ && Cools.eq(dto.getBoxType3(), detlDto.getBoxType3())) {
return true;
}
}
@@ -239,7 +239,7 @@
return null;
}
- public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3,Long lineNumber, String boxType1, String boxType2, String boxType3) {
+ public static DetlDto findLineNumber(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Long lineNumber, String boxType1, String boxType2, String boxType3) {
if (Cools.isEmpty(matnr)) {
return null;
}
@@ -256,7 +256,7 @@
return null;
}
- public static DetlDto findDto(List<DetlDto> detlDtos,DetlDto detlDtoB) {
+ public static DetlDto findDto(List<DetlDto> detlDtos, DetlDto detlDtoB) {
if (Cools.isEmpty(detlDtoB)) {
return null;
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index eaaffee..f4196b1 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -1,7 +1,6 @@
package com.zy.common.model;
import com.core.common.Cools;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -86,8 +85,10 @@
}
public String getFrozen$() {
- if (null == this.frozen){ return null; }
- switch (this.frozen){
+ if (null == this.frozen) {
+ return null;
+ }
+ switch (this.frozen) {
case 0:
return "姝ｅ父";
case 1:
@@ -98,8 +99,10 @@
}
public String getFrozenLoc$() {
- if (null == this.frozenLoc){ return null; }
- switch (this.frozenLoc){
+ if (null == this.frozenLoc) {
+ return null;
+ }
+ switch (this.frozenLoc) {
case 0:
return "姝ｅ父";
case 1:
diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java
index 2b76e0d..862e92a 100644
--- a/src/main/java/com/zy/common/model/MesPakoutParam.java
+++ b/src/main/java/com/zy/common/model/MesPakoutParam.java
@@ -61,7 +61,8 @@
param.setLgortTo("1111");
- Detl detl = new Detl(); param.getList().add(detl);
+ Detl detl = new Detl();
+ param.getList().add(detl);
detl.setBarcode("1100146-10000-23132132");
detl.setAnfme(1.0D);
diff --git a/src/main/java/com/zy/common/model/MobileLocDetlVo.java b/src/main/java/com/zy/common/model/MobileLocDetlVo.java
index 5e8eed2..0c20179 100644
--- a/src/main/java/com/zy/common/model/MobileLocDetlVo.java
+++ b/src/main/java/com/zy/common/model/MobileLocDetlVo.java
@@ -4,7 +4,7 @@
* Created by vincent on 2020/6/29
*/
public class MobileLocDetlVo {
-
+
private String locNo;
private String matnr;
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 77e050b..d7f80b1 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -8,7 +8,9 @@
import com.zy.asrs.service.LocDetlService;
import lombok.Data;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* Created by vincent on 2020/6/17
@@ -28,12 +30,12 @@
this.locDetlDtos.add(locDetlDto);
}
- public boolean isAll(){
+ public boolean isAll() {
List<LocDetlDto> locDetlDtosCp = new ArrayList<>(this.locDetlDtos);
// 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", this.locNo));
- if (locDetls == null || locDetls.isEmpty()){
+ if (locDetls == null || locDetls.isEmpty()) {
throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
}
int sameNumber = 0;
diff --git a/src/main/java/com/zy/common/model/PageParam.java b/src/main/java/com/zy/common/model/PageParam.java
index a2f24e6..ef1007c 100644
--- a/src/main/java/com/zy/common/model/PageParam.java
+++ b/src/main/java/com/zy/common/model/PageParam.java
@@ -8,10 +8,10 @@
*/
public class PageParam {
- @ApiModelProperty(value="鍒嗛〉绱㈠紩",required=true)
+ @ApiModelProperty(value = "鍒嗛〉绱㈠紩", required = true)
private int page = 1;
- @ApiModelProperty(value="鍗曢〉鏁伴噺",required=true)
+ @ApiModelProperty(value = "鍗曢〉鏁伴噺", required = true)
private int size = 10;
public Integer getPage() {
diff --git a/src/main/java/com/zy/common/model/Shelves.java b/src/main/java/com/zy/common/model/Shelves.java
index ae5015f..6493c94 100644
--- a/src/main/java/com/zy/common/model/Shelves.java
+++ b/src/main/java/com/zy/common/model/Shelves.java
@@ -31,31 +31,30 @@
}
/**
- * @param size 璐ф灦鍗曟帓鎬绘暟
- * @param group 璐ф灦缁勬暟閲�
+ * @param size 璐ф灦鍗曟帓鎬绘暟
+ * @param group 璐ф灦缁勬暟閲�
* @param offset 搴忓垪鍙峰亸绉婚噺
*/
public Shelves(int size, int group, int offset) {
this.size = size;
this.group = group;
- this.offset = offset-1;
+ this.offset = offset - 1;
init();
}
-
/**
* 鍒濆鍖栨柟娉曘�愮鏈夈��
*/
- private void init(){
- if (group == 0 || size%group != 0) {
+ private void init() {
+ if (group == 0 || size % group != 0) {
throw new RuntimeException("shelves init fail!");
}
nodes = new ArrayList<>();
- for (int g = 1; g <= this.group; g++){
- int unit = size/group;
+ for (int g = 1; g <= this.group; g++) {
+ int unit = size / group;
List<Integer> node = new ArrayList<>();
- for (int i = (g-1)*unit+1+offset ; i <= g*unit+offset; i++){
+ for (int i = (g - 1) * unit + 1 + offset; i <= g * unit + offset; i++) {
node.add(i);
}
nodes.add(node);
@@ -64,20 +63,20 @@
/**
* 寮�濮嬭绠� =======>>>
- *
- * 璐ф灦鍛戒腑瑙勫垯濡備笅锛�
- * 瀹夎浣嶇疆锛� [1] [2] | [3] [4] -------- [5] [6] | [7] [8]
- * 鍛戒腑椤哄簭锛� 1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 7 -> 1 ...
- *
- * 1.璇ヨ鍒欓�備笉闄愬埗璐ф灦鏁伴噺锛屾�绘暟涓庣粍鍒湪鏋勯�犲櫒涓缃�
- * 2.濡傛湁搴忓垪鍙疯捣濮嬮棶棰橈紝鐢ㄥ亸绉婚噺瑙勯伩鍗冲彲
+ * <p>
+ * 璐ф灦鍛戒腑瑙勫垯濡備笅锛�
+ * 瀹夎浣嶇疆锛� [1] [2] | [3] [4] -------- [5] [6] | [7] [8]
+ * 鍛戒腑椤哄簭锛� 1 -> 5 -> 4 -> 8 -> 2 -> 6 -> 3 -> 7 -> 1 ...
+ * <p>
+ * 1.璇ヨ鍒欓�備笉闄愬埗璐ф灦鏁伴噺锛屾�绘暟涓庣粍鍒湪鏋勯�犲櫒涓缃�
+ * 2.濡傛湁搴忓垪鍙疯捣濮嬮棶棰橈紝鐢ㄥ亸绉婚噺瑙勯伩鍗冲彲
*
* @param curSeq 褰撳墠璐ф灦鍙�
* @return 瑙勫垯鍛戒腑璐ф灦鍙�
*/
- public int start(int curSeq){
+ public int start(int curSeq) {
Iterator<List<Integer>> iterator = nodes.iterator();
- while (iterator.hasNext()){
+ while (iterator.hasNext()) {
List<Integer> node = iterator.next();
if (node.contains(curSeq)) {
int idx = node.indexOf(curSeq);
@@ -104,7 +103,7 @@
}
public Integer get(Integer curRow) {
- for (List<Integer> node : nodes){
+ for (List<Integer> node : nodes) {
if (node.contains(curRow)) {
return nodes.indexOf(node) + 1;
}
@@ -114,7 +113,7 @@
public static void main(String[] args) throws InterruptedException {
- double remainder = Arith.divides(1,16 - 1, 16);
+ double remainder = Arith.divides(1, 16 - 1, 16);
System.out.println(remainder);
System.out.println((int) remainder);
// Shelves shelves = new Shelves(8,2);
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 36a5aa3..cb7280e 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -8,7 +8,9 @@
import com.zy.asrs.service.LocDetlService;
import lombok.Data;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
/**
* Created by vincent on 2022/3/28
@@ -67,18 +69,18 @@
return null;
}
- public boolean isAll(){
+ public boolean isAll() {
// 姹囨�讳笉鑰冭檻搴忓垪鐮�
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(),locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3(), locDto.getAnfme());
+ DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getBrand(), locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3(), locDto.getAnfme());
if (DetlDto.has(detlDtos, dto)) {
- DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3(),dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
} else {
detlDtos.add(new DetlDto(locDto.getMatnr(), locDto.getBatch()
- ,locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(),locDto.getBoxType1(),locDto.getBoxType2(),locDto.getBoxType3()
+ , locDto.getBrand(), locDto.getStandby1(), locDto.getStandby2(), locDto.getStandby3(), locDto.getBoxType1(), locDto.getBoxType2(), locDto.getBoxType3()
, locDto.getAnfme()));
}
}
@@ -86,7 +88,7 @@
// 鏌ヨ褰撳墠搴撲綅鍙锋墍鏈夌殑搴撳瓨鏄庣粏
LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", this.locNo));
- if (locDetls == null || locDetls.isEmpty()){
+ if (locDetls == null || locDetls.isEmpty()) {
throw new CoolException("妫�绱㈠簱瀛樻槑缁嗗け璐ワ紝搴撲綅鍙�=" + this.locNo);
}
int sameNumber = 0;
diff --git a/src/main/java/com/zy/common/model/WrkDto.java b/src/main/java/com/zy/common/model/WrkDto.java
index cd38217..65228e0 100644
--- a/src/main/java/com/zy/common/model/WrkDto.java
+++ b/src/main/java/com/zy/common/model/WrkDto.java
@@ -21,6 +21,6 @@
public WrkDto(Integer wrkNo, WrkDetl wrkDetl) {
this.wrkNo = wrkNo;
- this.wrkDetls .add(wrkDetl);
+ this.wrkDetls.add(wrkDetl);
}
}
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderEnumVo.java b/src/main/java/com/zy/common/model/enumUtils/OrderEnumVo.java
deleted file mode 100644
index 2a7758b..0000000
--- a/src/main/java/com/zy/common/model/enumUtils/OrderEnumVo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.zy.common.model.enumUtils;
-
-/**
- * Created by IX on 2024/12/14
- */
-public enum OrderEnumVo {
- PAKIN("PAKIN"),
- PAKOUT("PAKOUT"),
- PAKALL("PAKALL"),
- ;
-
- private String code;
-
- OrderEnumVo(String code){
- this.code = code;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-}
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
deleted file mode 100644
index 7998654..0000000
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ /dev/null
@@ -1,604 +0,0 @@
-package com.zy.common.model.enumUtils;
-
-import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.service.OrderDetlPakinService;
-import com.zy.asrs.service.OrderDetlPakoutService;
-import com.zy.asrs.service.OrderPakinService;
-import com.zy.asrs.service.OrderPakoutService;
-import com.zy.asrs.utils.OrderTransFormationUtil;
-import lombok.Setter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.PostConstruct;
-import java.util.EnumSet;
-import java.util.List;
-
-/**
- * Created by IX on 2024/12/16
- */
-public enum OrderInAndOutType {
- PAKIN{
- @Transactional
- public void implement() {}
-
- @Transactional
- public void query(String orderNo) {
- OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
- if (!Cools.isEmpty(orderPakin)) {
- throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- }
- @Transactional
- public Order selectByNo(String orderNo) {
- OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
- if (Cools.isEmpty(orderPakin)) {
- return null;
- }
- return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
- }
- @Transactional
- public List<Order> selectBySettle(Long settle) {
- List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle);
- return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
- }
- @Transactional
- public List<OrderDetl> selectByOrderId(Long orderId) {
- List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
- return OrderTransFormationUtil.transformationOrderDetlListPakin(orderDetlPakinList);
- }
- @Transactional
- public List<OrderDetl> selectWorkingDetls(Long orderId) {
- List<OrderDetlPakin> orderDetlPakinList = orderPakinService.selectWorkingDetls(orderId);
- return OrderTransFormationUtil.transformationOrderDetlListPakin(orderDetlPakinList);
- }
- @Transactional
- public void checkComplete(String orderNo) {
- orderPakinService.checkComplete(orderNo);
- }
- @Transactional
- public boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- return orderPakinService.saveHandlerOrder(pakin,wrkMast,wrkDetls);
- }
- @Transactional
- public void insertOrder(Order order) {
- OrderPakin orderPakin = new OrderPakin();
- orderPakin.sync(order);
- if (!orderPakinService.insert(orderPakin)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- @Transactional
- public void insertOrderDetl(Order order, OrderDetl orderDetl) {
- OrderPakin orderPakin = orderPakinService.selectByNo(order.getOrderNo());
- OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
- orderDetlPakin.sync(orderDetl);
- orderDetlPakin.setOrderId(orderPakin.getId());
- orderDetlPakin.setOrderNo(orderPakin.getOrderNo());
- if (!orderDetlPakinService.insert(orderDetlPakin)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- @Transactional
- public void updateOrder(Long id, Long settle, Long userId) {
- if (!orderPakinService.updateSettle(id, settle, userId)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- @Transactional
- public void updateOrderDetl(Order order, OrderDetl orderDetl) {
- OrderPakin orderPakin = orderPakinService.selectByNo(order.getOrderNo());
- OrderDetlPakin orderDetlPakin = new OrderDetlPakin();
- orderDetlPakin.sync(orderDetl);
- orderDetlPakin.setOrderId(orderPakin.getId());
- orderDetlPakin.setOrderNo(orderPakin.getOrderNo());
- if (!orderDetlPakinService.insert(orderDetlPakin)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- @Transactional
- public void remove(Long orderId) {
- try{
- orderPakinService.remove(orderId);
- } catch (Exception e){
- throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
- }
- }
- @Transactional
- public List<Order> selectComplete() {
- List<OrderPakin> orderPakinList = orderPakinService.selectComplete();
- return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
- }
-
- @Transactional
- public List<Order> selectComplete8() {
- List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
- return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
- }
-
- @Transactional
- public boolean addToLogTableOrder(Order order) {
- OrderPakin orderPakin = OrderTransFormationUtil.transformationPakin(order);
- return orderPakinService.addToLogTable(orderPakin);
- }
-
- @Transactional
- public List<Order> selectOrderNoL(String orderNo) {
- List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo);
- return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
- }
-
- @Transactional
- public Order selectOrderMoveStatus() {
- OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus();
- return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
- }
-
- @Transactional
- public Order selectOrderMoveStatusInitial() {
- OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial();
- return OrderTransFormationUtil.transformationOrderPakin(orderPakin);
- }
-
- @Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
- }
-
- @Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
- }
-
- @Transactional
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- List<OrderDetlPakin> orderDetlPakins = OrderTransFormationUtil.transformationDetlListPakin(orderDetls);
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
- }
- @Transactional
- public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return orderDetlPakinService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- }
- @Transactional
- public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return orderDetlPakinService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- }
- @Transactional
- public boolean modifyStatus(Long orderId, Integer status) {
- return orderDetlPakinService.modifyStatus(orderId, status);
- }
- @Transactional
- public boolean addToLogTableOrderDetl(OrderDetl orderDetl) {
- OrderDetlPakin orderDetlPakin = OrderTransFormationUtil.transformationDetlPakin(orderDetl);
- return orderDetlPakinService.addToLogTable(orderDetlPakin);
- }
- @Transactional
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- }
- @Transactional
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
- return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty);
- }
- },
- PAKOUT{
- @Transactional
- public void implement() {}
-
- @Transactional
- public void query(String orderNo) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
- if (!Cools.isEmpty(orderPakout)) {
- throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- }
- @Transactional
- public Order selectByNo(String orderNo) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
- if (Cools.isEmpty(orderPakout)) {
- return null;
- }
- return OrderTransFormationUtil.transformationOrderPakout(orderPakout);
- }
- @Transactional
- public List<Order> selectBySettle(Long settle) {
- List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle);
- return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
- }
- @Transactional
- public List<OrderDetl> selectByOrderId(Long orderId) {
- List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
- return OrderTransFormationUtil.transformationOrderDetlListPakout(orderDetlPakoutList);
- }
- @Transactional
- public List<OrderDetl> selectWorkingDetls(Long orderId) {
- List<OrderDetlPakout> orderDetlPakoutList = orderPakoutService.selectWorkingDetls(orderId);
- return OrderTransFormationUtil.transformationOrderDetlListPakout(orderDetlPakoutList);
- }
- @Transactional
- public void checkComplete(String orderNo) {
- orderPakoutService.checkComplete(orderNo);
- }
- @Transactional
- public boolean saveHandlerOrder(Boolean Pakout, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- return orderPakoutService.saveHandlerOrder(Pakout,wrkMast,wrkDetls);
- }
- @Transactional
- public void insertOrder(Order order) {
- OrderPakout orderPakout = new OrderPakout();
- orderPakout.sync(order);
- if (!orderPakoutService.insert(orderPakout)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- @Transactional
- public void insertOrderDetl(Order order, OrderDetl orderDetl) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(order.getOrderNo());
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
- orderDetlPakout.sync(orderDetl);
- orderDetlPakout.setOrderId(orderPakout.getId());
- orderDetlPakout.setOrderNo(orderPakout.getOrderNo());
- if (!orderDetlPakoutService.insert(orderDetlPakout)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- @Transactional
- public void updateOrder(Long id, Long settle, Long userId) {
- if (!orderPakoutService.updateSettle(id, settle, userId)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- }
- @Transactional
- public void updateOrderDetl(Order order, OrderDetl orderDetl) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(order.getOrderNo());
- OrderDetlPakout orderDetlPakout = new OrderDetlPakout();
- orderDetlPakout.sync(orderDetl);
- orderDetlPakout.setOrderId(orderPakout.getId());
- orderDetlPakout.setOrderNo(orderPakout.getOrderNo());
- if (!orderDetlPakoutService.insert(orderDetlPakout)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- @Transactional
- public void remove(Long orderId) {
- try{
- orderPakoutService.remove(orderId);
- } catch (Exception e){
- throw new CoolException("鍒犻櫎鍗曟嵁澶辫触");
- }
- }
-
-
- @Transactional
- public List<Order> selectComplete8() {
- List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
- return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
- }
-
- @Transactional
- public boolean addToLogTableOrder(Order order) {
- OrderPakout orderPakout = OrderTransFormationUtil.transformationPakout(order);
- return orderPakoutService.addToLogTable(orderPakout);
- }
-
- @Transactional
- public List<Order> selectOrderNoL(String orderNo) {
- List<OrderPakout> orderPakoutList = orderPakoutService.selectorderNoL(orderNo);
- return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
- }
-
- @Transactional
- public Order selectOrderMoveStatus() {
- OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
- return OrderTransFormationUtil.transformationOrderPakout(orderPakout);
- }
-
- @Transactional
- public Order selectOrderMoveStatusInitial() {
- OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
- return OrderTransFormationUtil.transformationOrderPakout(orderPakout);
- }
-
- @Transactional
- public List<Order> selectComplete() {
- List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete();
- return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
- }
-
- @Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
- }
-
- @Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
- }
-
- @Transactional
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- List<OrderDetlPakout> orderDetlPakouts = OrderTransFormationUtil.transformationDetlListPakout(orderDetls);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
- }
- @Transactional
- public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return orderDetlPakoutService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- }
- @Transactional
- public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return orderDetlPakoutService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- }
- @Transactional
- public boolean modifyStatus(Long orderId, Integer status) {
- return orderDetlPakoutService.modifyStatus(orderId, status);
- }
- @Transactional
- public boolean addToLogTableOrderDetl(OrderDetl orderDetl) {
- OrderDetlPakout orderDetlPakout = OrderTransFormationUtil.transformationDetlPakout(orderDetl);
- return orderDetlPakoutService.addToLogTable(orderDetlPakout);
- }
- @Transactional
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, qty);
- }
- @Transactional
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
- return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3, workQty);
- }
-
-
-
- },
- PAKALL{
- @Transactional
- public void implement() {}
-
- @Transactional
- public void query(String orderNo) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
- if (!Cools.isEmpty(orderPakout)) {
- throw new CoolException(orderNo + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
- }
- }
- @Transactional
- public Order selectByNo(String orderNo) {
- OrderPakin orderPakin = orderPakinService.selectByNo(orderNo);
- if (Cools.isEmpty(orderPakin)) {
- OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
- if (Cools.isEmpty(orderPakout)) {
- return null;
- }
- return OrderTransFormationUtil.transformationOrder(null,orderPakout);
- }
- return OrderTransFormationUtil.transformationOrder(orderPakin,null);
-
- }
- @Transactional
- public List<Order> selectBySettle(Long settle) {
- List<OrderPakin> orderPakinList = orderPakinService.selectBySettle(settle);
- List<OrderPakout> orderPakoutList = orderPakoutService.selectBySettle(settle);
- return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
- }
- @Transactional
- public List<OrderDetl> selectByOrderId(Long orderId) {
- List<OrderDetlPakin> orderDetlPakinList = orderDetlPakinService.selectByOrderId(orderId);
- List<OrderDetlPakout> orderDetlPakoutList = orderDetlPakoutService.selectByOrderId(orderId);
- return OrderTransFormationUtil.transformationOrderDetlList(orderDetlPakinList,orderDetlPakoutList);
- }
- @Transactional
- public List<OrderDetl> selectWorkingDetls(Long orderId) {
- List<OrderDetlPakin> orderDetlPakinList = orderPakinService.selectWorkingDetls(orderId);
- List<OrderDetlPakout> orderDetlPakoutList = orderPakoutService.selectWorkingDetls(orderId);
- return OrderTransFormationUtil.transformationOrderDetlList(orderDetlPakinList,orderDetlPakoutList);
- }
- @Transactional
- public void checkComplete(String orderNo) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�403");
- }
- @Transactional
- public boolean saveHandlerOrder(Boolean Pakout, WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�407");
- }
- @Transactional
- public void insertOrder(Order order) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�411");
- }
- @Transactional
- public void insertOrderDetl(Order order, OrderDetl orderDetl) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�415");
- }
- @Transactional
- public void updateOrder(Long id, Long settle, Long userId) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�419");
- }
- @Transactional
- public void updateOrderDetl(Order order, OrderDetl orderDetl) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�423");
- }
- @Transactional
- public void remove(Long orderId) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�427");
- }
-
-
- @Transactional
- public List<Order> selectComplete8() {
- List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
- List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
- return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
- }
-
- @Transactional
- public boolean addToLogTableOrder(Order order) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�440");
- }
-
- @Transactional
- public List<Order> selectOrderNoL(String orderNo) {
- List<OrderPakin> orderPakinList = orderPakinService.selectorderNoL(orderNo);
- List<OrderPakout> orderPakoutList = orderPakoutService.selectorderNoL(orderNo);
- return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
- }
-
- @Transactional
- public Order selectOrderMoveStatus() {
- OrderPakin orderPakin = orderPakinService.selectOrderMoveStatus();
- OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatus();
- return OrderTransFormationUtil.transformationOrder(orderPakin,orderPakout);
- }
-
- @Transactional
- public Order selectOrderMoveStatusInitial() {
- OrderPakin orderPakin = orderPakinService.selectOrderMoveStatusInitial();
- OrderPakout orderPakout = orderPakoutService.selectOrderMoveStatusInitial();
- return OrderTransFormationUtil.transformationOrder(orderPakin,orderPakout);
- }
-
- @Transactional
- public List<Order> selectComplete() {
- List<OrderPakin> orderPakinList = orderPakinService.selectComplete();
- List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete();
- return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
- }
-
- @Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout);
- }
-
- @Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3,boxType1,boxType2,boxType3);
- return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout);
- }
-
- @Transactional
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�487");
- }
- @Transactional
- public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�491");
- }
- @Transactional
- public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�495");
- }
- @Transactional
- public boolean modifyStatus(Long orderId, Integer status) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�499");
- }
- @Transactional
- public boolean addToLogTableOrderDetl(OrderDetl orderDetl) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�503");
- }
- @Transactional
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�507");
- }
- @Transactional
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty) {
- throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�511");
- }
- },
- ;
-
- public abstract void implement();
-
- public abstract void query(String orderNo);
-
- public abstract Order selectByNo(String orderNo);
-
- public abstract List<Order> selectBySettle(Long settle);
-
- public abstract List<OrderDetl> selectByOrderId(Long orderId);
-
- public abstract List<OrderDetl> selectWorkingDetls(Long orderId);
-
- public abstract void checkComplete(String orderNo);
-
- public abstract boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
-
- public abstract void insertOrder(Order order);
-
- public abstract void insertOrderDetl(Order order, OrderDetl orderDetl);
-
- public abstract void updateOrder(Long id, Long settle, Long userId);
-
- public abstract void updateOrderDetl(Order order, OrderDetl orderDetl);
-
- public abstract void remove(Long orderId);
-
- public abstract List<Order> selectComplete();
-
- public abstract List<Order> selectComplete8();
-
- public abstract boolean addToLogTableOrder(Order order);
-
- public abstract List<Order> selectOrderNoL(String orderNo);
-
- public abstract Order selectOrderMoveStatus();
-
- public abstract Order selectOrderMoveStatusInitial();
-
- public abstract OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
-
- public abstract OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
-
- public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
-
- public abstract boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
-
- public abstract boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
-
- public abstract boolean modifyStatus(Long orderId, Integer status);
-
- public abstract boolean addToLogTableOrderDetl(OrderDetl orderDetl);
-
- public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double qty);
-
- public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3, Double workQty);
-
- @Setter
- OrderPakinService orderPakinService;
- @Setter
- OrderDetlPakinService orderDetlPakinService;
- @Setter
- OrderPakoutService orderPakoutService;
- @Setter
- OrderDetlPakoutService orderDetlPakoutService;
-
- @Component
- public static class ReportTypeServiceInjector {
- @Autowired
- OrderPakinService orderPakinService;
- @Autowired
- OrderDetlPakinService orderDetlPakinService;
- @Autowired
- OrderPakoutService orderPakoutService;
- @Autowired
- OrderDetlPakoutService orderDetlPakoutService;
- @PostConstruct
- public void postConstruct(){
- for(OrderInAndOutType orderInAndOutType : EnumSet.allOf(OrderInAndOutType.class)){
- orderInAndOutType.setOrderPakinService(orderPakinService);
- orderInAndOutType.setOrderDetlPakinService(orderDetlPakinService);
- orderInAndOutType.setOrderPakoutService(orderPakoutService);
- orderInAndOutType.setOrderDetlPakoutService(orderDetlPakoutService);
- }
- }
- }
-
-}
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java b/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java
deleted file mode 100644
index bdf2003..0000000
--- a/src/main/java/com/zy/common/model/enumUtils/OrderMethodVo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.zy.common.model.enumUtils;
-
-/**
- * Created by IX on 2024/12/14
- */
-public enum OrderMethodVo {
- IMPLEMENT("implement"),
- QUERY("query"),
- SELECT_BY_NO("selectByNo"),
- SELECT_SETTLE("selectBySettle"),
- SELECT_BY_ORDER_ID("selectByOrderId"),
- SELECT_WORKING_DETLS("selectWorkingDetls"),
- CHECK_COMPLETE("checkComplete"),
- SAVE_HANDLER_ORDER("saveHandlerOrder"),
- INSERT_ORDER("insertOrder"),
- INSERT_ORDERDETL("insertOrderDetl"),
- UPDATE_ORDER("updateOrder"),
- UPDATE_ORDERDETL("updateOrderDetl"),
- REMOVE("remove"),
- SELECT_COMPLETE("selectComplete"),
-
- SELECT_COMPLETE8("selectComplete8"),
- ADD_TO_LOG_TABLE_ORDER("addToLogTableOrder"),
- SELECT_ORDER_NO_L("selectOrderNoL"),
- SELECT_ORDER_MOVE_STATUS("selectOrderMoveStatus"),
- SELECT_ORDER_MOVE_STATUS_INITIAL("selectOrderMoveStatusInitial"),
-
- SELECT_ITEM1("selectItem"),
- SELECT_ITEM2("selectItem"),
- FIND_BY_LOOK("findByLook"),
- INCREASE("increase"),
- DECREASE("decrease"),
- MODIFY_STATUS("modifyStatus"),
- ADD_TO_LOG_TABLE_ORDERDETL("addToLogTableOrderDetl"),
- INCREASE_QTY_BY_ORDER_NO("increaseQtyByOrderNo"),
- INCREASE_WORKING_QTY("increaseWorkQty");
-
- private String code;
-
- OrderMethodVo(String code){
- this.code = code;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-}
diff --git a/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java b/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java
index 77c4569..ac2792c 100644
--- a/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java
+++ b/src/main/java/com/zy/common/model/enums/HtmlNavIconType.java
@@ -19,14 +19,15 @@
private String code;
private String icon;
- HtmlNavIconType(String code, String icon){
+
+ HtmlNavIconType(String code, String icon) {
this.code = code;
this.icon = icon;
}
public static String get(String code) {
- for (HtmlNavIconType type : HtmlNavIconType.values()){
- if (type.code.equals(code)){
+ for (HtmlNavIconType type : HtmlNavIconType.values()) {
+ if (type.code.equals(code)) {
return type.icon;
}
}
diff --git a/src/main/java/com/zy/common/properties/OSinfo.java b/src/main/java/com/zy/common/properties/OSinfo.java
index c66b5cd..3e74504 100644
--- a/src/main/java/com/zy/common/properties/OSinfo.java
+++ b/src/main/java/com/zy/common/properties/OSinfo.java
@@ -13,116 +13,118 @@
private SysOsType sysOsType;
- private OSinfo(){}
+ private OSinfo() {
+ }
- public static boolean isLinux(){
+ public static boolean isLinux() {
return OS.contains("linux");
}
- public static boolean isMacOS(){
- return OS.contains("mac") &&OS.indexOf("os")>0&& !OS.contains("x");
+ public static boolean isMacOS() {
+ return OS.contains("mac") && OS.indexOf("os") > 0 && !OS.contains("x");
}
- public static boolean isMacOSX(){
- return OS.contains("mac") &&OS.indexOf("os")>0&&OS.indexOf("x")>0;
+ public static boolean isMacOSX() {
+ return OS.contains("mac") && OS.indexOf("os") > 0 && OS.indexOf("x") > 0;
}
- public static boolean isWindows(){
+ public static boolean isWindows() {
return OS.contains("windows");
}
- public static boolean isOS2(){
+ public static boolean isOS2() {
return OS.contains("os/2");
}
- public static boolean isSolaris(){
+ public static boolean isSolaris() {
return OS.contains("solaris");
}
- public static boolean isSunOS(){
+ public static boolean isSunOS() {
return OS.contains("sunos");
}
- public static boolean isMPEiX(){
+ public static boolean isMPEiX() {
return OS.contains("mpe/ix");
}
- public static boolean isHPUX(){
+ public static boolean isHPUX() {
return OS.contains("hp-ux");
}
- public static boolean isAix(){
+ public static boolean isAix() {
return OS.contains("aix");
}
- public static boolean isOS390(){
+ public static boolean isOS390() {
return OS.contains("os/390");
}
- public static boolean isFreeBSD(){
+ public static boolean isFreeBSD() {
return OS.contains("freebsd");
}
- public static boolean isIrix(){
+ public static boolean isIrix() {
return OS.contains("irix");
}
- public static boolean isDigitalUnix(){
- return OS.contains("digital") &&OS.indexOf("unix")>0;
+ public static boolean isDigitalUnix() {
+ return OS.contains("digital") && OS.indexOf("unix") > 0;
}
- public static boolean isNetWare(){
+ public static boolean isNetWare() {
return OS.contains("netware");
}
- public static boolean isOSF1(){
+ public static boolean isOSF1() {
return OS.contains("osf1");
}
- public static boolean isOpenVMS(){
+ public static boolean isOpenVMS() {
return OS.contains("openvms");
}
/**
* 鑾峰彇鎿嶄綔绯荤粺鍚嶅瓧
+ *
* @return 鎿嶄綔绯荤粺鍚�
*/
- public static SysOsType getOSname(){
- if(isAix()){
+ public static SysOsType getOSname() {
+ if (isAix()) {
_instance.sysOsType = SysOsType.AIX;
- }else if (isDigitalUnix()) {
+ } else if (isDigitalUnix()) {
_instance.sysOsType = SysOsType.Digital_Unix;
- }else if (isFreeBSD()) {
+ } else if (isFreeBSD()) {
_instance.sysOsType = SysOsType.FreeBSD;
- }else if (isHPUX()) {
+ } else if (isHPUX()) {
_instance.sysOsType = SysOsType.HP_UX;
- }else if (isIrix()) {
+ } else if (isIrix()) {
_instance.sysOsType = SysOsType.Irix;
- }else if (isLinux()) {
+ } else if (isLinux()) {
_instance.sysOsType = SysOsType.Linux;
- }else if (isMacOS()) {
+ } else if (isMacOS()) {
_instance.sysOsType = SysOsType.Mac_OS;
- }else if (isMacOSX()) {
+ } else if (isMacOSX()) {
_instance.sysOsType = SysOsType.Mac_OS_X;
- }else if (isMPEiX()) {
+ } else if (isMPEiX()) {
_instance.sysOsType = SysOsType.MPEiX;
- }else if (isNetWare()) {
+ } else if (isNetWare()) {
_instance.sysOsType = SysOsType.NetWare_411;
- }else if (isOpenVMS()) {
+ } else if (isOpenVMS()) {
_instance.sysOsType = SysOsType.OpenVMS;
- }else if (isOS2()) {
+ } else if (isOS2()) {
_instance.sysOsType = SysOsType.OS2;
- }else if (isOS390()) {
+ } else if (isOS390()) {
_instance.sysOsType = SysOsType.OS390;
- }else if (isOSF1()) {
+ } else if (isOSF1()) {
_instance.sysOsType = SysOsType.OSF1;
- }else if (isSolaris()) {
+ } else if (isSolaris()) {
_instance.sysOsType = SysOsType.Solaris;
- }else if (isSunOS()) {
+ } else if (isSunOS()) {
_instance.sysOsType = SysOsType.SunOS;
- }else if (isWindows()) {
+ } else if (isWindows()) {
_instance.sysOsType = SysOsType.Windows;
- }else{
+ } else {
_instance.sysOsType = SysOsType.Others;
}
return _instance.sysOsType;
diff --git a/src/main/java/com/zy/common/properties/SystemProperties.java b/src/main/java/com/zy/common/properties/SystemProperties.java
index b693d42..bd926c4 100644
--- a/src/main/java/com/zy/common/properties/SystemProperties.java
+++ b/src/main/java/com/zy/common/properties/SystemProperties.java
@@ -18,7 +18,7 @@
// public static boolean SYSTEM_ACTIVATION = Boolean.FALSE;
public static boolean SYSTEM_ACTIVATION = Boolean.TRUE;
- public static String getActivationCode(String fileName){
+ public static String getActivationCode(String fileName) {
StringBuilder activationCode = new StringBuilder();
try {
FileReader f = new FileReader(fileName);
@@ -38,7 +38,7 @@
return activationCode.toString();
}
- public static boolean saveActivationCode(String filePath, String code){
+ public static boolean saveActivationCode(String filePath, String code) {
try {
// 闃叉鏂囦欢寤虹珛鎴栬鍙栧け璐ワ紝鐢╟atch鎹曟崏閿欒骞舵墦鍗帮紝涔熷彲浠hrow
File file = new File(filePath);// 鐩稿璺緞锛屽鏋滄病鏈夊垯瑕佸缓绔嬩竴涓柊鐨刼utput銆倀xt鏂囦欢
@@ -67,8 +67,8 @@
String timeStr = "2021-08-01 17:48:35";
Date exprTime = DateUtils.convert(timeStr);
String code = AesUtils.encrypt(DateUtils.convert(exprTime, DateUtils.yyyyMMddHHmmss), SystemProperties.SALT);
- System.out.println("婵�娲荤爜锛�"+code);
- System.out.println("鏈夋晥鏈熻嚦锛�"+timeStr);
+ System.out.println("婵�娲荤爜锛�" + code);
+ System.out.println("鏈夋晥鏈熻嚦锛�" + timeStr);
// saveActivationCode(SysOsType.Windows.getActivationCodePath(), code);
// String activationCode = getActivationCode(OSinfo.getOSname().getActivationCodePath());
// String decrypt = AesUtils.decrypt(activationCode, "123456789qwertyu");
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e659ad1..65775b0 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,17 +3,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
-import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -21,10 +18,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
import java.util.List;
/**
diff --git a/src/main/java/com/zy/common/utils/BarcodeUtils.java b/src/main/java/com/zy/common/utils/BarcodeUtils.java
index f2912db..6d25bd9 100644
--- a/src/main/java/com/zy/common/utils/BarcodeUtils.java
+++ b/src/main/java/com/zy/common/utils/BarcodeUtils.java
@@ -24,17 +24,18 @@
/**
* 鏉″舰鐮佺紪鐮�
*/
- public static BufferedImage encode(String string){
+ public static BufferedImage encode(String string) {
return encode(string, null, null);
}
- public static BufferedImage encode(String string, Integer width, Integer height){
+ public static BufferedImage encode(String string, Integer width, Integer height) {
try {
Code128Writer writer = new Code128Writer();
- BitMatrix bar = writer.encode(string, BarcodeFormat.CODE_128, width==null?DEFAULT_WIDTH:width, height==null?DEFAULT_HEIGHT:height, new HashMap<>());
+ BitMatrix bar = writer.encode(string, BarcodeFormat.CODE_128, width == null ? DEFAULT_WIDTH : width, height == null ? DEFAULT_HEIGHT : height, new HashMap<>());
return MatrixToImageWriter.toBufferedImage(bar);
+ } catch (WriterException e) {
+ throw new RuntimeException(e);
}
- catch (WriterException e){ throw new RuntimeException(e); }
}
/**
diff --git a/src/main/java/com/zy/common/utils/Http.java b/src/main/java/com/zy/common/utils/Http.java
index fc8dc1b..9d2fb23 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/common/utils/Http.java
@@ -14,7 +14,7 @@
*/
public class Http {
- public static void response(HttpServletResponse response, String baseRes){
+ public static void response(HttpServletResponse response, String baseRes) {
response.setCharacterEncoding("utf-8");
response.setContentType("application/json; charset=utf-8");
try (PrintWriter out = response.getWriter()) {
@@ -31,7 +31,7 @@
}
- public static void cors(HttpServletResponse response){
+ public static void cors(HttpServletResponse response) {
// 璺ㄥ煙璁剧疆
response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Origin", "*");
diff --git a/src/main/java/com/zy/common/utils/HttpHandler.java b/src/main/java/com/zy/common/utils/HttpHandler.java
index 70adcc7..d1abd5a 100644
--- a/src/main/java/com/zy/common/utils/HttpHandler.java
+++ b/src/main/java/com/zy/common/utils/HttpHandler.java
@@ -10,6 +10,7 @@
/**
* Http鍗忚瀹㈡埛绔�
+ *
* @author luxiaotao
* @date 2018-9-27
*/
@@ -27,7 +28,7 @@
private Integer timeout;
private TimeUnit timeUnit;
- public HttpHandler(Builder builder){
+ public HttpHandler(Builder builder) {
this.uri = builder.uri;
this.path = builder.path;
this.json = builder.json;
@@ -40,13 +41,14 @@
/**
* GET璇锋眰鎵ц
+ *
* @return the HttpHandler response
*/
public String doGet() throws IOException {
String url = paramsToUrl(uri, path, params, https);
Request.Builder headerBuilder = new Request.Builder();
- if (headers != null && headers.size()>0){
- for (Map.Entry<String, Object> entry : headers.entrySet()){
+ if (headers != null && headers.size() > 0) {
+ for (Map.Entry<String, Object> entry : headers.entrySet()) {
headerBuilder.addHeader(entry.getKey(), String.valueOf(entry.getValue()));
}
}
@@ -57,29 +59,30 @@
/**
* POST璇锋眰鎵ц
+ *
* @return the HttpHandler response
*/
public String doPost() throws IOException {
Request request;
Request.Builder headerBuilder = new Request.Builder();
- if (headers != null && headers.size()>0){
- for (Map.Entry<String, Object> entry : headers.entrySet()){
+ if (headers != null && headers.size() > 0) {
+ for (Map.Entry<String, Object> entry : headers.entrySet()) {
headerBuilder.addHeader(entry.getKey(), String.valueOf(entry.getValue()));
}
}
- if (json == null || "".equals(json)){
+ if (json == null || "".equals(json)) {
FormBody.Builder builder = new FormBody.Builder();
- for (Map.Entry<String, Object> entry : params.entrySet()){
+ for (Map.Entry<String, Object> entry : params.entrySet()) {
builder.add(entry.getKey(), String.valueOf(entry.getValue()));
}
FormBody body = builder.build();
request = headerBuilder
- .url((https?"https://":"http://")+uri+path)
+ .url((https ? "https://" : "http://") + uri + path)
.post(body)
.build();
} else {
RequestBody body = RequestBody.create(MEDIA_TYPE, json);
- Request.Builder builder = headerBuilder.url((https?"https://":"http://")+uri+path);
+ Request.Builder builder = headerBuilder.url((https ? "https://" : "http://") + uri + path);
builder.header("Content-Type", "application/json;charset=UTF-8");
request = builder.post(body).build();
@@ -92,13 +95,14 @@
/**
* get璇锋眰鍙傛暟鎷兼帴鏂规硶
+ *
* @return 璇锋眰琛�
*/
private String paramsToUrl(String uri, String path, Map<String, Object> params, boolean isHttps) {
StringBuilder res = new StringBuilder();
res.append(isHttps ? "https://" : "http://");
res.append(uri);
- if (path.length() > 0 && !(path.charAt(0) == '/')){
+ if (path.length() > 0 && !(path.charAt(0) == '/')) {
res.append("/");
}
res.append(path);
@@ -114,17 +118,18 @@
}
);
String url = res.toString();
- if ("&".equals(url.substring(url.length()-1, url.length()))){
- url = url.substring(0, url.length()-1);
+ if ("&".equals(url.substring(url.length() - 1, url.length()))) {
+ url = url.substring(0, url.length() - 1);
}
return url;
}
/**
* 鑾峰彇 okHttpClient
+ *
* @return the HttpHandler instance
*/
- private OkHttpClient getClient(Integer timeout, TimeUnit timeUnit){
+ private OkHttpClient getClient(Integer timeout, TimeUnit timeUnit) {
return new OkHttpClient
.Builder()
.connectTimeout(timeout, timeUnit)
@@ -155,16 +160,17 @@
/**
* 寤洪�犲櫒
+ *
* @return the HttpHandler instance
*/
- public HttpHandler build(){
- if (null == this.uri || "".equals(this.uri)){
+ public HttpHandler build() {
+ if (null == this.uri || "".equals(this.uri)) {
throw new RuntimeException("uri is null");
}
- if (this.uri.startsWith("http://")){
- this.uri = this.uri.substring(6,uri.length());
- } else if (this.uri.startsWith("https://")){
- this.uri = this.uri.substring(7,uri.length());
+ if (this.uri.startsWith("http://")) {
+ this.uri = this.uri.substring(6, uri.length());
+ } else if (this.uri.startsWith("https://")) {
+ this.uri = this.uri.substring(7, uri.length());
}
return new HttpHandler(this);
}
@@ -175,7 +181,7 @@
}
public Builder setPath(String path) {
- if (!path.startsWith("/")){
+ if (!path.startsWith("/")) {
path = "/" + path;
}
this.path = path;
diff --git a/src/main/java/com/zy/common/utils/NodeUtils.java b/src/main/java/com/zy/common/utils/NodeUtils.java
index 7d8a4ae..41eff18 100644
--- a/src/main/java/com/zy/common/utils/NodeUtils.java
+++ b/src/main/java/com/zy/common/utils/NodeUtils.java
@@ -29,8 +29,8 @@
NodeService bean = SpringUtils.getBean(NodeService.class);
Node parent = bean.selectById(node.getParentId());
if (null != parent) {
- path.insert(0, parent.getId()).insert(0,",");
- pathName.insert(0, parent.getName()).insert(0,",");
+ path.insert(0, parent.getId()).insert(0, ",");
+ pathName.insert(0, parent.getName()).insert(0, ",");
if (parent.getParentId() != null) {
executePath(parent);
} else {
@@ -44,8 +44,8 @@
TagService bean = SpringUtils.getBean(TagService.class);
Tag parent = bean.selectById(tag.getParentId());
if (null != parent) {
- path.insert(0, parent.getId()).insert(0,",");
- pathName.insert(0, parent.getName()).insert(0,",");
+ path.insert(0, parent.getId()).insert(0, ",");
+ pathName.insert(0, parent.getName()).insert(0, ",");
if (parent.getParentId() != null) {
executePath(parent);
} else {
@@ -59,8 +59,8 @@
TagService bean = SpringUtils.getBean(TagService.class);
Tag parent = bean.selectById(parentId);
if (null != parent) {
- path.insert(0, parent.getId()).insert(0,",");
- pathName.insert(0, parent.getName()).insert(0,",");
+ path.insert(0, parent.getId()).insert(0, ",");
+ pathName.insert(0, parent.getName()).insert(0, ",");
if (parent.getParentId() != null) {
executePath(parent);
} else {
diff --git a/src/main/java/com/zy/common/utils/QrCode.java b/src/main/java/com/zy/common/utils/QrCode.java
index ee63247..325be83 100644
--- a/src/main/java/com/zy/common/utils/QrCode.java
+++ b/src/main/java/com/zy/common/utils/QrCode.java
@@ -48,7 +48,7 @@
return image;
}
- private static InputStream convert(BufferedImage image){
+ private static InputStream convert(BufferedImage image) {
ByteArrayOutputStream os = new ByteArrayOutputStream();
try {
ImageIO.write(image, FORMAT_NAME, os);
@@ -88,7 +88,6 @@
// response.getOutputStream().flush();
// response.getOutputStream().close();
}
-
}
diff --git a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java b/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
index fd04503..ab4269c 100644
--- a/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
+++ b/src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java
@@ -11,7 +11,7 @@
public class RandomValidateCodeUtil {
public static final Map<String, String> code = new ConcurrentHashMap<>();
-
+
private static String randString = "0123456789ABCDEFGHJKLMNPRSTUVWXYZ";//闅忔満浜х敓鏁板瓧涓庡瓧姣嶇粍鍚堢殑瀛楃涓�
private static int width = 60;// 鍥剧墖瀹�
private static int height = 27;// 鍥剧墖楂�
@@ -97,7 +97,7 @@
.length())));
randomString += rand;
g.translate(random.nextInt(3), random.nextInt(3));
- g.drawString(rand, 13 * (i-1)+2, 16);
+ g.drawString(rand, 13 * (i - 1) + 2, 16);
return randomString;
}
diff --git a/src/main/java/com/zy/common/utils/RedisUtil.java b/src/main/java/com/zy/common/utils/RedisUtil.java
index b2df114..a81c43c 100644
--- a/src/main/java/com/zy/common/utils/RedisUtil.java
+++ b/src/main/java/com/zy/common/utils/RedisUtil.java
@@ -11,7 +11,6 @@
/**
* redisTemplate灏佽
- *
*/
//@Component
public class RedisUtil {
diff --git a/src/main/java/com/zy/common/utils/Synchro.java b/src/main/java/com/zy/common/utils/Synchro.java
index c23fbf1..ab90bdc 100644
--- a/src/main/java/com/zy/common/utils/Synchro.java
+++ b/src/main/java/com/zy/common/utils/Synchro.java
@@ -14,9 +14,9 @@
public static void Copy(Object source, Object dest) {
try {
- BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(),Object.class);
+ BeanInfo sourceBean = Introspector.getBeanInfo(source.getClass(), Object.class);
PropertyDescriptor[] sourceProperty = sourceBean.getPropertyDescriptors();
- BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(),Object.class);
+ BeanInfo destBean = Introspector.getBeanInfo(dest.getClass(), Object.class);
PropertyDescriptor[] destProperty = destBean.getPropertyDescriptors();
for (PropertyDescriptor propertyDescriptor : sourceProperty) {
for (PropertyDescriptor descriptor : destProperty) {
diff --git a/src/main/java/com/zy/common/utils/TreeUtils.java b/src/main/java/com/zy/common/utils/TreeUtils.java
index e18416c..5c0935e 100644
--- a/src/main/java/com/zy/common/utils/TreeUtils.java
+++ b/src/main/java/com/zy/common/utils/TreeUtils.java
@@ -29,8 +29,8 @@
/**
* 鑾峰彇鏍戝浘鏁版嵁缁撴瀯
*/
- @Cacheable(cacheNames="tagTree",key="#id")
- public ArrayList<Map> getTree(String id){
+ @Cacheable(cacheNames = "tagTree", key = "#id")
+ public ArrayList<Map> getTree(String id) {
ArrayList<Map> result = new ArrayList<>();
Tag tag = tagService.selectById(id);
// 涓昏妭鐐�
@@ -95,8 +95,8 @@
/**
* 鑾峰彇鏍戝浘鏁版嵁缁撴瀯
*/
- @Cacheable(cacheNames="nodeTree",key="#id")
- public ArrayList<Map> getNodeTree(String id, Long hostId){
+ @Cacheable(cacheNames = "nodeTree", key = "#id")
+ public ArrayList<Map> getNodeTree(String id, Long hostId) {
ArrayList<Map> result = new ArrayList<>();
Node node = nodeService.selectById(id);
// 涓昏妭鐐�
diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index cc00686..efb9aa2 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -4,17 +4,16 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
-import com.core.common.*;
+import com.core.common.Cools;
+import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.common.CodeRes;
import com.zy.common.entity.Parameter;
import com.zy.common.model.PowerDto;
import com.zy.common.model.enums.HtmlNavIconType;
-import com.zy.common.properties.OSinfo;
import com.zy.common.properties.SystemProperties;
import com.zy.common.utils.RandomValidateCodeUtil;
import com.zy.system.entity.*;
-import com.zy.system.entity.license.LicenseVerify;
import com.zy.system.service.*;
import com.zy.system.timer.LicenseTimer;
import com.zy.system.timer.LoadingConfigTimer;
@@ -81,7 +80,8 @@
String token = Cools.enToken(System.currentTimeMillis() + param.get("username"), user.getPassword());
if (loadingConfigTimer.getTokenNumber() == 1) {
userLoginService.delete(new EntityWrapper<UserLogin>().eq("user_id", user.getId()).eq("system", "WMS"));
- } UserLogin userLogin = new UserLogin();
+ }
+ UserLogin userLogin = new UserLogin();
userLogin.setUserId(user.getId());
userLogin.setToken(token);
userLogin.setCreateTime(new Date());
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 995c3d9..06a2bf5 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -41,7 +41,7 @@
@Autowired
private UserLoginService userLoginService;
- protected Node getOriginNode(){
+ protected Node getOriginNode() {
Node node = nodeService.getTop();
if (node == null) {
throw new CoolException("搴撳尯鏁版嵁閿欒");
@@ -49,7 +49,7 @@
return node;
}
- protected Long getHostId(){
+ protected Long getHostId() {
if (getUserId() == 9527) {
return null;
}
@@ -68,11 +68,11 @@
}
}
- protected Long getUserId(){
+ protected Long getUserId() {
return Long.parseLong(String.valueOf(request.getAttribute("userId")));
}
- protected User getUser(){
+ protected User getUser() {
User user = userService.selectById(getUserId());
if (null == user) {
throw new CoolException(BaseRes.DENIED);
@@ -80,21 +80,21 @@
return user;
}
- protected String getComment(Class<?> cls, String fieldName){
+ protected String getComment(Class<?> cls, String fieldName) {
Field[] fields = Cools.getAllFields(cls);
- for (Field field : fields){
- if (fieldName.equals(field.getName())){
+ for (Field field : fields) {
+ if (fieldName.equals(field.getName())) {
return field.getAnnotation(ApiModelProperty.class).value();
}
}
return "";
}
- protected Tag getOriginTag(){
+ protected Tag getOriginTag() {
return tagService.getTop();
}
- protected <T> void hostEq(EntityWrapper<T> wrapper){
+ protected <T> void hostEq(EntityWrapper<T> wrapper) {
Long hostId = getHostId();
if (hostId != null) {
wrapper.eq("host_id", hostId);
@@ -103,6 +103,7 @@
/**
* 鍒嗛〉缁勮
+ *
* @param pageNumber
* @param pageSize
* @param map
@@ -110,7 +111,7 @@
* @param <T>
* @return
*/
- protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls){
+ protected <T> Page<T> toPage(Integer pageNumber, Integer pageSize, Map<String, Object> map, Class<T> cls) {
// 鍒嗛〉绱㈠紩鍜屽崟椤垫暟閲忕粍瑁�
pageNumber = Optional.ofNullable(pageNumber).orElse(1);
pageSize = Optional.ofNullable(pageSize).orElse(10);
@@ -121,10 +122,10 @@
// 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
if (!Cools.isEmpty(map.get("condition"))) {
Set<String> columns = new HashSet<>();
- for (Field field : Cools.getAllFields(cls)){
+ for (Field field : Cools.getAllFields(cls)) {
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ || Modifier.isTransient(field.getModifiers())) {
continue;
}
String column = null;
@@ -138,7 +139,7 @@
columns.add(column);
}
}
- columns.forEach(col->map.put(col, map.get("condition")));
+ columns.forEach(col -> map.put(col, map.get("condition")));
}
page.setCondition(map);
return page;
@@ -146,19 +147,20 @@
/**
* 鍏ㄥ瓧娈垫ā绯婃悳绱�
- * @param cls 妯″瀷绫�
- * @param set 鎺掗櫎瀛楁闆嗗悎
+ *
+ * @param cls 妯″瀷绫�
+ * @param set 鎺掗櫎瀛楁闆嗗悎
* @param condition 鎼滅储鍐呭
*/
- protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition) {
if (Cools.isEmpty(condition)) {
return;
}
List<String> columns = new ArrayList<>();
- for (Field field :Cools.getAllFields(cls)){
+ for (Field field : Cools.getAllFields(cls)) {
if (Modifier.isFinal(field.getModifiers())
|| Modifier.isStatic(field.getModifiers())
- || Modifier.isTransient(field.getModifiers())){
+ || Modifier.isTransient(field.getModifiers())) {
continue;
}
String column = null;
@@ -175,8 +177,8 @@
if (columns.isEmpty()) {
return;
}
- for (int i=0;i<columns.size();i++){
- if (i==0){
+ for (int i = 0; i < columns.size(); i++) {
+ if (i == 0) {
wrapper.andNew();
} else {
wrapper.or();
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index cff077b..dc5b7d7 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -23,16 +23,16 @@
@RequestMapping("file/")
public class FileController {
-
+
@RequestMapping(value = "/barcode/qrcode/auth")
// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
- , @RequestParam String param
- , @RequestParam(required = false) Integer width
- , @RequestParam(required = false) Integer height
- , HttpServletResponse response) throws Exception {
+ , @RequestParam String param
+ , @RequestParam(required = false) Integer width
+ , @RequestParam(required = false) Integer height
+ , HttpServletResponse response) throws Exception {
AdminInterceptor.cors(response);
- if (Cools.isEmpty(param)){
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.EMPTY);
}
BufferedImage img;
diff --git a/src/main/java/com/zy/common/web/RouterController.java b/src/main/java/com/zy/common/web/RouterController.java
index 6b21c8a..b054349 100644
--- a/src/main/java/com/zy/common/web/RouterController.java
+++ b/src/main/java/com/zy/common/web/RouterController.java
@@ -17,36 +17,36 @@
@RequestMapping("/")
public void index(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/index.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/index.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/login")
public void login(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/login.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/login.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/pda")
public void pda(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/pda/login.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/pda/login.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
@RequestMapping("/pda/ce")
public void pdaCe(HttpServletResponse response) {
- try{
- response.sendRedirect(contextPath+"/views/pdaCe/login.html");
- } catch (Exception ex){
+ try {
+ response.sendRedirect(contextPath + "/views/pdaCe/login.html");
+ } catch (Exception ex) {
ex.printStackTrace();
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index c0c677f..9e11712 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -22,7 +22,6 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.stream.Collectors;
/**
* Created by vincent on 2020/10/30
@@ -45,7 +44,7 @@
@Autowired
private WaitPakinService waitPakinService;
@Autowired
- private LocDetlService locDetlService;
+ private LocDetlService locDetlService;
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
@@ -74,13 +73,13 @@
}
return R.parse(CodeRes.NO_COMB_700);
}
- int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
- int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
if (countLoc > 0 || countWrk > 0) {
return R.error(CodeRes.EXIST_500);
}
}
- if (Cools.isEmpty(param.getLocType1())){
+ if (Cools.isEmpty(param.getLocType1())) {
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -107,14 +106,14 @@
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
- public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto){
+ public R autoEmptyIn(@RequestBody LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
- StartupDto dto = commonService.getLocNo( 10, 12, findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo(10, 12, findLocNoAttributeVo, locTypeDto);
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -137,12 +136,12 @@
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
wrkMast.setMemo("鑷姩绌烘墭鍏ュ簱");
- return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
+ return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
@PostMapping("auto/emptyOut/v1")
@ResponseBody
- public R autoEmptyOut(){
+ public R autoEmptyOut() {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
.eq("loc_sts", "D"));
if (Cools.isEmpty(locMast)) {
@@ -150,9 +149,11 @@
}
EmptyPlateOutParam emptyPlateOutParam = new EmptyPlateOutParam();
emptyPlateOutParam.setOutSite(12);
- emptyPlateOutParam.setLocNos(new ArrayList<String>(){{add(locMast.getLocNo()+"");}});
+ emptyPlateOutParam.setLocNos(new ArrayList<String>() {{
+ add(locMast.getLocNo() + "");
+ }});
WrkMast wrkMast = workService.emptyPlateOut(emptyPlateOutParam);
- return R.ok(!Cools.isEmpty(wrkMast)? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
+ return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("鑷姩绌烘墭鍑哄簱鎴愬姛,宸ヤ綔鍙�:" + wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍑哄簱澶辫触"));
}
/**
@@ -167,7 +168,7 @@
// List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
// FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(matnrs.get(0), batchs.get(0));
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
- StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -220,19 +221,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(now);
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
@@ -244,7 +245,7 @@
// 妫�绱㈠簱浣�
FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo();
- StartupDto dto = commonService.getLocNo( 10, devpNo, findLocNoAttributeVo, locTypeDto);
+ StartupDto dto = commonService.getLocNo(10, devpNo, findLocNoAttributeVo, locTypeDto);
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -274,19 +275,19 @@
// 鏇存柊婧愮珯鐐逛俊鎭�
sourceStaNo.setWrkNo(workNo);
sourceStaNo.setModiTime(new Date());
- if (!basDevpService.updateById(sourceStaNo)){
+ if (!basDevpService.updateById(sourceStaNo)) {
throw new CoolException("鏇存柊婧愮珯澶辫触");
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(new Date());
- if (!locMastService.updateById(locMast)){
+ if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
} else {
- throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
return dto;
}
diff --git a/src/main/java/com/zy/system/controller/ApiController.java b/src/main/java/com/zy/system/controller/ApiController.java
index 9c65e8b..041d88a 100644
--- a/src/main/java/com/zy/system/controller/ApiController.java
+++ b/src/main/java/com/zy/system/controller/ApiController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/api/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Api> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,10 +41,10 @@
return R.ok(apiService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -57,10 +57,10 @@
@RequestMapping(value = "/api/edit/auth")
@ManagerAuth
public R edit(Api api) {
- if (Cools.isEmpty(api)){
+ if (Cools.isEmpty(api)) {
return R.error();
}
- if (null == api.getId()){
+ if (null == api.getId()) {
apiService.insert(api);
} else {
apiService.updateById(api);
@@ -75,10 +75,10 @@
return R.ok();
}
- @RequestMapping(value = "/api/update/auth")
+ @RequestMapping(value = "/api/update/auth")
@ManagerAuth
- public R update(Api api){
- if (Cools.isEmpty(api) || null==api.getId()){
+ public R update(Api api) {
+ if (Cools.isEmpty(api) || null == api.getId()) {
return R.error();
}
apiService.updateById(api);
@@ -87,8 +87,8 @@
@RequestMapping(value = "/api/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
apiService.deleteBatchIds(Arrays.asList(ids));
@@ -97,7 +97,7 @@
@RequestMapping(value = "/api/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Api> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("api"));
@@ -113,7 +113,7 @@
wrapper.like("id", condition);
Page<Api> page = apiService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Api api : page.getRecords()){
+ for (Api api : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", api.getId());
map.put("value", api.getId());
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index 69d2e8a..1f7e37c 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -31,11 +31,11 @@
@RequestMapping(value = "/config/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Config> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -43,10 +43,10 @@
return R.ok(configService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -59,15 +59,15 @@
@RequestMapping(value = "/config/edit/auth")
@ManagerAuth
public R edit(Config config) {
- if (Cools.isEmpty(config)){
+ if (Cools.isEmpty(config)) {
return R.error();
}
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
- if (null == config.getId()){
+ if (null == config.getId()) {
configService.insert(config);
} else {
configService.updateById(config);
@@ -79,8 +79,8 @@
@RequestMapping(value = "/config/add/auth")
@ManagerAuth
public R add(Config config) {
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
@@ -88,14 +88,14 @@
return R.ok();
}
- @RequestMapping(value = "/config/update/auth")
+ @RequestMapping(value = "/config/update/auth")
@ManagerAuth
- public R update(Config config){
- if (Cools.isEmpty(config) || null==config.getId()){
+ public R update(Config config) {
+ if (Cools.isEmpty(config) || null == config.getId()) {
return R.error();
}
- if (config.getType() == 2){
- if (!checkJson(config.getValue())){
+ if (config.getType() == 2) {
+ if (!checkJson(config.getValue())) {
return R.error("json瑙ｆ瀽澶辫触");
}
}
@@ -106,8 +106,8 @@
@RequestMapping(value = "/config/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
configService.deleteBatchIds(Arrays.asList(ids));
@@ -116,7 +116,7 @@
@RequestMapping(value = "/config/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Config> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("config"));
@@ -132,7 +132,7 @@
wrapper.like("id", condition);
Page<Config> page = configService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Config config : page.getRecords()){
+ for (Config config : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", config.getId());
map.put("value", config.getId());
@@ -146,7 +146,7 @@
*/
@RequestMapping(value = "/config/refresh/auth")
// @ManagerAuth
- public R refresh(){
+ public R refresh() {
Parameter parameter;
try {
parameter = Parameter.reset();
@@ -154,18 +154,18 @@
e.printStackTrace();
return R.error();
}
- if (Cools.isEmpty(parameter)){
+ if (Cools.isEmpty(parameter)) {
return R.error();
}
return R.ok();
}
- private static boolean checkJson(String val){
+ private static boolean checkJson(String val) {
Object parse = null;
try {
parse = JSON.parse(val);
- } catch (Exception ignore){
+ } catch (Exception ignore) {
}
return parse != null;
}
diff --git a/src/main/java/com/zy/system/controller/HomeController.java b/src/main/java/com/zy/system/controller/HomeController.java
index 6b20ccc..f608a09 100644
--- a/src/main/java/com/zy/system/controller/HomeController.java
+++ b/src/main/java/com/zy/system/controller/HomeController.java
@@ -1,12 +1,12 @@
package com.zy.system.controller;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.system.service.OperateLogService;
-import com.zy.system.service.UserLoginService;
-import com.zy.system.service.UserService;
import com.core.annotations.ManagerAuth;
import com.core.common.Arith;
import com.core.common.R;
+import com.zy.system.service.OperateLogService;
+import com.zy.system.service.UserLoginService;
+import com.zy.system.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
@@ -30,7 +30,7 @@
@RequestMapping("/top")
@ManagerAuth
- public R top(){
+ public R top() {
int logTotal = operateLogService.selectCount(new EntityWrapper<>());
int logWeek = operateLogService.selectCountByCurrentWeek();
int userTotal = userService.selectCount(new EntityWrapper<>());
@@ -40,14 +40,14 @@
result.put("logTotal", logTotal);
result.put("logWeek", logWeek);
result.put("userTotal", userTotal);
- result.put("live", Arith.multiplys(0, Arith.divides(2, loginWeek, userTotal), 100)+"%");
+ result.put("live", Arith.multiplys(0, Arith.divides(2, loginWeek, userTotal), 100) + "%");
return R.ok(result);
}
@RequestMapping("/report")
@ManagerAuth
- public R top(@RequestParam(defaultValue = "1", value = "type", required = false)Integer type){
+ public R top(@RequestParam(defaultValue = "1", value = "type", required = false) Integer type) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(new Date());
@@ -71,15 +71,15 @@
/**
* 鑷姩琛ラ浂
*/
- private List<Map<String, Object>> fill(List<Map<String, Object>> list, int start, int end){
- for (int i = start ; i <= end; i++){
+ private List<Map<String, Object>> fill(List<Map<String, Object>> list, int start, int end) {
+ for (int i = start; i <= end; i++) {
boolean exist = false;
- for (Map seq : list){
- if (Integer.parseInt(String.valueOf(seq.get("node"))) == i){
+ for (Map seq : list) {
+ if (Integer.parseInt(String.valueOf(seq.get("node"))) == i) {
exist = true;
}
}
- if (!exist){
+ if (!exist) {
HashMap<String, Object> map = new HashMap<>();
map.put("node", i);
map.put("val", 0);
@@ -92,14 +92,15 @@
/**
* x杞村崟浣嶈浆鎹�
+ *
* @param dot y杞存暟鍊间繚鐣欏皬鏁颁綅
*/
- private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot){
- for (Map<String, Object> map : list){
+ private List<Map<String, Object>> convert(List<Map<String, Object>> list, StatsType statsType, int dot) {
+ for (Map<String, Object> map : list) {
Object val = map.get("val");
map.put("val", Arith.multiplys(dot, 1, (Number) val));
Object node = map.get("node");
- switch (statsType){
+ switch (statsType) {
case MONTH:
map.put("node", node + "鍙�");
break;
@@ -113,15 +114,16 @@
return list;
}
- enum StatsType{
+ enum StatsType {
- YEAR(1,1, 12),
- MONTH(2,1, 30),
+ YEAR(1, 1, 12),
+ MONTH(2, 1, 30),
;
int id;
int start;
int end;
+
StatsType(int id, int start, int end) {
this.id = id;
this.start = start;
@@ -130,8 +132,8 @@
static StatsType get(int id) {
StatsType[] values = StatsType.values();
- for (StatsType statsType : values){
- if (statsType.id == id){
+ for (StatsType statsType : values) {
+ if (statsType.id == id) {
return statsType;
}
}
diff --git a/src/main/java/com/zy/system/controller/HostController.java b/src/main/java/com/zy/system/controller/HostController.java
index c63ec36..375f1c5 100644
--- a/src/main/java/com/zy/system/controller/HostController.java
+++ b/src/main/java/com/zy/system/controller/HostController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/host/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Host> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,10 +41,10 @@
return R.ok(hostService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -57,10 +57,10 @@
@RequestMapping(value = "/host/edit/auth")
@ManagerAuth
public R edit(Host host) {
- if (Cools.isEmpty(host)){
+ if (Cools.isEmpty(host)) {
return R.error();
}
- if (null == host.getId()){
+ if (null == host.getId()) {
hostService.insert(host);
} else {
hostService.updateById(host);
@@ -75,10 +75,10 @@
return R.ok();
}
- @RequestMapping(value = "/host/update/auth")
+ @RequestMapping(value = "/host/update/auth")
@ManagerAuth
- public R update(Host host){
- if (Cools.isEmpty(host) || null==host.getId()){
+ public R update(Host host) {
+ if (Cools.isEmpty(host) || null == host.getId()) {
return R.error();
}
hostService.updateById(host);
@@ -87,8 +87,8 @@
@RequestMapping(value = "/host/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
hostService.deleteBatchIds(Arrays.asList(ids));
@@ -97,7 +97,7 @@
@RequestMapping(value = "/host/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Host> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("host"));
@@ -113,7 +113,7 @@
wrapper.like("name", condition);
Page<Host> page = hostService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Host host : page.getRecords()){
+ for (Host host : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", host.getId());
map.put("value", host.getName());
diff --git a/src/main/java/com/zy/system/controller/LicenseCreatorController.java b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
index c60f310..2aa456f 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -5,38 +5,34 @@
import com.zy.system.entity.license.*;
import com.zy.system.timer.LicenseTimer;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
/**
- *
* 鐢ㄤ簬鐢熸垚璇佷功鏂囦欢锛屼笉鑳芥斁鍦ㄧ粰瀹㈡埛閮ㄧ讲鐨勪唬鐮侀噷
*/
@RestController
@RequestMapping("/license")
public class LicenseCreatorController {
-// @Value("${license.licensePath}")
+ // @Value("${license.licensePath}")
// private String licensePath;
@Autowired
private LicenseCheckListener licenseCheckListener;
@Autowired
private LicenseTimer licenseTimer;
+
/**
* 鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�
+ *
* @param osName 鎿嶄綔绯荤粺绫诲瀷锛屽鏋滀负绌哄垯鑷姩鍒ゆ柇
*/
- @RequestMapping(value = "/getServerInfos",produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
- public LicenseCheck getServerInfos(@RequestParam(value = "osName",required = false) String osName) {
+ @RequestMapping(value = "/getServerInfos", produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
+ public LicenseCheck getServerInfos(@RequestParam(value = "osName", required = false) String osName) {
//鎿嶄綔绯荤粺绫诲瀷
- if(Cools.isEmpty(osName)){
+ if (Cools.isEmpty(osName)) {
osName = System.getProperty("os.name");
}
osName = osName.toLowerCase();
@@ -48,7 +44,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -101,8 +97,6 @@
licenseTimer.timer();
return R.ok();
}
-
-
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index 8399ad4..d81226d 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/operateLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,10 +41,10 @@
return R.ok(operateLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -57,10 +57,10 @@
@RequestMapping(value = "/operateLog/edit/auth")
@ManagerAuth
public R edit(OperateLog operateLog) {
- if (Cools.isEmpty(operateLog)){
+ if (Cools.isEmpty(operateLog)) {
return R.error();
}
- if (null == operateLog.getId()){
+ if (null == operateLog.getId()) {
operateLogService.insert(operateLog);
} else {
operateLogService.updateById(operateLog);
@@ -75,10 +75,10 @@
return R.ok();
}
- @RequestMapping(value = "/operateLog/update/auth")
+ @RequestMapping(value = "/operateLog/update/auth")
@ManagerAuth
- public R update(OperateLog operateLog){
- if (Cools.isEmpty(operateLog) || null==operateLog.getId()){
+ public R update(OperateLog operateLog) {
+ if (Cools.isEmpty(operateLog) || null == operateLog.getId()) {
return R.error();
}
operateLogService.updateById(operateLog);
@@ -87,8 +87,8 @@
@RequestMapping(value = "/operateLog/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
operateLogService.deleteBatchIds(Arrays.asList(ids));
@@ -97,7 +97,7 @@
@RequestMapping(value = "/operateLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<OperateLog> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("operateLog"));
@@ -113,7 +113,7 @@
wrapper.like("id", condition);
Page<OperateLog> page = operateLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (OperateLog operateLog : page.getRecords()){
+ for (OperateLog operateLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", operateLog.getId());
map.put("value", operateLog.getId());
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index e712016..259b918 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/permission/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Permission> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,10 +41,10 @@
return R.ok(permissionService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -57,10 +57,10 @@
@RequestMapping(value = "/permission/edit/auth")
@ManagerAuth
public R edit(Permission permission) {
- if (Cools.isEmpty(permission)){
+ if (Cools.isEmpty(permission)) {
return R.error();
}
- if (null == permission.getId()){
+ if (null == permission.getId()) {
permissionService.insert(permission);
} else {
permissionService.updateById(permission);
@@ -75,10 +75,10 @@
return R.ok();
}
- @RequestMapping(value = "/permission/update/auth")
+ @RequestMapping(value = "/permission/update/auth")
@ManagerAuth
- public R update(Permission permission){
- if (Cools.isEmpty(permission) || null==permission.getId()){
+ public R update(Permission permission) {
+ if (Cools.isEmpty(permission) || null == permission.getId()) {
return R.error();
}
permissionService.updateById(permission);
@@ -87,8 +87,8 @@
@RequestMapping(value = "/permission/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
permissionService.deleteBatchIds(Arrays.asList(ids));
@@ -97,7 +97,7 @@
@RequestMapping(value = "/permission/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Permission> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("permission"));
@@ -113,7 +113,7 @@
wrapper.like("name", condition);
Page<Permission> page = permissionService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Permission permission : page.getRecords()){
+ for (Permission permission : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", permission.getId());
map.put("value", permission.getName());
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index b7d3d41..6c16420 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -13,7 +13,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class ResourceController extends BaseController {
@@ -29,11 +32,11 @@
@RequestMapping(value = "/resource/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -43,25 +46,26 @@
@RequestMapping(value = "/resource/tree/auth")
@ManagerAuth
- public R tree(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R tree(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- else {
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
wrapper.orderBy("sort");
}
return R.parse("0-鎿嶄綔鎴愬姛").add(resourceService.selectList(wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -74,11 +78,11 @@
@RequestMapping(value = "/resource/edit/auth")
@ManagerAuth(memo = "鑿滃崟缂栬緫")
public R edit(Resource resource) {
- if (Cools.isEmpty(resource)){
+ if (Cools.isEmpty(resource)) {
return R.error();
}
- if (null == resource.getId()){
- if (resource.getSort() == null){
+ if (null == resource.getId()) {
+ if (resource.getSort() == null) {
resource.setSort(999);
}
resourceService.insert(resource);
@@ -97,8 +101,8 @@
@RequestMapping(value = "/resource/update/auth")
@ManagerAuth(memo = "鑿滃崟淇敼")
- public R update(Resource resource){
- if (Cools.isEmpty(resource) || null==resource.getId()){
+ public R update(Resource resource) {
+ if (Cools.isEmpty(resource) || null == resource.getId()) {
return R.error();
}
resourceService.updateById(resource);
@@ -117,8 +121,8 @@
@RequestMapping(value = "/resource/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
resourceService.deleteById(id);
}
return R.ok();
@@ -126,7 +130,7 @@
@RequestMapping(value = "/resource/export/auth")
@ManagerAuth(memo = "鑿滃崟瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Resource> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("resource"));
@@ -142,7 +146,7 @@
wrapper.like("name", condition);
Page<Resource> page = resourceService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Resource resource : page.getRecords()){
+ for (Resource resource : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", resource.getId());
map.put("value", resource.getName().concat("(").concat(resource.getLevel$().substring(0, 2).concat(")")));
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index 9125452..4ec64ba 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -3,13 +3,13 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.zy.common.web.BaseController;
-import com.zy.system.entity.Role;
-import com.zy.system.service.RoleService;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.Role;
+import com.zy.system.service.RoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -29,11 +29,11 @@
@RequestMapping(value = "/role/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -61,10 +61,10 @@
return R.ok(roleService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -77,10 +77,10 @@
@RequestMapping(value = "/role/edit/auth")
@ManagerAuth(memo = "瑙掕壊缂栬緫")
public R edit(Role role) {
- if (Cools.isEmpty(role)){
+ if (Cools.isEmpty(role)) {
return R.error();
}
- if (null == role.getId()){
+ if (null == role.getId()) {
roleService.insert(role);
} else {
roleService.updateById(role);
@@ -95,10 +95,10 @@
return R.ok();
}
- @RequestMapping(value = "/role/update/auth")
+ @RequestMapping(value = "/role/update/auth")
@ManagerAuth(memo = "瑙掕壊淇敼")
- public R update(Role role){
- if (Cools.isEmpty(role) || null==role.getId()){
+ public R update(Role role) {
+ if (Cools.isEmpty(role) || null == role.getId()) {
return R.error();
}
roleService.updateById(role);
@@ -107,8 +107,8 @@
@RequestMapping(value = "/role/delete/auth")
@ManagerAuth(memo = "瑙掕壊鍒犻櫎")
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
roleService.deleteBatchIds(Arrays.asList(ids));
@@ -117,7 +117,7 @@
@RequestMapping(value = "/role/export/auth")
@ManagerAuth(memo = "瑙掕壊瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<Role> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("role"));
@@ -152,7 +152,7 @@
Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (Role role : page.getRecords()){
+ for (Role role : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", role.getId());
map.put("value", role.getName());
diff --git a/src/main/java/com/zy/system/controller/SaasLogController.java b/src/main/java/com/zy/system/controller/SaasLogController.java
index 538364d..e604698 100644
--- a/src/main/java/com/zy/system/controller/SaasLogController.java
+++ b/src/main/java/com/zy/system/controller/SaasLogController.java
@@ -1,22 +1,24 @@
package com.zy.system.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.DateUtils;
-import com.zy.system.entity.SaasLog;
-import com.zy.system.service.SaasLogService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.SaasLog;
+import com.zy.system.service.SaasLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@RestController
public class SaasLogController extends BaseController {
@@ -32,23 +34,25 @@
@RequestMapping(value = "/saasLog/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<SaasLog> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- wrapper.orderBy("io_time",false);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
+ wrapper.orderBy("io_time", false);
return R.ok(saasLogService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -65,10 +69,10 @@
return R.ok();
}
- @RequestMapping(value = "/saasLog/update/auth")
- @ManagerAuth
- public R update(SaasLog saasLog){
- if (Cools.isEmpty(saasLog) || null==saasLog.getId()){
+ @RequestMapping(value = "/saasLog/update/auth")
+ @ManagerAuth
+ public R update(SaasLog saasLog) {
+ if (Cools.isEmpty(saasLog) || null == saasLog.getId()) {
return R.error();
}
saasLogService.updateById(saasLog);
@@ -77,8 +81,8 @@
@RequestMapping(value = "/saasLog/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
saasLogService.deleteById(id);
}
return R.ok();
@@ -86,7 +90,7 @@
@RequestMapping(value = "/saasLog/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<SaasLog> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("saasLog"));
@@ -102,7 +106,7 @@
wrapper.like("id", condition);
Page<SaasLog> page = saasLogService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (SaasLog saasLog : page.getRecords()){
+ for (SaasLog saasLog : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", saasLog.getId());
map.put("value", saasLog.getId());
@@ -115,7 +119,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<SaasLog> wrapper = new EntityWrapper<SaasLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != saasLogService.selectOne(wrapper)){
+ if (null != saasLogService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(SaasLog.class, String.valueOf(param.get("key"))));
}
return R.ok();
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index a823f5a..1d32309 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -3,15 +3,15 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Role;
import com.zy.system.entity.User;
import com.zy.system.service.RoleService;
import com.zy.system.service.UserService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,11 +33,11 @@
@RequestMapping(value = "/user/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<User> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -63,10 +63,10 @@
return R.ok(userService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -79,10 +79,10 @@
@RequestMapping(value = "/user/edit/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛缂栬緫")
public R edit(User user) {
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return R.error();
}
- if (null == user.getId()){
+ if (null == user.getId()) {
user.setStatus(1);
user.setCreateTime(new Date());
userService.insert(user);
@@ -101,20 +101,20 @@
return R.ok();
}
- @RequestMapping(value = "/user/update/auth")
+ @RequestMapping(value = "/user/update/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛淇敼")
- public R update(User user){
- if (Cools.isEmpty(user) || null==user.getId()){
+ public R update(User user) {
+ if (Cools.isEmpty(user) || null == user.getId()) {
return R.error();
}
User entity = userService.selectById(user.getId());
- if (user.getPassword()!=null) {
+ if (user.getPassword() != null) {
entity.setPassword(user.getPassword());
}
- if (user.getUsername()!=null) {
+ if (user.getUsername() != null) {
entity.setUsername(user.getUsername());
}
- if (user.getMobile()!=null) {
+ if (user.getMobile() != null) {
entity.setMobile(user.getMobile());
}
userService.updateById(entity);
@@ -123,8 +123,8 @@
@RequestMapping(value = "/user/delete/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛鍒犻櫎")
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ public R delete(@RequestParam(value = "ids[]") Long[] ids) {
+ for (Long id : ids) {
userService.deleteById(id);
}
return R.ok();
@@ -132,7 +132,7 @@
@RequestMapping(value = "/user/export/auth")
@ManagerAuth(memo = "绯荤粺鐢ㄦ埛瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<User> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("user"));
@@ -148,7 +148,7 @@
wrapper.like("username", condition);
Page<User> page = userService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (User user : page.getRecords()){
+ for (User user : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", user.getId());
map.put("value", user.getUsername());
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 031729f..4e6f5c2 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -29,11 +29,11 @@
@RequestMapping(value = "/userLogin/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
excludeTrash(param);
EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
convert(param, wrapper);
@@ -41,10 +41,10 @@
return R.ok(userLoginService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -57,10 +57,10 @@
@RequestMapping(value = "/userLogin/edit/auth")
@ManagerAuth
public R edit(UserLogin userLogin) {
- if (Cools.isEmpty(userLogin)){
+ if (Cools.isEmpty(userLogin)) {
return R.error();
}
- if (null == userLogin.getId()){
+ if (null == userLogin.getId()) {
userLoginService.insert(userLogin);
} else {
userLoginService.updateById(userLogin);
@@ -75,10 +75,10 @@
return R.ok();
}
- @RequestMapping(value = "/userLogin/update/auth")
+ @RequestMapping(value = "/userLogin/update/auth")
@ManagerAuth
- public R update(UserLogin userLogin){
- if (Cools.isEmpty(userLogin) || null==userLogin.getId()){
+ public R update(UserLogin userLogin) {
+ if (Cools.isEmpty(userLogin) || null == userLogin.getId()) {
return R.error();
}
userLoginService.updateById(userLogin);
@@ -87,8 +87,8 @@
@RequestMapping(value = "/userLogin/delete/auth")
@ManagerAuth
- public R delete(Integer[] ids){
- if (Cools.isEmpty(ids)){
+ public R delete(Integer[] ids) {
+ if (Cools.isEmpty(ids)) {
return R.error();
}
userLoginService.deleteBatchIds(Arrays.asList(ids));
@@ -97,7 +97,7 @@
@RequestMapping(value = "/userLogin/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<UserLogin> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("userLogin"));
@@ -113,7 +113,7 @@
wrapper.like("token", condition);
Page<UserLogin> page = userLoginService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (UserLogin userLogin : page.getRecords()){
+ for (UserLogin userLogin : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", userLogin.getId());
map.put("value", userLogin.getToken());
diff --git a/src/main/java/com/zy/system/entity/Api.java b/src/main/java/com/zy/system/entity/Api.java
index 9342543..3a80e0c 100644
--- a/src/main/java/com/zy/system/entity/Api.java
+++ b/src/main/java/com/zy/system/entity/Api.java
@@ -27,7 +27,7 @@
private String namespace;
/**
- * 鎺堟潈 0: 鏃犻渶鎺堟潈 1: 闇�瑕佹巿鏉�
+ * 鎺堟潈 0: 鏃犻渶鎺堟潈 1: 闇�瑕佹巿鏉�
*/
private Short oauth;
@@ -54,13 +54,14 @@
private Date updateTime;
/**
- * 鐘舵�� 1: 鏈夋晥 0: 绂佺敤
+ * 鐘舵�� 1: 鏈夋晥 0: 绂佺敤
*/
private Short status;
- public Api() {}
+ public Api() {
+ }
- public Api(String namespace,Short oauth,String request,String response,Date createTime,Date updateTime,Short status) {
+ public Api(String namespace, Short oauth, String request, String response, Date createTime, Date updateTime, Short status) {
this.namespace = namespace; // 鍛藉悕绌洪棿[闈炵┖]
this.oauth = oauth; // 鎺堟潈[闈炵┖]
this.request = request; // 璇锋眰缁撴瀯
@@ -90,9 +91,11 @@
return oauth;
}
- public String getOauth$(){
- if (null == this.oauth){ return null; }
- switch (this.oauth){
+ public String getOauth$() {
+ if (null == this.oauth) {
+ return null;
+ }
+ switch (this.oauth) {
case 0:
return "鏃犻渶鎺堟潈";
case 1:
@@ -126,8 +129,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -141,8 +144,8 @@
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -156,9 +159,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鏈夋晥";
case 0:
diff --git a/src/main/java/com/zy/system/entity/Config.java b/src/main/java/com/zy/system/entity/Config.java
index 9b6a39a..d472403 100644
--- a/src/main/java/com/zy/system/entity/Config.java
+++ b/src/main/java/com/zy/system/entity/Config.java
@@ -33,18 +33,19 @@
private String value;
/**
- * 绫诲瀷 1: String 2: JSON
+ * 绫诲瀷 1: String 2: JSON
*/
private Short type;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
private Short status;
- public Config() {}
+ public Config() {
+ }
- public Config(String name,String code,String value,Short type,Short status) {
+ public Config(String name, String code, String value, Short type, Short status) {
this.name = name;
this.code = code;
this.value = value;
@@ -96,9 +97,11 @@
return type;
}
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
+ public String getType$() {
+ if (null == this.type) {
+ return null;
+ }
+ switch (this.type) {
case 1:
return "String";
case 2:
@@ -116,9 +119,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
diff --git a/src/main/java/com/zy/system/entity/Host.java b/src/main/java/com/zy/system/entity/Host.java
index 28b85ab..e8c2458 100644
--- a/src/main/java/com/zy/system/entity/Host.java
+++ b/src/main/java/com/zy/system/entity/Host.java
@@ -44,13 +44,14 @@
private Date updateTime;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
private Integer status;
- public Host() {}
+ public Host() {
+ }
- public Host(String name,String flag,Date createTime,Date updateTime,Integer status) {
+ public Host(String name, String flag, Date createTime, Date updateTime, Integer status) {
this.name = name;
this.flag = flag;
this.createTime = createTime;
@@ -94,8 +95,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -109,8 +110,8 @@
return updateTime;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -124,9 +125,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
diff --git a/src/main/java/com/zy/system/entity/LicenseInfos.java b/src/main/java/com/zy/system/entity/LicenseInfos.java
index dafec6d..2e972b2 100644
--- a/src/main/java/com/zy/system/entity/LicenseInfos.java
+++ b/src/main/java/com/zy/system/entity/LicenseInfos.java
@@ -1,16 +1,17 @@
package com.zy.system.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotations.TableField;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("sys_license_infos")
@@ -18,24 +19,25 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String license;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String licenseTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- public LicenseInfos() {}
+ public LicenseInfos() {
+ }
- public LicenseInfos(String license,Date createTime) {
+ public LicenseInfos(String license, Date createTime) {
this.license = license;
this.createTime = createTime;
}
@@ -45,8 +47,8 @@
// null //
// );
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
diff --git a/src/main/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index 56b86cb..62feeb0 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -75,16 +75,17 @@
return userId;
}
- public String getUserId$(){
+ public String getUserId$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.userId);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return user.getUsername();
- } else if (this.userId==9527L){
+ } else if (this.userId == 9527L) {
return "鏈煡";
}
return "鏈煡";
}
+
public void setUserId(Long userId) {
this.userId = userId;
}
@@ -117,8 +118,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
diff --git a/src/main/java/com/zy/system/entity/Permission.java b/src/main/java/com/zy/system/entity/Permission.java
index 832ee3d..fa42f24 100644
--- a/src/main/java/com/zy/system/entity/Permission.java
+++ b/src/main/java/com/zy/system/entity/Permission.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.ResourceService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.service.ResourceService;
import java.io.Serializable;
@@ -38,13 +38,14 @@
private Long resourceId;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
private Short status;
- public Permission() {}
+ public Permission() {
+ }
- public Permission(String name,String action,Long resourceId,Short status) {
+ public Permission(String name, String action, Long resourceId, Short status) {
this.name = name;
this.action = action;
this.resourceId = resourceId;
@@ -86,10 +87,10 @@
return resourceId;
}
- public String getResourceName(){
+ public String getResourceName() {
ResourceService service = SpringUtils.getBean(ResourceService.class);
Resource resource = service.selectById(this.resourceId);
- if (!Cools.isEmpty(resource)){
+ if (!Cools.isEmpty(resource)) {
return resource.getName();
}
return null;
@@ -103,9 +104,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
diff --git a/src/main/java/com/zy/system/entity/Resource.java b/src/main/java/com/zy/system/entity/Resource.java
index c10a279..ab0f718 100644
--- a/src/main/java/com/zy/system/entity/Resource.java
+++ b/src/main/java/com/zy/system/entity/Resource.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.ResourceService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.service.ResourceService;
import java.io.Serializable;
@@ -38,7 +38,7 @@
private Long resourceId;
/**
- * 鑿滃崟绛夌骇 1: 涓�绾ц彍鍗� 2: 浜岀骇鑿滃崟
+ * 鑿滃崟绛夌骇 1: 涓�绾ц彍鍗� 2: 浜岀骇鑿滃崟
*/
private Short level;
@@ -48,13 +48,14 @@
private Integer sort;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
private Short status;
- public Resource() {}
+ public Resource() {
+ }
- public Resource(String code,String name,Long resourceId,Short level,Integer sort,Short status) {
+ public Resource(String code, String name, Long resourceId, Short level, Integer sort, Short status) {
this.code = code;
this.name = name;
this.resourceId = resourceId;
@@ -100,10 +101,10 @@
return resourceId;
}
- public String getResourceName(){
+ public String getResourceName() {
ResourceService service = SpringUtils.getBean(ResourceService.class);
Resource resource = service.selectById(this.resourceId);
- if (!Cools.isEmpty(resource)){
+ if (!Cools.isEmpty(resource)) {
return resource.getName();
}
return null;
@@ -117,9 +118,11 @@
return level;
}
- public String getLevel$(){
- if (null == this.level){ return null; }
- switch (this.level){
+ public String getLevel$() {
+ if (null == this.level) {
+ return null;
+ }
+ switch (this.level) {
case 1:
return "涓�绾ц彍鍗�";
case 2:
@@ -147,9 +150,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
diff --git a/src/main/java/com/zy/system/entity/Role.java b/src/main/java/com/zy/system/entity/Role.java
index 7f31512..9f40be1 100644
--- a/src/main/java/com/zy/system/entity/Role.java
+++ b/src/main/java/com/zy/system/entity/Role.java
@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.RoleService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.service.RoleService;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -18,37 +18,38 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 缂栫爜
*/
- @ApiModelProperty(value= "缂栫爜")
+ @ApiModelProperty(value = "缂栫爜")
private String code;
/**
* 鍚嶇О
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value = "鍚嶇О")
private String name;
/**
* 涓婄骇
*/
- @ApiModelProperty(value= "涓婄骇")
+ @ApiModelProperty(value = "涓婄骇")
private Long leader;
/**
- * 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇
+ * 瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇
*/
- @ApiModelProperty(value= "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ")
+ @ApiModelProperty(value = "瑙掕壊绛夌骇 1: 涓�绾� 2: 浜岀骇 3: 涓夌骇 4: 鍥涚骇 5: 浜旂骇 ")
private Short level;
- public Role() {}
+ public Role() {
+ }
- public Role(String code,String name,Long leader,Short level) {
+ public Role(String code, String name, Long leader, Short level) {
this.code = code;
this.name = name;
this.leader = leader;
@@ -90,10 +91,10 @@
return leader;
}
- public String getLeader$(){
+ public String getLeader$() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.leader);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return String.valueOf(role.getName());
}
return null;
@@ -107,9 +108,11 @@
return level;
}
- public String getLevel$(){
- if (null == this.level){ return null; }
- switch (this.level){
+ public String getLevel$() {
+ if (null == this.level) {
+ return null;
+ }
+ switch (this.level) {
case 1:
return "涓�绾�";
case 2:
diff --git a/src/main/java/com/zy/system/entity/RolePermission.java b/src/main/java/com/zy/system/entity/RolePermission.java
index 489de41..4b2dbdf 100644
--- a/src/main/java/com/zy/system/entity/RolePermission.java
+++ b/src/main/java/com/zy/system/entity/RolePermission.java
@@ -4,10 +4,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.PermissionService;
-import com.zy.system.service.RoleService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.service.PermissionService;
+import com.zy.system.service.RoleService;
import java.io.Serializable;
@@ -36,9 +36,10 @@
@TableField("permission_id")
private Long permissionId;
- public RolePermission() {}
+ public RolePermission() {
+ }
- public RolePermission(Long roleId,Long permissionId) {
+ public RolePermission(Long roleId, Long permissionId) {
this.roleId = roleId;
this.permissionId = permissionId;
}
@@ -60,10 +61,10 @@
return roleId;
}
- public String getRoleName(){
+ public String getRoleName() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.roleId);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return role.getName();
}
return null;
@@ -77,10 +78,10 @@
return permissionId;
}
- public String getPermissionName(){
+ public String getPermissionName() {
PermissionService service = SpringUtils.getBean(PermissionService.class);
Permission permission = service.selectById(this.permissionId);
- if (!Cools.isEmpty(permission)){
+ if (!Cools.isEmpty(permission)) {
return permission.getName();
}
return null;
diff --git a/src/main/java/com/zy/system/entity/SaasLog.java b/src/main/java/com/zy/system/entity/SaasLog.java
index 36d64e3..772b6cc 100644
--- a/src/main/java/com/zy/system/entity/SaasLog.java
+++ b/src/main/java/com/zy/system/entity/SaasLog.java
@@ -1,16 +1,17 @@
package com.zy.system.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("sys_saas_log")
@@ -21,38 +22,39 @@
/**
* id
*/
- @ApiModelProperty(value= "id")
+ @ApiModelProperty(value = "id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* {0:鍏ュ簱,1:鍑哄簱}
*/
- @ApiModelProperty(value= "{0:鍏ュ簱,1:鍑哄簱}")
+ @ApiModelProperty(value = "{0:鍏ュ簱,1:鍑哄簱}")
private Integer type;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String matnr;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("create_by")
private Long createBy;
@TableField("anfme")
private Double anfme;
- public SaasLog() {}
+ public SaasLog() {
+ }
- public SaasLog(Long id,Integer type,String locNo,String matnr,Date ioTime,Long createBy) {
+ public SaasLog(Long id, Integer type, String locNo, String matnr, Date ioTime, Long createBy) {
this.id = id;
this.type = type;
this.locNo = locNo;
@@ -70,23 +72,23 @@
// null //
// );
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
+ public String getIoTime$() {
+ if (Cools.isEmpty(this.ioTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getType$(){
- if (this.type ==0) {
+ public String getType$() {
+ if (this.type == 0) {
return "鍏ュ簱";
- } else if (this.type == 1) {
+ } else if (this.type == 1) {
return "鍑哄簱";
} else if (this.type == 2) {
return "搴撲綅绉昏浆";
} else if (this.type == 3) {
return "搴撳瓨璋冩暣";
- }else {
+ } else {
return "";
}
diff --git a/src/main/java/com/zy/system/entity/User.java b/src/main/java/com/zy/system/entity/User.java
index 98d856f..f04af64 100644
--- a/src/main/java/com/zy/system/entity/User.java
+++ b/src/main/java/com/zy/system/entity/User.java
@@ -110,7 +110,7 @@
public String getHostName() {
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
+ if (!Cools.isEmpty(host)) {
return host.getName();
}
return null;
@@ -185,9 +185,11 @@
return sex;
}
- public String getSex$(){
- if (null == this.sex){ return null; }
- switch (this.sex){
+ public String getSex$() {
+ if (null == this.sex) {
+ return null;
+ }
+ switch (this.sex) {
case 0:
return "鐢�";
case 1:
@@ -207,10 +209,10 @@
return roleId;
}
- public String getRoleName(){
+ public String getRoleName() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.roleId);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return role.getName();
}
return null;
@@ -224,8 +226,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
@@ -239,9 +241,11 @@
return status;
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "鍚敤";
case 0:
diff --git a/src/main/java/com/zy/system/entity/UserLogin.java b/src/main/java/com/zy/system/entity/UserLogin.java
index a585ee8..8d4c326 100644
--- a/src/main/java/com/zy/system/entity/UserLogin.java
+++ b/src/main/java/com/zy/system/entity/UserLogin.java
@@ -4,9 +4,9 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.system.service.UserService;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,7 +29,7 @@
/**
* 鎵�灞為」鐩�
*/
- @ApiModelProperty(value= "鎵�灞為」鐩�")
+ @ApiModelProperty(value = "鎵�灞為」鐩�")
@TableField("host_id")
private Long hostId;
@@ -76,14 +76,15 @@
return userId;
}
- public String getUserUsername(){
+ public String getUserUsername() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.userId);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return user.getUsername();
}
return null;
}
+
public void setUserId(Long userId) {
this.userId = userId;
}
@@ -100,8 +101,8 @@
return createTime;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
diff --git a/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java b/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java
index cb413ae..1075c92 100644
--- a/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java
+++ b/src/main/java/com/zy/system/entity/license/AbstractServerInfos.java
@@ -19,7 +19,7 @@
/**
* 缁勮闇�瑕侀澶栨牎楠岀殑License鍙傛暟
*/
- public LicenseCheck getServerInfos(){
+ public LicenseCheck getServerInfos() {
LicenseCheck result = new LicenseCheck();
try {
@@ -27,8 +27,8 @@
result.setMacAddress(this.getMacAddress());
result.setCpuSerial(this.getCPUSerial());
result.setMainBoardSerial(this.getMainBoardSerial());
- }catch (Exception e){
- logger.error("鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭け璐�",e);
+ } catch (Exception e) {
+ logger.error("鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭け璐�", e);
}
return result;
@@ -68,8 +68,8 @@
InetAddress inetAddr = (InetAddress) inetAddresses.nextElement();
//鎺掗櫎LoopbackAddress銆丼iteLocalAddress銆丩inkLocalAddress銆丮ulticastAddress绫诲瀷鐨処P鍦板潃
- if(!inetAddr.isLoopbackAddress() /*&& !inetAddr.isSiteLocalAddress()*/
- && !inetAddr.isLinkLocalAddress() && !inetAddr.isMulticastAddress()){
+ if (!inetAddr.isLoopbackAddress() /*&& !inetAddr.isSiteLocalAddress()*/
+ && !inetAddr.isLinkLocalAddress() && !inetAddr.isMulticastAddress()) {
result.add(inetAddr);
}
}
@@ -81,21 +81,21 @@
/**
* 鑾峰彇鏌愪釜缃戠粶鎺ュ彛鐨凪ac鍦板潃
*/
- protected String getMacByInetAddress(InetAddress inetAddr){
+ protected String getMacByInetAddress(InetAddress inetAddr) {
try {
byte[] mac = NetworkInterface.getByInetAddress(inetAddr).getHardwareAddress();
StringBuffer stringBuffer = new StringBuffer();
- for(int i=0;i<mac.length;i++){
- if(i != 0) {
+ for (int i = 0; i < mac.length; i++) {
+ if (i != 0) {
stringBuffer.append("-");
}
//灏嗗崄鍏繘鍒禸yte杞寲涓哄瓧绗︿覆
String temp = Integer.toHexString(mac[i] & 0xff);
- if(temp.length() == 1){
+ if (temp.length() == 1) {
stringBuffer.append("0" + temp);
- }else{
+ } else {
stringBuffer.append(temp);
}
}
diff --git a/src/main/java/com/zy/system/entity/license/CustomKeyStoreParam.java b/src/main/java/com/zy/system/entity/license/CustomKeyStoreParam.java
index 1732b20..f1cab8b 100644
--- a/src/main/java/com/zy/system/entity/license/CustomKeyStoreParam.java
+++ b/src/main/java/com/zy/system/entity/license/CustomKeyStoreParam.java
@@ -2,7 +2,9 @@
import de.schlichtherle.license.AbstractKeyStoreParam;
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
/**
* 鑷畾涔塊eyStoreParam锛岀敤浜庡皢鍏閽ュ瓨鍌ㄦ枃浠跺瓨鏀惧埌鍏朵粬纾佺洏浣嶇疆鑰屼笉鏄」鐩腑
diff --git a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
index 9a7fc6d..36d042f 100644
--- a/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
+++ b/src/main/java/com/zy/system/entity/license/CustomLicenseManager.java
@@ -16,7 +16,7 @@
/**
* 鑷畾涔塋icenseManager锛岀敤浜庡鍔犻澶栫殑鏈嶅姟鍣ㄧ‖浠朵俊鎭牎楠�
*/
-public class CustomLicenseManager extends LicenseManager{
+public class CustomLicenseManager extends LicenseManager {
private static Logger logger = LogManager.getLogger(CustomLicenseManager.class);
//XML缂栫爜
@@ -57,7 +57,7 @@
final GenericCertificate certificate = getPrivacyGuard().key2cert(key);
notary.verify(certificate);
- final LicenseContent content = (LicenseContent)this.load(certificate.getEncoded());
+ final LicenseContent content = (LicenseContent) this.load(certificate.getEncoded());
this.validate(content);
setLicenseKey(key);
setCertificate(certificate);
@@ -75,13 +75,13 @@
// Load license key from preferences,
final byte[] key = getLicenseKey();
- if (null == key){
+ if (null == key) {
throw new NoLicenseInstalledException(getLicenseParam().getSubject());
}
certificate = getPrivacyGuard().key2cert(key);
notary.verify(certificate);
- final LicenseContent content = (LicenseContent)this.load(certificate.getEncoded());
+ final LicenseContent content = (LicenseContent) this.load(certificate.getEncoded());
this.validate(content);
setCertificate(certificate);
@@ -98,14 +98,14 @@
final Date now = new Date();
final Date notBefore = content.getNotBefore();
final Date notAfter = content.getNotAfter();
- if (null != notAfter && now.after(notAfter)){
+ if (null != notAfter && now.after(notAfter)) {
throw new LicenseContentException("璇佷功澶辨晥鏃堕棿涓嶈兘鏃╀簬褰撳墠鏃堕棿");
}
- if (null != notBefore && null != notAfter && notAfter.before(notBefore)){
+ if (null != notBefore && null != notAfter && notAfter.before(notBefore)) {
throw new LicenseContentException("璇佷功鐢熸晥鏃堕棿涓嶈兘鏅氫簬璇佷功澶辨晥鏃堕棿");
}
final String consumerType = content.getConsumerType();
- if (null == consumerType){
+ if (null == consumerType) {
throw new LicenseContentException("鐢ㄦ埛绫诲瀷涓嶈兘涓虹┖");
}
}
@@ -126,27 +126,27 @@
//褰撳墠鏈嶅姟鍣ㄧ湡瀹炵殑鍙傛暟淇℃伅
LicenseCheck serverCheckModel = getServerInfos();
- if(expectedCheckModel != null && serverCheckModel != null){
+ if (expectedCheckModel != null && serverCheckModel != null) {
//鏍￠獙IP鍦板潃
- if(!checkIpAddress(expectedCheckModel.getIpAddress(),serverCheckModel.getIpAddress())){
+ if (!checkIpAddress(expectedCheckModel.getIpAddress(), serverCheckModel.getIpAddress())) {
throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑IP娌″湪鎺堟潈鑼冨洿鍐�");
}
//鏍￠獙Mac鍦板潃
- if(!checkIpAddress(expectedCheckModel.getMacAddress(),serverCheckModel.getMacAddress())){
+ if (!checkIpAddress(expectedCheckModel.getMacAddress(), serverCheckModel.getMacAddress())) {
throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑Mac鍦板潃娌″湪鎺堟潈鑼冨洿鍐�");
}
//鏍￠獙涓绘澘搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getMainBoardSerial(),serverCheckModel.getMainBoardSerial())){
+ if (!checkSerial(expectedCheckModel.getMainBoardSerial(), serverCheckModel.getMainBoardSerial())) {
throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑涓绘澘搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
}
//鏍￠獙CPU搴忓垪鍙�
- if(!checkSerial(expectedCheckModel.getCpuSerial(),serverCheckModel.getCpuSerial())){
+ if (!checkSerial(expectedCheckModel.getCpuSerial(), serverCheckModel.getCpuSerial())) {
throw new LicenseContentException("褰撳墠鏈嶅姟鍣ㄧ殑CPU搴忓垪鍙锋病鍦ㄦ巿鏉冭寖鍥村唴");
}
- }else{
+ } else {
throw new LicenseContentException("涓嶈兘鑾峰彇鏈嶅姟鍣ㄧ‖浠朵俊鎭�");
}
}
@@ -155,27 +155,27 @@
/**
* 閲嶅啓XMLDecoder瑙ｆ瀽XML
*/
- private Object load(String encoded){
+ private Object load(String encoded) {
BufferedInputStream inputStream = null;
XMLDecoder decoder = null;
try {
inputStream = new BufferedInputStream(new ByteArrayInputStream(encoded.getBytes(XML_CHARSET)));
- decoder = new XMLDecoder(new BufferedInputStream(inputStream, DEFAULT_BUFSIZE),null,null);
+ decoder = new XMLDecoder(new BufferedInputStream(inputStream, DEFAULT_BUFSIZE), null, null);
return decoder.readObject();
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} finally {
try {
- if(decoder != null){
+ if (decoder != null) {
decoder.close();
}
- if(inputStream != null){
+ if (inputStream != null) {
inputStream.close();
}
} catch (Exception e) {
- logger.error("XMLDecoder瑙ｆ瀽XML澶辫触",e);
+ logger.error("XMLDecoder瑙ｆ瀽XML澶辫触", e);
}
}
@@ -185,7 +185,7 @@
/**
* 鑾峰彇褰撳墠鏈嶅姟鍣ㄩ渶瑕侀澶栨牎楠岀殑License鍙傛暟
*/
- private LicenseCheck getServerInfos(){
+ private LicenseCheck getServerInfos() {
//鎿嶄綔绯荤粺绫诲瀷
String osName = System.getProperty("os.name").toLowerCase();
AbstractServerInfos abstractServerInfos = null;
@@ -195,7 +195,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -206,18 +206,18 @@
* 鏍￠獙褰撳墠鏈嶅姟鍣ㄧ殑IP/Mac鍦板潃鏄惁鍦ㄥ彲琚厑璁哥殑IP鑼冨洿鍐�<br/>
* 濡傛灉瀛樺湪IP鍦ㄥ彲琚厑璁哥殑IP/Mac鍦板潃鑼冨洿鍐咃紝鍒欒繑鍥瀟rue
*/
- private boolean checkIpAddress(List<String> expectedList,List<String> serverList){
- if(expectedList != null && expectedList.size() > 0){
- if(serverList != null && serverList.size() > 0){
- for(String expected : expectedList){
- if(serverList.contains(expected.trim())){
+ private boolean checkIpAddress(List<String> expectedList, List<String> serverList) {
+ if (expectedList != null && expectedList.size() > 0) {
+ if (serverList != null && serverList.size() > 0) {
+ for (String expected : expectedList) {
+ if (serverList.contains(expected.trim())) {
return true;
}
}
}
return false;
- }else {
+ } else {
return true;
}
}
@@ -225,15 +225,15 @@
/**
* 鏍￠獙褰撳墠鏈嶅姟鍣ㄧ‖浠讹紙涓绘澘銆丆PU绛夛級搴忓垪鍙锋槸鍚﹀湪鍙厑璁歌寖鍥村唴
*/
- private boolean checkSerial(String expectedSerial,String serverSerial){
- if(!Cools.isEmpty(expectedSerial)){
- if(!Cools.isEmpty(serverSerial)){
- if(expectedSerial.equals(serverSerial)){
+ private boolean checkSerial(String expectedSerial, String serverSerial) {
+ if (!Cools.isEmpty(expectedSerial)) {
+ if (!Cools.isEmpty(serverSerial)) {
+ if (expectedSerial.equals(serverSerial)) {
return true;
}
}
return false;
- }else{
+ } else {
return true;
}
}
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 7e28bf9..2c2f6ab 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -1,8 +1,6 @@
package com.zy.system.entity.license;
-import com.core.common.Cools;
import com.zy.system.timer.LicenseTimer;
-import de.schlichtherle.license.LicenseContent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -11,9 +9,6 @@
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.util.Date;
/**
* 鍦ㄩ」鐩惎鍔ㄦ椂瀹夎璇佷功
@@ -53,34 +48,34 @@
public void onApplicationEvent(ContextRefreshedEvent event) {
//root application context 娌℃湁parent
ApplicationContext context = event.getApplicationContext().getParent();
- if(context == null){
+ if (context == null) {
loadLicense();
}
}
//鍔犺浇璇佷功
public boolean loadLicense() {
- logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
+ logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
- try {
+ try {
- LicenseVerifyParam param = new LicenseVerifyParam();
- param.setSubject(subject);
- param.setPublicAlias(publicAlias);
- param.setStorePass(storePass);
- param.setPublicKeysStorePath(publicKeysStorePath);
+ LicenseVerifyParam param = new LicenseVerifyParam();
+ param.setSubject(subject);
+ param.setPublicAlias(publicAlias);
+ param.setStorePass(storePass);
+ param.setPublicKeysStorePath(publicKeysStorePath);
- licenseTimer.timer();
+ licenseTimer.timer();
- logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
+ logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
- logger.info("++++++++ 璁稿彲璇佸姞杞芥爣璁帮紝鎼滅储淇敼 ++++++++");
+ logger.info("++++++++ 璁稿彲璇佸姞杞芥爣璁帮紝鎼滅储淇敼 ++++++++");
// licenseTimer.setSystemSupport(true);
// licenseTimer.setLicenseDays(9999);
- return true;
+ return true;
- } catch (Exception e) {
- return false;
- }
+ } catch (Exception e) {
+ return false;
+ }
}
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCreator.java b/src/main/java/com/zy/system/entity/license/LicenseCreator.java
index 01f2ad1..70c2fa3 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCreator.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCreator.java
@@ -24,16 +24,16 @@
/**
* 鐢熸垚License璇佷功
*/
- public boolean generateLicense(){
+ public boolean generateLicense() {
try {
LicenseManager licenseManager = new CustomLicenseManager(initLicenseParam());
LicenseContent licenseContent = initLicenseContent();
- licenseManager.store(licenseContent,new File(param.getLicensePath()));
+ licenseManager.store(licenseContent, new File(param.getLicensePath()));
return true;
- }catch (Exception e){
- logger.error(MessageFormat.format("璇佷功鐢熸垚澶辫触锛歿0}",param),e);
+ } catch (Exception e) {
+ logger.error(MessageFormat.format("璇佷功鐢熸垚澶辫触锛歿0}", param), e);
return false;
}
}
@@ -41,22 +41,22 @@
/**
* 鍒濆鍖栬瘉涔︾敓鎴愬弬鏁�
*/
- private LicenseParam initLicenseParam(){
+ private LicenseParam initLicenseParam() {
Preferences preferences = Preferences.userNodeForPackage(LicenseCreator.class);
//璁剧疆瀵硅瘉涔﹀唴瀹瑰姞瀵嗙殑绉橀挜
CipherParam cipherParam = new DefaultCipherParam(param.getStorePass());
KeyStoreParam privateStoreParam = new CustomKeyStoreParam(LicenseCreator.class
- ,param.getPrivateKeysStorePath()
- ,param.getPrivateAlias()
- ,param.getStorePass()
- ,param.getKeyPass());
+ , param.getPrivateKeysStorePath()
+ , param.getPrivateAlias()
+ , param.getStorePass()
+ , param.getKeyPass());
LicenseParam licenseParam = new DefaultLicenseParam(param.getSubject()
- ,preferences
- ,privateStoreParam
- ,cipherParam);
+ , preferences
+ , privateStoreParam
+ , cipherParam);
return licenseParam;
}
@@ -64,7 +64,7 @@
/**
* 璁剧疆璇佷功鐢熸垚姝ｆ枃淇℃伅
*/
- private LicenseContent initLicenseContent(){
+ private LicenseContent initLicenseContent() {
LicenseContent licenseContent = new LicenseContent();
licenseContent.setHolder(DEFAULT_HOLDER_AND_ISSUER);
licenseContent.setIssuer(DEFAULT_HOLDER_AND_ISSUER);
diff --git a/src/main/java/com/zy/system/entity/license/LicenseVerify.java b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
index da239c0..709df99 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseVerify.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseVerify.java
@@ -46,16 +46,16 @@
/**
* 鏍￠獙License璇佷功
*/
- public boolean verify(){
+ public boolean verify() {
try {
LicenseManager licenseManager = LicenseManagerHolder.getInstance(null);
DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
LicenseContent licenseContent = licenseManager.verify();
- logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}",format.format(licenseContent.getNotBefore()),format.format(licenseContent.getNotAfter())));
+ logger.info(MessageFormat.format("璁稿彲璇佹牎楠岄�氳繃锛岃鍙瘉鏈夋晥鏈燂細{0} - {1}", format.format(licenseContent.getNotBefore()), format.format(licenseContent.getNotAfter())));
return true;
- }catch (Exception e){
- logger.error("璁稿彲璇佹牎楠屽け璐ワ紒",e);
+ } catch (Exception e) {
+ logger.error("璁稿彲璇佹牎楠屽け璐ワ紒", e);
return false;
}
}
@@ -63,46 +63,48 @@
/**
* 鏍￠獙License璇佷功骞惰幏鍙栬瘉涔︿俊鎭�
*/
- public LicenseContent getVerifyInfo(){
+ public LicenseContent getVerifyInfo() {
LicenseManager licenseManager = LicenseManagerHolder.getInstance(null);
//鏍￠獙璇佷功
try {
LicenseContent licenseContent = licenseManager.verify();
return licenseContent;
- }catch (Exception e){
- logger.error("璁稿彲璇佹牎楠屽け璐ワ紒",e);
+ } catch (Exception e) {
+ logger.error("璁稿彲璇佹牎楠屽け璐ワ紒", e);
return null;
}
}
/**
* 鍒濆鍖栬瘉涔︾敓鎴愬弬鏁�
+ *
* @param param License鏍￠獙绫婚渶瑕佺殑鍙傛暟
* @return de.schlichtherle.license.LicenseParam
*/
- private LicenseParam initLicenseParam(LicenseVerifyParam param){
+ private LicenseParam initLicenseParam(LicenseVerifyParam param) {
Preferences preferences = Preferences.userNodeForPackage(LicenseVerify.class);
CipherParam cipherParam = new DefaultCipherParam(param.getStorePass());
KeyStoreParam publicStoreParam = new CustomKeyStoreParam(LicenseVerify.class
- ,param.getPublicKeysStorePath()
- ,param.getPublicAlias()
- ,param.getStorePass()
- ,null);
+ , param.getPublicKeysStorePath()
+ , param.getPublicAlias()
+ , param.getStorePass()
+ , null);
return new DefaultLicenseParam(param.getSubject()
- ,preferences
- ,publicStoreParam
- ,cipherParam);
+ , preferences
+ , publicStoreParam
+ , cipherParam);
}
/**
* 灏咮ase64瀛楃涓茶浆鎹负涓存椂鏂囦欢
+ *
* @param base64String Base64缂栫爜鐨勫瓧绗︿覆
- * @param filePrefix 鏂囦欢鍚嶅墠缂�锛堜緥濡� "license_"锛�
- * @param fileSuffix 鏂囦欢鍚庣紑锛堜緥濡� ".lic"锛�
+ * @param filePrefix 鏂囦欢鍚嶅墠缂�锛堜緥濡� "license_"锛�
+ * @param fileSuffix 鏂囦欢鍚庣紑锛堜緥濡� ".lic"锛�
* @return 鐢熸垚鐨勪复鏃禙ile瀵硅薄锛堣嚜鍔ㄥ湪JVM閫�鍑烘椂鍒犻櫎锛�
* @throws IOException
*/
diff --git a/src/main/java/com/zy/system/entity/license/LicenseVerifyParam.java b/src/main/java/com/zy/system/entity/license/LicenseVerifyParam.java
index 3d5e40e..bbbf00d 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseVerifyParam.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseVerifyParam.java
@@ -24,7 +24,6 @@
private String storePass;
-
/**
* 瀵嗛挜搴撳瓨鍌ㄨ矾寰�
*/
diff --git a/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java b/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
index c575e6d..6f8b774 100644
--- a/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
+++ b/src/main/java/com/zy/system/entity/license/WindowsServerInfos.java
@@ -17,7 +17,7 @@
//鑾峰彇鎵�鏈夌綉缁滄帴鍙�
List<InetAddress> inetAddresses = getLocalAllInetAddress();
- if(inetAddresses != null && inetAddresses.size() > 0){
+ if (inetAddresses != null && inetAddresses.size() > 0) {
result = inetAddresses.stream().map(InetAddress::getHostAddress).distinct().map(String::toLowerCase).collect(Collectors.toList());
}
@@ -31,7 +31,7 @@
//1. 鑾峰彇鎵�鏈夌綉缁滄帴鍙�
List<InetAddress> inetAddresses = getLocalAllInetAddress();
- if(inetAddresses != null && inetAddresses.size() > 0){
+ if (inetAddresses != null && inetAddresses.size() > 0) {
//2. 鑾峰彇鎵�鏈夌綉缁滄帴鍙ｇ殑Mac鍦板潃
result = inetAddresses.stream().map(this::getMacByInetAddress).distinct().collect(Collectors.toList());
}
@@ -49,11 +49,11 @@
process.getOutputStream().close();
Scanner scanner = new Scanner(process.getInputStream());
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
scanner.next();
}
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
serialNumber = scanner.next().trim();
}
@@ -71,11 +71,11 @@
process.getOutputStream().close();
Scanner scanner = new Scanner(process.getInputStream());
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
scanner.next();
}
- if(scanner.hasNext()){
+ if (scanner.hasNext()) {
serialNumber = scanner.next().trim();
}
diff --git a/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java b/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java
index 2e51ff1..7a47079 100644
--- a/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java
+++ b/src/main/java/com/zy/system/mapper/LicenseInfosMapper.java
@@ -1,7 +1,7 @@
package com.zy.system.mapper;
-import com.zy.system.entity.LicenseInfos;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.system.entity.LicenseInfos;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/mapper/SaasLogMapper.java b/src/main/java/com/zy/system/mapper/SaasLogMapper.java
index 21975a7..e99397e 100644
--- a/src/main/java/com/zy/system/mapper/SaasLogMapper.java
+++ b/src/main/java/com/zy/system/mapper/SaasLogMapper.java
@@ -1,7 +1,7 @@
package com.zy.system.mapper;
-import com.zy.system.entity.SaasLog;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.system.entity.SaasLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/system/service/LicenseInfosService.java b/src/main/java/com/zy/system/service/LicenseInfosService.java
index dc3dc04..75fdaab 100644
--- a/src/main/java/com/zy/system/service/LicenseInfosService.java
+++ b/src/main/java/com/zy/system/service/LicenseInfosService.java
@@ -1,7 +1,7 @@
package com.zy.system.service;
-import com.zy.system.entity.LicenseInfos;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.system.entity.LicenseInfos;
public interface LicenseInfosService extends IService<LicenseInfos> {
diff --git a/src/main/java/com/zy/system/service/SaasLogService.java b/src/main/java/com/zy/system/service/SaasLogService.java
index 5d4e5f7..1d8693b 100644
--- a/src/main/java/com/zy/system/service/SaasLogService.java
+++ b/src/main/java/com/zy/system/service/SaasLogService.java
@@ -1,7 +1,7 @@
package com.zy.system.service;
-import com.zy.system.entity.SaasLog;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.system.entity.SaasLog;
public interface SaasLogService extends IService<SaasLog> {
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index 8bb1bf9..f6645d3 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -13,9 +13,11 @@
public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
@Override
- public Config selectConfigByCode(String code){
+ public Config selectConfigByCode(String code) {
return this.baseMapper.selectConfigByCode(code);
- };
+ }
+
+ ;
@Override
@SuppressWarnings("unchecked")
diff --git a/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java b/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java
index 2a6b9b3..491a6c2 100644
--- a/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/LicenseInfosServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.system.service.impl;
-import com.zy.system.mapper.LicenseInfosMapper;
-import com.zy.system.entity.LicenseInfos;
-import com.zy.system.service.LicenseInfosService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.system.entity.LicenseInfos;
+import com.zy.system.mapper.LicenseInfosMapper;
+import com.zy.system.service.LicenseInfosService;
import org.springframework.stereotype.Service;
@Service("licenseInfosService")
diff --git a/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java b/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
index 6a460a0..960a05f 100644
--- a/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/OperateLogServiceImpl.java
@@ -1,10 +1,10 @@
package com.zy.system.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.zy.system.entity.OperateLog;
import com.zy.system.mapper.OperateLogMapper;
import com.zy.system.service.OperateLogService;
-import com.core.common.Cools;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/zy/system/service/impl/SaasLogServiceImpl.java b/src/main/java/com/zy/system/service/impl/SaasLogServiceImpl.java
index ceacc73..733913b 100644
--- a/src/main/java/com/zy/system/service/impl/SaasLogServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/SaasLogServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.system.service.impl;
-import com.zy.system.mapper.SaasLogMapper;
-import com.zy.system.entity.SaasLog;
-import com.zy.system.service.SaasLogService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.system.entity.SaasLog;
+import com.zy.system.mapper.SaasLogMapper;
+import com.zy.system.service.SaasLogService;
import org.springframework.stereotype.Service;
@Service("saasLogService")
diff --git a/src/main/java/com/zy/system/timer/LicenseTimer.java b/src/main/java/com/zy/system/timer/LicenseTimer.java
index 90d10f6..aa4e860 100644
--- a/src/main/java/com/zy/system/timer/LicenseTimer.java
+++ b/src/main/java/com/zy/system/timer/LicenseTimer.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.core.common.Cools;
import com.zy.common.utils.HttpHandler;
import com.zy.system.entity.LicenseInfos;
import com.zy.system.entity.license.*;
@@ -76,7 +75,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
LicenseCheck serverInfos = abstractServerInfos.getServerInfos();
@@ -132,7 +131,7 @@
int day = (int) (num / 24 / 60 / 60 / 1000);
setLicenseDays(day);
setSystemSupport(true);
- }else {
+ } else {
setLicenseDays(0);
setSystemSupport(false);
}
diff --git a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
index 12e4a0a..8843d89 100644
--- a/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
+++ b/src/main/java/com/zy/system/timer/LoadingConfigTimer.java
@@ -28,6 +28,8 @@
*/
private Integer logDeleteDays = 360;
+ // erp涓婃姤
+ private Boolean erpReport = false;
@Autowired
@@ -38,6 +40,8 @@
tokenExpire = configService.getVal("tokenExpire", Integer.class, tokenExpire);
tokenNumber = configService.getVal("tokenNumber", Integer.class, tokenNumber);
logDeleteDays = configService.getVal("logDeleteDays", Integer.class, logDeleteDays);
+ erpReport = configService.getVal("erpReport", Boolean.class, erpReport);
+
}
--
Gitblit v1.9.1