From 82de5a307466894bbb0258f8a63a26a7bb96d80d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 16 十月 2025 09:55:35 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 1
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 | 4
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/controller/LocMastController.java | 100
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/entity/OrderDetlReportLog.java | 132
src/main/java/com/zy/asrs/service/AutoMoveService.java | 2
src/main/java/com/zy/system/entity/UserLogin.java | 13
src/main/java/com/zy/asrs/entity/param/TagParam.java | 1
src/main/java/com/zy/asrs/controller/StaDescController.java | 66
src/main/java/com/zy/asrs/utils/Utils.java | 65
src/main/java/com/zy/asrs/task/ErrorStockScheduler.java | 88
src/main/java/com/zy/system/service/LicenseInfosService.java | 2
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 126
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/system/entity/license/LicenseCheckListener.java | 6
src/main/java/com/zy/asrs/controller/BasLocStsController.java | 48
src/main/java/com/zy/system/controller/UserController.java | 50
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 9
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 13
src/main/java/com/zy/system/entity/license/LicenseVerify.java | 36
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 215
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/common/config/SwaggerConfig.java | 5
src/main/java/com/zy/asrs/entity/param/StaDescInitParam.java | 14
src/main/java/com/zy/asrs/mapper/OrderMapper.java | 6
src/main/java/com/zy/asrs/mapper/BasCrnOptMapper.java | 2
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 7
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/system/controller/LicenseCreatorController.java | 14
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/system/entity/Permission.java | 21
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 | 135
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 42
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/entity/param/GTOrderParam.java | 2
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/common/config/WebSocketServer.java | 11
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 | 32
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/task/kingdee/handler/SubmitOrderSyncHandler.java | 19
src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java | 4
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 22
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 48
src/main/java/com/zy/asrs/entity/Order.java | 149
src/main/java/com/zy/system/service/SaasLogService.java | 2
src/main/java/com/zy/asrs/controller/WrkDetlLogController.java | 4
src/main/java/com/zy/asrs/entity/WaitPakin.java | 128
src/main/java/com/zy/asrs/entity/BasLocSts.java | 37
src/main/resources/application.yml | 2
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 30
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/ViewInOutBean.java | 130
src/main/java/com/zy/asrs/service/BasCrnOptService.java | 2
src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java | 24
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 4
src/main/java/com/zy/system/controller/ConfigController.java | 54
src/main/java/com/zy/asrs/mapper/OrderDetlReportLogMapper.java | 2
src/main/java/com/zy/asrs/entity/Tag.java | 77
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/controller/TrayCodeController.java | 59
src/main/java/com/zy/asrs/entity/WrkDetl.java | 138
src/main/java/com/zy/asrs/controller/AutoMoveController.java | 52
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/timer/LedWebsocket.java | 72
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/entity/param/InventoryErpParam.java | 6
src/main/java/com/zy/common/model/TaskDto.java | 8
src/main/java/com/zy/common/model/LocDto.java | 5
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/asrs/service/OrderDetlReportService.java | 4
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 | 129
src/main/java/com/zy/common/utils/TreeUtils.java | 8
src/main/java/com/zy/asrs/controller/WrkLastnoController.java | 46
src/main/java/com/zy/common/utils/Http.java | 2
src/main/java/com/zy/common/model/WrkDto.java | 2
src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java | 2
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 5
src/main/java/com/zy/asrs/entity/BasWhs.java | 39
src/main/java/com/zy/asrs/entity/DocType.java | 68
src/main/java/com/zy/asrs/task/CheckDeepScheduler.java | 9
src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java | 2
src/main/java/com/zy/asrs/service/ApiLogService.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 456 --
src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java | 38
src/main/java/com/zy/asrs/controller/OrderController.java | 95
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 19
src/main/java/com/zy/asrs/controller/OpenController.java | 4
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/task/handler/WorkLogHandler.java | 11
src/main/java/com/zy/asrs/entity/AutoMove.java | 62
src/main/java/com/zy/common/web/FileController.java | 12
src/main/java/com/zy/asrs/task/BareBoardScheduler.java | 16
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 34
src/main/java/com/zy/common/utils/RedisUtil.java | 1
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 6
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/service/LocMastService.java | 21
src/main/java/com/zy/system/controller/SaasLogController.java | 52
src/main/java/com/zy/asrs/controller/ReportQueryController.java | 571 +-
src/main/java/com/zy/asrs/entity/StaDesc.java | 65
src/main/java/com/zy/asrs/entity/DocLog.java | 37
src/main/java/com/zy/asrs/entity/vo/LocChartPie.java | 57
src/main/java/com/zy/asrs/entity/param/pdaAdjustParam.java | 4
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 | 2
src/main/java/com/zy/asrs/entity/BasCrnp.java | 93
src/main/java/com/zy/asrs/entity/param/MatSyncParam.java | 4
src/main/java/com/zy/asrs/entity/param/MatDto.java | 7
src/main/java/com/zy/asrs/utils/InitStaDesc.java | 10
src/main/java/com/zy/common/web/AuthController.java | 50
src/main/java/com/zy/asrs/command/LedCommand.java | 2
src/main/java/com/zy/asrs/mapper/TrayCodeMapper.java | 2
src/main/java/com/zy/system/timer/LicenseTimer.java | 5
src/main/java/com/zy/system/entity/Api.java | 33
src/main/java/com/zy/common/service/CommonService.java | 10
src/main/java/com/zy/system/controller/RoleController.java | 40
src/main/java/com/zy/asrs/entity/OrderDetl.java | 173
src/main/java/com/zy/asrs/service/LocDetlService.java | 19
src/main/java/com/zy/asrs/entity/TrayCode.java | 41
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/mapper/BasErrLogMapper.java | 2
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 39
src/main/java/com/zy/asrs/entity/LocDetl.java | 142
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/service/TrayCodeService.java | 2
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 57
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 | 11
src/main/java/com/zy/asrs/controller/RowLastnoTypeController.java | 52
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 48
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/WrkDetlLogService.java | 6
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 5
src/main/java/com/zy/asrs/mapper/MatMapper.java | 11
src/main/java/com/zy/common/model/DetlDto.java | 2
src/main/java/com/zy/asrs/controller/OutController.java | 183
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 | 17
src/main/java/com/zy/asrs/entity/Pack.java | 81
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 139
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 | 35
src/main/java/com/zy/asrs/controller/BasPlcerrorController.java | 40
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/common/constant/AgvSiteConstant.java | 131
src/main/java/com/zy/asrs/entity/ApiLog.java | 84
src/main/java/com/zy/asrs/controller/StkPlcmController.java | 36
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 5
src/main/java/com/zy/asrs/mapper/AdjDetlMapper.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/task/handler/OrderSyncHandler.java | 1
src/main/java/com/zy/asrs/mapper/OrderDetlReportMapper.java | 7
src/main/java/com/zy/asrs/entity/result/KeyValueVo.java | 1
src/main/java/com/zy/asrs/entity/OrderDetlReport.java | 132
src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java | 1
src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java | 2
src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java | 6
src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java | 4
src/main/java/com/zy/asrs/entity/ViewStockUseBean.java | 152
src/main/java/com/zy/system/entity/User.java | 31
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 | 44
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 19
src/main/java/com/zy/common/model/enums/HtmlNavIconType.java | 7
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 | 32
src/main/java/com/zy/asrs/controller/AdjDetlController.java | 42
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 25
src/main/java/com/zy/asrs/service/OrderSettleService.java | 2
src/main/java/com/zy/asrs/entity/Mat.java | 145
src/main/java/com/zy/asrs/third/TokenUtils.java | 3
src/main/java/com/zy/asrs/entity/LocMast.java | 122
src/main/java/com/zy/asrs/service/MatService.java | 2
src/main/java/com/zy/asrs/entity/param/CheckOrderParam.java | 2
src/main/java/com/zy/common/task/ActivateScheduler.java | 6
src/main/java/com/zy/asrs/controller/BasDevpController.java | 52
src/main/java/com/zy/asrs/entity/BasCrnError.java | 37
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/system/controller/HomeController.java | 40
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 128
src/main/java/com/zy/asrs/controller/BasCrnStatusController.java | 46
src/main/java/com/zy/common/utils/NodeUtils.java | 12
src/main/java/com/zy/asrs/entity/param/ForwardAGVTaskParam.java | 4
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/system/controller/PermissionController.java | 34
src/main/java/com/zy/asrs/utils/VersionUtils.java | 2
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/asrs/controller/BasWrkStatusController.java | 48
src/main/java/com/zy/asrs/controller/WrkMastController.java | 54
src/main/java/com/zy/asrs/service/OpenService.java | 1
src/main/java/com/zy/asrs/task/AbstractHandler.java | 5
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java | 16
src/main/java/com/zy/asrs/entity/AxisBean.java | 36
src/main/java/com/zy/common/utils/OutStockInterceptUtil.java | 17
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 | 2
src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java | 2
src/main/java/com/zy/asrs/entity/WrkMast.java | 217
src/main/java/com/zy/asrs/mapper/OrderSettleMapper.java | 2
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 2
src/main/java/com/zy/common/utils/RandomValidateCodeUtil.java | 4
src/main/java/com/zy/asrs/controller/MobileController.java | 169
src/main/java/com/zy/asrs/entity/RowLastno.java | 77
src/main/java/com/zy/asrs/service/PackService.java | 2
/dev/null | 24
src/main/java/com/zy/asrs/controller/ConsoleController.java | 28
src/main/java/com/zy/asrs/service/WaitPakinService.java | 2
src/main/java/com/zy/asrs/service/WrkMastService.java | 6
src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java | 3
src/main/java/com/zy/asrs/service/NodeService.java | 15
src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java | 5
280 files changed, 5,207 insertions(+), 5,476 deletions(-)
diff --git a/src/main/java/com/zy/asrs/command/LedCommand.java b/src/main/java/com/zy/asrs/command/LedCommand.java
index 46d54d1..49eca38 100644
--- a/src/main/java/com/zy/asrs/command/LedCommand.java
+++ b/src/main/java/com/zy/asrs/command/LedCommand.java
@@ -41,7 +41,7 @@
if (!Cools.isEmpty(this.barcode)) {
s.append("鎵樼洏鐮乕" + this.barcode + "]\n");
}
- if (!this.emptyMk){
+ if (!this.emptyMk) {
for (MatDto matDto : matDtos) {
s.append("[鍟嗗搧缂栫爜:" + matDto.getMatnr() + ", 鏁伴噺:" + matDto.getCount() + "]\n");
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/AutoMoveController.java b/src/main/java/com/zy/asrs/controller/AutoMoveController.java
index 1a9b6f7..bbf0e81 100644
--- a/src/main/java/com/zy/asrs/controller/AutoMoveController.java
+++ b/src/main/java/com/zy/asrs/controller/AutoMoveController.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.AutoMove;
-import com.zy.asrs.service.AutoMoveService;
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.AutoMove;
+import com.zy.asrs.service.AutoMoveService;
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 AutoMoveController extends BaseController {
@@ -32,24 +34,26 @@
@RequestMapping(value = "/autoMove/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<AutoMove> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
allLike(AutoMove.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(autoMoveService.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 = "/autoMove/update/auth")
- @ManagerAuth
- public R update(AutoMove autoMove){
- if (Cools.isEmpty(autoMove) || null==autoMove.getId()){
+ @RequestMapping(value = "/autoMove/update/auth")
+ @ManagerAuth
+ public R update(AutoMove autoMove) {
+ if (Cools.isEmpty(autoMove) || null == autoMove.getId()) {
return R.error();
}
autoMoveService.updateById(autoMove);
@@ -78,8 +82,8 @@
@RequestMapping(value = "/autoMove/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) {
autoMoveService.deleteById(id);
}
return R.ok();
@@ -87,7 +91,7 @@
@RequestMapping(value = "/autoMove/export/auth")
@ManagerAuth
- public R export(@RequestBody JSONObject param){
+ public R export(@RequestBody JSONObject param) {
EntityWrapper<AutoMove> wrapper = new EntityWrapper<>();
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
Map<String, Object> map = excludeTrash(param.getJSONObject("autoMove"));
@@ -103,7 +107,7 @@
wrapper.like("id", condition);
Page<AutoMove> page = autoMoveService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (AutoMove autoMove : page.getRecords()){
+ for (AutoMove autoMove : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", autoMove.getId());
map.put("value", autoMove.getId());
@@ -116,7 +120,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<AutoMove> wrapper = new EntityWrapper<AutoMove>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != autoMoveService.selectOne(wrapper)){
+ if (null != autoMoveService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(AutoMove.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 d1a65dd..991e6fc 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, 10), 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 9503d71..ae0523e 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, 1000), 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 42c0978..1672414 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, 32), 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/BasWhsController.java b/src/main/java/com/zy/asrs/controller/BasWhsController.java
index b57ce2f..494c341 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.BasWhs;
-import com.zy.asrs.service.BasWhsService;
-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.BasWhs;
+import com.zy.asrs.service.BasWhsService;
+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<BasWhs> 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(basWhsService.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(BasWhs basWhs){
- if (Cools.isEmpty(basWhs) || null==basWhs.getId()){
+ public R update(BasWhs basWhs) {
+ if (Cools.isEmpty(basWhs) || null == basWhs.getId()) {
return R.error();
}
basWhs.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<BasWhs> list = JSONArray.parseArray(param, BasWhs.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (BasWhs entity : list){
+ for (BasWhs entity : list) {
basWhsService.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<BasWhs> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs"));
@@ -111,7 +113,7 @@
wrapper.like("whs_desc", condition);
Page<BasWhs> page = basWhsService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (BasWhs basWhs : page.getRecords()){
+ for (BasWhs basWhs : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", basWhs.getIdentifying());
map.put("value", basWhs.getWhsDesc());
@@ -124,7 +126,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != basWhsService.selectOne(wrapper)){
+ if (null != basWhsService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.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 2232210..c56f06c 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, 20), 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 ad1eff4..ed8b736 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, 20), 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/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
deleted file mode 100644
index 879e668..0000000
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.zy.asrs.controller;
-
-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.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.InventoryCheckOrder;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.InventoryCheckOrderDetlService;
-import com.zy.asrs.service.InventoryCheckOrderService;
-import com.zy.asrs.service.WrkDetlService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class InventoryCheckOrderController extends BaseController {
-
- @Autowired
- private InventoryCheckOrderService inventoryCheckOrderService;
- @Autowired
- private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
- @Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkDetlService wrkDetlService;
-
- @RequestMapping("/inventoryCheckOrder/StockCheck/select/barcode")
- @ManagerAuth()
- public R StockCheckSelectBarcode(@RequestParam String barcode) {
- if (Cools.isEmpty(barcode)) {
- return R.ok();
- }
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
- if (Cools.isEmpty(wrkMast)) {
- return R.error("璇ユ潯鐮佹湭鏌ヨ鍒扮洏鐐逛换鍔�");
- }
- ArrayList<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>();
- List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- for (WrkDetl wrkDetl : wrkDetls) {
- InventoryCheckOrderDetl checkDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", wrkMast.getSheetNo())
- .eq("matnr", wrkDetl.getMatnr())
- .eq("batch", wrkDetl.getBatch()));
- if (Cools.isEmpty(checkDetl)) {
- continue;
- }
- checkOrderDetls.add(checkDetl);
-
- }
- return R.ok(checkOrderDetls);
- }
-
- @RequestMapping("/inventoryCheckOrder/select/status/1")
- @ManagerAuth()
- public R availableTakeCheckSite(){
- return R.ok().add(inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>().eq("status", "1")));
- }
-
-
- @RequestMapping(value = "/inventoryCheckOrder/nav/list/auth")
- @ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
- EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
- if (!Cools.isEmpty(orderNo)) {
- wrapper.like("order_no", orderNo);
- }
- wrapper.eq("status", 1);
- wrapper.orderBy("create_time", false);
- List<InventoryCheckOrder> orders = inventoryCheckOrderService.selectList(wrapper);
-
- return R.ok().add(orders);
- }
-
- @RequestMapping(value = "/inventoryCheckOrder/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(inventoryCheckOrderService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/inventoryCheckOrder/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){
- EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(InventoryCheckOrder.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(inventoryCheckOrderService.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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @PostMapping (value = "/inventoryCheckOrder/add/auth")
- @ManagerAuth
- public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
- String orderNo = inventoryCheckOrder.getOrderNo();
- long time = new Date().getTime();
- if (Cools.isEmpty(orderNo)) {
- switch (inventoryCheckOrder.getArea()){
- case "鍫嗗灈鏈�":
- orderNo = "DDJ"+time;
- break;
- case "鍥涘悜搴�":
- orderNo = "SXK"+time;
- break;
- case "CTU":
- orderNo = "CTU"+time;
- break;
- }
- inventoryCheckOrder.setOrderNo(orderNo);
- }
-
- int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
- if (count > 0) {
- return R.parse("鍗曟嵁缂栧彿宸茬粡瀛樺湪锛�" + orderNo);
- }
-
- inventoryCheckOrder.setCreateBy(getUserId().toString());
- inventoryCheckOrder.setCreateTime(new Date());
- inventoryCheckOrder.setStatus("1");
-
- inventoryCheckOrderService.insert(inventoryCheckOrder);
- return R.ok(orderNo + "鏂板鎴愬姛");
- }
-
- @RequestMapping(value = "/inventoryCheckOrder/update/auth")
- @ManagerAuth
- public R update(InventoryCheckOrder inventoryCheckOrder){
- if (Cools.isEmpty(inventoryCheckOrder) || null==inventoryCheckOrder.getId()){
- return R.error();
- }
- inventoryCheckOrderService.updateById(inventoryCheckOrder);
- return R.ok();
- }
-
- @RequestMapping(value = "/inventoryCheckOrder/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- inventoryCheckOrderService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/inventoryCheckOrder/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("inventoryCheckOrder"));
- convert(map, wrapper);
- List<InventoryCheckOrder> list = inventoryCheckOrderService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/inventoryCheckOrderQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<InventoryCheckOrder> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<InventoryCheckOrder> page = inventoryCheckOrderService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (InventoryCheckOrder inventoryCheckOrder : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", inventoryCheckOrder.getId());
- map.put("value", inventoryCheckOrder.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/inventoryCheckOrder/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<InventoryCheckOrder> wrapper = new EntityWrapper<InventoryCheckOrder>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != inventoryCheckOrderService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(InventoryCheckOrder.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
deleted file mode 100644
index 7e1e31b..0000000
--- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderDetlController.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.zy.asrs.controller;
-
-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.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.InventoryCheckOrder;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.zy.asrs.service.InventoryCheckOrderDetlService;
-import com.zy.asrs.service.InventoryCheckOrderService;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class InventoryCheckOrderDetlController extends BaseController {
-
- @Autowired
- private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
- @Autowired
- private InventoryCheckOrderService inventoryCheckOrderService;
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/pakout/list/auth")
- @ManagerAuth
- public R pakoutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (null == param.get("order_id")|| param.get("order_id").equals("9999999999")){
- return R.ok(inventoryCheckOrderDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<InventoryCheckOrderDetl>().eq("order_no",null)));
- }
- InventoryCheckOrder inventoryCheckOrder = inventoryCheckOrderService.selectById(Integer.parseInt(param.get("order_id").toString()));
-
- EntityWrapper<InventoryCheckOrderDetl> inventoryCheckOrderDetlEntityWrapper = new EntityWrapper<>();
-// convert(param, inventoryCheckOrderDetlEntityWrapper);
- inventoryCheckOrderDetlEntityWrapper.eq("order_no",inventoryCheckOrder.getOrderNo());
-
- return R.ok(inventoryCheckOrderDetlService.selectPage(new Page<>(curr, limit), inventoryCheckOrderDetlEntityWrapper));
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(inventoryCheckOrderDetlService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/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){
- EntityWrapper<InventoryCheckOrderDetl> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(InventoryCheckOrderDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(inventoryCheckOrderDetlService.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()){
- String val = String.valueOf(entry.getValue());
- if (entry.getKey().equals("curr") || entry.getKey().equals("limit")){
- continue;
- }
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/add/auth")
- @ManagerAuth
- public R add(InventoryCheckOrderDetl inventoryCheckOrderDetl) {
- inventoryCheckOrderDetlService.insert(inventoryCheckOrderDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/update/auth")
- @ManagerAuth
- public R update(InventoryCheckOrderDetl inventoryCheckOrderDetl){
- if (Cools.isEmpty(inventoryCheckOrderDetl) || null==inventoryCheckOrderDetl.getId()){
- return R.error();
- }
- inventoryCheckOrderDetlService.updateById(inventoryCheckOrderDetl);
- return R.ok();
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- inventoryCheckOrderDetlService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<InventoryCheckOrderDetl> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("inventoryCheckOrderDetl"));
- convert(map, wrapper);
- List<InventoryCheckOrderDetl> list = inventoryCheckOrderDetlService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetlQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<InventoryCheckOrderDetl> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<InventoryCheckOrderDetl> page = inventoryCheckOrderDetlService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (InventoryCheckOrderDetl inventoryCheckOrderDetl : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", inventoryCheckOrderDetl.getId());
- map.put("value", inventoryCheckOrderDetl.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/inventoryCheckOrderDetl/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<InventoryCheckOrderDetl> wrapper = new EntityWrapper<InventoryCheckOrderDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != inventoryCheckOrderDetlService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(InventoryCheckOrderDetl.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/LocCheckController.java b/src/main/java/com/zy/asrs/controller/LocCheckController.java
deleted file mode 100644
index 8549423..0000000
--- a/src/main/java/com/zy/asrs/controller/LocCheckController.java
+++ /dev/null
@@ -1,129 +0,0 @@
-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.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class LocCheckController extends BaseController {
-
- @Autowired
- private LocCheckService locCheckService;
-
- @RequestMapping(value = "/locCheck/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(locCheckService.selectById(String.valueOf(id)));
- }
-
- @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){
- EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- 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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/locCheck/add/auth")
- @ManagerAuth
- public R add(LocCheck locCheck) {
- locCheckService.insert(locCheck);
- return R.ok();
- }
-
- @RequestMapping(value = "/locCheck/update/auth")
- @ManagerAuth
- public R update(LocCheck locCheck){
- if (Cools.isEmpty(locCheck) || null==locCheck.getId()){
- return R.error();
- }
- locCheckService.updateById(locCheck);
- return R.ok();
- }
-
- @RequestMapping(value = "/locCheck/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- locCheckService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/locCheck/export/auth")
- @ManagerAuth
- 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"));
- convert(map, wrapper);
- List<LocCheck> list = locCheckService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/locCheckQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
- 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()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", locCheck.getId());
- map.put("value", locCheck.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/locCheck/check/column/auth")
- @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)){
- 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){
- 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 a47c88e..4b7dd18 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -115,7 +115,7 @@
}
param.remove("crn_no");
convert(param, wrapper);
- wrapper.orderBy("appe_time",true);
+ wrapper.orderBy("appe_time", true);
Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
if (locDetlPage.getRecords().size() == 0) {
locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index ac44727..f6648dd 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -58,54 +58,58 @@
@RequestMapping(value = "/locMast/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<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
@RequestMapping(value = "/locMast/crn/list/auth")
@ManagerAuth
- public R crnList(@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 crnList(@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<LocMast> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- wrapper.in("crn_no", 1,2);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ wrapper.in("crn_no", 1, 2);
+ if (!Cools.isEmpty(orderByField)) {
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }
return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
}
- private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
boolean sign = false;
- for (Map.Entry<String, Object> entry : map.entrySet()){
+ 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]));
- } else if (entry.getKey().equals("loc_no")){
+ } else if (entry.getKey().equals("loc_no")) {
wrapper.like(entry.getKey(), val);
} else {
- if (entry.getKey().equals("loc_type1")){
- sign=true;
+ if (entry.getKey().equals("loc_type1")) {
+ sign = true;
}
wrapper.eq(entry.getKey(), val);
}
}
- if (sign){
- wrapper.and().ne("loc_sts","Y");
+ if (sign) {
+ wrapper.and().ne("loc_sts", "Y");
}
}
@@ -120,10 +124,10 @@
return R.ok();
}
- @RequestMapping(value = "/locMast/update/auth")
- @ManagerAuth(memo = "搴撲綅淇敼")
- public R update(LocMast locMast){
- if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
+ @RequestMapping(value = "/locMast/update/auth")
+ @ManagerAuth(memo = "搴撲綅淇敼")
+ public R update(LocMast locMast) {
+ if (Cools.isEmpty(locMast) || null == locMast.getLocNo()) {
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
@@ -136,7 +140,7 @@
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
}
}
- if (locMast.getLocSts().equals("O")){
+ if (locMast.getLocSts().equals("O")) {
locMast.setBarcode("");
}
locMast.setModiUser(getUserId());
@@ -147,12 +151,12 @@
@RequestMapping(value = "/locMast/delete/auth")
@ManagerAuth(memo = "搴撲綅鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocMast entity : list){
+ for (LocMast entity : list) {
locMastService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -160,7 +164,7 @@
@RequestMapping(value = "/locMast/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<LocMast> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locMast"));
@@ -176,7 +180,7 @@
wrapper.like("loc_no", condition);
Page<LocMast> page = locMastService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocMast locMast : page.getRecords()){
+ for (LocMast locMast : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locMast.getLocNo());
map.put("value", locMast.getLocNo());
@@ -189,7 +193,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocMast> wrapper = new EntityWrapper<LocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locMastService.selectOne(wrapper)){
+ if (null != locMastService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocMast.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -199,38 +203,38 @@
@ManagerAuth(memo = "鍒濆鍖栧簱浣�")
// @Transactional
public R init(LocMastInitParam param) {
- try{
+ try {
List<LocMast> list = new ArrayList<>();
BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying());
- if (Cools.isEmpty(basWhs)){
+ if (Cools.isEmpty(basWhs)) {
return R.error("搴撳瀷涓嶅瓨鍦紒锛侊紒");
}
- for (int r=param.getStartRow(); r<=param.getEndRow(); r++){
- for (int b=param.getStartBay(); b<=param.getEndBay(); b++) {
- for (int l=param.getStartLev(); l<=param.getEndLev(); l++) {
+ for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
+ for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
+ for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
// 鑾峰彇搴撲綅鍙�
String locNo = String.format("%02d", r) + String.format("%03d", b) + String.format("%02d", l);
// 鑾峰彇鍫嗗灈鏈哄彿
int crnNo = 0;
- try{
- Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow());
- for (List<Integer> node : shelves.nodes){
+ try {
+ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(), param.getStartRow());
+ for (List<Integer> node : shelves.nodes) {
if (node.contains(r)) {
- if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){
+ if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0) {
crnNo = shelves.nodes.indexOf(node) + param.getStaCrn();
- }else {
+ } else {
crnNo = shelves.nodes.indexOf(node) + 1;
}
break;
}
}
- }catch (Exception e){
+ } catch (Exception e) {
throw new Exception("瑙ｆ瀽鍫嗗灈鏈哄彿澶辫触锛岃濉啓姝ｇ‘鐨勬暟鎹�!!!");
}
- Date now = new Date();
+ Date now = new Date();
LocMast locMast = new LocMast();
locMast.setLocNo(locNo);
locMast.setLocSts("O");
@@ -251,13 +255,13 @@
}
}
}
- if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1){
+ if (!Cools.isEmpty(param.getEnable()) && param.getEnable() == 1) {
locMastService.delete(new EntityWrapper<>());
}
locMastService.insertBatch(list);
return R.ok("鍒濆鍖栨垚鍔�");
- }catch (Exception e){
- return R.error("鍒濆鍖栧け璐�===>"+e.getMessage());
+ } catch (Exception e) {
+ return R.error("鍒濆鍖栧け璐�===>" + e.getMessage());
}
}
}
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
deleted file mode 100644
index 612634e..0000000
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
-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.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.param.LocDetlAdjustParam;
-import com.zy.asrs.service.ManLocDetlService;
-import com.zy.asrs.service.MatService;
-import com.zy.common.utils.RoleUtils;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class ManLocDetlController extends BaseController {
-
- @Autowired
- private ManLocDetlService manLocDetlService;
- @Autowired
- private MatService matService;
-
- @RequestMapping("/manLocDetl/matnr/count")
- public R getCount(@RequestBody Map<String, String> param){
- String matnr = param.get("matnr");
- Double sum = 0.0;
- if (Cools.isEmpty(matnr)){
- sum = manLocDetlService.sum();
- }else {
- sum = manLocDetlService.getSumAnfme(matnr);
- }
-
- return R.ok(sum);
- }
-
- @RequestMapping(value = "/manLocDetl/export/auth")
- @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
- public R export(@RequestBody JSONObject param){
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
- Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
- String row = "";
- if (map.get("row") != null) {
- String chooseRow = (String) map.get("row");
- if (chooseRow.length() == 1) {
- row = "0" + chooseRow;
- map.remove("row");
- }else {
- row = chooseRow;
- map.remove("row");
- }
- }
- convert(map, wrapper);
- if (!row.equals("")){
- wrapper.and()
- .where("loc_no like '" +row +"%'");
- }
- List<ManLocDetl> list = manLocDetlService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/manLocDetl/statis/export")
-// @ManagerAuth
- public void statisExport(HttpServletResponse response) throws IOException {
- List<ManLocDetl> excel = manLocDetlService.getStockStatisExcel();
- for (ManLocDetl locDetl : excel) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
- String fileName = URLEncoder.encode("骞冲簱搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), LocDetl.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .sheet("琛�1")
- .doWrite(excel);
- }
-
- /**
- * 鑾峰彇搴撳瓨鎬绘暟
- * @return
- */
- @RequestMapping("/manLocDetl/count")
- public R getAllCount(){
- Double sum = manLocDetlService.sum();
- return R.ok(sum);
- }
-
-
- @RequestMapping(value = "/manLocDetl/statis/auth")
- @ManagerAuth
- public R statis(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param) {
- Page<ManLocDetl> stockStatis = manLocDetlService.getStockStatis(toPage(curr, limit, param, ManLocDetl.class));
- for (ManLocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
- return R.ok().add(stockStatis);
- }
-
- @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(required = false)String condition,
- @RequestParam Map<String, Object> param){
-
- EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(ManLocDetl.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-
- return R.ok(manLocDetlService.selectPage(new Page<>(curr, limit), wrapper));
- }
-
-
- @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){
-
- Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
- Page<ManLocDetl> outPage = manLocDetlService.getOutPage(manLocDetlPage);
-// Page<ManLocDetl> page = manLocDetlService.getPage(manLocDetlPage);
- return R.ok(outPage);
- }
-
- @RequestMapping("/manLocDetl/adjust/start")
- @ManagerAuth(memo = "搴撳瓨璋冩暣")
- public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
- manLocDetlService.adjustLocDetl(param, getUserId());
- return R.ok("搴撳瓨璋冩暣鎴愬姛");
- }
-
-// @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){
-//
-// 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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- if (entry.getKey().equals("locNo")) {
- wrapper.eq("loc_no", String.valueOf(entry.getValue()));
- } else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
- }
- }
- }
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b560a5e..5632924 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -11,7 +11,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
-import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.service.CommonService;
@@ -33,7 +32,7 @@
@RestController
@RequestMapping("mobile")
@Slf4j
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -56,8 +55,6 @@
@Autowired
private PackService packService;
@Autowired
- private ManLocDetlMapper manLocDetlMapper;
- @Autowired
private WrkDetlLogService wrkDetlLogService;
@Autowired
private CommonService commonService;
@@ -74,7 +71,7 @@
@PostMapping("/agv/start")
@ManagerAuth
- public R pdaAgvStart(@RequestBody Map<String,Object> map){
+ public R pdaAgvStart(@RequestBody Map<String, Object> map) {
if (Cools.isEmpty(map.get("sta"))) {
return R.parse("鏆傚瓨浣嶄笉鑳戒负绌�");
@@ -100,7 +97,7 @@
@PostMapping("/agv/unbind")
@ManagerAuth
- public R pdaAgvUnbind(@RequestBody Map<String,Object> map){
+ public R pdaAgvUnbind(@RequestBody Map<String, Object> map) {
String site = (String) map.get("site"); // 鏆傚瓨浣�
@@ -111,16 +108,16 @@
return mobileService.unbind(site);
}
- private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){
+ private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam, String agv, String sta) {
List<ForwardAGVTaskParam.PositionCodePaths> agvTaskParamList = Arrays.asList(
//璧峰浣�
- new ForwardAGVTaskParam.PositionCodePaths(agv,"05"),
+ new ForwardAGVTaskParam.PositionCodePaths(agv, "05"),
//鐩爣浣�
- new ForwardAGVTaskParam.PositionCodePaths(sta,"05")
+ new ForwardAGVTaskParam.PositionCodePaths(sta, "05")
);
Date date = new Date();
DecimalFormat df = new DecimalFormat("0000");
- String wrkNo = "Crn"+date.getTime()/1000;
+ String wrkNo = "Crn" + date.getTime() / 1000;
agvTaskCreateParam.setReqCode(wrkNo);
agvTaskCreateParam.setReqTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
agvTaskCreateParam.setTaskTyp("GT1");
@@ -131,7 +128,7 @@
}
- private String forwardAGVHttpRequest(Object requestParam, String url, String path){
+ private String forwardAGVHttpRequest(Object requestParam, String url, String path) {
String response = "";
String success = "error";
try {
@@ -145,13 +142,13 @@
JSONObject jsonObject = JSON.parseObject(response);
String message = jsonObject.get("code").toString();
- if(("0").equals(message) || ("璇锋眰缂栧彿宸插瓨鍦�").contains(message)){
+ if (("0").equals(message) || ("璇锋眰缂栧彿宸插瓨鍦�").contains(message)) {
success = "SUCCESS";
- }else {
+ } else {
success = message;
}
- log.info("杞彂agv浠诲姟锛氳姹備綋:"+JSONObject.toJSONString(requestParam)+",杩斿洖鍊�:"+jsonObject);
- }catch (Exception e){
+ log.info("杞彂agv浠诲姟锛氳姹備綋:" + JSONObject.toJSONString(requestParam) + ",杩斿洖鍊�:" + jsonObject);
+ } catch (Exception e) {
}
return success;
@@ -159,7 +156,7 @@
@RequestMapping("/select/workDetl/barcode")
@ManagerAuth
- public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) {
+ public R selectWorkDetlBarcode(@RequestBody Map<String, Object> map) {
String barcode = map.get("barcode").toString();
if (Cools.isEmpty(barcode)) {
return R.error("鏉＄爜涓虹┖");
@@ -181,28 +178,12 @@
@RequestMapping("/leftovers/out")
@ManagerAuth
- public R leftoversOut(@RequestBody Map<String,Object> map) {
- mobileService.leftoversOut(map,getUserId());
+ public R leftoversOut(@RequestBody Map<String, Object> map) {
+ mobileService.leftoversOut(map, getUserId());
return R.ok();
}
-
- // 鍟嗗搧涓婃灦
- @RequestMapping("/mat/onSale/auth")
- @ManagerAuth
- public R matOnSale(@RequestBody CombParam combParam){
- mobileService.onSale(combParam);
- return R.ok("涓婃灦鎴愬姛");
- }
- // 鍟嗗搧涓嬫灦
- @RequestMapping("/mat/offSale/auth")
- //@ManagerAuth
- public R matOffSale(@RequestBody OffSaleParam offSaleParam){
- mobileService.offSale(offSaleParam);
- return R.ok("涓嬫灦鎴愬姛");
- }
-
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -233,18 +214,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);
- if (Cools.isEmpty(orders)){
+ 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 (Order order : orders) {
+ CombParam combParam = new CombParam();
if (order == null) {
continue;
}
@@ -258,11 +239,11 @@
List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
if (!Cools.isEmpty(orderDetls)) {
LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
- for (OrderDetl orderDetl:orderDetls){
+ for (OrderDetl 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);
@@ -278,19 +259,19 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
- log.info("缁勬墭锛�"+JSONObject.toJSONString(combParam));
+ public R comb(@RequestBody CombParam combParam) {
+ log.info("缁勬墭锛�" + JSONObject.toJSONString(combParam));
if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("barcode", combParam.getBarcode())
.eq("io_type", 104)
- .in("wrk_sts", 14,105));
+ .in("wrk_sts", 14, 105));
if (Cools.isEmpty(wrkMast)) {
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
- }else {
+ } else {
mobileService.mergeComb(combParam, getUserId());
return R.ok("骞舵澘鎴愬姛");
}
@@ -298,31 +279,10 @@
}
- @RequestMapping("/pingKu/Shelves/auth")
- @ManagerAuth(memo = "骞冲簱涓婃灦")
- public R pingKuShelves(@RequestBody CombParam combParam){
- if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
- mobileService.pingKuShelves(combParam, getUserId());
-
- return R.ok();
- }
-
- @RequestMapping("/pingKu/unShelves/auth")
- @ManagerAuth(memo = "骞冲簱涓嬫灦")
- public R pingKuUnShelves(@RequestBody CombParam combParam){
- if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
- throw new CoolException(BaseRes.PARAM);
- }
- mobileService.pingKuUnShelves(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();
@@ -335,7 +295,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("缁勬墭鎴愬姛");
}
@@ -348,7 +308,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();
}
@@ -372,7 +332,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();
}
@@ -393,16 +353,16 @@
*/
@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()));
- if (Cools.isEmpty(orderDetl)){
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("matnr", combParam.getMatnr()).eq("batch", combParam.getBatch()).eq("order_no", combParam.getOrderNo()));
+ if (Cools.isEmpty(orderDetl)) {
return R.error("鏈煡鍒版暟鎹�");
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")) {
return R.error("浠诲姟鏈畬鎴�");
}
//澶嶆牳鏁�
@@ -411,15 +371,6 @@
return R.ok();
}
- // 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
- @RequestMapping("/mat/find/auth")
- public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
- //List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
- ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
- return R.ok(manLocDetl);
- //return R.ok(manLocDetlMapper.selectItem0(locNo, matnr));
- }
/**
* 鍑哄簱纭 - 鎷ｆ枡鍑哄簱 - 閫夋嫨鍏蜂綋鏉＄爜鍟嗗搧
@@ -427,7 +378,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();
}
@@ -562,34 +513,23 @@
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
mobileService.adjust(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
- @RequestMapping("/pda/adjust/auth")
- @ManagerAuth(memo = "pda鐩樼偣")
- public R pdaAdjust(@RequestBody pdaAdjustParam param){
- mobileService.pdaAdjust(param,getUserId());
- return R.ok("鐩樼偣鎴愬姛");
- }
+
@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("鍑哄簱鎴愬姛");
}
- @GetMapping("/checkOut/submit/auth")
- @ManagerAuth(memo = "鐩樼偣涓婁紶")
- public R CheckOutUploadERP(@RequestParam String orderId){
- mobileService.inventoryUpload(orderId);
- return R.ok("鐩樼偣鎴愬姛");
- }
@RequestMapping("/ddd/ddd")
@@ -597,25 +537,25 @@
public R ddd() {
int w = 99999;
for (int i = 17; i <= 37; i++) {
- for (int j = 8;j<=14;j++){
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
- LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
+ for (int j = 8; j <= 14; j++) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
+ LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
// LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", 26).eq("bay1", i).eq("lev1", 1));
- if (locMast.getGro1() == 999){
- continue;
- }
+ if (locMast.getGro1() == 999) {
+ continue;
+ }
// locMast.setGro1(w);
// locMast.setGro1(locMast.getGro1()+1000);
- locMast2.setGro1(locMast.getGro1()+1000);
- locMast3.setGro1(locMast.getGro1()+2000);
+ locMast2.setGro1(locMast.getGro1() + 1000);
+ locMast3.setGro1(locMast.getGro1() + 2000);
// locMast4.setGro1(w);
// locMastService.updateById(locMast);
- locMastService.updateById(locMast2);
- locMastService.updateById(locMast3);
+ locMastService.updateById(locMast2);
+ locMastService.updateById(locMast3);
// locMastService.updateById(locMast4);
- w++;
- }
+ w++;
+ }
}
// for (int i = 17; i <=37; i++) {
// LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
@@ -639,7 +579,6 @@
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 62a3c53..16192c0 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -13,12 +13,10 @@
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;
import com.zy.asrs.entity.result.KeyValueVo;
-import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.NodeService;
import com.zy.common.entity.NodeExcel;
import com.zy.common.entity.NodeExcelListener;
@@ -37,8 +35,6 @@
import java.net.URLEncoder;
import java.util.*;
-import static jdk.nashorn.api.scripting.ScriptUtils.convert;
-
@RestController
public class NodeController extends BaseController {
@@ -46,8 +42,6 @@
private NodeService nodeService;
@Autowired
private TreeUtils treeUtils;
- @Autowired
- private ManLocDetlMapper manLocDetlMapper;
@RequestMapping(value = "/node/{id}/auth")
@ManagerAuth
@@ -57,53 +51,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]));
@@ -123,7 +123,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);
@@ -146,21 +146,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);
@@ -172,7 +171,6 @@
node.setNamePath(nodeUtils.pathName.toString());
node.setUuid(node.getName());
- manLocDetlMapper.updateLocNo0(node.getId(),node.getName());
node.setUpdateBy(getUserId());
node.setUpdateTime(new Date());
nodeService.updateById(node);
@@ -181,12 +179,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();
@@ -194,8 +192,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();
@@ -203,7 +201,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"));
@@ -220,10 +218,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);
@@ -233,7 +231,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();
@@ -296,41 +294,26 @@
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() + "涓揣浣�");
}
/*************************************** 鍏ュ簱鍑虹浉鍏� ***********************************************/
- @RequestMapping("/work/stock/pakin")
- @ManagerAuth(memo = "鍏ュ簱")
- public R stockPakin(@RequestBody PakinParam number) {
- return nodeService.stockPakin(number, getUserId(), getHostId());
- }
-
- @RequestMapping("/work/stock/pakout")
- @ManagerAuth(memo = "鍑哄簱")
- public R initPakout(@RequestBody List<InitPakoutParam> params) {
- return nodeService.initPakout(params, getUserId(), getHostId());
- }
@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,
- @RequestParam String targetLocNo) {
- 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);
}
@@ -343,12 +326,12 @@
}
@RequestMapping(value = "/node/all/get/loc")
- public R getarea(){
+ public R getarea() {
EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
- nodeEntityWrapper.eq("type",2);
+ nodeEntityWrapper.eq("type", 2);
List<Node> list = nodeService.selectList(nodeEntityWrapper);
List<KeyValueVo> keyValueVoList = new ArrayList<>();
- for (Node node : list){
+ for (Node node : list) {
KeyValueVo vo = new KeyValueVo();
vo.setName(node.getName());
vo.setValue(node.getId());
@@ -366,29 +349,29 @@
Integer value = param.getInteger("value");
Integer num = param.getInteger("startRow");
EntityWrapper<Node> nodeEntityWrapper = new EntityWrapper<>();
- nodeEntityWrapper.eq("id",value);
- nodeEntityWrapper.eq("name",area);
+ nodeEntityWrapper.eq("id", value);
+ nodeEntityWrapper.eq("name", area);
Node node = nodeService.selectOne(nodeEntityWrapper);
String[] string = node.getNamePath().split(",");
for (int i = 1; i <= num; i++) {
- String locNo =area + String.format("%04d", i);
+ String locNo = area + String.format("%04d", i);
String uuid = String.valueOf(System.currentTimeMillis());
- Date now = new Date();
+ Date now = new Date();
Node node1 = new Node();
node1.setUuid(uuid);
node1.setName(locNo);
node1.setParentId(node.getId());
node1.setParentName(node.getName());
node1.setType(3);
- node1.setPath(node.getPath()+","+node.getId());
- node1.setNamePath(node.getNamePath()+","+node.getName());
+ node1.setPath(node.getPath() + "," + node.getId());
+ node1.setNamePath(node.getNamePath() + "," + node.getName());
node1.setLevel(3);
node1.setStatus(1);
node1.setCreateBy(getUserId());
node1.setCreateTime(now);
node1.setUpdateBy(getUserId());
node1.setUpdateTime(now);
- if (!nodeService.insert(node1)){
+ if (!nodeService.insert(node1)) {
return R.error("鏁版嵁鎻掑叆澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 27a4246..74aa83b 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -96,9 +96,9 @@
}
} else {
if (!Cools.isEmpty(param.getMsgType()) && param.getMsgType().equalsIgnoreCase("task_complete")) {
- if (wrkMast.getStaNo()==1031){
+ if (wrkMast.getStaNo() == 1031) {
wrkMast.setWrkSts(106L);
- }else {
+ } else {
wrkMast.setWrkSts(14L);
}
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenMesController.java b/src/main/java/com/zy/asrs/controller/OpenMesController.java
deleted file mode 100644
index f629b01..0000000
--- a/src/main/java/com/zy/asrs/controller/OpenMesController.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.zy.asrs.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.annotations.AppAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
-import com.zy.asrs.service.*;
-import com.zy.common.web.BaseController;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * Created by vincent on 2022/4/8
- */
-@Slf4j
-@RestController
-@RequestMapping("Open/wms")
-public class OpenMesController extends BaseController {
-
- private static final boolean auth = true;
- public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
- add("ea1f0459efc02a79f046f982767939ae");
- }};
-
- @Autowired
- private OpenService openService;
-
- @Autowired
- private MatService matService;
-
- @Autowired
- private WorkService workService;
-
- @Autowired
- private LocMastService locMastService;
-
- @Autowired
- private InventoryCheckOrderService inventoryCheckOrderService;
-
- @Autowired
- private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
-
-
- @PostMapping("/mat/sync/default/v1")
- @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
- public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- openService.syncMat(param);
- return R.ok();
- }
-
- @PostMapping("/inventory/result")
- @AppAuth(memo = "鐩樼偣缁撴灉鍚屾鎺ュ彛")
- public synchronized R inventory(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CheckResult param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", param.getPalletBarcode()));
- if (locMast == null) {
- throw new CoolException("璇ユ墭鐩樹笉瀛樺湪搴撲腑");
- }
- LocDetlAdjustParam adjustParam = new LocDetlAdjustParam();
- adjustParam.setLocNo(locMast.getLocNo());
- List<LocDetlAdjustParam.LocDetlAdjust> list = new ArrayList<>();
- param.getDetails().forEach(elem -> {
- list.add(new LocDetlAdjustParam.LocDetlAdjust(elem.getProductionCode(), elem.getBatch(), elem.getActulQty(), elem.getQuality(),elem.getCode()));
- });
- workService.adjustLocDetl(adjustParam, getUserId());
- return R.ok();
- }
-
-// @PostMapping("/orderSync/default/v1")
-// @AppAuth(memo = "璁㈠崟淇℃伅鍚屾鎺ュ彛")
-// public synchronized R syncOrderInfo(@RequestHeader(required = false) String appkey,
-// @RequestBody(required = false) GTOrderParam param,
-// HttpServletRequest request) {
-// auth(appkey, param, request);
-// if (Cools.isEmpty(param)) {
-// return R.parse(BaseRes.PARAM);
-// }
-//
-// return R.ok();
-// }
-
-
- /**
- * 娣诲姞鍏ュ簱鍗�
- */
- @PostMapping("/order/pakin/default/v1")
- @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
- public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakinOrderCreate(param);
- return R.ok();
- }
-
-
- /**
- * 娣诲姞鍑哄簱鍗�
- */
- @PostMapping("/order/pakout/auth/v1")
- @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
- public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getOrderNo())) {
- return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getOrderType())) {
- return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getDetails())) {
- return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
- }
- openService.pakoutOrderCreate(param);
- return R.ok();
- }
-
- /**
- * 娣诲姞鐩樼偣鍗�
- */
- @PostMapping("/inventory/trigger/v1")
- @AppAuth(memo = "娣诲姞鐩樼偣鍗�")
- public synchronized R check(@RequestHeader(required = false) String appkey,
- @RequestBody CheckOrderParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- String orderNo = param.getInventoryCode();
-
- int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));
- if (count > 0) {
- return R.parse("鍗曟嵁缂栧彿宸茬粡瀛樺湪锛�" + orderNo);
- }
- InventoryCheckOrder checkOrder = new InventoryCheckOrder();
- checkOrder.setOrderNo(orderNo);
- //checkOrder.setCreateBy(getUserId().toString());
- checkOrder.setCreateTime(new Date());
- checkOrder.setStatus("1");
- param.getDetails().forEach(elem -> {
- Mat mat = matService.selectByMatnr(elem.getProductionCode());
- if (mat == null) {
- throw new CoolException("鐗╂枡涓嶅瓨鍦�");
- }
- //checkOrder.setArea(param.getArea());
- InventoryCheckOrderDetl detail = new InventoryCheckOrderDetl();
- detail.setMatnr(elem.getProductionCode());
- detail.setOrderNo(orderNo);
- detail.setMaktx(mat.getMaktx());
- //detail.setBatch(elem.getBatch());
- inventoryCheckOrderDetlService.insert(detail);
- });
- inventoryCheckOrderService.insert(checkOrder);
-
-
- return R.ok();
- }
-
-
- private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
- request.setAttribute("cache", obj);
- if (!auth) {
- return;
- }
-// if (Cools.isEmpty(appkey)) {
-// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
-// }
-// if (!APP_KEY_LIST.contains(appkey)) {
-// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
-// }
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 5a44740..cce593d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -9,18 +9,15 @@
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 io.swagger.models.auth.In;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.print.Doc;
import java.util.*;
@RestController
@@ -47,7 +44,7 @@
@RequestMapping(value = "/order/search/pda/auth")
@ManagerAuth
- public R pdaOrderSearch(@RequestParam(required = false)String condition){
+ public R pdaOrderSearch(@RequestParam(required = false) String condition) {
EntityWrapper<Order> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -61,9 +58,9 @@
@RequestMapping(value = "/order/list/pda/page/auth")
@ManagerAuth
- public R pdaPageList(@RequestParam(required = true)Long tagId,
- @RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit){
+ public R pdaPageList(@RequestParam(required = true) Long tagId,
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit) {
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
ArrayList<Integer> arrayList = new ArrayList<>();
docTypes.forEach(docType -> {
@@ -72,7 +69,7 @@
EntityWrapper<Order> wrapper = new EntityWrapper<>();
// wrapper.eq("tag_id", tagId);
wrapper.in("doc_type", arrayList);
- wrapper.in("settle",1,2);
+ wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
@@ -80,9 +77,9 @@
@RequestMapping(value = "/order/list/pda/page/out/auth")
@ManagerAuth
- public R pdaPageListOut(@RequestParam(required = true)Long tagId,
- @RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit){
+ public R pdaPageListOut(@RequestParam(required = true) Long tagId,
+ @RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit) {
List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
ArrayList<Integer> arrayList = new ArrayList<>();
docTypes.forEach(docType -> {
@@ -91,7 +88,7 @@
EntityWrapper<Order> wrapper = new EntityWrapper<>();
// wrapper.eq("tag_id", tagId);
wrapper.in("doc_type", arrayList);
- wrapper.in("settle",1,2);
+ wrapper.in("settle", 1, 2);
wrapper.orderBy("create_time", false);
Page<Order> orderPage = orderService.selectPage(new Page<>(curr, limit), wrapper);
return R.ok().add(orderPage);
@@ -99,7 +96,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);
@@ -127,15 +124,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);
@@ -144,18 +143,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<OrderDetl>().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());
@@ -234,7 +233,7 @@
@RequestMapping(value = "/order/form/modify/auth")
@ManagerAuth(memo = "鎵嬪姩淇敼璁㈠崟")
@Transactional
- public R formModify(@RequestBody OrderDomainParam param){
+ public R formModify(@RequestBody OrderDomainParam param) {
Order order = orderService.selectById(param.getOrderId());
if (order == null || order.getStatus() == 0) {
return R.error("璁㈠崟涓嶅瓨鍦�");
@@ -303,7 +302,7 @@
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,null,null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null, null, null, null);
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
issued = issued - locDetl.getAnfme();
@@ -323,8 +322,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();
@@ -352,9 +351,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)
);
}
@@ -369,22 +368,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]));
@@ -396,15 +397,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("瀛樺湪浣滀笟涓暟鎹紝涓嶈兘瀹岀粨銆傝妫�鏌ュ叆搴撻�氱煡妗ｅ拰宸ヤ綔妗�");
}
@@ -421,7 +422,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) {
@@ -436,7 +437,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"));
@@ -452,7 +453,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());
@@ -465,7 +466,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 7f780de..2c04fa4 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -33,7 +33,7 @@
@RequestMapping(value = "/orderDetl/search/pda/auth")
@ManagerAuth
- public R pdaOrderDetlSearch(@RequestParam(required = false)String condition,@RequestParam(required = false) String order){
+ public R pdaOrderDetlSearch(@RequestParam(required = false) String condition, @RequestParam(required = false) String order) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
// wrapper.like("matnr", condition).or().like("maktx", condition);
@@ -47,7 +47,7 @@
}
@PostMapping("/orderDetl/list/pda/auth")
- public R getPdaOrderDetl(@RequestBody Map<String,Object> map) {
+ public R getPdaOrderDetl(@RequestBody Map<String, Object> map) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", map.get("orderNo"));
return R.ok(orderDetlService.selectList(wrapper));
@@ -61,15 +61,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);
@@ -79,16 +81,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]));
@@ -105,10 +107,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);
@@ -117,8 +119,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();
@@ -126,7 +128,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"));
@@ -142,7 +144,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());
@@ -155,7 +157,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/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 3c43c40..981fe80 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -17,8 +17,6 @@
import com.zy.common.model.ExistDto;
import com.zy.common.model.LocDto;
import com.zy.common.model.TaskDto;
-import com.zy.common.utils.OutStockInterceptUtil;
-import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -78,7 +76,9 @@
return R.ok().add(result);
}
- /** 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ /**
+ * 澶勭悊璁㈠崟鍑哄簱璐т綅鍒嗛厤
+ *
* @param jsonObject 璇锋眰鍙傛暟(鍖呭惈璁㈠崟鏄庣粏ID鍒楄〃鍜屽嚭搴撴暟閲�)
*/
@PostMapping("/out/pakout/OrderOutGetLoc.number/auth")
@@ -109,13 +109,14 @@
/**
* 澶勭悊鍗曚釜璁㈠崟鏄庣粏鐨勮揣浣嶅垎閰�
- * @param orderDetl 璁㈠崟鏄庣粏
+ *
+ * @param orderDetl 璁㈠崟鏄庣粏
* @param requiredAmount 闇�姹傚嚭搴撻噺
- * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
+ * @param processedLocs 宸插鐞嗙殑璐т綅闆嗗悎锛堢敤浜庡幓閲嶏級
* @param processedStock 宸插鐞嗙殑搴撳瓨璁板綍闆嗗悎锛堢敤浜庡幓閲嶏級
*/
private List<LocDto> processOrderDetl(OrderDetl orderDetl, Double requiredAmount,
- Set<String> processedLocs, Set<ExistDto> processedStock) {
+ Set<String> processedLocs, Set<ExistDto> processedStock) {
List<LocDto> result = new ArrayList<>();
double remaining = Optional.ofNullable(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
@@ -125,7 +126,7 @@
throw new CoolException("鍑哄簱鏁伴噺蹇呴』澶т簬0");
}
if (requiredAmount > remaining) {
- throw new CoolException("璁㈠崟"+orderDetl.getOrderNo()+"璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
+ throw new CoolException("璁㈠崟" + orderDetl.getOrderNo() + "璇锋眰鏁伴噺瓒呰繃鍙嚭搴撴暟閲忥紝鍓╀綑鍙嚭锛�" + remaining);
}
// 褰撴寚瀹氭暟閲忔椂锛屼娇鐢ㄦ寚瀹氭暟閲忚鐩栧墿浣欓噺
remaining = Math.min(requiredAmount, remaining);
@@ -133,9 +134,9 @@
// 鑾峰彇鍙敤搴撳瓨璁板綍
List<LocDetl> stocks = locDetlService.queryStock(
- orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
- processedLocs, orderDetl.getSupp(),
- orderDetl.getTemp1(), orderDetl.getTemp2()
+ orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
+ processedLocs, orderDetl.getSupp(),
+ orderDetl.getTemp1(), orderDetl.getTemp2()
);
// 閬嶅巻澶勭悊姣忎釜搴撳瓨璁板綍
@@ -143,7 +144,7 @@
if (remaining <= 0) break;
LocMast locMast = locMastService.selectOne(
- new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
+ new EntityWrapper<LocMast>().eq("loc_no", stock.getLocNo()));
// 闈�7鍙峰爢鍨涙満澶勭悊閫昏緫
if (locMast.getCrnNo() != 7) {
@@ -165,22 +166,26 @@
return result;
}
- /** 鍒涘缓缂洪噺DTO */
+ /**
+ * 鍒涘缓缂洪噺DTO
+ */
private LocDto createShortageDto(OrderDetl orderDetl, double qty) {
LocDto dto = new LocDto(null, orderDetl.getMatnr(),
- orderDetl.getMaktx(), orderDetl.getBatch(),
- orderDetl.getOrderNo(), qty);
+ orderDetl.getMaktx(), orderDetl.getBatch(),
+ orderDetl.getOrderNo(), qty);
dto.setLack(true);
return dto;
}
- /** 澶勭悊鏅�氳揣浣� */
+ /**
+ * 澶勭悊鏅�氳揣浣�
+ */
private void processNormalLocation(LocDetl stock, OrderDetl orderDetl, double remaining,
- Set<ExistDto> processedStock, List<LocDto> result) {
+ Set<ExistDto> processedStock, List<LocDto> result) {
ExistDto exist = new ExistDto()
- .setLocNo(stock.getLocNo())
- .setMatnr(stock.getMatnr())
- .setBatch(stock.getBatch());
+ .setLocNo(stock.getLocNo())
+ .setMatnr(stock.getMatnr())
+ .setBatch(stock.getBatch());
if (processedStock.add(exist)) {
double allocateQty = Math.min(remaining, stock.getAnfme());
@@ -188,38 +193,42 @@
}
}
- /** 澶勭悊7鍙峰爢鍨涙満璐т綅 */
+ /**
+ * 澶勭悊7鍙峰爢鍨涙満璐т綅
+ */
private void processCrn7Location(LocMast baseLoc, LocDetl stock, OrderDetl orderDetl,
- double remaining, Set<ExistDto> processedStock,
- List<LocDto> result) {
+ double remaining, Set<ExistDto> processedStock,
+ List<LocDto> result) {
// 鏋勫缓鏌ヨ鏉′欢
EntityWrapper<LocMast> wrapper = (EntityWrapper<LocMast>) new EntityWrapper<LocMast>()
- .eq("gro1", baseLoc.getGro1())
- .eq("crn_no", 7)
- .eq("loc_type1", baseLoc.getLocType1())
- .orderBy("bay1", (baseLoc.getBay1() == 6 || baseLoc.getBay1() == 5));
+ .eq("gro1", baseLoc.getGro1())
+ .eq("crn_no", 7)
+ .eq("loc_type1", baseLoc.getLocType1())
+ .orderBy("bay1", (baseLoc.getBay1() == 6 || baseLoc.getBay1() == 5));
// 鑾峰彇鍚岀粍璐т綅骞跺鐞�
locMastService.selectList(wrapper).stream()
- .filter(loc -> "F".equals(loc.getLocSts()))
- .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetl, remaining, processedStock, result));
+ .filter(loc -> "F".equals(loc.getLocSts()))
+ .forEach(loc -> processCrn7SubLocation(loc, stock, orderDetl, remaining, processedStock, result));
}
- /** 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣� */
+ /**
+ * 澶勭悊7鍙峰爢鍨涙満瀛愯揣浣�
+ */
private void processCrn7SubLocation(LocMast loc, LocDetl stock, OrderDetl orderDetl,
- double remaining, Set<ExistDto> processedStock,
- List<LocDto> result) {
+ double remaining, Set<ExistDto> processedStock,
+ List<LocDto> result) {
LocDetl subStock = locDetlService.selectOne(
- new EntityWrapper<LocDetl>()
- .eq("loc_No", loc.getLocNo())
- .eq("matnr", stock.getMatnr())
- .eq("batch", stock.getBatch()));
+ new EntityWrapper<LocDetl>()
+ .eq("loc_No", loc.getLocNo())
+ .eq("matnr", stock.getMatnr())
+ .eq("batch", stock.getBatch()));
if (!Cools.isEmpty(subStock)) {
ExistDto exist = new ExistDto()
- .setLocNo(subStock.getLocNo())
- .setMatnr(subStock.getMatnr())
- .setBatch(subStock.getBatch());
+ .setLocNo(subStock.getLocNo())
+ .setMatnr(subStock.getMatnr())
+ .setBatch(subStock.getBatch());
if (processedStock.add(exist) && remaining > 0) {
double allocateQty = Math.min(remaining, subStock.getAnfme());
@@ -228,22 +237,24 @@
}
}
- /** 鏋勫缓璐т綅DTO閫氱敤鏂规硶 */
+ /**
+ * 鏋勫缓璐т綅DTO閫氱敤鏂规硶
+ */
private LocDto buildLocDto(LocDetl stock, OrderDetl orderDetl, double qty) {
LocDto dto = new LocDto(
- stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
- stock.getBatch(), orderDetl.getOrderNo(), qty
+ stock.getLocNo(), stock.getMatnr(), stock.getMaktx(),
+ stock.getBatch(), orderDetl.getOrderNo(), qty
);
// 鑾峰彇宸ヤ綔绔欏苟杞崲
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(
- stock.getLocNo(), qty >= stock.getAnfme() ? 101 : 103);
+ stock.getLocNo(), qty >= stock.getAnfme() ? 101 : 103);
List<LocDto.staListDto> staList = staNos.stream()
- .map(staNo -> new LocDto.staListDto()
- .setStaNo(staNo)
- .setStaName(Utils.getStaName(staNo)))
- .collect(Collectors.toList());
+ .map(staNo -> new LocDto.staListDto()
+ .setStaNo(staNo)
+ .setStaName(Utils.getStaName(staNo)))
+ .collect(Collectors.toList());
dto.setStaNos(staList);
return dto;
@@ -340,7 +351,9 @@
// }
- /** 鍥涘悜搴撹鍗曞嚭搴� **/
+ /**
+ * 鍥涘悜搴撹鍗曞嚭搴�
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/sxk")
@ManagerAuth
public R pakoutPreviewCustomQuantitySXK(@RequestBody JSONObject jsonObject) {
@@ -363,12 +376,14 @@
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_No", locMast.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
@@ -377,7 +392,7 @@
existDto.setLocNo(locDetl1.getLocNo());
existDto.setMatnr(locDetl1.getMatnr());
existDto.setBatch(locDetl1.getBatch());
- if (existDtos.add(existDto)){
+ if (existDtos.add(existDto)) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
@@ -393,7 +408,7 @@
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
- }else {
+ } else {
break;
}
}
@@ -424,12 +439,14 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
- if (locMast.getLocSts().equals("F")){
+ if (locMast.getLocSts().equals("F")) {
LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_No", locMast.getLocNo())
.eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
@@ -438,7 +455,7 @@
existDto.setLocNo(locDetl1.getLocNo());
existDto.setMatnr(locDetl1.getMatnr());
existDto.setBatch(locDetl1.getBatch());
- if (existDtos.add(existDto)){
+ if (existDtos.add(existDto)) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl1.getLocNo(), locDetl1.getMatnr(), locDetl1.getMaktx(), locDetl1.getBatch(), orderDetl.getOrderNo(),
issued >= locDetl1.getAnfme() ? locDetl1.getAnfme() : issued);
@@ -454,7 +471,7 @@
locDtos.add(locDto);
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
- }else {
+ } else {
break;
}
}
@@ -471,7 +488,9 @@
return R.ok().add(locDtos);
}
- /** ctu璁㈠崟鍑哄簱 **/
+ /**
+ * ctu璁㈠崟鍑哄簱
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/ctu")
@ManagerAuth
public R pakoutPreviewCustomQuantityCTU(@RequestBody JSONObject jsonObject) {
@@ -494,9 +513,11 @@
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -519,7 +540,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -546,9 +567,11 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockMinAnfme(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -571,7 +594,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -584,7 +607,9 @@
return R.ok().add(locDtos);
}
- /** crn璁㈠崟鍑哄簱 **/
+ /**
+ * crn璁㈠崟鍑哄簱
+ **/
@PostMapping("/out/pakout/previewCustomQuantity/auth/crn")
@ManagerAuth
public R pakoutPreviewCustomQuantityCRN(@RequestBody JSONObject jsonObject) {
@@ -607,9 +632,11 @@
}
issued = amount;
}
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -632,7 +659,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -659,9 +686,11 @@
for (OrderDetl orderDetl : orderDetls) {
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
- if (issued <= 0.0D) { continue; }
+ if (issued <= 0.0D) {
+ continue;
+ }
List<LocDetl> locDetls = new ArrayList<>();
- locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
+ locDetls = locDetlService.queryStockCrn(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist, orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2());
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
ExistDto existDto = new ExistDto();
@@ -684,7 +713,7 @@
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
issued = issued - locDetl.getAnfme();
}
- }else {
+ } else {
break;
}
}
@@ -696,10 +725,6 @@
}
return R.ok().add(locDtos);
}
-
-
-
-
@PostMapping("/out/pakout/auth")
@@ -726,7 +751,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);
@@ -768,7 +795,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 542d0a8..31a70a6 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]));
@@ -95,10 +97,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());
@@ -109,8 +111,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();
@@ -118,7 +120,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"));
@@ -134,7 +136,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());
@@ -147,7 +149,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 67c619b..2f8de48 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -24,6 +24,7 @@
/**
* 鏃ュ織缁熻鎺у埗鍣ㄥ眰
+ *
* @author admin
* @date 2018骞�11鏈�23鏃�
*/
@@ -31,309 +32,311 @@
@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);
- if (!Cools.isEmpty(param.get("modi_time"))) {
- String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
- bean.setBegin_date(dates[0]);
- bean.setEnd_date(dates[1]);
- }
- int count = 0;
- List<ViewInOutBean> list = new ArrayList<>();
- if (param.get("type") == null || param.get("type").equals(1)) {
- list = reportQueryMapper.queryViewInOutListDay(bean);
- count = reportQueryMapper.getViewInOutCountDay(bean);
- }else if ( param.get("type").equals("2")) {
- list = reportQueryMapper.queryViewInOutListMonth(bean);
- count = reportQueryMapper.getViewInOutCountMonth(bean);
- } else if (param.get("type").equals("3")) {
- list = reportQueryMapper.queryViewInOutListYear(bean);
- count = reportQueryMapper.getViewInOutCountYear(bean);
- }else {
- list = reportQueryMapper.queryViewInOutListDay(bean);
- count = reportQueryMapper.getViewInOutCountDay(bean);
- }
+ //------------------绔欑偣鏃ュ叆鍑哄簱娆℃暟缁熻--------------------------------------
+ @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);
+ if (!Cools.isEmpty(param.get("modi_time"))) {
+ String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
+ bean.setBegin_date(dates[0]);
+ bean.setEnd_date(dates[1]);
+ }
+ int count = 0;
+ List<ViewInOutBean> list = new ArrayList<>();
+ if (param.get("type") == null || param.get("type").equals(1)) {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ count = reportQueryMapper.getViewInOutCountDay(bean);
+ } else if (param.get("type").equals("2")) {
+ list = reportQueryMapper.queryViewInOutListMonth(bean);
+ count = reportQueryMapper.getViewInOutCountMonth(bean);
+ } else if (param.get("type").equals("3")) {
+ list = reportQueryMapper.queryViewInOutListYear(bean);
+ count = reportQueryMapper.getViewInOutCountYear(bean);
+ } else {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ count = reportQueryMapper.getViewInOutCountDay(bean);
+ }
// List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
- Page<ViewInOutBean> page = new Page<>();
- page.setRecords(list);
- page.setTotal(count);
- return R.ok(page);
- }
+ Page<ViewInOutBean> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ return R.ok(page);
+ }
- @RequestMapping("/viewInOutList/count")
- public R getAllCount() {
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(99999);
- bean.setPageNumber(1);
- List<ViewInOutBean> list = new ArrayList<>();
- Map<String, Double> map = new HashMap<>();
- Double in = 0.0;
- Double out = 0.0;
- list = reportQueryMapper.queryViewInOutListDay(bean);
- for (ViewInOutBean bean1 : list) {
- in += bean1.getSto_qty().doubleValue();
- out += bean1.getRet_qty().doubleValue();
- }
- map.put("in", in);
- map.put("out", out);
- return R.ok(map);
- }
+ @RequestMapping("/viewInOutList/count")
+ public R getAllCount() {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(99999);
+ bean.setPageNumber(1);
+ List<ViewInOutBean> list = new ArrayList<>();
+ Map<String, Double> map = new HashMap<>();
+ Double in = 0.0;
+ Double out = 0.0;
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ for (ViewInOutBean bean1 : list) {
+ in += bean1.getSto_qty().doubleValue();
+ out += bean1.getRet_qty().doubleValue();
+ }
+ map.put("in", in);
+ map.put("out", out);
+ return R.ok(map);
+ }
- /**
- * 鑾峰彇搴撳瓨鎬绘暟
- * @return
- */
- @RequestMapping("/viewInOutList/date/count")
- public R getCount(@RequestBody Map<String, String> param){
- ViewInOutBean bean = new ViewInOutBean();
- bean.setPageSize(99999);
- bean.setPageNumber(1);
- if (!Cools.isEmpty(param.get("modi_time"))) {
- String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
- bean.setBegin_date(dates[0]);
- bean.setEnd_date(dates[1]);
- }
- Map<String, Double> map = new HashMap<>();
- Double in = 0.0;
- Double out = 0.0;
- List<ViewInOutBean> list = new ArrayList<>();
- if (param.get("type") == null || param.get("type").equals(1)) {
- list = reportQueryMapper.queryViewInOutListDay(bean);
- }else if ( param.get("type").equals("2")) {
- list = reportQueryMapper.queryViewInOutListMonth(bean);
- } else if (param.get("type").equals("3")) {
- list = reportQueryMapper.queryViewInOutListYear(bean);
- }else {
- list = reportQueryMapper.queryViewInOutListDay(bean);
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ *
+ * @return
+ */
+ @RequestMapping("/viewInOutList/date/count")
+ public R getCount(@RequestBody Map<String, String> param) {
+ ViewInOutBean bean = new ViewInOutBean();
+ bean.setPageSize(99999);
+ bean.setPageNumber(1);
+ if (!Cools.isEmpty(param.get("modi_time"))) {
+ String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
+ bean.setBegin_date(dates[0]);
+ bean.setEnd_date(dates[1]);
+ }
+ Map<String, Double> map = new HashMap<>();
+ Double in = 0.0;
+ Double out = 0.0;
+ List<ViewInOutBean> list = new ArrayList<>();
+ if (param.get("type") == null || param.get("type").equals(1)) {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
+ } else if (param.get("type").equals("2")) {
+ list = reportQueryMapper.queryViewInOutListMonth(bean);
+ } else if (param.get("type").equals("3")) {
+ list = reportQueryMapper.queryViewInOutListYear(bean);
+ } else {
+ list = reportQueryMapper.queryViewInOutListDay(bean);
- }
- for (ViewInOutBean bean1 : list) {
- in += bean1.getSto_qty().doubleValue();
- out += bean1.getRet_qty().doubleValue();
- }
- map.put("in", in);
- map.put("out", out);
- return R.ok(map);
- }
+ }
+ for (ViewInOutBean bean1 : list) {
+ in += bean1.getSto_qty().doubleValue();
+ out += bean1.getRet_qty().doubleValue();
+ }
+ map.put("in", in);
+ map.put("out", out);
+ return R.ok(map);
+ }
- //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));
+ }
- 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)){
- String[] dates = val.split(RANGE_TIME_LINK);
- wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
- wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
+ 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)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
}
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 ee0c3ed..81bb038 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;
@@ -38,18 +38,18 @@
@ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�")
public R init(StaDescInitParam param) {
SqlSession sqlSession = null;
- 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 = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
+ 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))
@@ -76,9 +76,9 @@
sqlSession.clearCache();
// staDescService.insertBatch(staDescList);
- }catch (Exception e){
+ } catch (Exception e) {
return R.error(e.getMessage());
- }finally {
+ } finally {
sqlSession.close();
}
@@ -93,22 +93,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]));
@@ -137,10 +139,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());
@@ -151,12 +153,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();
@@ -164,7 +166,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"));
@@ -180,7 +182,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());
@@ -193,7 +195,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/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 7d994d8..e541fea 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -11,7 +11,6 @@
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;
@@ -44,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]));
@@ -79,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);
@@ -92,14 +92,14 @@
@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));
@@ -115,7 +115,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"));
@@ -131,7 +131,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());
@@ -144,7 +144,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/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index d4b7c72..fb4231a 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -36,30 +36,30 @@
@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);
}
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByBarcode(getUserId(),wrapper);
+ RoleUtils.addRoleWrapperByBarcode(getUserId(), wrapper);
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]));
@@ -78,12 +78,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();
@@ -91,7 +91,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"));
@@ -107,7 +107,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());
@@ -120,7 +120,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 33270f9..416cba1 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -85,13 +85,13 @@
EntityWrapper<WrkDetlLog> wrapper = new EntityWrapper<>();
convert(param, wrapper);
allLike(WrkDetlLog.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);
}
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByBarcode(getUserId(),wrapper);
+ RoleUtils.addRoleWrapperByBarcode(getUserId(), wrapper);
return R.ok(wrkDetlLogService.selectPage(new Page<>(curr, limit), wrapper));
// Integer wrkNo = null;
// String orderNo = null;
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 314ebf6..d2336a9 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastController.java
@@ -33,33 +33,33 @@
@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);
}
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
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]));
@@ -80,10 +80,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());
@@ -94,12 +94,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();
@@ -107,7 +107,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"));
@@ -123,7 +123,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());
@@ -136,7 +136,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();
@@ -148,8 +148,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();
@@ -161,7 +161,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/WrkMastExecuteController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
deleted file mode 100644
index 5b15e25..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-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.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastExecuteController extends BaseController {
-
- @Autowired
- private WrkMastExecuteService wrkMastExecuteService;
-
- @RequestMapping(value = "/wrkMastExecute/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastExecuteService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastExecute/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){
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastExecute.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastExecuteService.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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastExecute/add/auth")
- @ManagerAuth
- public R add(WrkMastExecute wrkMastExecute) {
- wrkMastExecuteService.insert(wrkMastExecute);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/update/auth")
- @ManagerAuth
- public R update(WrkMastExecute wrkMastExecute){
- if (Cools.isEmpty(wrkMastExecute) || null==wrkMastExecute.getWrkNo()){
- return R.error();
- }
- wrkMastExecuteService.updateById(wrkMastExecute);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastExecuteService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecute/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecute"));
- convert(map, wrapper);
- List<WrkMastExecute> list = wrkMastExecuteService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastExecuteQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastExecute> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastExecute> page = wrkMastExecuteService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastExecute wrkMastExecute : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastExecute.getWrkNo());
- map.put("value", wrkMastExecute.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastExecute/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastExecute> wrapper = new EntityWrapper<WrkMastExecute>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastExecuteService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecute.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
deleted file mode 100644
index cbaa129..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastExecuteLogController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-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.WrkMastExecuteLog;
-import com.zy.asrs.service.WrkMastExecuteLogService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastExecuteLogController extends BaseController {
-
- @Autowired
- private WrkMastExecuteLogService wrkMastExecuteLogService;
-
- @RequestMapping(value = "/wrkMastExecuteLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastExecuteLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/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){
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastExecuteLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastExecuteLogService.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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/add/auth")
- @ManagerAuth
- public R add(WrkMastExecuteLog wrkMastExecuteLog) {
- wrkMastExecuteLogService.insert(wrkMastExecuteLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/update/auth")
- @ManagerAuth
- public R update(WrkMastExecuteLog wrkMastExecuteLog){
- if (Cools.isEmpty(wrkMastExecuteLog) || null==wrkMastExecuteLog.getWrkNo()){
- return R.error();
- }
- wrkMastExecuteLogService.updateById(wrkMastExecuteLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastExecuteLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastExecuteLog"));
- convert(map, wrapper);
- List<WrkMastExecuteLog> list = wrkMastExecuteLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastExecuteLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastExecuteLog> page = wrkMastExecuteLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastExecuteLog wrkMastExecuteLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastExecuteLog.getWrkNo());
- map.put("value", wrkMastExecuteLog.getWrkNo());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastExecuteLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastExecuteLog> wrapper = new EntityWrapper<WrkMastExecuteLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastExecuteLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastExecuteLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
deleted file mode 100644
index e4a946c..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-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.WrkMastFourWarVehicle;
-import com.zy.asrs.service.WrkMastFourWarVehicleService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastFourWarVehicleController extends BaseController {
-
- @Autowired
- private WrkMastFourWarVehicleService wrkMastFourWarVehicleService;
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastFourWarVehicleService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/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){
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastFourWarVehicle.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastFourWarVehicleService.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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/add/auth")
- @ManagerAuth
- public R add(WrkMastFourWarVehicle wrkMastFourWarVehicle) {
- wrkMastFourWarVehicleService.insert(wrkMastFourWarVehicle);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/update/auth")
- @ManagerAuth
- public R update(WrkMastFourWarVehicle wrkMastFourWarVehicle){
- if (Cools.isEmpty(wrkMastFourWarVehicle) || null==wrkMastFourWarVehicle.getId()){
- return R.error();
- }
- wrkMastFourWarVehicleService.updateById(wrkMastFourWarVehicle);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastFourWarVehicleService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastFourWarVehicle"));
- convert(map, wrapper);
- List<WrkMastFourWarVehicle> list = wrkMastFourWarVehicleService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastFourWarVehicle> page = wrkMastFourWarVehicleService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastFourWarVehicle wrkMastFourWarVehicle : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastFourWarVehicle.getId());
- map.put("value", wrkMastFourWarVehicle.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicle/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastFourWarVehicle> wrapper = new EntityWrapper<WrkMastFourWarVehicle>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastFourWarVehicleService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastFourWarVehicle.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
deleted file mode 100644
index 739e028..0000000
--- a/src/main/java/com/zy/asrs/controller/WrkMastFourWarVehicleLogController.java
+++ /dev/null
@@ -1,125 +0,0 @@
-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.WrkMastFourWarVehicleLog;
-import com.zy.asrs.service.WrkMastFourWarVehicleLogService;
-import com.core.annotations.ManagerAuth;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
-import com.zy.common.web.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-@RestController
-public class WrkMastFourWarVehicleLogController extends BaseController {
-
- @Autowired
- private WrkMastFourWarVehicleLogService wrkMastFourWarVehicleLogService;
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/{id}/auth")
- @ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(wrkMastFourWarVehicleLogService.selectById(String.valueOf(id)));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/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){
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- excludeTrash(param);
- convert(param, wrapper);
- allLike(WrkMastFourWarVehicleLog.class, param.keySet(), wrapper, condition);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
- return R.ok(wrkMastFourWarVehicleLogService.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()){
- String val = String.valueOf(entry.getValue());
- 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]));
- } else {
- wrapper.like(entry.getKey(), val);
- }
- }
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/add/auth")
- @ManagerAuth
- public R add(WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog) {
- wrkMastFourWarVehicleLogService.insert(wrkMastFourWarVehicleLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/update/auth")
- @ManagerAuth
- public R update(WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog){
- if (Cools.isEmpty(wrkMastFourWarVehicleLog) || null==wrkMastFourWarVehicleLog.getId()){
- return R.error();
- }
- wrkMastFourWarVehicleLogService.updateById(wrkMastFourWarVehicleLog);
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/delete/auth")
- @ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- wrkMastFourWarVehicleLogService.deleteById(id);
- }
- return R.ok();
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMastFourWarVehicleLog"));
- convert(map, wrapper);
- List<WrkMastFourWarVehicleLog> list = wrkMastFourWarVehicleLogService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLogQuery/auth")
- @ManagerAuth
- public R query(String condition) {
- EntityWrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<>();
- wrapper.like("id", condition);
- Page<WrkMastFourWarVehicleLog> page = wrkMastFourWarVehicleLogService.selectPage(new Page<>(0, 10), wrapper);
- List<Map<String, Object>> result = new ArrayList<>();
- for (WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog : page.getRecords()){
- Map<String, Object> map = new HashMap<>();
- map.put("id", wrkMastFourWarVehicleLog.getId());
- map.put("value", wrkMastFourWarVehicleLog.getId());
- result.add(map);
- }
- return R.ok(result);
- }
-
- @RequestMapping(value = "/wrkMastFourWarVehicleLog/check/column/auth")
- @ManagerAuth
- public R query(@RequestBody JSONObject param) {
- Wrapper<WrkMastFourWarVehicleLog> wrapper = new EntityWrapper<WrkMastFourWarVehicleLog>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != wrkMastFourWarVehicleLogService.selectOne(wrapper)){
- return R.parse(BaseRes.REPEAT).add(getComment(WrkMastFourWarVehicleLog.class, String.valueOf(param.get("key"))));
- }
- return R.ok();
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 9a41f8e..8825627 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -36,33 +36,33 @@
@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);
}
// 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
- RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
+ RoleUtils.addRoleWrapperByCrn(getUserId(), wrapper);
return R.ok(wrkMastLogService.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]));
@@ -83,10 +83,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);
@@ -95,12 +95,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();
@@ -108,7 +108,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"));
@@ -124,7 +124,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());
@@ -137,7 +137,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/AutoMove.java b/src/main/java/com/zy/asrs/entity/AutoMove.java
index 3b81f79..a5b5ae9 100644
--- a/src/main/java/com/zy/asrs/entity/AutoMove.java
+++ b/src/main/java/com/zy/asrs/entity/AutoMove.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_auto_move")
@@ -23,48 +22,49 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Short status;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("line_number")
private Integer lineNumber;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("row_priority")
private Integer rowPriority;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("order_no")
private String orderNo;
- @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 Integer uuid;
- public AutoMove() {}
+ public AutoMove() {
+ }
- public AutoMove(Short status,Integer lineNumber,String locNo,Integer rowPriority,String orderNo,Date createTime,Date updateTime,Integer uuid) {
+ public AutoMove(Short status, Integer lineNumber, String locNo, Integer rowPriority, String orderNo, Date createTime, Date updateTime, Integer uuid) {
this.status = status;
this.lineNumber = lineNumber;
this.locNo = locNo;
@@ -86,9 +86,11 @@
// 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:
@@ -98,15 +100,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/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/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/BasWhs.java b/src/main/java/com/zy/asrs/entity/BasWhs.java
index c003470..706961d 100644
--- a/src/main/java/com/zy/asrs/entity/BasWhs.java
+++ b/src/main/java/com/zy/asrs/entity/BasWhs.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,55 +22,56 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
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 = "鏍囪瘑")
@TableId(value = "identifying", type = IdType.AUTO)
private String identifying;
- public BasWhs() {}
+ public BasWhs() {
+ }
- public BasWhs(String whsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public BasWhs(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.whsDesc = whsDesc;
this.modiUser = modiUser;
this.modiTime = modiTime;
@@ -106,10 +107,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;
@@ -123,8 +124,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);
@@ -138,10 +139,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;
@@ -155,8 +156,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/InventoryCheckOrder.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java
deleted file mode 100644
index 6a938b8..0000000
--- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrder.java
+++ /dev/null
@@ -1,100 +0,0 @@
-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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("man_Inventory_check_order")
-public class InventoryCheckOrder implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 鍗曟嵁鍙�
- */
- @ApiModelProperty(value= "鍗曟嵁鍙�")
- @TableField("order_no")
- private String orderNo;
-
- /**
- * 搴撳尯
- */
- @ApiModelProperty(value= "搴撳尯")
- private String area;
-
- @ApiModelProperty(value= "鐘舵��")
- private String status;
-
- /**
- * 鍒涘缓鏃堕棿
- */
- @ApiModelProperty(value= "鍒涘缓鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 鍒涘缓浜�
- */
- @ApiModelProperty(value= "鍒涘缓浜�")
- @TableField("create_by")
- private String createBy;
-
-
- public InventoryCheckOrder() {}
-
- public InventoryCheckOrder(Integer id,String orderNo,String area,Date createTime,String createBy) {
- this.id = id;
- this.orderNo = orderNo;
- this.area = area;
- this.createTime = createTime;
- this.createBy = createBy;
- }
-
-// InventoryCheckOrder inventoryCheckOrder = new InventoryCheckOrder(
-// null, // ID[闈炵┖]
-// null, // 鍗曟嵁鍙�
-// null, // 搴撳尯
-// null, // 鍒涘缓鏃堕棿
-// null // 鍒涘缓浜�
-// );
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getStatus$(){
- if (Cools.isEmpty(this.status)){
- return "";
- }
- switch (this.status){
- case "1":
- return "鏈彁浜�";
- case "2":
- return "宸叉彁浜�";
- default:
- return "";
- }
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
deleted file mode 100644
index 98c81e6..0000000
--- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("man_Inventory_check_order_detl")
-public class InventoryCheckOrderDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value= "")
- @TableField("order_no")
- private String orderNo;
-
- @ApiModelProperty(value= "")
- private String matnr;
-
- @ApiModelProperty(value= "")
- private String maktx;
-
- @ApiModelProperty(value= "")
- private String batch;
-
- @ApiModelProperty(value= "")
- private Double anfme;
-
- @ApiModelProperty(value= "")
- private String area;
-
- @ApiModelProperty(value= "")
- private String status;
-
- @ApiModelProperty(value= "")
- @TableField("loc_no")
- private String locNo;
-
- @ApiModelProperty(value= "")
- @TableField("check_anfme")
- private Double checkAnfme;
-
- @ApiModelProperty(value= "")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- public InventoryCheckOrderDetl() {}
-
- public InventoryCheckOrderDetl(String orderNo,String matnr,String maktx,String batch,Double anfme,String area,String locNo,Date ioTime) {
- this.orderNo = orderNo;
- this.matnr = matnr;
- this.maktx = maktx;
- this.batch = batch;
- this.anfme = anfme;
- this.area = area;
- this.locNo = locNo;
- this.ioTime = ioTime;
- }
-
-// InventoryCheckOrderDetl inventoryCheckOrderDetl = new InventoryCheckOrderDetl(
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getStatus$(){
- if (Cools.isEmpty(this.status)){
- return "";
- }
- switch (this.status){
- case "1":
- return "寰呯洏";
- case "2":
- return "宸茬洏";
- default:
- return "";
- }
- }
-
- public String getProfit$(){
- if (Cools.isEmpty(this.status) || !this.status.equals("1")){
- return "鏈洏鐐�";
- }
- if (Cools.isEmpty(this.anfme) || Cools.isEmpty(this.checkAnfme)){
- return "";
- }
- if (this.anfme > this.checkAnfme){
- return "鐩樹簭";
- }else if (this.anfme < this.checkAnfme){
- return "鐩樼泩";
- }else {
- return "骞�";
- }
- }
-
-
-}
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
deleted file mode 100644
index aa7ba3e..0000000
--- a/src/main/java/com/zy/asrs/entity/LocCheck.java
+++ /dev/null
@@ -1,154 +0,0 @@
-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 io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("man_loc_check")
-public class LocCheck implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鍞竴ID
- */
- @ApiModelProperty(value= "鍞竴ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫
- */
- @ApiModelProperty(value= "鐘舵�� 1: 鐩樼偣涓� 2: 鐩樼偣缁撴潫 ")
- private Integer type;
-
- /**
- * 搴撲綅鍙�
- */
- @ApiModelProperty(value= "搴撲綅鍙�")
- @TableField("loc_no")
- private String locNo;
-
- /**
- * 鐗╂枡鍙�
- */
- @ApiModelProperty(value= "鐗╂枡鍙�")
- private String matnr;
-
- /**
- * 鐩樼偣鍓嶆暟閲�
- */
- @ApiModelProperty(value= "鐩樼偣鍓嶆暟閲�")
- @TableField("origin_anfme")
- private Double originAnfme;
-
- /**
- * 鐪熷疄鏁伴噺
- */
- @ApiModelProperty(value= "鐪熷疄鏁伴噺")
- @TableField("real_anfme")
- private Double realAnfme;
-
- /**
- * 鍒涘缓浜�
- */
- @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;
-
- public LocCheck() {}
-
- 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;
- this.originAnfme = originAnfme;
- this.realAnfme = realAnfme;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// LocCheck locCheck = new LocCheck(
-// null, // 鐘舵��
-// null, // 搴撲綅鍙�
-// null, // 鐗╂枡鍙�
-// null, // 鐩樼偣鍓嶆暟閲�
-// null, // 鐪熷疄鏁伴噺
-// null, // 鍒涘缓浜�
-// null, // 鍒涘缓鏃堕棿
-// null, // 淇敼浜�
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getType$(){
- if (null == this.type){ return null; }
- switch (this.type){
- case 1:
- return "鐩樼偣涓�";
- case 2:
- return "鐩樼偣缁撴潫";
- default:
- return String.valueOf(this.type);
- }
- }
-
- 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)){
- 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 59974a3..fea08a1 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -24,161 +24,163 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "搴撲綅鍙�")
+ @ApiModelProperty(value = "搴撲綅鍙�")
@TableField("loc_no")
private String locNo;
- @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 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 String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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 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:
@@ -188,9 +190,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:
@@ -202,9 +206,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:
@@ -214,9 +220,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:
@@ -226,47 +234,47 @@
}
}
- 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(){
- if (Cools.isEmpty(this.appeTime)){
+ public long getStoreDate() {
+ if (Cools.isEmpty(this.appeTime)) {
this.appeTime = new Date();
}
long timeNow = new Date().getTime();
long timeCreate = this.appeTime.getTime();
- return (timeNow - timeCreate) /24/60/60/1000;
+ return (timeNow - timeCreate) / 24 / 60 / 60 / 1000;
}
public void sync(Object source) {
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index a62b9cd..ba1a298 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.BasWhsService;
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,190 +34,192 @@
/**
* 搴撲綅绫诲瀷
*/
- @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;
- public String getWhsType$(){
+ public String getWhsType$() {
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
BasWhs basWhs = service.selectById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
+ if (!Cools.isEmpty(basWhs)) {
return String.valueOf(basWhs.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:
@@ -230,8 +232,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:
@@ -244,8 +248,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:
@@ -257,40 +263,40 @@
}
}
- 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);
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
deleted file mode 100644
index 40770f9..0000000
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-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.NodeService;
-import com.zy.common.utils.Synchro;
-import com.zy.system.entity.Host;
-import com.zy.system.entity.User;
-import com.zy.system.service.HostService;
-import com.zy.system.service.UserService;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@TableName("man_loc_detl")
-public class ManLocDetl implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 鎵�灞為」鐩�
- */
- @ApiModelProperty(value= "鎵�灞為」鐩�")
- @TableField("host_id")
- private Long hostId;
-
- /**
- * 璐т綅缂栧彿
- */
- @ApiModelProperty(value= "璐т綅缂栧彿")
- @TableId(value = "loc_no", type = IdType.INPUT)
- @TableField("loc_no")
- private String locNo;
-
- /**
- * 鎵�灞炶揣浣�
- */
- @ApiModelProperty(value= "鎵�灞炶揣浣�")
- @TableField("node_id")
- private Long nodeId;
-
- /**
- * 鎵樼洏鐮�
- */
- @ApiModelProperty(value= "鎵樼洏鐮�")
- private String zpallet;
-
- /**
- * 搴撳瓨浣欓噺
- */
- @ApiModelProperty(value= "搴撳瓨浣欓噺")
- @ExcelProperty(value = "搴撳瓨鎬婚噺")
- private Double anfme;
-
- /**
- * 鍟嗗搧缂栧彿
- */
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @TableId(value = "matnr", type = IdType.INPUT)
- @ExcelProperty(value = "鍟嗗搧缂栧彿")
- private String matnr;
-
- /**
- * 鍟嗗搧鍚嶇О
- */
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty(value = "鍟嗗搧鍚嶇О")
- private String maktx;
-
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
-
- /**
- * 瑙勬牸
- */
- @ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty(value = "瑙勬牸")
- private String specs;
-
- /**
- * 鍨嬪彿
- */
- @ApiModelProperty(value= "鍨嬪彿")
- private String model;
-
- /**
- * 鎵瑰彿
- */
- @ApiModelProperty(value= "鎵瑰彿")
- @TableId(value = "batch", type = IdType.INPUT)
- private String batch;
-
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(value= "鍗曚綅")
- @ExcelProperty(value = "鍗曚綅")
- private String unit;
-
- /**
- * SKC
- */
- @ApiModelProperty(value= "SKC")
- @ExcelProperty(value = "SKC")
- private String barcode;
-
- /**
- * 鍗曟嵁绫诲瀷
- */
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @TableField("doc_id")
- private Long docId;
-
- /**
- * 鍗曟嵁缂栧彿
- */
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("doc_num")
- private String docNum;
-
- /**
- * 瀹㈡埛鍚嶇О
- */
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- @TableField("cust_name")
- private String custName;
-
- /**
- * 鍝侀」鏁�
- */
- @ApiModelProperty(value= "鍝侀」鏁�")
- @TableField("item_num")
- private Integer itemNum;
-
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(value= "鏁伴噺")
- private Integer count;
-
-
- /**
- * 鍗曚环
- */
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
-
- /**
- * 閲嶉噺
- */
- @ApiModelProperty(value= "閲嶉噺")
- private Double weight;
-
- /**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
- */
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
- private Integer status;
-
- /**
- * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
- */
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
- private Integer danger;
-
- /**
- * 娣诲姞浜哄憳
- */
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- @TableField("create_by")
- private Long createBy;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- private Date createTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
- private Long updateBy;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- private Date modiTime;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
-
- @ApiModelProperty(value = "棰勭暀1")
- private String temp1;
- @ApiModelProperty(value = "棰勭暀2")
- private String temp2;
- @ApiModelProperty(value = "棰勭暀3")
- private String temp3;
- @ApiModelProperty(value = "棰勭暀4")
- private String temp4;
-
-
- 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) {
- this.hostId = hostId;
- this.nodeId = nodeId;
- this.zpallet = zpallet;
- this.anfme = anfme;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.docId = docId;
- this.docNum = docNum;
- this.custName = custName;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.modiTime = modiTime;
- this.memo = memo;
- }
-
-// LocDetl locDetl = new LocDetl(
-// null, // 璐т綅缂栧彿[闈炵┖]
-// null, // 鎵�灞炶揣浣�
-// null, // 鎵樼洏鐮�
-// null, // 搴撳瓨浣欓噺[闈炵┖]
-// null, // 鍟嗗搧缂栧彿[闈炵┖]
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍚嶇О
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 鎵瑰彿
-// null, // 鍗曚綅
-// null, // SKC
-// null, // 鍗曟嵁绫诲瀷
-// null, // 鍗曟嵁缂栧彿
-// null, // 瀹㈡埛鍚嶇О
-// null, // 鍝侀」鏁�
-// null, // 鏁伴噺
-// null, // 閲嶉噺
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getHostId$(){
- HostService service = SpringUtils.getBean(HostService.class);
- Host host = service.selectById(this.hostId);
- if (!Cools.isEmpty(host)){
- return String.valueOf(host.getName());
- }
- return null;
- }
-
- public Long getNodeId() {
- return nodeId;
- }
-
- public String getNodeId$(){
- NodeService service = SpringUtils.getBean(NodeService.class);
- Node node = service.selectById(this.nodeId);
- if (!Cools.isEmpty(node)){
- return String.valueOf(node.getName());
- }
- 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 getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- 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.getNickname());
- }
- return null;
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void sync(Object source) {
- Synchro.Copy(source, this);
- }
-
- public long getStoreDate(){
- if (Cools.isEmpty(this.createTime)){
- this.createTime = new Date();
- }
- long timeNow = new Date().getTime();
- long timeCreate = this.createTime.getTime();
-
-
- return (timeNow - timeCreate) /24/60/60/1000;
- }
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 18e4fed..72b0f83 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -39,27 +39,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;
@@ -67,98 +67,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;
@@ -166,7 +166,7 @@
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
@@ -174,7 +174,7 @@
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
@@ -182,28 +182,28 @@
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
@ExcelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
@ExcelProperty(value = "闀垮害")
private Double length;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
@ExcelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@ExcelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
@@ -211,14 +211,14 @@
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
@ExcelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
@@ -226,14 +226,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;
@@ -241,7 +241,7 @@
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
@ExcelProperty(value = "棰勮澶╂暟")
private Integer deadWarn;
@@ -249,61 +249,61 @@
/**
* 鍒惰喘 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(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
@ExcelProperty(value = "澶囨敞")
private String memo;
@@ -325,9 +325,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 length,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 length, 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;
@@ -407,18 +408,20 @@
// 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 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 +431,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 +447,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 +461,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,9 +475,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:
@@ -478,33 +489,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 5aebc90..409db6a 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -27,250 +27,251 @@
/**
* 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;
- 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;
@@ -344,18 +345,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:
@@ -365,9 +368,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:
@@ -377,32 +382,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:
@@ -412,9 +419,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:
@@ -426,33 +435,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 e3c3acb..d5ce844 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -27,21 +27,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;
@@ -49,262 +49,263 @@
/**
* 鏁伴噺
*/
- @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 = "闀垮害")
private Double 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;
/**
* 鏄惁鎵规 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;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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 length, 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;
@@ -348,18 +349,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:
@@ -369,9 +372,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:
@@ -383,9 +388,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:
@@ -395,9 +402,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:
@@ -407,9 +416,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:
@@ -419,33 +430,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);
@@ -461,8 +472,8 @@
return null;
}
- public String getQty$(){
- if (getAnfme().equals(getQty())){
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
return "宸插畬鎴�";
}
return "鏈畬鎴�";
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlReport.java b/src/main/java/com/zy/asrs/entity/OrderDetlReport.java
index 5d2c626..8a93745 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlReport.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlReport.java
@@ -25,258 +25,260 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏁伴噺
*/
- @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 = "闀垮害")
private Double 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;
/**
* 鏄惁鎵规 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;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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:
@@ -286,9 +288,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:
@@ -300,9 +304,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:
@@ -312,9 +318,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:
@@ -324,33 +332,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/OrderDetlReportLog.java b/src/main/java/com/zy/asrs/entity/OrderDetlReportLog.java
index d02db8a..1acbd18 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlReportLog.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlReportLog.java
@@ -25,258 +25,260 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 鏁伴噺
*/
- @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 = "闀垮害")
private Double 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;
/**
* 鏄惁鎵规 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;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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:
@@ -286,9 +288,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:
@@ -300,9 +304,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:
@@ -312,9 +318,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:
@@ -324,33 +332,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/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 5160dbd..0f8a551 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -5,12 +5,12 @@
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.BasWhsService;
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;
@@ -25,7 +25,7 @@
/**
* 绫诲埆
*/
- @ApiModelProperty(value= "绫诲埆")
+ @ApiModelProperty(value = "绫诲埆")
@TableId(value = "whs_type", type = IdType.INPUT)
@TableField("whs_type")
private Integer whsType;
@@ -33,149 +33,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;
@@ -263,10 +264,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;
@@ -280,8 +281,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);
@@ -295,10 +296,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;
@@ -312,8 +313,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);
@@ -330,6 +331,7 @@
public void setLimintLoc(Integer limintLoc) {
this.limintLoc = limintLoc;
}
+
public Integer getsCrnNo() {
return sCrnNo;
}
@@ -381,13 +383,14 @@
public Integer getTypeId() {
return typeId;
}
+
public String getTypeId$() {
RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = basWhsService.selectOne(new EntityWrapper<BasWhs>().eq("identifying",rowLastnoType.getType().longValue()) );
- if (!Cools.isEmpty(rowLastnoType)){
- return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
+ BasWhs basWhs = basWhsService.selectOne(new EntityWrapper<BasWhs>().eq("identifying", rowLastnoType.getType().longValue()));
+ if (!Cools.isEmpty(rowLastnoType)) {
+ return rowLastnoType.getTypeName() + "<==>" + rowLastnoType.getMemo() + "<==>" + basWhs.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/StockStatisDo.java b/src/main/java/com/zy/asrs/entity/StockStatisDo.java
deleted file mode 100644
index 08c6ed4..0000000
--- a/src/main/java/com/zy/asrs/entity/StockStatisDo.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.zy.asrs.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * Created by vincent on 2021/3/16
- */
-@Data
-public class StockStatisDo implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String matnr;
-
- private Double anfme;
-
-}
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/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 0a172e0..86887a5 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 length;
+ @ApiModelProperty(value = "闀垮害")
+ private Double 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 a4947ff..c8f62fb 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 length;
+ @ApiModelProperty(value = "闀垮害")
+ private Double 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 a7cb928..a5d0be2 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -17,153 +17,155 @@
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 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;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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:
@@ -173,9 +175,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:
@@ -187,9 +191,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:
@@ -199,9 +205,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:
@@ -211,15 +219,15 @@
}
}
- 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/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index c4583a2..933af7a 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -16,153 +16,155 @@
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 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;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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:
@@ -172,9 +174,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:
@@ -186,9 +190,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:
@@ -198,9 +204,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:
@@ -210,15 +218,15 @@
}
}
- 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/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 046f448..e1a4cc3 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -23,271 +23,273 @@
/**
* 宸ヤ綔鍙�
*/
- @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 = "闀垮害")
private Double 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;
/**
* 鏄惁鎵规 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姝ｅ父锛�2鎶ュ簾锛�3闇�杩斿伐
*/
- @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 String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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:
@@ -297,9 +299,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:
@@ -311,9 +315,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:
@@ -323,9 +329,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:
@@ -335,33 +343,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 bdf4453..2836cbc 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -23,271 +23,273 @@
/**
* 宸ヤ綔鍙�
*/
- @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 = "闀垮害")
private Double 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;
/**
* 鏄惁鎵规 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;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp1;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp2;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp3;
- @ApiModelProperty(value= "棰勭暀1")
+ @ApiModelProperty(value = "棰勭暀1")
private String temp4;
- 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:
@@ -297,9 +299,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:
@@ -311,9 +315,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:
@@ -323,9 +329,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:
@@ -335,37 +343,38 @@
}
}
- 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 void sync(Object source) {
Synchro.Copy(source, this);
}
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 090f397..92f2b06 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.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.*;
import com.zy.common.utils.Synchro;
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,457 +26,458 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
@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 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;
/**
* 鎷ｆ枡
*/
- @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= "鐢ㄤ簬鏍囪瘑璺ㄥ簱鎿嶄綔锛�1锛屽爢鍨涙満寰�鍥涘悜搴擄紝2鍥涘悜搴撳線鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鐢ㄤ簬鏍囪瘑璺ㄥ簱鎿嶄綔锛�1锛屽爢鍨涙満寰�鍥涘悜搴擄紝2鍥涘悜搴撳線鍫嗗灈鏈�")
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 this.locNo;
}
- 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 this.sourceLocNo;
}
- 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);
@@ -489,21 +490,21 @@
// 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);
}
- public Long getWrkStsComplete(){
- if (Cools.isEmpty(this.wrkSts)){
+ public Long getWrkStsComplete() {
+ if (Cools.isEmpty(this.wrkSts)) {
return this.wrkSts;
}
- if (this.ioType>10){
- return this.wrkSts+2;
- }else {
- return this.wrkSts+2;
+ if (this.ioType > 10) {
+ return this.wrkSts + 2;
+ } else {
+ return this.wrkSts + 2;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
deleted file mode 100644
index ec65a91..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-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 com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import com.baomidou.mybatisplus.annotations.TableId;
-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
-@TableName("asr_wrk_mast_execute")
-public class WrkMastExecute implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("sou_loc_no")
- private String souLocNo;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("end_loc_no")
- private String endLocNo;
-
- /**
- * 鍘熸ゼ灞�
- */
- @ApiModelProperty(value= "鍘熸ゼ灞�")
- @TableField("sou_floor")
- private Integer souFloor;
-
- /**
- * 鐩爣妤煎眰
- */
- @ApiModelProperty(value= "鐩爣妤煎眰")
- @TableField("end_floor")
- private Integer endFloor;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- @TableField("sou_sta_no")
- private String souStaNo;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- @TableField("end_sta_no")
- private String endStaNo;
-
- /**
- * 褰撳墠鑺傜偣
- */
- @ApiModelProperty(value= "褰撳墠鑺傜偣")
- @TableField("now_position")
- private Integer nowPosition;
-
- /**
- * 鐩爣鑺傜偣
- */
- @ApiModelProperty(value= "鐩爣鑺傜偣")
- @TableField("end_position")
- private Integer endPosition;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private String appeUser;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Integer status;
-
- @ApiModelProperty(value= "")
- @TableId(value = "wrk_no", type = IdType.INPUT)
- @TableField("wrk_no")
- private Long wrkNo;
-
- public WrkMastExecute() {}
-
- public WrkMastExecute(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
- this.souLocNo = souLocNo;
- this.endLocNo = endLocNo;
- this.souFloor = souFloor;
- this.endFloor = endFloor;
- this.souStaNo = souStaNo;
- this.endStaNo = endStaNo;
- this.nowPosition = nowPosition;
- this.endPosition = endPosition;
- this.ioType = ioType;
- this.wrkSts = wrkSts;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- this.status = status;
- this.wrkNo = wrkNo;
- }
-
-// WrkMastExecute wrkMastExecute = new WrkMastExecute(
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 鍘熸ゼ灞�
-// null, // 鐩爣妤煎眰
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 褰撳墠鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 浠诲姟绫诲瀷
-// null, // 宸ヤ綔鐘舵��
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 浠诲姟鐘舵��
-// null // [闈炵┖]
-// );
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public Long getWrkStsCode(){
- switch (this.wrkSts.intValue()){
- case 1:
- return (long)2;
- default:
- return this.wrkSts+1;
- }
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
deleted file mode 100644
index c80d1ae..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package com.zy.asrs.entity;
-
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-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 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 java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_execute_log")
-public class WrkMastExecuteLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * 婧愬簱浣�
- */
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("sou_loc_no")
- private String souLocNo;
-
- /**
- * 鐩爣搴撲綅
- */
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("end_loc_no")
- private String endLocNo;
-
- /**
- * 鍘熸ゼ灞�
- */
- @ApiModelProperty(value= "鍘熸ゼ灞�")
- @TableField("sou_floor")
- private Integer souFloor;
-
- /**
- * 鐩爣妤煎眰
- */
- @ApiModelProperty(value= "鐩爣妤煎眰")
- @TableField("end_floor")
- private Integer endFloor;
-
- /**
- * 婧愮珯鐐�
- */
- @ApiModelProperty(value= "婧愮珯鐐�")
- @TableField("sou_sta_no")
- private String souStaNo;
-
- /**
- * 鐩爣绔欑偣
- */
- @ApiModelProperty(value= "鐩爣绔欑偣")
- @TableField("end_sta_no")
- private String endStaNo;
-
- /**
- * 褰撳墠鑺傜偣
- */
- @ApiModelProperty(value= "褰撳墠鑺傜偣")
- @TableField("now_position")
- private Integer nowPosition;
-
- /**
- * 鐩爣鑺傜偣
- */
- @ApiModelProperty(value= "鐩爣鑺傜偣")
- @TableField("end_position")
- private Integer endPosition;
-
- /**
- * 浠诲姟绫诲瀷
- */
- @ApiModelProperty(value= "浠诲姟绫诲瀷")
- @TableField("io_type")
- private Integer ioType;
-
- /**
- * 宸ヤ綔鐘舵��
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
-
- /**
- * 宸ヤ綔鏃堕棿
- */
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
- @TableField("io_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date ioTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
-
- /**
- * 淇敼浜哄憳
- */
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private String modiUser;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
-
- /**
- * 鍒涘缓鑰�
- */
- @ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private String appeUser;
-
- /**
- * 浠诲姟鐘舵��
- */
- @ApiModelProperty(value= "浠诲姟鐘舵��")
- private Integer status;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_no")
- private Long wrkNo;
-
- public WrkMastExecuteLog() {}
-
- public WrkMastExecuteLog(String souLocNo,String endLocNo,Integer souFloor,Integer endFloor,String souStaNo,String endStaNo,Integer nowPosition,Integer endPosition,Integer ioType,Long wrkSts,Date ioTime,Date modiTime,String modiUser,Date appeTime,String appeUser,Integer status,Long wrkNo) {
- this.souLocNo = souLocNo;
- this.endLocNo = endLocNo;
- this.souFloor = souFloor;
- this.endFloor = endFloor;
- this.souStaNo = souStaNo;
- this.endStaNo = endStaNo;
- this.nowPosition = nowPosition;
- this.endPosition = endPosition;
- this.ioType = ioType;
- this.wrkSts = wrkSts;
- this.ioTime = ioTime;
- this.modiTime = modiTime;
- this.modiUser = modiUser;
- this.appeTime = appeTime;
- this.appeUser = appeUser;
- this.status = status;
- this.wrkNo = wrkNo;
- }
-
-// WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(
-// null, // 婧愬簱浣�
-// null, // 鐩爣搴撲綅
-// null, // 鍘熸ゼ灞�
-// null, // 鐩爣妤煎眰
-// null, // 婧愮珯鐐�
-// null, // 鐩爣绔欑偣
-// null, // 褰撳墠鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 浠诲姟绫诲瀷
-// null, // 宸ヤ綔鐘舵��
-// null, // 宸ヤ綔鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 浠诲姟鐘舵��
-// null // [闈炵┖]
-// );
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getIoTime$(){
- if (Cools.isEmpty(this.ioTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
- }
-
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public String getModiUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
- }
-
- public String getAppeUser$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
deleted file mode 100644
index c4b1632..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicle.java
+++ /dev/null
@@ -1,178 +0,0 @@
-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 java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_four_war_vehicle")
-public class WrkMastFourWarVehicle implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 鍥涘悜杞︽帴璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽帴璐т綅缃�")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 鍥涘悜杞︽斁璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽斁璐т綅缃�")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:婊＄増 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Integer lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- public WrkMastFourWarVehicle() {}
-
- public WrkMastFourWarVehicle(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.wrkCrn = wrkCrn;
- }
-
-// WrkMastFourWarVehicle wrkMastFourWarVehicle = new WrkMastFourWarVehicle(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽帴璐т綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽斁璐т綅缃甗闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴揫闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null //
-// );
-
- 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)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java b/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
deleted file mode 100644
index c1b60ec..0000000
--- a/src/main/java/com/zy/asrs/entity/WrkMastFourWarVehicleLog.java
+++ /dev/null
@@ -1,178 +0,0 @@
-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 java.text.SimpleDateFormat;
-import java.util.Date;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
-import java.io.Serializable;
-
-@Data
-@TableName("asr_wrk_mast_four_war_vehicle_log")
-public class WrkMastFourWarVehicleLog implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- /**
- * ID
- */
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- /**
- * 宸ヤ綔鍙�
- */
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Long wrkNo;
-
- /**
- * 宸ヤ綔妗ｅ紑濮嬩綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
- @TableField("wrk_start")
- private Integer wrkStart;
-
- /**
- * 宸ヤ綔妗ｇ粨鏉熶綅缃�
- */
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
- @TableField("wrk_end")
- private Integer wrkEnd;
-
- /**
- * 鍥涘悜杞︽帴璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽帴璐т綅缃�")
- @TableField("sta_start")
- private Integer staStart;
-
- /**
- * 鍥涘悜杞︽斁璐т綅缃�
- */
- @ApiModelProperty(value= "鍥涘悜杞︽斁璐т綅缃�")
- @TableField("sta_end")
- private Integer staEnd;
-
- /**
- * 娣诲姞鏃堕棿
- */
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
-
- /**
- * 淇敼鏃堕棿
- */
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
-
- /**
- * 绫诲瀷 0:婊＄増 1:绌烘澘
- */
- @ApiModelProperty(value= "绫诲瀷 0:婊＄増 1:绌烘澘")
- private Integer type;
-
- /**
- * 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�
- */
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴�")
- @TableField("wrk_sts")
- private Integer wrkSts;
-
- /**
- * 琛屽彿
- */
- @ApiModelProperty(value= "琛屽彿")
- @TableField("line_number")
- private Integer lineNumber;
-
- /**
- * 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�
- */
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴�")
- @TableField("wrk_type")
- private Integer wrkType;
-
- /**
- * 鏍囪鏃堕棿
- */
- @ApiModelProperty(value= "鏍囪鏃堕棿")
- @TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date bignTime;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_crn")
- private Integer wrkCrn;
-
- public WrkMastFourWarVehicleLog() {}
-
- public WrkMastFourWarVehicleLog(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime,Integer wrkCrn) {
- this.wrkNo = wrkNo;
- this.wrkStart = wrkStart;
- this.wrkEnd = wrkEnd;
- this.staStart = staStart;
- this.staEnd = staEnd;
- this.createTime = createTime;
- this.updateTime = updateTime;
- this.type = type;
- this.wrkSts = wrkSts;
- this.lineNumber = lineNumber;
- this.wrkType = wrkType;
- this.bignTime = bignTime;
- this.wrkCrn = wrkCrn;
- }
-
-// WrkMastFourWarVehicleLog wrkMastFourWarVehicleLog = new WrkMastFourWarVehicleLog(
-// null, // 宸ヤ綔鍙穂闈炵┖]
-// null, // 宸ヤ綔妗ｅ紑濮嬩綅缃甗闈炵┖]
-// null, // 宸ヤ綔妗ｇ粨鏉熶綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽帴璐т綅缃甗闈炵┖]
-// null, // 鍥涘悜杞︽斁璐т綅缃甗闈炵┖]
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼鏃堕棿
-// null, // 绫诲瀷 0:婊＄増 1:绌烘澘[闈炵┖]
-// null, // 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氬叆搴撲腑 2锛氬嚭搴撲腑 3锛氬畬鎴怺闈炵┖]
-// null, // 琛屽彿[闈炵┖]
-// null, // 宸ヤ綔绫诲瀷 绫诲瀷 1:鍏ュ簱 2锛氬嚭搴揫闈炵┖]
-// null, // 鏍囪鏃堕棿
-// null //
-// );
-
- 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)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
- }
-
-
-}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index fc9f7ea..cc7b55e 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.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.*;
import com.zy.common.utils.Synchro;
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,481 +26,482 @@
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value = "缂栧彿")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
- @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 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")
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;
/**
* 鎷ｆ枡
*/
- @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 = "")
@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")
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;
/**
* 婊℃澘
*/
- @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 WrkMastLog() {}
+ public WrkMastLog() {
+ }
- 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.getWrkNo());
}
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 long getWrkSts(){
- return (long)this.wrkSts;
+ public long getWrkSts() {
+ return (long) this.wrkSts;
}
- 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.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/param/CheckOrderParam.java b/src/main/java/com/zy/asrs/entity/param/CheckOrderParam.java
index 1cb2dbd..c974eb2 100644
--- a/src/main/java/com/zy/asrs/entity/param/CheckOrderParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CheckOrderParam.java
@@ -9,7 +9,7 @@
public class CheckOrderParam implements Serializable {
private String inventoryCode;
private String inventoryStartTime;
- private String inventoryName;
+ private String inventoryName;
//private String status;
private List<MatDto> details;
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 761e0f4..fcdddfe 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -1,6 +1,5 @@
package com.zy.asrs.entity.param;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
diff --git a/src/main/java/com/zy/asrs/entity/param/ForwardAGVTaskParam.java b/src/main/java/com/zy/asrs/entity/param/ForwardAGVTaskParam.java
index d4c9d19..9412dfb 100644
--- a/src/main/java/com/zy/asrs/entity/param/ForwardAGVTaskParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ForwardAGVTaskParam.java
@@ -25,11 +25,11 @@
private String data = "";
@Data
- public static class PositionCodePaths{
+ public static class PositionCodePaths {
private String positionCode;
private String type;
- public PositionCodePaths(String positionCode, String type){
+ public PositionCodePaths(String positionCode, String type) {
this.positionCode = positionCode;
this.type = type;
diff --git a/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java b/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java
index 6f78b21..76aa018 100644
--- a/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/GTOrderParam.java
@@ -20,7 +20,7 @@
@Data
- public class matList{
+ public class matList {
private String matnr; //鐗╂枡缂栫爜
private String maktx; //鐗╂枡鍚嶇О
private String batch; //鎵规
diff --git a/src/main/java/com/zy/asrs/entity/param/InventoryErpParam.java b/src/main/java/com/zy/asrs/entity/param/InventoryErpParam.java
index ca88a59..c19ad27 100644
--- a/src/main/java/com/zy/asrs/entity/param/InventoryErpParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/InventoryErpParam.java
@@ -12,12 +12,13 @@
@Data
- public static class DataJson{
+ public static class DataJson {
private String flowCode = "LIKUwms12GOTmes";
private String tableCode;
private String logName;
}
+
@Data
public static class UpdateJson {
private String orderNo;
@@ -26,8 +27,9 @@
}
+
@Data
- public static class MatDetails{
+ public static class MatDetails {
private String matnr;
private Integer seq; //搴忓彿
private String batch;
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 696f53a..52f6c7b 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -31,7 +31,7 @@
private Double count;
// 搴忓垪鐮�
- private String threeCode;
+ private String threeCode;
private Integer danger;
@@ -40,7 +40,8 @@
this.batch = batch;
this.count = count;
}
- public LocDetlAdjust(String matnr, String batch, Double count,Integer danger ,String threeCode ) {
+
+ public LocDetlAdjust(String matnr, String batch, Double count, Integer danger, String threeCode) {
this.matnr = matnr;
this.batch = batch;
this.count = count;
diff --git a/src/main/java/com/zy/asrs/entity/param/MatDto.java b/src/main/java/com/zy/asrs/entity/param/MatDto.java
index cb6d627..ba6dc56 100644
--- a/src/main/java/com/zy/asrs/entity/param/MatDto.java
+++ b/src/main/java/com/zy/asrs/entity/param/MatDto.java
@@ -9,7 +9,7 @@
public class MatDto {
// 鐗╂枡缂栧彿
- private String productionCode;
+ private String productionCode;
// 鐗╂枡缂栧彿
private String matnr;
@@ -38,6 +38,7 @@
public MatDto() {
}
+
public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total) {
this.matnr = matnr;
this.maknx = maknx;
@@ -49,7 +50,7 @@
this.total = total;
}
- public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total,String orderNo,String customer) {
+ public MatDto(String matnr, String maknx, String batch, String specs, String manu, String memo, Double count, Double total, String orderNo, String customer) {
this.matnr = matnr;
this.maknx = maknx;
this.batch = batch;
@@ -67,12 +68,14 @@
this.maknx = maknx;
this.count = count;
}
+
public MatDto(String matNo, String maknx, Double count, String specs) {
this.specs = specs;
this.matnr = matNo;
this.maknx = maknx;
this.count = count;
}
+
public MatDto(String matNo, String maknx, Double count, Double total, String specs) {
this.specs = specs;
this.matnr = matNo;
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 d8c1843..5090dfd 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 {
/**
- * 鍒涘缓鏃堕棿
+ * 鍒涘缓鏃堕棿
*/
private String createTime;
private List<MatParam> matDetails;
@Data
- public static class MatParam{
+ public static class MatParam {
/**
* 鍟嗗搧缂栧彿
*/
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 ea29de5..b065b8d 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;
/**
@@ -31,7 +27,6 @@
private List<DetlDto> details;
private String lgort;
-
}
diff --git a/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java b/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java
index 1d92848..b8e19b7 100644
--- a/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ShuttleFinishParam.java
@@ -7,7 +7,7 @@
//涓婄骇绯荤粺宸ヤ綔鍙�
private String superTaskNo;
- private String msgType;
+ private String msgType;
//private String taskNo;
}
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/TagParam.java b/src/main/java/com/zy/asrs/entity/param/TagParam.java
index 26ec294..56c0626 100644
--- a/src/main/java/com/zy/asrs/entity/param/TagParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TagParam.java
@@ -2,7 +2,6 @@
import lombok.Data;
-import java.util.List;
import java.util.Map;
@Data
diff --git a/src/main/java/com/zy/asrs/entity/param/pdaAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/pdaAdjustParam.java
index e2d63ab..6356656 100644
--- a/src/main/java/com/zy/asrs/entity/param/pdaAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/pdaAdjustParam.java
@@ -1,12 +1,8 @@
package com.zy.asrs.entity.param;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
import lombok.Data;
-
-import java.util.List;
@Data
public class pdaAdjustParam {
private String barcode;
- private List<InventoryCheckOrderDetl> param;
}
diff --git a/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java b/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
index eb943db..f3216d2 100644
--- a/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/KeyValueVo.java
@@ -11,6 +11,7 @@
private String name;
private Object value;
+
public KeyValueVo() {
}
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/entity/vo/LocChartPie.java b/src/main/java/com/zy/asrs/entity/vo/LocChartPie.java
index 53bc4f6..375e2b5 100644
--- a/src/main/java/com/zy/asrs/entity/vo/LocChartPie.java
+++ b/src/main/java/com/zy/asrs/entity/vo/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/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/AutoMoveMapper.java b/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
index 5831cc7..0b6fbe2 100644
--- a/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AutoMoveMapper.java
@@ -1,7 +1,7 @@
package com.zy.asrs.mapper;
-import com.zy.asrs.entity.AutoMove;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.AutoMove;
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/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/InventoryCheckOrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/InventoryCheckOrderDetlMapper.java
deleted file mode 100644
index c6709ed..0000000
--- a/src/main/java/com/zy/asrs/mapper/InventoryCheckOrderDetlMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface InventoryCheckOrderDetlMapper extends BaseMapper<InventoryCheckOrderDetl> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/InventoryCheckOrderMapper.java b/src/main/java/com/zy/asrs/mapper/InventoryCheckOrderMapper.java
deleted file mode 100644
index 1a88652..0000000
--- a/src/main/java/com/zy/asrs/mapper/InventoryCheckOrderMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface InventoryCheckOrderMapper extends BaseMapper<InventoryCheckOrder> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java b/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java
deleted file mode 100644
index 226f138..0000000
--- a/src/main/java/com/zy/asrs/mapper/LocCheckMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.LocCheck;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface LocCheckMapper extends BaseMapper<LocCheck> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 96ce396..fd93d01 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -21,11 +21,11 @@
Integer listByPageCount(Map<String, Object> map);
- LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
+ LocDetl 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<LocDetl> getStockOutPage(Map<String, Object> map);
@@ -37,7 +37,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);
@@ -56,10 +56,13 @@
// -------------------------------------------------
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
- List<LocDetl> queryStockCrn(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
- List<LocDetl> queryStockFour(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
- List<LocDetl> queryStockMinAnfme(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
+ List<LocDetl> queryStock(@Param("matnr") String matnr, @Param("batch") String batch, @Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos, @Param("supp") String supp, @Param("temp1") String temp1, @Param("temp2") String temp2);
+
+ List<LocDetl> queryStockCrn(@Param("matnr") String matnr, @Param("batch") String batch, @Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos, @Param("supp") String supp, @Param("temp1") String temp1, @Param("temp2") String temp2);
+
+ List<LocDetl> queryStockFour(@Param("matnr") String matnr, @Param("batch") String batch, @Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos, @Param("supp") String supp, @Param("temp1") String temp1, @Param("temp2") String temp2);
+
+ List<LocDetl> queryStockMinAnfme(@Param("matnr") String matnr, @Param("batch") String batch, @Param("orderNo") String orderNo, @Param("locNos") Set<String> locNos, @Param("supp") String supp, @Param("temp1") String temp1, @Param("temp2") String temp2);
Double queryStockAnfme(String matnr, String batch);
@@ -72,14 +75,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);
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 39516b2..ef436e4 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,48 +13,49 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- 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 selectLocByLocStsPakInShuttleF1(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
+ LocMast selectLocByLocStsPakInShuttleF1(@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 selectLocByLocStsPakInShuttleF2(@Param("crnNo") Integer crnNo,@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("gro") Integer gro,@Param("whsType") Long whsType);
+ LocMast selectLocByLocStsPakInShuttleF2(@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);
}
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
deleted file mode 100644
index c37099b..0000000
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.result.StockVo;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-@Mapper
-@Repository
-public interface ManLocDetlMapper extends BaseMapper<ManLocDetl> {
- List<ManLocDetl> listByPage(Map<String, Object> map);
-
- Integer listByPageCount(Map<String, Object> map);
-
- 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 updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);
-
- List<ManLocDetl> getStockOutPage(Map<String, Object> map);
-
- Integer getStockOutPageCount(Map<String, Object> map);
-
- @Update("update asr_loc_detl set loc_no = #{newLocNo}, modi_time=getDate() where loc_no = #{oldLocNo}")
- int updateLocNo(String newLocNo, String oldLocNo);
-
- @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, lm.appe_time, getdate()) = 0) ORDER BY lm.appe_time ASC")
- List<String> selectSameDetlToday(@Param("matnr") String matnr, @Param("start") Integer start, @Param("end") Integer end);
-
- List<ManLocDetl> getStockStatis(Map<String, Object> map);
-
- Integer getStockStatisCount(Map<String, Object> map);
-
- List<ManLocDetl> getStockStatisExcel();
-
- @Select("select sum(a.anfme) as sum from man_loc_detl where matnr = #{matnr}")
- Double selectSumAnfmeByMatnr(@Param("matnr") String matnr);
-
- List<ManLocDetl> selectPakoutByRule(String matnr);
-
- List<ManLocDetl> getAsrsLocDetl(String matnr);
-
- Integer countLocNoNum(String locNo);
-
- // -------------------------------------------------
-
- List<LocDetl> queryStock(@Param("matnr")String matnr, @Param("batch")String batch, @Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("supp")String supp, @Param("temp1")String temp1, @Param("temp2")String temp2);
-
- Double queryStockAnfme(String matnr, String batch);
-
- List<StockVo> queryStockTotal();
-
-
- Double sum();
-
- List<ManLocDetl> unreason();
-
- Double selectLocDetlSumQty(String locNo);
-
- int updateLocNo0(Long nodeId, String locNo);
-
- ManLocDetl selectLocNo0(String locNo, String matnr);
-
- List<ManLocDetl> selectItem0(String locNo, String matnr);
-
- int deleteLocNo0(String locNo, String matnr);
-
- int updateAnfme0(double anfme, Long nodeId);
-
- List<ManLocDetl> listByOutPage(Map<String, Object> condition);
-
- long listByOutPageCount(Map<String, Object> condition);
-
- List<ManLocDetl> selectAllPage(Map<String, Object> condition);
-
- long selectAllPageSize(Map<String, Object> condition);
-}
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/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 16fa979..72a0903 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -24,22 +24,23 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increase(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("qty") Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int decrease(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @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("qty")Double qty);
+ int increaseQtyByOrderNo(@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("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("workQty") Double workQty);
- int increaseWorkQty2(@Param("id")Long id, @Param("workQty")Double workQty);
+ int increaseWorkQty2(@Param("id") Long id, @Param("workQty") Double workQty);
/**
* 鏌ヨ鎵撳嵃璁㈠崟鏄庣粏浜岀淮鐮佹暟鎹�
+ *
* @param id 璁㈠崟鏄庣粏id
*/
PrintDataDto selectPrintData(Integer id);
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlReportLogMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlReportLogMapper.java
index 9099237..9a376c9 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlReportLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlReportLogMapper.java
@@ -1,8 +1,6 @@
-
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.OrderDetlReport;
import com.zy.asrs.entity.OrderDetlReportLog;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlReportMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlReportMapper.java
index bdd1f5b..4f7b283 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlReportMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlReportMapper.java
@@ -1,16 +1,9 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlReport;
-import com.zy.asrs.entity.OrderDetlReportLog;
-import com.zy.asrs.entity.param.PrintDataDto;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
-
-import java.util.List;
-import java.util.Map;
@Mapper
@Repository
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index 5500ade..4dd0e9b 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -12,15 +12,17 @@
@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> 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/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 88f3063..2c0285f 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -12,85 +12,100 @@
@Repository
public interface ReportQueryMapper {
- List<ViewStockUseBean> queryViewStockUseListDate(ViewStockUseBean viewStockUse);
-
- //鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
- List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
- int getViewStockUseCount(ViewStockUseBean viewStockUse);
- List<ViewStockUseBean> getViewStockUseAll(ViewStockUseBean viewStockUse);
+ List<ViewStockUseBean> queryViewStockUseListDate(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 List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
- public List<ViewInOutBean> queryViewInOutListDay(ViewInOutBean viewInOut);
+ public List<ViewInOutBean> queryViewInOutListDay(ViewInOutBean viewInOut);
- public List<ViewInOutBean> queryViewInOutListMonth(ViewInOutBean viewInOut);
+ public List<ViewInOutBean> queryViewInOutListMonth(ViewInOutBean viewInOut);
- public List<ViewInOutBean> queryViewInOutListYear(ViewInOutBean viewInOut);
- public int getViewInOutCount(ViewInOutBean viewInOut);
- public int getViewInOutCountDay(ViewInOutBean viewInOut);
- public int getViewInOutCountMonth(ViewInOutBean viewInOut);
- public int getViewInOutCountYear(ViewInOutBean viewInOut);
- //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
- public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
+ public List<ViewInOutBean> queryViewInOutListYear(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);
+ public int getViewInOutCountDay(ViewInOutBean viewInOut);
+
+ public int getViewInOutCountMonth(ViewInOutBean viewInOut);
+
+ public int getViewInOutCountYear(ViewInOutBean viewInOut);
+
+ //涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬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);
- List<ViewInOutBean> selectAll();
+ Integer selectWorkCountOutSum(String matnr, @Param("start") String startTime, @Param("end") String endTime);
+
+ List<ViewInOutBean> selectAll();
}
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/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 a336d03..f73e148 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -15,15 +15,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/WrkMastExecuteLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
deleted file mode 100644
index d0e1f05..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastExecuteLogMapper extends BaseMapper<WrkMastExecuteLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
deleted file mode 100644
index 53d39fc..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
deleted file mode 100644
index c2138eb..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleLogMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastFourWarVehicleLogMapper extends BaseMapper<WrkMastFourWarVehicleLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
deleted file mode 100644
index 2309cc2..0000000
--- a/src/main/java/com/zy/asrs/mapper/WrkMastFourWarVehicleMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.mapper;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Repository;
-
-@Mapper
-@Repository
-public interface WrkMastFourWarVehicleMapper extends BaseMapper<WrkMastFourWarVehicle> {
-
-}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index ae41072..fbb72d0 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -14,15 +14,15 @@
@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> selectWrkMastWrkDetlMatnrBatch(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("grade") String grade , @Param("crnNo") Integer crnNo);
+ List<WrkMast> selectWrkMastWrkDetlMatnrBatch(@Param("ioType") Integer ioType, @Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade, @Param("crnNo") Integer crnNo);
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
int saveWrkMastLog(Integer workNo);
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/AutoMoveService.java b/src/main/java/com/zy/asrs/service/AutoMoveService.java
index 2891d4f..1bdfdcb 100644
--- a/src/main/java/com/zy/asrs/service/AutoMoveService.java
+++ b/src/main/java/com/zy/asrs/service/AutoMoveService.java
@@ -1,7 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.AutoMove;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.AutoMove;
public interface AutoMoveService extends IService<AutoMove> {
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 0af1070..66fb6ab 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -9,43 +9,54 @@
/**
* 鍏ュ簱绔�
+ *
* @return
*/
List<Integer> getAvailableInSite();
/**
* 绌烘澘鍏ュ簱绔�
+ *
* @return
*/
List<Integer> getAvailableEmptyInSite();
/**
* 鍑哄簱绔�
+ *
* @return
*/
List<Integer> getAvailableOutSite(Integer typeNo);
List<Integer> getCrnAvailableOutSite(Integer typeNo);
+
List<Integer> getShuttleAvailableOutSite(Integer typeNo);
+
List<Integer> getCtuAvailableOutSite(Integer typeNo);
/**
* 绌烘澘鍑哄簱绔�
+ *
* @return
*/
List<Integer> getAvailableEmptyOutSite();
List<Integer> getCrnAvailableEmptyOutSite();
+
List<Integer> getShuttleAvailableEmptyOutSite();
+
List<Integer> getCtuAvailableEmptyOutSite();
+
/**
* 鐩爣绔欑偣鐘舵�佹娴�
+ *
* @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/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/InventoryCheckOrderDetlService.java b/src/main/java/com/zy/asrs/service/InventoryCheckOrderDetlService.java
deleted file mode 100644
index 2654d03..0000000
--- a/src/main/java/com/zy/asrs/service/InventoryCheckOrderDetlService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface InventoryCheckOrderDetlService extends IService<InventoryCheckOrderDetl> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/InventoryCheckOrderService.java b/src/main/java/com/zy/asrs/service/InventoryCheckOrderService.java
deleted file mode 100644
index 7e8bf3c..0000000
--- a/src/main/java/com/zy/asrs/service/InventoryCheckOrderService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface InventoryCheckOrderService extends IService<InventoryCheckOrder> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/LocCheckService.java b/src/main/java/com/zy/asrs/service/LocCheckService.java
deleted file mode 100644
index db3fe91..0000000
--- a/src/main/java/com/zy/asrs/service/LocCheckService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.LocCheck;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface LocCheckService extends IService<LocCheck> {
-
- void autoCreatePick(String prec);
-}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index b9350f3..3880d27 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -27,6 +27,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @return locNo 搴撲綅鍙�
*/
@@ -34,6 +35,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
+ *
* @param matnr 鍟嗗搧缂栧彿
* @param batch 鎵规鍙�
* @return locNo 搴撲綅鍙�
@@ -52,10 +54,13 @@
// --------------------------------------------------
- List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
- List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
- List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
- List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
+ List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2);
+
+ List<LocDetl> queryStockCrn(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2);
+
+ List<LocDetl> queryStockFour(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2);
+
+ List<LocDetl> queryStockMinAnfme(String matnr, String batch, String orderNo, Set<String> locNos, String supp, String temp1, String temp2);
Double queryStockAnfme(String matnr, String batch);
@@ -68,12 +73,12 @@
Double getLocDetlSumQty(String locNo);
- void updateMatTurn(String matnrOld,String matnr);
+ void updateMatTurn(String matnrOld, String matnr);
List<Map<String, Object>> selectLocDetlUnilateralMoveShuttleMap(Integer crnNo);
- void adjustLocDetl2(LocDetlAdjustParam param,String barcode, Long userId);
+ void adjustLocDetl2(LocDetlAdjustParam param, String barcode, Long userId);
- 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 c13f719..d6ffc19 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -13,52 +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 selectLocByLocStsPakInShuttleF(Integer curRow,Integer nearRow,LocMast locNo, Long whsType);
+ LocMast selectLocByLocStsPakInShuttleF(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);
}
diff --git a/src/main/java/com/zy/asrs/service/ManLocDetlService.java b/src/main/java/com/zy/asrs/service/ManLocDetlService.java
deleted file mode 100644
index 0f21c9f..0000000
--- a/src/main/java/com/zy/asrs/service/ManLocDetlService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.zy.asrs.service;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.param.LocDetlAdjustParam;
-import com.zy.asrs.entity.result.StockVo;
-
-import java.util.List;
-import java.util.Set;
-
-public interface ManLocDetlService extends IService<ManLocDetl> {
- Page<ManLocDetl> getPage(Page<ManLocDetl> page);
-
- ManLocDetl selectItem(String locNo, String matnr, String batch);
-
- Page<ManLocDetl> getStockOut(Page<ManLocDetl> page);
-
- /**
- * 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏋滄暟閲忎负0锛屽垯鍒犻櫎璁板綍
- */
- boolean updateAnfme(Double anfme, String locNo, String matnr, String batch);
-
- boolean updateLocNo(String newLocNo, String oldLocNo);
-
- /**
- * 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鍟嗗搧缂栧彿
- * @return locNo 搴撲綅鍙�
- */
- List<String> getSameDetlToday(String matnr, Integer start, Integer end);
-
- Page<ManLocDetl> getStockStatis(Page<ManLocDetl> page);
-
- Double getSumAnfme(String matnr);
-
- List<ManLocDetl> selectPakoutByRule(String matnr);
-
- List<ManLocDetl> getAsrsLocDetl(String matnr);
-
- Integer countLocNoNum(String locNo);
-
- // --------------------------------------------------
-
- List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2);
-
- Double queryStockAnfme(String matnr, String batch);
-
- List<StockVo> queryStockTotal();
-
-
- Double sum();
-
- List<ManLocDetl> unreason();
-
- Double getLocDetlSumQty(String locNo);
-
- Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage);
-
-
- void adjustLocDetl(LocDetlAdjustParam param, Long userId);
-
-
-
- Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param);
-
- List<ManLocDetl> getStockStatisExcel();
-}
diff --git a/src/main/java/com/zy/asrs/service/MatService.java b/src/main/java/com/zy/asrs/service/MatService.java
index dd30afd..27d1031 100644
--- a/src/main/java/com/zy/asrs/service/MatService.java
+++ b/src/main/java/com/zy/asrs/service/MatService.java
@@ -9,9 +9,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 fc1e1a4..953f8d1 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -32,17 +32,8 @@
* 缁勬墭
*/
void comb(CombParam param, Long userId);
+
void mergeComb(CombParam param, Long userId);
-
- /**
- * 涓婃灦
- */
- void onSale(CombParam param);
-
- /**
- * 涓嬫灦
- */
- void offSale(OffSaleParam param);
/**
* 鐩樼偣
@@ -58,13 +49,7 @@
void leftoversOut(Map<String, Object> map, Long userId);
- void pdaAdjust(pdaAdjustParam param, Long userId);
- void inventoryUpload(String orderId);
-
- void pingKuShelves(CombParam combParam, Long userId);
-
- void pingKuUnShelves(CombParam combParam, Long userId);
List<CodeDataParam> getData(Map<String, Object> token, CodeParam codeParam);
diff --git a/src/main/java/com/zy/asrs/service/NodeService.java b/src/main/java/com/zy/asrs/service/NodeService.java
index 2de56d4..e44a867 100644
--- a/src/main/java/com/zy/asrs/service/NodeService.java
+++ b/src/main/java/com/zy/asrs/service/NodeService.java
@@ -10,19 +10,14 @@
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);
-
- 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 658d5aa..85abaa6 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/OrderDetlReportService.java b/src/main/java/com/zy/asrs/service/OrderDetlReportService.java
index 37502d9..a32c481 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlReportService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlReportService.java
@@ -1,11 +1,7 @@
package com.zy.asrs.service;
-import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.OrderDetlReport;
-
-import java.util.List;
public interface OrderDetlReportService extends IService<OrderDetlReport> {
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 3e81066..2bbe8f0 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/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 1711cc9..d8d429f 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;
@@ -23,6 +23,7 @@
void remove(Long orderId);
List<Order> selectComplete();
+
List<Order> selectComplete8();
boolean addToLogTable(Order order);
@@ -30,6 +31,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/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/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/WrkMastExecuteLogService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
deleted file mode 100644
index e191114..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastExecuteLogService extends IService<WrkMastExecuteLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java b/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
deleted file mode 100644
index bca4c26..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastExecuteService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastExecute;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastExecuteService extends IService<WrkMastExecute> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
deleted file mode 100644
index 0f5533c..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleLogService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastFourWarVehicleLogService extends IService<WrkMastFourWarVehicleLog> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java b/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
deleted file mode 100644
index 19c99d0..0000000
--- a/src/main/java/com/zy/asrs/service/WrkMastFourWarVehicleService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.zy.asrs.service;
-
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.baomidou.mybatisplus.service.IService;
-
-public interface WrkMastFourWarVehicleService extends IService<WrkMastFourWarVehicle> {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index ae749a8..747e91d 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -18,18 +18,20 @@
/**
* 浠庡伐浣滄。寰楀埌绔欑偣鍏ュ簱鏆傚瓨鏁�
+ *
* @param crnNo
* @return
*/
int getStoreCount(Integer crnNo);
- int selectWrkMastBareBoardStaNo(Integer ioType,Integer staNo);
+ int selectWrkMastBareBoardStaNo(Integer ioType, Integer staNo);
- List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo);
+ List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType, String matnr, String batch, String grade, Integer crnNo);
int saveWrkMastLog(Integer wrkNo);
List<WrkMast> selectToShuttleTask();
+
List<WrkMast> selectToShuttleOutTask();
@Insert("insert into asr_wrk_detl_log select * from asr_wrk_detl where wrk_no=#{workNo}")
diff --git a/src/main/java/com/zy/asrs/service/impl/InventoryCheckOrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/InventoryCheckOrderDetlServiceImpl.java
deleted file mode 100644
index 4a27f56..0000000
--- a/src/main/java/com/zy/asrs/service/impl/InventoryCheckOrderDetlServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.InventoryCheckOrderDetlMapper;
-import com.zy.asrs.entity.InventoryCheckOrderDetl;
-import com.zy.asrs.service.InventoryCheckOrderDetlService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("inventoryCheckOrderDetlService")
-public class InventoryCheckOrderDetlServiceImpl extends ServiceImpl<InventoryCheckOrderDetlMapper, InventoryCheckOrderDetl> implements InventoryCheckOrderDetlService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/InventoryCheckOrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/InventoryCheckOrderServiceImpl.java
deleted file mode 100644
index 0523360..0000000
--- a/src/main/java/com/zy/asrs/service/impl/InventoryCheckOrderServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.InventoryCheckOrderMapper;
-import com.zy.asrs.entity.InventoryCheckOrder;
-import com.zy.asrs.service.InventoryCheckOrderService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("inventoryCheckOrderService")
-public class InventoryCheckOrderServiceImpl extends ServiceImpl<InventoryCheckOrderMapper, InventoryCheckOrder> implements InventoryCheckOrderService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
deleted file mode 100644
index d1e91e5..0000000
--- a/src/main/java/com/zy/asrs/service/impl/LocCheckServiceImpl.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.zy.asrs.service.impl;
-
-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;
-
-import java.util.List;
-
-@Service("locCheckService")
-public class LocCheckServiceImpl extends ServiceImpl<LocCheckMapper, LocCheck> implements LocCheckService {
- @Autowired
- private ManLocDetlService manLocDetlService;
-
- @Override
- public void autoCreatePick(String prec) {
- List<ManLocDetl> manLocDetls = manLocDetlService.selectList(null);
-
- }
-}
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 006216f..da0d4bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -5,9 +5,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
-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.LocDetlMapper;
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
deleted file mode 100644
index 232034d..0000000
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-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.param.LocDetlAdjustParam;
-import com.zy.asrs.entity.result.StockVo;
-import com.zy.asrs.mapper.ManLocDetlMapper;
-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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-@Service("manLocDetlService")
-public class ManLocDetlServiceImpl extends ServiceImpl<ManLocDetlMapper, ManLocDetl> implements ManLocDetlService {
- @Autowired
- private MatService matService;
- @Autowired
- private NodeService nodeService;
-
- @Override
- public Page<ManLocDetl> getPage(Page<ManLocDetl> page) {
- Map<String, Object> condition = page.getCondition();
- List<ManLocDetl> manLocDetls = baseMapper.listByPage(condition);
- page.setRecords(manLocDetls);
- page.setTotal(baseMapper.listByPageCount(page.getCondition()));
- return page;
- }
-
- @Override
- public Page<ManLocDetl> getStockOut(Page<ManLocDetl> page) {
- page.setRecords(baseMapper.getStockOutPage(page.getCondition()));
- page.setTotal(baseMapper.getStockOutPageCount(page.getCondition()));
- return page;
- }
-
- @Override
- public boolean updateAnfme(Double anfme, String locNo, String matnr, String batch) {
- if (anfme <= 0) {
- return this.baseMapper.deleteItem(locNo, matnr, batch) > 0;
- } else {
- return baseMapper.updateAnfme(anfme, locNo, matnr, batch) > 0;
- }
- }
-
-
- @Override
- public boolean updateLocNo(String newLocNo, String oldLocNo) {
- return baseMapper.updateLocNo(newLocNo, oldLocNo) > 0;
- }
-
- @Override
- public List<String> getSameDetlToday(String matnr, Integer start, Integer end) {
- return this.baseMapper.selectSameDetlToday(matnr, start, end);
- }
-
-
- @Override
- public Page<ManLocDetl> getStockStatis(Page<ManLocDetl> page) {
- page.setRecords(baseMapper.getStockStatis(page.getCondition()));
- page.setTotal(baseMapper.getStockStatisCount(page.getCondition()));
- return page;
- }
-
- @Override
- public Double getSumAnfme(String matnr) {
- return this.baseMapper.selectSumAnfmeByMatnr(matnr);
- }
-
- @Override
- public List<ManLocDetl> selectPakoutByRule(String matnr) {
- return this.baseMapper.selectPakoutByRule(matnr);
- }
-
- @Override
- public List<ManLocDetl> getAsrsLocDetl(String matnr) {
- return this.baseMapper.getAsrsLocDetl(matnr);
- }
-
- @Override
- public Integer countLocNoNum(String locNo) {
- return this.baseMapper.countLocNoNum(locNo);
- }
-
- @Override
- public List<LocDetl> queryStock(String matnr, String batch, String orderNo, Set<String> locNos,String supp,String temp1,String temp2) {
- return this.baseMapper.queryStock(matnr, batch, orderNo, locNos,supp,temp1,temp2);
- }
-
- @Override
- public Double queryStockAnfme(String matnr, String batch) {
- return this.baseMapper.queryStockAnfme(matnr, batch);
- }
-
- @Override
- public List<StockVo> queryStockTotal() {
- return this.baseMapper.queryStockTotal();
- }
-
- /**
- * 鑾峰彇搴撳瓨鎬绘暟
- *
- * @return
- */
- @Override
- public Double sum() {
-
- return this.baseMapper.sum();
- }
-
- @Override
- public List<ManLocDetl> unreason() {
- return this.baseMapper.unreason();
- }
-
-
- @Override
- public ManLocDetl selectItem(String locNo, String matnr, String batch) {
- return this.baseMapper.selectItem(locNo, matnr, batch);
- }
-
- @Override
- public Double getLocDetlSumQty(String locNo) {
- return this.baseMapper.selectLocDetlSumQty(locNo);
- }
-
- @Override
- public Page<ManLocDetl> getOutPage(Page<ManLocDetl> manLocDetlPage) {
- Map<String, Object> condition = manLocDetlPage.getCondition();
- List<ManLocDetl> manLocDetls = baseMapper.listByOutPage(condition);
- manLocDetlPage.setRecords(manLocDetls);
- manLocDetlPage.setTotal(baseMapper.listByOutPageCount(manLocDetlPage.getCondition()));
- return manLocDetlPage;
- }
-
- @Transactional
- @Override
- public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
- Date now = new Date();
- this.baseMapper.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", param.getLocNo()));
- for (LocDetlAdjustParam.LocDetlAdjust locDetlAdjust : param.getList()) {
- Mat mat = matService.selectOne(new EntityWrapper<Mat>()
- .eq("matnr", locDetlAdjust.getMatnr()));
- if (mat == null) {
- throw new CoolException("鏃犳硶鎵惧埌闇�瑕佽皟鏁寸殑鐗╂枡,璇疯仈绯荤鐞嗗憳");
- }
- Node node = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("uuid", param.getLocNo()));
- if (node == null) {
- throw new CoolException("鏃犳硶鎵惧埌闇�瑕佽皟鏁寸殑搴撲綅,璇疯仈绯荤鐞嗗憳");
-
- }
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(param.getLocNo());
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(mat.getBarcode());
- manLocDetl.setAnfme(locDetlAdjust.getCount());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setName(mat.getName());
- manLocDetl.setSpecs(mat.getSpecs());
- manLocDetl.setModel(mat.getModel());
- manLocDetl.setBatch(locDetlAdjust.getBatch());
- manLocDetl.setUnit(mat.getUnit());
- manLocDetl.setBarcode(mat.getBarcode());
- manLocDetl.setPrice(mat.getPrice());
- manLocDetl.setDanger(locDetlAdjust.getDanger());
- SaasUtils.insertLog(3,manLocDetl.getLocNo(), manLocDetl.getMatnr(),manLocDetl.getAnfme());
- this.baseMapper.insert(manLocDetl);
- }
- }
-
-
-
- @Override
- public Page<ManLocDetl> selectAllPage(Page<ManLocDetl> param) {
- Map<String, Object> condition = param.getCondition();
- List<ManLocDetl> manLocDetls = baseMapper.selectAllPage(condition);
- param.setRecords(manLocDetls);
- param.setTotal(baseMapper.selectAllPageSize(condition));
- return param;
- }
-
- @Override
- public List<ManLocDetl> getStockStatisExcel() {
- return this.baseMapper.getStockStatisExcel();
- }
-}
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 4ea2ac5..cfbc7fb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -9,7 +9,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.mapper.BasDevpMapper;
-import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.third.CodeDataParam;
import com.zy.asrs.third.CodeParam;
@@ -77,14 +76,6 @@
private CommonService commonService;
@Autowired
private NodeService nodeService;
- @Autowired
- private ManLocDetlService manLocDetlService;
- @Autowired
- private ManLocDetlMapper manLocDetlMapper;
- @Resource
- private InventoryCheckOrderService checkOrderService;
- @Resource
- private InventoryCheckOrderDetlService checkOrderDetlService;
@Resource
private BasDevpMapper basDevpMapper;
@@ -573,58 +564,7 @@
}
- // 鍟嗗搧涓婃灦
- @Override
- public void onSale(CombParam param) {
- Date now = new Date();
- // 鑾峰彇搴撲綅鍙�
- String locno = param.getLocno();
- Node node = nodeService.selectByUuid(locno);
- if (Cools.isEmpty(node)) {
- throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�");
- }
- // 鑾峰彇鍟嗗搧鍒楄〃
- for (CombParam.CombMat combMat : param.getCombMats()) {
- Mat mat = matService.selectByMatnr(combMat.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧妗ｆ涓嶅瓨鍦紒");
- }
- if (Cools.isEmpty(combMat.getAnfme()) || combMat.getAnfme() == 0) {
- throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鏁伴噺鏈夎锛�");
- }
- if (Cools.isEmpty(combMat.getBatch())) {
-// throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�");
- }
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(locno);
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setBatch(Cools.isEmpty(combMat.getBatch()) ? "" : combMat.getBatch());
- manLocDetl.setAnfme(combMat.getAnfme());
- manLocDetl.setModiTime(now);
- if (!manLocDetlService.insert(manLocDetl)) {
- throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
- }
- }
- }
-
- // 鍟嗗搧涓嬫灦
- @Override
- public void offSale(OffSaleParam offSaleParam) {
- ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- if (Cools.isEmpty(manLocDetl)) {
- throw new CoolException("鏃犳鍟嗗搧锛�");
- }
- double anfme = manLocDetl.getAnfme() - offSaleParam.getAnfme();
- if (anfme < 0) {
- throw new CoolException("鍟嗗搧搴撳瓨涓嶈冻锛�");
- } else if (anfme == 0) {
- manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
- }
- manLocDetlMapper.updateAnfme0(anfme, manLocDetl.getNodeId());
- }
// 鏌ユ壘鍟嗗搧
@@ -996,404 +936,8 @@
}
- @Override
- public void pdaAdjust(pdaAdjustParam param, Long userId) {
- if (Cools.isEmpty(param)) {
- throw new CoolException("鐩樼偣鍒楄〃鍙傛暟涓虹┖");
- }
- for (InventoryCheckOrderDetl orderDetl : param.getParam()) {
- InventoryCheckOrderDetl inventoryCheckOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", orderDetl.getOrderNo())
- .eq("matnr", orderDetl.getMatnr())
- .eq("batch", orderDetl.getBatch()));
- if (Cools.isEmpty(inventoryCheckOrderDetl)) {
- throw new CoolException("鏈煡璇㈠埌鐩樼偣淇℃伅");
- }
- if (!inventoryCheckOrderDetl.getStatus().equals("1")) {
- throw new CoolException("璇ヤ换鍔″凡鐩樼偣");
- }
- inventoryCheckOrderDetl.setCheckAnfme(orderDetl.getCheckAnfme());
- inventoryCheckOrderDetl.setStatus("2");
- if (!checkOrderDetlService.updateById(inventoryCheckOrderDetl)) {
- throw new CoolException("淇濆瓨鐩樼偣淇℃伅澶辫触!");
- }
-
- }
- }
-
- @Override
- @Transactional
- public void inventoryUpload(String orderId) {
- if (Cools.isEmpty(orderId)) {
- throw new CoolException("鐩樼偣鍗昳d涓虹┖");
- }
- InventoryCheckOrder inventoryCheckOrder = checkOrderService.selectById(orderId);
- if (Cools.isEmpty(inventoryCheckOrder)) {
- throw new CoolException("鏈壘鍒扮洏鐐瑰崟");
- }
- if (inventoryCheckOrder.getStatus().equals("2")) {
- throw new CoolException("鐩樼偣鍗曞凡鎻愪氦");
- }
- int count = checkOrderDetlService.selectCount(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", inventoryCheckOrder.getOrderNo()).isNull("check_anfme"));
- if (count > 0) {
- throw new CoolException("鏈夋湭瀹屾垚鐨勭洏鐐逛换鍔�");
- }
-
- List<InventoryCheckOrderDetl> checkOrderProfitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", inventoryCheckOrder.getOrderNo())
- .addFilter("anfme < check_anfme"));
- if (!checkOrderProfitDetls.isEmpty()) {
- //鑾峰彇鐩樼泩鍗昿aram
- InventoryErpParam erpProfitParam = getErpProfitParam(inventoryCheckOrder, checkOrderProfitDetls);
- uploadErp(erpProfitParam);
- }
-
- List<InventoryCheckOrderDetl> checkOrderDeficitDetls = checkOrderDetlService.selectList(new EntityWrapper<InventoryCheckOrderDetl>()
- .eq("order_no", inventoryCheckOrder.getOrderNo())
- .addFilter("anfme > check_anfme"));
-
- if (!checkOrderDeficitDetls.isEmpty()) {
- //鑾峰彇鐩樹簭鍗昿aram
- InventoryErpParam erpDeficitParam = getErpDeficitParam(inventoryCheckOrder, checkOrderDeficitDetls);
- uploadErp(erpDeficitParam);
- }
-
- inventoryCheckOrder.setStatus("2");
- if (!checkOrderService.updateById(inventoryCheckOrder)) {
- throw new CoolException("鐘舵�佹洿鏂板け璐�");
- }
-
-
- }
-
- @Override
- @Transactional
- public void pingKuShelves(CombParam combParam, Long userId) {
- Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
- if (Cools.isEmpty(node)) {
- throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�");
- }
-
- Order order = orderService.selectByNo(combParam.getOrderNo());
- if (Cools.isEmpty(order) || order.getSettle() > 2) {
- throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
- }
- // 鐢熸垚鍏ュ簱閫氱煡妗�
- List<DetlDto> detlDtos = new ArrayList<>();
-
- for (CombParam.CombMat elem : combParam.getCombMats()) {
-
-
-// param.getCombMats().forEach(elem -> {
-
- // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
- }
- if (elem.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
- }
-
-// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), orderDetl.getSuppCode()
- , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
- if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
- assert one != null;
- one.setAnfme(one.getAnfme() + detlDto.getAnfme());
- } else {
- detlDtos.add(detlDto);
- }
-// });
- }
- int workNo = commonService.getWorkNo(4);
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(4L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(300); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
- wrkMast.setIoPri(12D); // 浼樺厛绾�
- wrkMast.setLocNo(node.getName());
- wrkMast.setBarcode(""); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setSheetNo(order.getOrderNo());
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
- for (DetlDto detlDto : detlDtos) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WrkDetl wrkDetl = new WrkDetl();
-
- wrkDetl.sync(detlDto);
- wrkDetl.sync(mat);
-
- wrkDetl.setOrderNo(order.getOrderNo());
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- wrkDetl.setManu(detlDto.getMark()); //鏍囪
- wrkDetl.setOrigin(order.getItemName());//浠撳簱
- wrkDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
- wrkDetl.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
- wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
- wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
- wrkDetl.setTemp1(detlDto.getTemp1());
- wrkDetl.setTemp2(detlDto.getTemp2());
- wrkDetl.setTemp3(detlDto.getSuppName());
- wrkDetl.setTemp4(detlDto.getTemp4());
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
- }
- orderService.updateSettle(order.getId(), 2L, userId);
-
-
- }
-
- @Override
- @Transactional
- public void pingKuUnShelves(CombParam combParam, Long userId) {
- String orderNo = combParam.getOrderNo();
-
- Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
- if (Cools.isEmpty(node)) {
- throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�");
- }
- //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
- Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
- if (order.getSettle() != 1 && order.getSettle() != 2) {
- throw new CoolException("璇ヨ鍗曞凡澶勭悊");
- }
- List<DetlDto> detlDtos = new ArrayList<>();
- for (CombParam.CombMat elem : combParam.getCombMats()) {
- Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", combParam.getLocno())
- .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())
- .eq("temp3", elem.getSupp()).eq("temp1", elem.getTemp1()).eq("temp2", elem.getTemp2());
- ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
-
- if (Cools.isEmpty(manLocDetl)) {
- throw new CoolException("璇ュ簱浣嶆湭鏌ヨ鍒拌揣鐗╀俊鎭�");
- }
- if (elem.getAnfme() > manLocDetl.getAnfme()) {
- throw new CoolException("鍑哄簱鏁伴噺澶т簬搴撲綅鍓╀綑鏁伴噺");
- }
-
- OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- if (Cools.isEmpty(orderDetl)) {
- throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
- }
- if (elem.getAnfme() > orderDetl.getEnableQty()) {
- throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
- }
- // 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
- throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
- }
-
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(), orderDetl.getSuppCode()
- , orderDetl.getManu(), orderDetl.getSku(), orderDetl.getSupp(), orderDetl.getTemp1(), orderDetl.getTemp2(), orderDetl.getTemp3(), orderDetl.getTemp4());
-
-
- int workNo = commonService.getWorkNo(4);
- Date now = new Date();
- // 鐢熸垚宸ヤ綔妗�
- WrkMast wrkMast = new WrkMast();
- wrkMast.setWrkNo(workNo);
- wrkMast.setIoTime(new Date());
- wrkMast.setWrkSts(14L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
- wrkMast.setIoType(301); // 鍏ュ嚭搴撶姸鎬侊細301.骞冲簱鍑哄簱
- wrkMast.setIoPri(12D); // 浼樺厛绾�
- wrkMast.setSourceLocNo(node.getName());
- wrkMast.setBarcode(""); // 鎵樼洏鐮�
- wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast.setPicking("N"); // 鎷ｆ枡
- wrkMast.setExitMk("N"); // 閫�鍑�
- wrkMast.setEmptyMk("N"); // 绌烘澘
- wrkMast.setLinkMis("Y");
- wrkMast.setSheetNo(order.getOrderNo());
- // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast.setAppeTime(now);
- wrkMast.setModiTime(now);
- boolean res = wrkMastService.insert(wrkMast);
- if (!res) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
- }
-
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
- }
- WrkDetl wrkDetl = new WrkDetl();
-
- wrkDetl.sync(detlDto);
- wrkDetl.sync(mat);
-
- wrkDetl.setOrderNo(order.getOrderNo());
- wrkDetl.setWrkNo(wrkMast.getWrkNo());
- wrkDetl.setIoTime(wrkMast.getIoTime());
- wrkDetl.setAppeTime(now);
- wrkDetl.setModiTime(now);
- wrkDetl.setManu(detlDto.getMark()); //鏍囪
- wrkDetl.setOrigin(order.getItemName());//浠撳簱
- wrkDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
- wrkDetl.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
- wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
- wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
- wrkDetl.setTemp1(detlDto.getTemp1());
- wrkDetl.setTemp2(detlDto.getTemp2());
- wrkDetl.setTemp3(detlDto.getTemp3());
- wrkDetl.setTemp4(detlDto.getTemp4());
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
- }
-
- if (new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue() == 0) {
- manLocDetlService.delete(manLocDetlWrapper);
- } else {
- manLocDetl.setAnfme(new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue());
- if (!manLocDetlService.update(manLocDetl, manLocDetlWrapper)) {
- throw new CoolException("鏇存柊鏄庣粏澶辫触");
- }
- }
-
-
- }
- orderService.updateSettle(order.getId(), 2L, userId);
-
-
- }
-
- public void uploadErp(InventoryErpParam param) {
-// String response = "";
-// boolean success = false;
-// try {
-// HashMap<String, Object> headers = new HashMap<>();
-// headers.put("Content-Type", "application/json");
-// response = new HttpHandler.Builder()
-// .setHeaders(headers)
-// .setUri("10.0.100.160:30108")
-// .setPath("web/apps/gongqi.df.dataTrans/DTInterFace/doJobWithupdateBody")
-// .setJson(JSON.toJSONString(param))
-// .build()
-// .doPost();
-// JSONObject jsonObject = JSON.parseObject(response);
-// if (jsonObject.getInteger("errcode").equals(0)) {
-// success = true;
-// } else if (jsonObject.getInteger("errcode").equals(1)) {
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
-// throw new CoolException(jsonObject.getString("msg"));
-// } else {
-// log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PACK_DOWN_URL, JSON.toJSONString(param), response);
-// throw new CoolException("涓婃姤mes绯荤粺澶辫触");
-// }
-// } catch (Exception e) {
-// log.error("fail", e);
-// throw new CoolException(e.getMessage());
-// } finally {
-// try {
-// // 淇濆瓨鎺ュ彛鏃ュ織
-// apiLogService.save(
-// "鐩樼偣鍗曚笂鎶�",
-// url ,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(param),
-// response,
-// success
-// );
-// } catch (Exception e) { log.error("", e); }
-// }
- }
-
- public InventoryErpParam getErpProfitParam(InventoryCheckOrder inventoryCheckOrder, List<InventoryCheckOrderDetl> checkOrderProfitDetls) {
- Date date = new Date();
- InventoryErpParam erpProfitParam = new InventoryErpParam();
- InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
- dataJson.setFlowCode("LIKUwms12GOTmes");
- dataJson.setTableCode("DTInventInTable_pdd");
- dataJson.setLogName("鐩樼泩鍗�-鍏ュ簱鍗�");
- erpProfitParam.setDataJson(dataJson);
- List<InventoryErpParam.UpdateJson> updateJsonList = new ArrayList<>();
- InventoryErpParam.UpdateJson updateJson = new InventoryErpParam.UpdateJson();
- updateJson.setOrderNo(inventoryCheckOrder.getOrderNo());
- updateJson.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
- List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
- for (InventoryCheckOrderDetl checkOrderProfitDetl : checkOrderProfitDetls) {
- InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();
-
- Mat mat = matService.selectByMatnr(checkOrderProfitDetl.getMatnr());
-
- matDetail.setMatnr(checkOrderProfitDetl.getMatnr());
- matDetail.setBatch(checkOrderProfitDetl.getBatch());
- matDetail.setSpecs(mat.getSpecs());
- Double anfme = new BigDecimal(checkOrderProfitDetl.getCheckAnfme()).subtract(new BigDecimal(checkOrderProfitDetl.getAnfme())).doubleValue();
- matDetail.setAnfme(anfme);
- matDetail.setLocNo(checkOrderProfitDetl.getLocNo());
- matDetail.setWarehouse(checkOrderProfitDetl.getArea());
- matDetail.setSeq(updateJson.getMatDetails() == null ? 1 : updateJson.getMatDetails().size() + 1);
- matDetails.add(matDetail);
- }
- updateJson.setMatDetails(matDetails);
- updateJsonList.add(updateJson);
- erpProfitParam.setUpdateJson(updateJsonList);
- return erpProfitParam;
- }
-
- public InventoryErpParam getErpDeficitParam(InventoryCheckOrder inventoryCheckOrder, List<InventoryCheckOrderDetl> checkOrderDeficitDetls) {
- Date date = new Date();
- InventoryErpParam erpDeficitParam = new InventoryErpParam();
- InventoryErpParam.DataJson dataJson = new InventoryErpParam.DataJson();
- dataJson.setFlowCode("LIKUwms12GOTmes");
- dataJson.setTableCode("DTInventOutTable_pdd");
- dataJson.setLogName("鐩樹簭鍗�-鍑哄簱鍗�");
- erpDeficitParam.setDataJson(dataJson);
- List<InventoryErpParam.UpdateJson> updateJsonList2 = new ArrayList<>();
- InventoryErpParam.UpdateJson updateJson2 = new InventoryErpParam.UpdateJson();
- updateJson2.setOrderNo(inventoryCheckOrder.getOrderNo());
- updateJson2.setDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date));
- List<InventoryErpParam.MatDetails> matDetails = new ArrayList<>();
- for (InventoryCheckOrderDetl checkOrderDeficitDetl : checkOrderDeficitDetls) {
- InventoryErpParam.MatDetails matDetail = new InventoryErpParam.MatDetails();
-
- Mat mat = matService.selectByMatnr(checkOrderDeficitDetl.getMatnr());
-
- matDetail.setMatnr(checkOrderDeficitDetl.getMatnr());
- matDetail.setBatch(checkOrderDeficitDetl.getBatch());
- matDetail.setSpecs(mat.getSpecs());
- Double anfme = new BigDecimal(checkOrderDeficitDetl.getAnfme()).subtract(new BigDecimal(checkOrderDeficitDetl.getCheckAnfme())).doubleValue();
- matDetail.setAnfme(anfme);
- matDetail.setLocNo(checkOrderDeficitDetl.getLocNo());
- matDetail.setWarehouse(checkOrderDeficitDetl.getArea());
- matDetail.setSeq(updateJson2.getMatDetails() == null ? 1 : updateJson2.getMatDetails().size() + 1);
- matDetails.add(matDetail);
- }
- updateJson2.setMatDetails(matDetails);
- updateJsonList2.add(updateJson2);
- erpDeficitParam.setUpdateJson(updateJsonList2);
- return erpDeficitParam;
- }
@Override
@Transactional
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..142977a 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -6,19 +6,15 @@
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Node;
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;
@@ -35,8 +31,6 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
- @Autowired
- private ManLocDetlService manLocDetlService;
@Override
public Node getTop() {
Node top = this.selectOne(new EntityWrapper<Node>().eq("type", 0).eq("level", 0));
@@ -78,127 +72,7 @@
return selectOne(new EntityWrapper<Node>().eq("host_id", hostId).eq("uuid", uuid).eq("type", type).eq("parent_id", parentId));
}
- @Override
- public R stockPakin(PakinParam param, Long userId, Long hostId) {
- Node node = nodeService.selectByUuid(param.getNodeId(), hostId);
- if (node == null) {
- node = nodeService.selectById(param.getNodeId());
- }
- if (node == null) {
- return R.error("璐т綅涓嶅瓨鍦�");
- }
- if (Cools.isEmpty(param.getMats())) {
- return R.error("鍏ュ簱鐗╂枡涓嶈兘涓虹┖");
- }
- Date now = new Date();
- for (MatnrDto dto : param.getMats()) {
-
- Mat mat = matService.selectByMatnr(dto.getMatnr());
- if (mat == null) {
- throw new CoolException("鐗╂枡鏁版嵁閿欒锛岃鑱旂郴绠＄悊鍛�");
- }
- ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", node.getUuid())
- .eq("matnr", dto.getMatnr()));
- if (check == null) {
- ManLocDetl manLocDetl = new ManLocDetl();
- manLocDetl.setLocNo(node.getUuid());
- manLocDetl.setNodeId(node.getId());
- manLocDetl.setZpallet(mat.getBarcode());
- manLocDetl.setAnfme(dto.getCount());
- manLocDetl.setMatnr(mat.getMatnr());
- manLocDetl.setMaktx(mat.getMaktx());
- manLocDetl.setName(mat.getName());
- manLocDetl.setBatch(null);
- manLocDetl.setSpecs(mat.getSpecs());
- manLocDetl.setModel(mat.getModel());
- manLocDetl.setCreateTime(now);
- manLocDetl.setModiTime(now);
- manLocDetl.setCreateBy(userId);
- SaasUtils.insertLog(0,manLocDetl.getLocNo(),manLocDetl.getMatnr(), manLocDetl.getAnfme());
- manLocDetlService.insert(manLocDetl);
- }else {
- check.setAnfme(dto.getCount() + check.getAnfme());
- manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
- .eq("loc_no", node.getUuid())
- .eq("matnr", dto.getMatnr()));
- }
- }
- return R.ok("鍏ュ簱鎴愬姛");
- }
- @Transactional
- @Override
- public R initPakout(List<InitPakoutParam> params, Long userId, Long hostId) {
- if (!Cools.isEmpty(params)) {
- Date now = new Date();
- for (InitPakoutParam param : params) {
- ManLocDetl manLocDetl = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("node_id", param.getNodeId())
- .eq("matnr", param.getMatnr()));
- Node node = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("id", param.getNodeId()));
- if (node == null) {
- return R.error("鎵句笉鍒拌搴撲綅,璇疯仈绯荤鐞嗗憳:" + param.getNodeId() );
- }
- if (manLocDetl == null) {
- return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑涓嶅瓨鍦�");
- }
- if (manLocDetl.getAnfme() - param.getCount() < 0) {
- return R.error("鐗╂枡:"+ param.getMatnr() + " 鍦ㄥ簱浣嶄腑鏁伴噺涓嶈冻");
- } else if (manLocDetl.getAnfme() - param.getCount() == 0) {
- SaasUtils.insertLog(1,manLocDetl.getLocNo(), manLocDetl.getMatnr(),param.getCount());
- manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
- .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());
- }
- }
- }
- return R.ok("鍑哄簱鎴愬姛");
- }
-
- @Transactional
- @Override
- public void locMove(String sourceLocNo, String targetLocNo, Long userId) {
- List<ManLocDetl> sourceManDetl = manLocDetlService.selectList(new EntityWrapper<ManLocDetl>()
- .like("loc_no", sourceLocNo));
- for (ManLocDetl source : sourceManDetl) {
- Node targetNode = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("uuid", targetLocNo));
- Node sourceNode = nodeService.selectOne(new EntityWrapper<Node>()
- .eq("uuid", sourceLocNo));
- if (targetNode == null || targetNode.equals("")) {
- throw new RuntimeException("鏃犳硶鏌ヨ鍒扮Щ搴撶殑鐩爣搴撲綅");
- }
- ManLocDetl check = manLocDetlService.selectOne(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", targetNode.getUuid())
- .eq("matnr", source.getMatnr()));
- if (check == null) {
- manLocDetlService.deleteById(source);
- source.setLocNo(targetNode.getUuid());
- source.setNodeId(targetNode.getId());
-
- SaasUtils.insertLog(2,source.getLocNo(), source.getMatnr(), source.getAnfme());
- manLocDetlService.insert(source);
- }else {
- check.setAnfme(check.getAnfme() + source.getAnfme());
- manLocDetlService.update(check,new EntityWrapper<ManLocDetl>()
- .eq("loc_no", targetNode.getUuid())
- .eq("matnr", check.getMatnr()));
- manLocDetlService.delete(new EntityWrapper<ManLocDetl>()
- .eq("loc_no", sourceNode.getUuid())
- .eq("matnr", source.getMatnr()));
- }
-
- }
- }
}
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 5503e51..c5bcbfd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -80,8 +80,6 @@
private SlaveProperties slaveProperties;
@Autowired
private WaitPakinService waitPakinService;
- @Autowired
- private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
@Override
@Transactional
@@ -386,19 +384,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- InventoryCheckOrderDetl inventoryCheckOrderDetl = new InventoryCheckOrderDetl();
- inventoryCheckOrderDetl.setOrderNo(param.getOrderNo());
- inventoryCheckOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr());
- inventoryCheckOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx());
- inventoryCheckOrderDetl.setBatch(detlDto.getLocDetl().getBatch());
- inventoryCheckOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo());
- inventoryCheckOrderDetl.setArea(detlDto.getLocDetl().getOrigin());
- inventoryCheckOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme());
- inventoryCheckOrderDetl.setIoTime(now);
- inventoryCheckOrderDetl.setStatus("1");
- if (!inventoryCheckOrderDetlService.insert(inventoryCheckOrderDetl)) {
- throw new CoolException("淇濆瓨鐩樼偣鏄庣粏澶辫触");
- }
+
if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
continue;
@@ -1058,19 +1044,7 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
- InventoryCheckOrderDetl inventoryCheckOrderDetl = new InventoryCheckOrderDetl();
- inventoryCheckOrderDetl.setOrderNo(param.getOrderNo());
- inventoryCheckOrderDetl.setMatnr(detlDto.getLocDetl().getMatnr());
- inventoryCheckOrderDetl.setMaktx(detlDto.getLocDetl().getMaktx());
- inventoryCheckOrderDetl.setBatch(detlDto.getLocDetl().getBatch());
- inventoryCheckOrderDetl.setLocNo(detlDto.getLocDetl().getLocNo());
- inventoryCheckOrderDetl.setArea(detlDto.getLocDetl().getOrigin());
- inventoryCheckOrderDetl.setAnfme(detlDto.getLocDetl().getAnfme());
- inventoryCheckOrderDetl.setIoTime(now);
- inventoryCheckOrderDetl.setStatus("1");
- if (!inventoryCheckOrderDetlService.insert(inventoryCheckOrderDetl)) {
- throw new CoolException("淇濆瓨鐩樼偣鏄庣粏澶辫触");
- }
+
if (detlDto.getCount() == null || detlDto.getCount() <= 0.0D) {
continue;
@@ -1196,7 +1170,7 @@
if (Cools.isEmpty(wrkMast)) {
throw new CoolException(workNo + "宸ヤ綔妗ｄ笉瀛樺湪");
}
- if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 14) {
+ if (wrkMast.getWrkSts() == 4 || wrkMast.getWrkSts() == 5||wrkMast.getWrkSts() == 14 || wrkMast.getWrkSts() == 15) {
throw new CoolException("褰撳墠宸ヤ綔妗ｅ凡瀹屾垚");
}
// 鍏ュ簱 + 搴撲綅杞Щ
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
deleted file mode 100644
index abbd9e1..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteLogMapper;
-import com.zy.asrs.entity.WrkMastExecuteLog;
-import com.zy.asrs.service.WrkMastExecuteLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastExecuteLogService")
-public class WrkMastExecuteLogServiceImpl extends ServiceImpl<WrkMastExecuteLogMapper, WrkMastExecuteLog> implements WrkMastExecuteLogService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
deleted file mode 100644
index 06f9976..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastExecuteMapper;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastExecuteService")
-public class WrkMastExecuteServiceImpl extends ServiceImpl<WrkMastExecuteMapper, WrkMastExecute> implements WrkMastExecuteService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
deleted file mode 100644
index 39e8ea5..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleLogServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastFourWarVehicleLogMapper;
-import com.zy.asrs.entity.WrkMastFourWarVehicleLog;
-import com.zy.asrs.service.WrkMastFourWarVehicleLogService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastFourWarVehicleLogService")
-public class WrkMastFourWarVehicleLogServiceImpl extends ServiceImpl<WrkMastFourWarVehicleLogMapper, WrkMastFourWarVehicleLog> implements WrkMastFourWarVehicleLogService {
-
-}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
deleted file mode 100644
index 3c0bacd..0000000
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastFourWarVehicleServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.zy.asrs.service.impl;
-
-import com.zy.asrs.mapper.WrkMastFourWarVehicleMapper;
-import com.zy.asrs.entity.WrkMastFourWarVehicle;
-import com.zy.asrs.service.WrkMastFourWarVehicleService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service("wrkMastFourWarVehicleService")
-public class WrkMastFourWarVehicleServiceImpl extends ServiceImpl<WrkMastFourWarVehicleMapper, WrkMastFourWarVehicle> implements WrkMastFourWarVehicleService {
-
-}
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 d90a3a3..b6f1606 100644
--- a/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoLocMoveScheduler.java
@@ -2,7 +2,9 @@
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.Order;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.*;
import com.zy.asrs.task.handler.AutoLocMoveHandler;
import com.zy.common.properties.SlaveWmsParameterProperties;
@@ -39,18 +41,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;
}
Order order = orderService.selectOrderMoveStatus();
- if (!Cools.isEmpty(order)){
+ if (!Cools.isEmpty(order)) {
// autoMoveService.selectList()
- }else {
+ } else {
order = orderService.selectOrderMoveStatusInitial();
- if (Cools.isEmpty(order)){
+ if (Cools.isEmpty(order)) {
return;
}
order.setMoveStatus(2);
@@ -61,18 +63,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);
}
}
}
@@ -81,21 +83,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/AutoMoveHaiKangScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveHaiKangScheduler.java
deleted file mode 100644
index 791b9c9..0000000
--- a/src/main/java/com/zy/asrs/task/AutoMoveHaiKangScheduler.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.zy.asrs.task;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.service.WrkMastExecuteService;
-import com.zy.asrs.task.handler.AutoMoveHaiKangHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-// 鑷姩绉诲簱
-@Slf4j
-@Component
-public class AutoMoveHaiKangScheduler {
-
- @Autowired
- private WrkMastExecuteService wrkMastExecuteService;
- @Autowired
- private AutoMoveHaiKangHandler autoMoveHaiKangHandler;
-
- /**
- * 鎵цagv_wrk_mast_execute浠诲姟
- */
-// @Scheduled(cron = "0/2 * * * * ? ")
- private void autoMove(){
- List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",0L));
- for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
- try{
- if (true){
- autoMoveHaiKangHandler.start(wrkMastExecute);
- }
- }catch (Exception e){
- log.error("鎵цagv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
- }
- }
- }
-//
-// /**
-// * 涓嬩竴姝gv_wrk_mast_execute浠诲姟
-// */
-//// @Scheduled(cron = "0/2 * * * * ? ")
-// private void autoMove2(){
-// List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",3L));
-// for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
-// Date now = new Date();
-// try{
-// if (wrkMastExecute.getStatus()==2 && wrkMastExecute.getNowPosition()==1){
-// //鍒ゆ柇鐢垫蹇欎笉蹇�
-// int count = wrkMastExecuteService.selectCount(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("status", 2));
-// if(count<3){
-// wrkMastExecute.setStatus(3);
-// wrkMastExecute.setWrkSts(0L);
-// wrkMastExecute.setModiTime(now);
-// wrkMastExecute.setEndPosition(4);
-// wrkMastExecuteService.updateById(wrkMastExecute);
-// updateAgvBasDevp(agvBasDevp,"R",agvBasDevp.getLocType2(),agvBasDevp.getBarcode());
-// }
-// }
-// }catch (Exception e){
-// log.error("鎵цagv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
-// }
-// }
-// }
-//
-// /**
-// * 涓嬩竴姝gv_wrk_mast_execute浠诲姟
-// */
-//// @Scheduled(cron = "0/2 * * * * ? ")
-// private void autoMove3(){
-// List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectList(new EntityWrapper<WrkMastExecute>().eq("io_type", 121).eq("wrk_sts",2L));
-// for (WrkMastExecute wrkMastExecute:wrkMastExecuteList){
-// Date now = new Date();
-// try{
-// if (wrkMastExecute.getStatus()==2){
-// AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getEndPosition()]));
-// if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("S")){
-// log.error("绔欑偣鐘舵�乴ocsts鍙傛暟鏈夎锛歭ocSts:"+agvBasDevp.getLocSts$());
-// }else {
-// wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
-// wrkMastExecute.setModiTime(now);
-// wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
-// wrkMastExecuteService.updateById(wrkMastExecute);
-// updateAgvBasDevp(agvBasDevp,"F",agvBasDevp.getLocType2(),agvBasDevp.getBarcode());
-// }
-// }else if (wrkMastExecute.getStatus()==3 || wrkMastExecute.getStatus()==4){
-// AgvBasDevp agvBasDevp = agvBasDevpService.selectOne(new EntityWrapper<AgvBasDevp>().eq("dev_no", wrkMastExecute.getRoute()[wrkMastExecute.getNowPosition()]));
-// if (Cools.isEmpty(agvBasDevp) || !agvBasDevp.getLocSts().equals("R")){
-// log.error("绔欑偣鐘舵�乴ocsts鍙傛暟鏈夎锛歭ocSts:"+agvBasDevp.getLocSts$());
-// }else {
-// wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
-// wrkMastExecute.setModiTime(now);
-// wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
-// wrkMastExecuteService.updateById(wrkMastExecute);
-// agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvBasDevp.getDevNo(),"O","",(short)0);
-// }
-// }else if (wrkMastExecute.getStatus()==1){
-// wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
-// wrkMastExecute.setModiTime(now);
-// wrkMastExecute.setNowPosition(wrkMastExecute.getEndPosition());
-// wrkMastExecuteService.updateById(wrkMastExecute);
-// }
-// }catch (Exception e){
-// log.error("鎵цagv_wrk_mast_execute浠诲姟寮傚父===銆嬪紓甯稿師鍥狅細"+e.getMessage());
-// }
-// }
-// }
-//
-//
-//
-// private void updateAgvBasDevp(AgvBasDevp agvBasDevp, String locSts, Short continerType, String containerCode){
-// if(!Cools.isEmpty(agvBasDevp)){
-// agvBasDevp.setLocSts(locSts);
-// agvBasDevp.setLocType2(continerType);
-// agvBasDevp.setBarcode(containerCode);
-// agvBasDevpService.updateById(agvBasDevp);
-// }
-// }
-}
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 6770a36..b2b3df8 100644
--- a/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ErrorStockScheduler.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.ShuttleTask;
import com.zy.asrs.service.LocMastService;
@@ -19,7 +18,6 @@
import org.springframework.stereotype.Component;
import java.io.IOException;
-import java.util.Date;
import java.util.List;
/**
@@ -46,48 +44,48 @@
}
}
- @Scheduled(cron = "0/15 * * * * ? ")
- private void execute2() {
- String response = null;
- try {
- ShuttleTask param = new ShuttleTask();
- response = new HttpHandler.Builder()
- .setUri(shuttleWcsUrl)
- .setJson(JSON.toJSONString(param))
- .setPath("/openapi/getAllLocInformation")
- .build()
- .doPost();
- } catch (IOException e) {
- e.printStackTrace();
- }
- JSONObject jsonObject = JSON.parseObject(response);
- Integer code = jsonObject.getInteger("code");
- if (code.equals(200)) {
- String data = jsonObject.getString("data");
- List<LocMast> locMasts = JSONArray.parseArray(data, LocMast.class);
- for (LocMast locMast : locMasts) {
- if (locMast.getLocNo().startsWith("02003") || locMast.getLocNo().startsWith("12003")) {
- continue;
- }
- String locNo = locMast.getLocNo();
- int row = Integer.parseInt(locNo.substring(0, 2)) + 4;
- if (row >= 10) {
- locNo = row + locMast.getLocNo().substring(2);
- } else {
- locNo = "0" + row + locMast.getLocNo().substring(2);
- }
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
- if (locMast1 == null) {
- log.info("搴撲綅涓嶅尮閰�");
- } else {
- if (locMast1.getLocSts().equalsIgnoreCase("X")) {
-
- } else if (!locMast1.getLocSts().equalsIgnoreCase(locMast.getLocSts())) {
- log.info("搴撲綅鐘舵�佷笉鍖归厤{}锛學MS:{}锛孯CS:{}", locMast1.getLocNo(), locMast1.getLocSts(), locMast.getLocSts());
- }
- }
- }
- }
- }
+// @Scheduled(cron = "0/15 * * * * ? ")
+// private void execute2() {
+// String response = null;
+// try {
+// ShuttleTask param = new ShuttleTask();
+// response = new HttpHandler.Builder()
+// .setUri(shuttleWcsUrl)
+// .setJson(JSON.toJSONString(param))
+// .setPath("/openapi/getAllLocInformation")
+// .build()
+// .doPost();
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// JSONObject jsonObject = JSON.parseObject(response);
+// Integer code = jsonObject.getInteger("code");
+// if (code.equals(200)) {
+// String data = jsonObject.getString("data");
+// List<LocMast> locMasts = JSONArray.parseArray(data, LocMast.class);
+// for (LocMast locMast : locMasts) {
+// if (locMast.getLocNo().startsWith("02003") || locMast.getLocNo().startsWith("12003")) {
+// continue;
+// }
+// String locNo = locMast.getLocNo();
+// int row = Integer.parseInt(locNo.substring(0, 2)) + 4;
+// if (row >= 10) {
+// locNo = row + locMast.getLocNo().substring(2);
+// } else {
+// locNo = "0" + row + locMast.getLocNo().substring(2);
+// }
+// LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locNo));
+// if (locMast1 == null) {
+// log.info("搴撲綅涓嶅尮閰�");
+// } else {
+// if (locMast1.getLocSts().equalsIgnoreCase("X")) {
+//
+// } else if (!locMast1.getLocSts().equalsIgnoreCase(locMast.getLocSts())) {
+// log.info("搴撲綅鐘舵�佷笉鍖归厤{}锛學MS:{}锛孯CS:{}", locMast1.getLocNo(), locMast1.getLocSts(), locMast.getLocSts());
+// }
+// }
+// }
+// }
+// }
}
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 2f1081a..620995e 100644
--- a/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderMoveHistoryScheduler.java
@@ -15,7 +15,7 @@
* 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
*/
@Scheduled(cron = "0/30 * * * * ?")
- public void execute(){
+ public void execute() {
orderMoveHistoryHandler.start();
}
}
diff --git a/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java b/src/main/java/com/zy/asrs/task/OverYearLogScheduler.java
index 95a8a29..aaea1ad 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/3 * * * * ? ")
- 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
deleted file mode 100644
index 708392f..0000000
--- a/src/main/java/com/zy/asrs/task/PlcLogScheduler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.zy.asrs.task;
-
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.handler.PlcLogHandler;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Component
-public class PlcLogScheduler {
-
- private static final Logger log = LoggerFactory.getLogger(PlcLogScheduler.class);
-
- @Autowired
- private PlcLogHandler plcLogHandler;
-
- @Scheduled(cron = "0/3 * * * * ? ")
- 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/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 263c796..6b5c8e4 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoLocMoveHandler.java
@@ -40,27 +40,27 @@
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);
- StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(),locDetl.getBrand(), null,false);
- workService.locMove(locMast.getLocNo(), startupDto.getLocNo(),9527L);
+ StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 917 : 918, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null, false);
+ 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;
@@ -69,14 +69,14 @@
List<LocDetl> locDetlList = locDetlService.selectLocDetlUnilateralMoveShuttle(matnr, batch, grade, crnNo);
for (LocDetl locDetl : locDetlList) {
// StartupDto startupDto = commonService.getLocNo(crnNo == 1 ? 4 : 3, ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null);
- StartupDto startupDto = commonService.getLocNo( ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null,false);
+ StartupDto startupDto = commonService.getLocNo(ioType, crnNo == 1 ? 901 : 932, locDetl.getMatnr(), locDetl.getBatch(), locDetl.getBrand(), null, false);
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/AutoMoveHaiKangHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHaiKangHandler.java
deleted file mode 100644
index 88959fe..0000000
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHaiKangHandler.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.WrkMastExecute;
-import com.zy.asrs.entity.param.AgvHaiKangTaskCreateParam;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.impl.WrkMastExecuteServiceImpl;
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.utils.HttpHandler;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Service
-@Transactional
-public class AutoMoveHaiKangHandler extends AbstractHandler<String> {
-
- @Value("${agv.url}")
- private String url;
-
- @Value("${agv.taskCreatePath}")
- private String taskCreatePath;
-
- @Autowired
- private ApiLogService apiLogService;
- @Autowired
- private WrkMastExecuteServiceImpl wrkMastExecuteService;
-
- public ReturnT<String> start(WrkMastExecute wrkMastExecute) {
- try{
- AgvHaiKangTaskCreateParam agvTaskCreateParam = new AgvHaiKangTaskCreateParam();
- getRequestParam(agvTaskCreateParam,wrkMastExecute);
- int doHttpRequest = doHttpRequest(agvTaskCreateParam, "鎼繍浠诲姟涓嬪彂==>2-3==1", url, taskCreatePath, null, "127.0.0.1");
- if(doHttpRequest != 0){
- throw new CoolException("浠诲姟涓嬪彂澶辫触,code:"+doHttpRequest);
- }
- wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
- wrkMastExecute.setModiTime(new Date());
- if (!wrkMastExecuteService.updateById(wrkMastExecute)){
- throw new CoolException("浠诲姟涓嬪彂鎴愬姛,浣嗘槸鏇存柊鎵ц浠诲姟鐘舵�佸け璐�:"+doHttpRequest);
- }
- }catch (Exception e){
- log.error("鎼繍浠诲姟涓嬪彂===銆嬪紓甯革細"+e.getMessage());
- }
- return SUCCESS;
- }
-
-// public ReturnT<String> start1(WrkMastExecute wrkMastExecute) {
-// try{
-// AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
-// getRequestParam(agvTaskCreateParam,wrkMastExecute);
-// int doHttpRequest = doHttpRequest(agvTaskCreateParam, "鎼繍浠诲姟涓嬪彂", url, taskCreatePath, null, "127.0.0.1");
-// if(doHttpRequest != 0){
-// throw new CoolException("浠诲姟涓嬪彂澶辫触,code:"+doHttpRequest);
-// }
-// wrkMastExecute.setWrkSts(wrkMastExecute.getWrkStsCode());
-// wrkMastExecute.setModiTime(new Date());
-// if (!wrkMastExecuteService.updateById(wrkMastExecute)){
-// throw new CoolException("浠诲姟涓嬪彂鎴愬姛,浣嗘槸鏇存柊鎵ц浠诲姟鐘舵�佸け璐�:"+doHttpRequest);
-// }
-// }catch (Exception e){
-// log.error("鎼繍浠诲姟涓嬪彂===銆嬪紓甯革細"+e.getMessage());
-// }
-// return SUCCESS;
-// }
-//
- private void getRequestParam(AgvHaiKangTaskCreateParam agvHaiKangTaskCreateParam, WrkMastExecute wrkMastExecute){
-
-// List<AgvTaskParam> agvTaskParamList = Arrays.asList(
-// //璧峰浣�
-// new AgvTaskParam(wrkMastExecute.getRoute()[wrkMastExecute.getNowPosition()]),
-// //鐩爣浣�
-// new AgvTaskParam(wrkMastExecute.getRoute()[wrkMastExecute.getEndPosition()]));
-
- Long wrkNo = wrkMastExecute.getWrkNo();
- if (wrkMastExecute.getNowPosition()==1){
- agvHaiKangTaskCreateParam.setTaskCode(wrkMastExecute.getWrkNo().toString());
- }else {
- wrkNo = -wrkNo;
- agvHaiKangTaskCreateParam.setTaskCode(wrkNo.toString());
- }
- if (!wrkMastExecute.getSouFloor().equals(wrkMastExecute.getEndFloor())) {
- agvHaiKangTaskCreateParam.setTaskTyp("F06");
- } else {
- agvHaiKangTaskCreateParam.setTaskTyp("F01");
- }
-
-// agvHaiKangTaskCreateParam.setPositionCodePath(agvTaskParamList);
-
- }
-
- private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
-// if (true){
-// apiLogService.save(
-// namespace,
-// url + path,
-// appkey,
-// ip,
-// JSON.toJSONString(JSONObject.toJSONString(requestParam)),
-// "",
-// true
-// );
-// return 0;
-// }
- String response = "";
- boolean success = false;
-
- try {
- response = new HttpHandler.Builder()
- .setUri(url)
- .setPath(path)
- .setJson(JSONObject.toJSONString(requestParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
-
- int code = Integer.parseInt(jsonObject.get("code").toString());
- if(code != 0){
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- }
- success = true;
- return code;
- }catch (Exception e){
- log.error(e.getMessage());
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- }finally {
- apiLogService.save(
- namespace,
- url + path,
- appkey,
- ip,
- JSON.toJSONString(JSONObject.toJSONString(requestParam)),
- response,
- 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 62c4ffa..383bf73 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/LocMoveAllHandler.java b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
index c30ecf0..9050caa 100644
--- a/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/LocMoveAllHandler.java
@@ -1,7 +1,5 @@
package com.zy.asrs.task.handler;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WorkService;
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
index 30ea19d..49b93dc 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -31,26 +31,26 @@
@Autowired
private OrderDetlReportService orderDetlReportService;
- public ReturnT<String> start(){
+ public ReturnT<String> start() {
List<Order> settleEqual6 = orderService.selectList(new EntityWrapper<Order>()
.eq("settle", 6));
for (Order order : settleEqual6) {
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
.eq("order_no", order.getOrderNo()));
- moveBoth(order,orderDetls);
+ moveBoth(order, orderDetls);
List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
- for (OrderDetlReport orderDetlReport : orderNo){
+ for (OrderDetlReport orderDetlReport : orderNo) {
OrderDetlReportLog log = new OrderDetlReportLog();
log.sync(orderDetlReport);
orderDetlReportLogService.insert(log);
orderDetlReportService.deleteById(orderDetlReport);
}
- log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
+ log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" + order);
}
return SUCCESS;
}
- private void moveBoth(Order order, List<OrderDetl> orderDetls){
+ private void moveBoth(Order order, List<OrderDetl> orderDetls) {
Date now = new Date();
if (!Cools.isEmpty(orderDetls)) {
for (OrderDetl orderDetl : orderDetls) {
@@ -58,15 +58,15 @@
orderDetl.setUpdateTime(now);
orderDetlService.addToLogTable(orderDetl);
orderDetlService.delete(new EntityWrapper<OrderDetl>()
- .eq("id",orderDetl.getId()));
+ .eq("id", orderDetl.getId()));
}
}
- if (!Cools.isEmpty(order)){
+ if (!Cools.isEmpty(order)) {
order.setUpdateBy(0L);
order.setUpdateTime(now);
orderService.addToLogTable(order);
orderService.delete(new EntityWrapper<Order>()
- .eq("id",order.getId()));
+ .eq("id", order.getId()));
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 1442b28..2e0425f 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -7,7 +7,6 @@
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.entity.OrderDetlReport;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
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 62b7596..cd60675 100644
--- a/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OverYearLogHandler.java
@@ -21,7 +21,6 @@
public ReturnT<String> start() {
try {
// 鍒犻櫎鍗婂勾浠ヤ笂鐨勫巻鍙叉。
- jdbcTemplate.update("delete from asr_stk_hplc where dateadd(day,180,appe_time) <= getdate();");
jdbcTemplate.update("delete from asr_wrk_detl_log where dateadd(day,360,appe_time) <= getdate();");
jdbcTemplate.update("delete from asr_wrk_mast_log where dateadd(day,360,appe_time) <= getdate();");
jdbcTemplate.update("delete from cust_wait_pakin_log where dateadd(day,360,appe_time) <= getdate();");
diff --git a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java b/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
deleted file mode 100644
index d2cecf1..0000000
--- a/src/main/java/com/zy/asrs/task/handler/PlcLogHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.zy.asrs.task.handler;
-
-import com.zy.asrs.task.AbstractHandler;
-import com.zy.asrs.task.core.ReturnT;
-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 org.springframework.transaction.interceptor.TransactionAspectSupport;
-
-/**
- * Created by vincent on 2020/7/7
- */
-@Service
-public class PlcLogHandler extends AbstractHandler<String> {
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
-
- @Transactional
- public ReturnT<String> start() {
- try {
- // 涓嬩綅鏈哄懡浠よ浆鍘嗗彶妗�
- int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
- if (updateCount > 0) {
- int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
- if (deleteCount <= 0) {
- exceptionHandle("鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。閿欒 ! ");
- }
- }
- } catch (Exception e) {
- e.printStackTrace();
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- }
- return SUCCESS;
- }
-
-}
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 a176edf..9a64985 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -75,7 +75,7 @@
// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
// }
// }
- // 鎷ｆ枡鍐嶅叆搴�
+ // 鎷ｆ枡鍐嶅叆搴�
} else if (wrkMast.getIoType() == 53) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
@@ -84,7 +84,7 @@
// }
}
- // 鍑哄簱 --------------------------------------------------------------------------------
+ // 鍑哄簱 --------------------------------------------------------------------------------
} else if (wrkMast.getWrkSts() == 15) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
@@ -92,7 +92,6 @@
// }
// }
}
-
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
@@ -106,7 +105,7 @@
wrkMastLog.sync(wrkMast1);
wrkMastLog.setModiTime(now);
wrkMastLog.setWrkSts(wrkMast1.getWrkSts().intValue());
- if (!wrkMastLogService.insert(wrkMastLog)){
+ if (!wrkMastLogService.insert(wrkMastLog)) {
exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
@@ -116,11 +115,11 @@
}
// 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
- wrkDetls1.forEach( wrkDetl -> {
+ wrkDetls1.forEach(wrkDetl -> {
WrkDetlLog wrkDetlLog = new WrkDetlLog();
wrkDetlLog.sync(wrkDetl);
wrkDetlLog.setModiTime(now);
- if (!wrkDetlLogService.insert(wrkDetlLog)){
+ if (!wrkDetlLogService.insert(wrkDetlLog)) {
exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
}
});
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 0c697cf..867af39 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -131,7 +131,7 @@
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 娣诲姞搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
- if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
OrderDetlReport orderDetlReport = new OrderDetlReport();
orderDetlReport.sync(wrkDetl);
orderDetlReportService.insert(orderDetlReport);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
index 2955277..b665cc7 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -17,8 +17,8 @@
private boolean InboundOrderSwitch;
@Scheduled(cron = "0/3 * * * * ? ")
- void login(){
- if(!InboundOrderSwitch){
+ void login() {
+ if (!InboundOrderSwitch) {
return;
}
inboundOrderHandler.start();
diff --git a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
index 8b7be90..46bc690 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java
@@ -16,8 +16,8 @@
private boolean LoginAuthenticationSwitch;
//@Scheduled(cron = "0/3 * * * * ? ")
- void login(){
- if(!LoginAuthenticationSwitch){
+ void login() {
+ if (!LoginAuthenticationSwitch) {
return;
}
loginAuthenticationHandler.start();
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 2767e9f..60e9a86 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -1,7 +1,6 @@
package com.zy.asrs.task.kingdee;
import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
@@ -31,8 +30,8 @@
@Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
- if(!ReviewOrderSwitch){
+ public void completeAndReport() {
+ if (!ReviewOrderSwitch) {
return;
}
List<Order> orders = orderService.selectComplete();
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index 932bca7..b701a89 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -8,7 +8,6 @@
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;
import java.util.List;
@@ -28,11 +27,11 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ // @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
- if (1==1) return;
- if(!ReviewOrderSwitch){
+ public void completeAndReport() {
+ if (1 == 1) return;
+ if (!ReviewOrderSwitch) {
return;
}
List<Order> orders = orderService.selectComplete8();
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
index 069489a..7d73669 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -1,12 +1,9 @@
package com.zy.asrs.task.kingdee;
import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.ReviewOrderSyncHandler;
import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
-import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -33,8 +30,8 @@
@Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
- if(!ReviewOrderSwitch){
+ public void completeAndReport() {
+ if (!ReviewOrderSwitch) {
return;
}
List<Order> orders = orderService.selectComplete8();
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index c98e298..f8fd107 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -7,14 +7,13 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.utils.HttpHandler;
import com.zy.erp.kingdee.entity.param.InFormIdParam;
import com.zy.erp.kingdee.enums.KingDeeUtilType;
-import com.zy.common.utils.HttpHandler;
import com.zy.erp.kingdee.utils.KingDeeUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -63,19 +62,19 @@
@Transactional
public synchronized ReturnT<String> start() {
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鐧诲綍閲戣澏
ReturnT<String> start = loginAuthenticationHandler.start();
- for(KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
+ for (KingDeeUtilType kingDeeUtilType : KingDeeUtilType.values()) {
InFormIdParam inFormIdParam = new InFormIdParam();
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", kingDeeUtilType.desc));
- if (Cools.isEmpty(docType) && !kingDeeUtilType.formId.equals("BD_MATERIAL")){
+ if (Cools.isEmpty(docType) && !kingDeeUtilType.formId.equals("BD_MATERIAL")) {
docType = docTypeService.selectOrAdd(kingDeeUtilType.desc, kingDeeUtilType.pakIn.equals(1));
}
inFormIdParam.setFormId(kingDeeUtilType.formId);
inFormIdParam.setLimit(100);
inFormIdParam.setStartRow("0");
- String FDocumentStatus=null;
+ String FDocumentStatus = null;
//鏉′欢鍜岄渶瑕佽幏寰楃殑缁撴灉鎷兼帴
JSONObject jsonObject = new JSONObject();
@@ -83,23 +82,23 @@
jsonObject.put("Limit", inFormIdParam.getLimit());
jsonObject.put("StartRow", inFormIdParam.getStartRow());
//鐗╂枡妗ｆ鏌ヨ
- if(kingDeeUtilType.formId.equals("BD_MATERIAL")){
+ if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
//鐗╂枡鐘舵�� FUseOrgId .FNumber
- FDocumentStatus="C";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(tag.getUpdateTime())+"' and FDocumentStatus='"+FDocumentStatus+"' and FUseOrgId .FNumber='100'");
+ FDocumentStatus = "C";
+ jsonObject.put("FilterString", "FCreateDate>'" + sdf.format(tag.getUpdateTime()) + "' and FDocumentStatus='" + FDocumentStatus + "' and FUseOrgId .FNumber='100'");
jsonObject.put("FieldKeys", "FName,FNumber,FCreateDate,FSpecification,FDocumentStatus");
// FName : 鐗╂枡鍚嶇О 锛�
// FNumber 锛氱墿鏂欑紪鍙凤紱
// FCreateDate 锛氱墿鏂欏垱寤烘椂闂达紱
// FSpecification 锛氱墿鏂欒鏍硷紱
// FDocumentStatus 锛氱墿鏂欑姸鎬�
- }else{
+ } else {
//鑾峰彇鏈�鏂版椂闂�
//鍗曟嵁鐘舵��
- FDocumentStatus="B";
- jsonObject.put("FilterString", "FCreateDate>'"+sdf.format(docType.getCreateTime())+"'"+" and FStockId.Fname='绔嬪簱'"+" and FDocumentStatus='"+FDocumentStatus+"'");
- jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,"+kingDeeUtilType.anfme+",FDocumentStatus");
+ FDocumentStatus = "B";
+ jsonObject.put("FilterString", "FCreateDate>'" + sdf.format(docType.getCreateTime()) + "'" + " and FStockId.Fname='绔嬪簱'" + " and FDocumentStatus='" + FDocumentStatus + "'");
+ jsonObject.put("FieldKeys", "FBillNo,FCreateDate,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification," + kingDeeUtilType.anfme + ",FDocumentStatus");
// FBillNo :鍗曟嵁缂栧彿锛�
// FCreateDate 锛氬崟鎹垱寤烘椂闂达紱
// FMaterialId.FNumber : 鐗╂枡缂栫爜锛�
@@ -127,8 +126,8 @@
.build()
.doPost();
JSONArray data = JSON.parseArray(response);
- if(data.size()<=0) continue;
- if (data.getJSONArray(0).get(0).toString().length()>=20) continue;
+ if (data.size() <= 0) continue;
+ if (data.getJSONArray(0).get(0).toString().length() >= 20) continue;
if (kingDeeUtilType.formId.equals("BD_MATERIAL")) {//鐗╂枡妗ｆ
Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
for (int j = 0; j < data.size(); j++) {
@@ -150,15 +149,15 @@
//鏈�鏂版姄鍙栧晢鍝佹椂闂�
if (!matService.insert(mat)) {
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- callApiLogSaveMat(mat,kingDeeUtilType, "鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒"+mat, false);
- log.info("鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒鍙傛暟锛歔{}]銆乕{}]",mat,jsonArray);
+ callApiLogSaveMat(mat, kingDeeUtilType, "鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒" + mat, false);
+ log.info("鍚屾鏂扮墿鏂欏嚭閿欙紒锛侊紒鍙傛暟锛歔{}]銆乕{}]", mat, jsonArray);
} else {
- callApiLogSaveMat(mat,kingDeeUtilType, "鍚屾鏂扮墿鏂欙紒", true);
+ callApiLogSaveMat(mat, kingDeeUtilType, "鍚屾鏂扮墿鏂欙紒", true);
// log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
- }else {
- if (!jsonDate.equals(tag.getUpdateTime())){
- callApiLogSaveMat(mat,kingDeeUtilType, "鍟嗗搧缂栧彿閲嶅:"+mat.getMatnr(), false);
+ } else {
+ if (!jsonDate.equals(tag.getUpdateTime())) {
+ callApiLogSaveMat(mat, kingDeeUtilType, "鍟嗗搧缂栧彿閲嶅:" + mat.getMatnr(), false);
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}],鍟嗗搧缂栧彿閲嶅锛侊紒锛�", mat.getMatnr());
}
}
@@ -213,8 +212,8 @@
);
if (!orderService.insert(order)) {
- if (!jsonDate.equals(docType.getCreateTime())){
- callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�"+order, false);
+ if (!jsonDate.equals(docType.getCreateTime())) {
+ callApiLogSaveOrder(order, kingDeeUtilType, "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�" + order, false);
}
continue;
// throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -223,8 +222,8 @@
//鐗╂枡缂栫爜
Mat mat = matService.selectByMatnr(jsonArray.get(2).toString());
if (Cools.isEmpty(mat)) {
- if (!jsonDate.equals(docType.getCreateTime())){
- callApiLogSaveOrder(order,kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧"+jsonArray.get(2).toString(), false);
+ if (!jsonDate.equals(docType.getCreateTime())) {
+ callApiLogSaveOrder(order, kingDeeUtilType, "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧" + jsonArray.get(2).toString(), false);
}
continue;
}
@@ -245,7 +244,7 @@
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
if (!orderDetlService.insert(orderDetl)) {
- callApiLogSaveOrder(order,kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!璁㈠崟鍙凤細"+order.getOrderNo(), false);
+ callApiLogSaveOrder(order, kingDeeUtilType, "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�!璁㈠崟鍙凤細" + order.getOrderNo(), false);
// throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
}
@@ -276,14 +275,14 @@
}
public void callApiLogSaveMat(Mat mat, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
- apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
+ apiLogService.save("鑾峰彇" + kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
"鐗╂枡缂栧彿锛�" + mat.getMatnr() + "銆佺墿鏂欏悕绉帮細" + mat.getName() + "銆佺被鍨嬶細" + mat.getTagId$() + "銆佺姸鎬侊細" + mat.getStatus$(),
response, bool);
}
public void callApiLogSaveOrder(Order order, KingDeeUtilType kingDeeUtilType, String response, Boolean bool) {
- apiLogService.save("鑾峰彇"+kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
- "鍗曟嵁缂栧彿锛�" + order.getId() + "銆佺姸鎬侊細" + order.getStatus$(),
+ apiLogService.save("鑾峰彇" + kingDeeUtilType.desc, kingDeeUtilType.formId, "null", URL,
+ "鍗曟嵁缂栧彿锛�" + order.getId() + "銆佺姸鎬侊細" + order.getStatus$(),
response, bool);
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
index 3530b48..45315a3 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/LoginAuthenticationHandler.java
@@ -4,14 +4,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
import com.zy.erp.kingdee.entity.param.LoginParam;
-import com.zy.erp.kingdee.enums.KingDeeUtilType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -54,12 +51,13 @@
/**
* 45鍒嗛挓鐧诲綍涓�娆￠噾铦剁郴缁�
+ *
* @return
*/
@Transactional
public synchronized ReturnT<String> start() {
- LoginParam loginParam =new LoginParam();
+ LoginParam loginParam = new LoginParam();
loginParam.setAcctID(acctID);
loginParam.setUsername(username);
loginParam.setPassword(password);
@@ -77,18 +75,18 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
Object sessionId = findValueByKey(JSON.parseObject(response), "SessionId");
- cookie="ASP.NET_SessionId="+sessionId+";"+"kdservice-sessionid="+jsonObject.getString("KDSVCSessionId");
+ cookie = "ASP.NET_SessionId=" + sessionId + ";" + "kdservice-sessionid=" + jsonObject.getString("KDSVCSessionId");
if (Cools.isEmpty(jsonObject.getString("Message"))) {
success = true;
} else {
- callApiLogSaveLog(JSON.toJSONString(loginParam),false);
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+loginaddress, JSON.toJSONString(loginParam), response);
+ callApiLogSaveLog(JSON.toJSONString(loginParam), false);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + loginaddress, JSON.toJSONString(loginParam), response);
// throw new CoolException("鐧诲綍閲戣澏澶辫触");
}
} catch (Exception e) {
log.error("fail", e);
- callApiLogSaveLog(JSON.toJSONString(loginParam),false);
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+loginaddress, JSON.toJSONString(loginParam), response);
+ callApiLogSaveLog(JSON.toJSONString(loginParam), false);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + loginaddress, JSON.toJSONString(loginParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
@@ -119,13 +117,13 @@
int size = ((JSONArray) v).size();
for (int i = 0; i <= size - 1; i++) {
Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
+ if (result != null) {
return result;
}
}
- } else if (v instanceof JSONObject){
+ } else if (v instanceof JSONObject) {
Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
+ if (result != null) {
return result;
}
}
@@ -135,7 +133,7 @@
public void callApiLogSaveLog(String response, Boolean bool) {
apiLogService.save("鐧诲綍閲戣澏澶辫触", URL, "null", loginaddress,
- "濂楄处ID锛�"+acctID+"銆佽处鍙凤細"+username+"銆佸瘑鐮侊細"+password,
+ "濂楄处ID锛�" + acctID + "銆佽处鍙凤細" + username + "銆佸瘑鐮侊細" + password,
response, bool);
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 313ebc8..e8bb394 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -57,10 +57,10 @@
//鏉′欢鎷兼帴
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
+ jsonObject.put("Numbers", order.getOrderNo());
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.formId);
+ jsonObject1.put("FormId", kingDeeUtilType.formId);
String add = jsonObject1.toJSONString();
//涓婃姤
String response = "";
@@ -78,12 +78,12 @@
.doPost();
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+ String bool = IsSuccess.toString();
//瀹℃牳瀹屾垚鍘熻鍗�4杞�8 8.瀹℃牳瀹屾垚
- if(bool.equals("true")){
+ if (bool.equals("true")) {
success = true;
order.setSettle(8L);
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
}
} catch (Exception e) {
log.error("fail", e);
@@ -94,7 +94,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"瀹℃牳",
- URL+ outaddressAudit,
+ URL + outaddressAudit,
null,
"127.0.0.1",
add,
@@ -107,6 +107,7 @@
}
return SUCCESS;
}
+
public static Object findValueByKey(JSONObject json, String key) {
Set<String> keySet = json.keySet();
for (String k : keySet) {
@@ -117,13 +118,13 @@
int size = ((JSONArray) v).size();
for (int i = 0; i <= size - 1; i++) {
Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
+ if (result != null) {
return result;
}
}
- } else if (v instanceof JSONObject){
+ } else if (v instanceof JSONObject) {
Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
+ if (result != null) {
return result;
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index 88134a3..0518557 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -57,10 +57,10 @@
//鏉′欢鎷兼帴
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
+ jsonObject.put("Numbers", order.getOrderNo());
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
+ jsonObject1.put("FormId", kingDeeUtilType.correspondingFormId);
String add = jsonObject1.toJSONString();
//涓婃姤
String response = "";
@@ -78,12 +78,12 @@
.doPost();
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+ String bool = IsSuccess.toString();
//淇濆瓨瀹屾垚鍘熻鍗�8杞�6
- if(bool.equals("true")){
+ if (bool.equals("true")) {
success = true;
order.setSettle(6L);
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
}
} catch (Exception e) {
log.error("fail", e);
@@ -94,7 +94,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"淇濆瓨",
- URL+ outaddressSave,
+ URL + outaddressSave,
null,
"127.0.0.1",
add,
@@ -107,6 +107,7 @@
}
return SUCCESS;
}
+
public static Object findValueByKey(JSONObject json, String key) {
Set<String> keySet = json.keySet();
for (String k : keySet) {
@@ -117,13 +118,13 @@
int size = ((JSONArray) v).size();
for (int i = 0; i <= size - 1; i++) {
Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
+ if (result != null) {
return result;
}
}
- } else if (v instanceof JSONObject){
+ } else if (v instanceof JSONObject) {
Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
+ if (result != null) {
return result;
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
index 7e922d6..001d2b1 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
@@ -57,10 +57,10 @@
//鏉′欢鎷兼帴
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
+ jsonObject.put("Numbers", order.getOrderNo());
JSONObject jsonObject1 = new JSONObject();
jsonObject1.put("data", jsonObject);
- jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
+ jsonObject1.put("FormId", kingDeeUtilType.correspondingFormId);
String add = jsonObject1.toJSONString();
//涓婃姤
String response = "";
@@ -78,12 +78,12 @@
.doPost();
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+ String bool = IsSuccess.toString();
//瀹℃牳瀹屾垚鍘熻鍗�8杞�6
- if(bool.equals("true")){
+ if (bool.equals("true")) {
success = true;
order.setSettle(6L);
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ orderService.update(order, new EntityWrapper<Order>().eq("order_no", order.getOrderNo()));
}
} catch (Exception e) {
log.error("fail", e);
@@ -94,7 +94,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎻愪氦",
- URL+ outaddressSubmit,
+ URL + outaddressSubmit,
null,
"127.0.0.1",
add,
@@ -107,6 +107,7 @@
}
return SUCCESS;
}
+
public static Object findValueByKey(JSONObject json, String key) {
Set<String> keySet = json.keySet();
for (String k : keySet) {
@@ -117,13 +118,13 @@
int size = ((JSONArray) v).size();
for (int i = 0; i <= size - 1; i++) {
Object result = findValueByKey((JSONObject) ((JSONArray) v).get(i), key);
- if (result != null){
+ if (result != null) {
return result;
}
}
- } else if (v instanceof JSONObject){
+ } else if (v instanceof JSONObject) {
Object result = findValueByKey((JSONObject) v, key);
- if (result != null){
+ if (result != null) {
return result;
}
}
diff --git a/src/main/java/com/zy/asrs/third/TokenUtils.java b/src/main/java/com/zy/asrs/third/TokenUtils.java
index 89614f8..3ec9ab6 100644
--- a/src/main/java/com/zy/asrs/third/TokenUtils.java
+++ b/src/main/java/com/zy/asrs/third/TokenUtils.java
@@ -7,6 +7,7 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+
@Slf4j
public class TokenUtils {
@@ -37,7 +38,7 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- log.info("token:{}",response);
+ log.info("token:{}", response);
MesResponse jsonObject = JSON.parseObject(response, MesResponse.class);
if (jsonObject.getCode().equals(200)) {
data.put("token", JSON.parseObject(jsonObject.getData()).getString("token"));
diff --git a/src/main/java/com/zy/asrs/timer/LedWebsocket.java b/src/main/java/com/zy/asrs/timer/LedWebsocket.java
index a3a8507..3e2209f 100644
--- a/src/main/java/com/zy/asrs/timer/LedWebsocket.java
+++ b/src/main/java/com/zy/asrs/timer/LedWebsocket.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Arith;
import com.core.common.Cools;
-
import com.zy.asrs.entity.AxisBean;
import com.zy.asrs.entity.LocChartPie;
import com.zy.asrs.entity.LocDetl;
@@ -13,10 +12,8 @@
import com.zy.asrs.service.LocDetlService;
import com.zy.common.config.WebSocketServer;
import com.zy.common.service.CommonService;
-
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
@@ -26,7 +23,7 @@
@Slf4j
public class LedWebsocket {
- private static final String[] WEEK = {"鏄熸湡鏃�","鏄熸湡涓�","鏄熸湡浜�","鏄熸湡涓�","鏄熸湡鍥�","鏄熸湡浜�","鏄熸湡鍏�"};
+ private static final String[] WEEK = {"鏄熸湡鏃�", "鏄熸湡涓�", "鏄熸湡浜�", "鏄熸湡涓�", "鏄熸湡鍥�", "鏄熸湡浜�", "鏄熸湡鍏�"};
@Autowired
private ReportQueryMapper reportQueryMapper;
@@ -35,13 +32,13 @@
@Autowired
private LocDetlService locDetlService;
-// @Scheduled(cron = "0/2 * * * * ? ")
+ // @Scheduled(cron = "0/2 * * * * ? ")
private void send() {
//楗煎浘
List<Map<String, Object>> pie = new ArrayList<>();
LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
- if(locUseRate!=null) {
+ if (locUseRate != null) {
Map<String, Object> map = new HashMap<>();
map.put("name", "鍦ㄥ簱");
map.put("value", locUseRate.getFqty());
@@ -71,30 +68,30 @@
double usedPr = Arith.multiplys(1, usedDivides, 100);
//鎶樼嚎鍥�
- Map<String,Object> map=new HashMap<String, Object>();
+ 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);
}
@@ -113,35 +110,36 @@
//浠撳簱鏁版嵁
EntityWrapper<LocDetl> locDetlEntityWrapper = new EntityWrapper<>();
locDetlEntityWrapper.setSqlSelect("matnr,COUNT(*) as matnrCount").groupBy("matnr");
- List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
+ List<Map<String, Object>> selectMap = locDetlService.selectMaps(locDetlEntityWrapper);
Date now = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(now);
// Map<String, Object> map = new HashMap<>();
- map.put("to","all");
- map.put("message", Cools.add("type", "default").add("pie", pie)
- .add("stockCunt", locUseRate.getFqty())
- .add("emptyCount", locUseRate.getOqty())
- .add("noneCount", locUseRate.getXqty())
- .add("total", total)
- .add("used", used)
- .add("usedPr", usedPr)
- .add("rows",list)
- .add("year", calendar.get(Calendar.YEAR))
- .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH)+1), 2))
- .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
- .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
- .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
- .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)) , 2))
- .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK)-1])
- .add("inventoryData",selectMap));
- webSocketServer.onMessage(JSONObject.toJSONString(map),null,"all");
+ map.put("to", "all");
+ map.put("message", Cools.add("type", "default").add("pie", pie)
+ .add("stockCunt", locUseRate.getFqty())
+ .add("emptyCount", locUseRate.getOqty())
+ .add("noneCount", locUseRate.getXqty())
+ .add("total", total)
+ .add("used", used)
+ .add("usedPr", usedPr)
+ .add("rows", list)
+ .add("year", calendar.get(Calendar.YEAR))
+ .add("month", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MONTH) + 1), 2))
+ .add("day", CommonService.zerofill(String.valueOf(calendar.get(Calendar.DATE)), 2))
+ .add("hour", CommonService.zerofill(String.valueOf(calendar.get(Calendar.HOUR_OF_DAY)), 2))
+ .add("minute", CommonService.zerofill(String.valueOf(calendar.get(Calendar.MINUTE)), 2))
+ .add("second", CommonService.zerofill(String.valueOf(calendar.get(Calendar.SECOND)), 2))
+ .add("week", WEEK[calendar.get(Calendar.DAY_OF_WEEK) - 1])
+ .add("inventoryData", selectMap));
+ webSocketServer.onMessage(JSONObject.toJSONString(map), null, "all");
}
-// @Scheduled(cron = "0/2 * * * * ? ")
- private void errorSend(){
- Map<String,Object> map=new HashMap<String, Object>();
+
+ // @Scheduled(cron = "0/2 * * * * ? ")
+ private void errorSend() {
+ Map<String, Object> map = new HashMap<String, Object>();
// for (LedSlave slave : slaveProperties.getLed()) {
// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
// if (null != ledThread) {
@@ -153,9 +151,9 @@
// }
}
-// @Scheduled(cron = "0/2 * * * * ? ")
- private void TaskSend(){
- Map<String,Object> map=new HashMap<String, Object>();
+ // @Scheduled(cron = "0/2 * * * * ? ")
+ private void TaskSend() {
+ Map<String, Object> map = new HashMap<String, Object>();
// List<LedCommand> commandList = null;
// for (LedSlave slave : slaveProperties.getLed()) {
// LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
diff --git a/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java b/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java
index 35958da..412cb25 100644
--- a/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java
+++ b/src/main/java/com/zy/asrs/utils/DigitAndSortUrils.java
@@ -7,8 +7,8 @@
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");
+ System.out.println(digitMax(numbers) + ":max");
+ System.out.println(digitMin(numbers) + ":min");
}
public static Integer digitMax(int[] numbers) {
diff --git a/src/main/java/com/zy/asrs/utils/InitStaDesc.java b/src/main/java/com/zy/asrs/utils/InitStaDesc.java
index 934d92b..ee64390 100644
--- a/src/main/java/com/zy/asrs/utils/InitStaDesc.java
+++ b/src/main/java/com/zy/asrs/utils/InitStaDesc.java
@@ -16,7 +16,7 @@
@Autowired
private StaDescService staDescService;
-// @PostConstruct
+ // @PostConstruct
@GetMapping("/init/staDesc")
public void initStaDesc() {
in();
@@ -25,8 +25,8 @@
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};
+ 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();
@@ -74,9 +74,9 @@
public void out() {
// 鍏ㄧ彮鍑哄簱
- int[] stnNos = new int[] {304, 302, 300};
+ 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};
+ int[] crnStns = new int[]{312, 310, 308, 306};
for (int stnNo : stnNos) {
for (int i = 0; i < crnStns.length; i++) {
StaDesc staDesc = new StaDesc();
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 28b4960..a94e7c2 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -8,15 +8,12 @@
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.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
/**
* Created by vincent on 2020/8/27
@@ -25,26 +22,33 @@
private static final DecimalFormat fmt = new DecimalFormat("##0.00");
- public static String getStaName(Integer sta){
+ public static String getStaName(Integer sta) {
HashMap<Integer, String> map = new HashMap<>();
- map.put(113,"Ctu搴�102");map.put(115,"Ctu搴�101");
- map.put(204,"Ctu搴�201");map.put(304,"Ctu搴�301");
- map.put(31001,"鍥涘悜搴�101");
+ map.put(113, "Ctu搴�102");
+ map.put(115, "Ctu搴�101");
+ map.put(204, "Ctu搴�201");
+ map.put(304, "Ctu搴�301");
+ map.put(31001, "鍥涘悜搴�101");
- map.put(1024,"鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");map.put(1028,"鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛");
- map.put(1040,"鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");map.put(1042,"鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛");
+ map.put(1024, "鍫嗗灈鏈哄簱鍖�1鍙峰嚭搴撳彛");
+ map.put(1028, "鍫嗗灈鏈哄簱鍖�2鍙峰嚭搴撳彛");
+ map.put(1040, "鍫嗗灈鏈哄簱鍗�1鍙峰叆搴撳彛");
+ map.put(1042, "鍫嗗灈鏈哄簱鍗�1鍙峰嚭搴撳彛");
- map.put(2000,"鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");map.put(2002,"鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛");
- map.put(2010,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");map.put(2012,"鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛");
+ map.put(2000, "鍫嗗灈鏈哄簱鍖�2妤煎嚭鍏ュ簱鍙�");
+ map.put(2002, "鍫嗗灈鏈哄簱鍖椾簩妤煎嚭搴撳彛");
+ map.put(2010, "鍫嗗灈鏈哄簱鍗椾簩妤煎嚭鍏ュ簱鍙�");
+ map.put(2012, "鍫嗗灈鏈哄簱鍗椾簩妤煎嚭搴撳彛");
- map.put(3010,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");map.put(3012,"鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
+ map.put(3010, "鍫嗗灈鏈哄簱鍗椾笁妤煎嚭鍏ュ簱鍙�");
+ map.put(3012, "鍫嗗灈鏈哄簱鍗椾笁妤煎嚭搴撳彛");
- return map.get(sta)==null?sta.toString():map.get(sta);
+ return map.get(sta) == null ? sta.toString() : map.get(sta);
}
- public static boolean isNorth(Integer sourceStaNo){
- if ((sourceStaNo>1000 && sourceStaNo < 1040) || (sourceStaNo>2000 && sourceStaNo > 2010)|| (sourceStaNo > 3000 && sourceStaNo < 3010)){
+ public static boolean isNorth(Integer sourceStaNo) {
+ if ((sourceStaNo > 1000 && sourceStaNo < 1040) || (sourceStaNo > 2000 && sourceStaNo > 2010) || (sourceStaNo > 3000 && sourceStaNo < 3010)) {
return true;
}
return false;
@@ -279,30 +283,30 @@
}
public static boolean BooleanWhsTypeSta2(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4 || whsType == 9) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType == 3 || whsType == 4 || whsType == 9) {
return true;
}
return false;
}
public static int RowCount(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[0];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[0];
}
public static int getCurRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[1];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[1];
}
public static int getCrnNo(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[2];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[2];
}
public static int getNearRow(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
- return LocNecessaryParameters(rowLastno, curRow, crnNumber,0)[3];
+ return LocNecessaryParameters(rowLastno, curRow, crnNumber, 0)[3];
}
//搴撲綅鎺掑彿鍒嗛厤
- public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber,Integer whsType) {
+ public static int[] LocNecessaryParameters(RowLastno rowLastno, Integer curRow, Integer crnNumber, Integer whsType) {
switch (rowLastno.getTypeId()) {
case 1://缁忓吀鍙屼几搴撲綅
return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
@@ -519,6 +523,7 @@
return necessaryParameters;
}
+
//鍥涘悜搴擄紙鐗涚溂\鍏夋嘲锛�
public static int[] LocNecessaryParametersDoubleExtension6(RowLastno rowLastno, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
@@ -528,7 +533,7 @@
necessaryParameters[0] = crnNumber; // 杞娆℃暟
curRow = curRow - offset;
//婊℃澘姝ｅ父鍏ュ簱
- switch (curRow){
+ switch (curRow) {
case 1:
necessaryParameters[1] = 3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
@@ -559,7 +564,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 鏈�娴呭簱浣嶆帓
@@ -634,12 +639,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 f1c570e..cfb105f 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -2,9 +2,7 @@
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.WrkDetl;
-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 bd12527..2965b5a 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=jxgtasrs";
- generator.username="sa";
- generator.password="sa@123";
- generator.table="man_Inventory_check_order_detl";
- generator.packagePath="com.zy.asrs";
+ generator.url = "127.0.0.1:1433;databasename=jxgtasrs";
+ generator.username = "sa";
+ generator.password = "sa@123";
+ generator.table = "man_Inventory_check_order_detl";
+ 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 95122b7..90f1f5b 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;
@@ -50,12 +49,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));
// 鍗婂皬鏃跺悗杩囨湡
- if (System.currentTimeMillis() - timestamp > 1000 * 60 * 30){
+ if (System.currentTimeMillis() - timestamp > 1000 * 60 * 30) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -74,15 +73,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());
}
}
@@ -108,11 +107,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;
}
@@ -120,7 +119,7 @@
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
// 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 1800000){
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 1800000) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -150,7 +149,7 @@
// request.setAttribute("operateLog", operateLog);
}
return true;
- } catch (Exception e){
+ } catch (Exception e) {
Http.response(response, BaseRes.DENIED);
return false;
}
@@ -159,6 +158,7 @@
/**
* 鏉冮檺鎷︽埅
+ *
* @return false:鏃犳潈闄�; true:璁よ瘉閫氳繃
*/
private boolean limit(String action, User user) {
@@ -176,7 +176,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 ace211e..10e8d29 100644
--- a/src/main/java/com/zy/common/config/WebConfig.java
+++ b/src/main/java/com/zy/common/config/WebConfig.java
@@ -19,7 +19,7 @@
registry.addInterceptor(adminInterceptor)
.addPathPatterns("/**")
.excludePathPatterns("/imserver/**")
- ;
+ ;
}
}
diff --git a/src/main/java/com/zy/common/config/WebSocketServer.java b/src/main/java/com/zy/common/config/WebSocketServer.java
index 393fc16..dbc2cdf 100644
--- a/src/main/java/com/zy/common/config/WebSocketServer.java
+++ b/src/main/java/com/zy/common/config/WebSocketServer.java
@@ -23,6 +23,7 @@
* 璁板綍褰撳墠鍦ㄧ嚎杩炴帴鏁�
*/
public static final Map<String, Session> sessionMap = new ConcurrentHashMap<>();
+
/**
* 杩炴帴寤虹珛鎴愬姛璋冪敤鐨勬柟娉�
*/
@@ -42,6 +43,7 @@
// {"users": [{"username": "zhang"},{ "username": "admin"}]}
sendAllMessage(JSONUtil.toJsonStr(result)); // 鍚庡彴鍙戦�佹秷鎭粰鎵�鏈夌殑瀹㈡埛绔�
}
+
/**
* 杩炴帴鍏抽棴璋冪敤鐨勬柟娉�
*/
@@ -50,11 +52,13 @@
sessionMap.remove(username);
log.info("鏈変竴杩炴帴鍏抽棴锛岀Щ闄sername={}鐨勭敤鎴穝ession, 褰撳墠鍦ㄧ嚎浜烘暟涓猴細{}", username, sessionMap.size());
}
+
/**
* 鏀跺埌瀹㈡埛绔秷鎭悗璋冪敤鐨勬柟娉�
* 鍚庡彴鏀跺埌瀹㈡埛绔彂閫佽繃鏉ョ殑娑堟伅
* onMessage 鏄竴涓秷鎭殑涓浆绔�
* 鎺ュ彈 娴忚鍣ㄧ socket.send 鍙戦�佽繃鏉ョ殑 json鏁版嵁
+ *
* @param message 瀹㈡埛绔彂閫佽繃鏉ョ殑娑堟伅
*/
@OnMessage
@@ -66,9 +70,9 @@
// {"to": "admin", "text": "鑱婂ぉ鏂囨湰"}
if ("heartBeat".equals(toUsername)) {
log.info("蹇冭烦");
- }else if ("all".equals(toUsername)) {
+ } else if ("all".equals(toUsername)) {
sendAllMessage(text);
- }else {
+ } else {
Session toSession = sessionMap.get(toUsername); // 鏍规嵁 to鐢ㄦ埛鍚嶆潵鑾峰彇 session锛屽啀閫氳繃session鍙戦�佹秷鎭枃鏈�
if (toSession != null) {
// 鏈嶅姟鍣ㄧ 鍐嶆妸娑堟伅缁勮涓�涓嬶紝缁勮鍚庣殑娑堟伅鍖呭惈鍙戦�佷汉鍜屽彂閫佺殑鏂囨湰鍐呭
@@ -84,11 +88,13 @@
}
}
+
@OnError
public void onError(Session session, Throwable error) {
log.error("鍙戠敓閿欒");
error.printStackTrace();
}
+
/**
* 鏈嶅姟绔彂閫佹秷鎭粰瀹㈡埛绔�
*/
@@ -100,6 +106,7 @@
log.error("鏈嶅姟绔彂閫佹秷鎭粰瀹㈡埛绔け璐�", e);
}
}
+
/**
* 鏈嶅姟绔彂閫佹秷鎭粰鎵�鏈夊鎴风
*/
diff --git a/src/main/java/com/zy/common/constant/AgvSiteConstant.java b/src/main/java/com/zy/common/constant/AgvSiteConstant.java
index e2b5274..9293e68 100644
--- a/src/main/java/com/zy/common/constant/AgvSiteConstant.java
+++ b/src/main/java/com/zy/common/constant/AgvSiteConstant.java
@@ -10,37 +10,104 @@
*/
public class AgvSiteConstant {
- public static final Map<String,String> SiteMap = new HashMap<String,String>(){{
- put("a100","700000EE501013");put("a101","700001EE501013");put("a102","700002EE501013");put("a103","700003EE501013");
- put("a104","700004EE501013");put("a105","700005EE501013");put("a106","700006EE501013");put("a107","700007EE501013");
- put("a108","700008EE501013");put("a109","700009EE501013");put("a110","700010EE501013");put("a111","700046EE501013");
- put("a112","700047EE501013");put("a113","700048EE501013");put("a114","700049EE501013");
- put("a200","700032EE501013");put("a201","700011EE501013");put("a202","700012EE501013");put("a203","700013EE501013");
- put("a204","700014EE501013");put("a205","700015EE501013");put("a206","700016EE501013");put("a207","700017EE501013");
- put("a208","700018EE501013");put("a209","700019EE501013");put("a210","700020EE501013");put("a211","700050EE501013");
- put("a212","700051EE501013");put("a213","700052EE501013");put("a214","700053EE501013");
- put("a300","700031EE501013");put("a301","700021EE501013");put("a302","700022EE501013");put("a303","700023EE501013");
- put("a304","700024EE501013");put("a305","700025EE501013");put("a306","700026EE501013");put("a307","700027EE501013");
- put("a308","700028EE501013");put("a309","700029EE501013");put("a310","700030EE501013");put("a311","700054EE501013");
- put("a312","700055EE501013");put("a313","700056EE501013");put("a314","700057EE501013");
- put("a400","700033EE501013");put("a401","700034EE501013");put("a402","700035EE501013");put("a403","700036EE501013");
- put("a404","700037EE501013");put("a405","700038EE501013");put("a406","700039EE501013");put("a407","700040EE501013");
- put("a408","700041EE501013");put("a409","700058EE501013");put("a410","700059EE501013");put("a411","700060EE501013");
- put("a412","700061EE501013");
- put("a500","700042EE501013");put("a501","700043EE501013");put("a502","700044EE501013");put("a503","700045EE501013");
- put("aa11","700062EE501013");put("aa22","700063EE501013");
- put("b1","820001EE501013");put("b2","820002EE501013");put("b3","820003EE501013");put("b4","820004EE501013");
- put("b5","820005EE501013");put("b6","820006EE501013");
- put("c1","830001EE501013");put("c2","830002EE501013");put("c3","830003EE501013");put("c4","830004EE501013");
- put("c5","830005EE501013");put("c6","830006EE501013");
- put("d1","840001EE501013");put("d2","840002EE501013");put("d3","840003EE501013");put("d4","840004EE501013");
- put("d5","840005EE501013");put("d6","840006EE501013");put("d7","840007EE501013");put("d8","840008EE501013");
- put("d9","840009EE501013");put("d10","840010EE501013");put("d11","840011EE501013");put("d12","840012EE501013");
- put("d13","840013EE501013");
- put("1040","800001FF501013");put("1042","800002FF501013");
- put("2010","600001XX501013");put("2012","600002XX501013");
- put("2000","500001HH501013");put("2002","500002HH501013");
- put("3010","400001GG501013");put("3012","400002GG501013");
- }};
+ public static final Map<String, String> SiteMap = new HashMap<String, String>() {{
+ put("a100", "700000EE501013");
+ put("a101", "700001EE501013");
+ put("a102", "700002EE501013");
+ put("a103", "700003EE501013");
+ put("a104", "700004EE501013");
+ put("a105", "700005EE501013");
+ put("a106", "700006EE501013");
+ put("a107", "700007EE501013");
+ put("a108", "700008EE501013");
+ put("a109", "700009EE501013");
+ put("a110", "700010EE501013");
+ put("a111", "700046EE501013");
+ put("a112", "700047EE501013");
+ put("a113", "700048EE501013");
+ put("a114", "700049EE501013");
+ put("a200", "700032EE501013");
+ put("a201", "700011EE501013");
+ put("a202", "700012EE501013");
+ put("a203", "700013EE501013");
+ put("a204", "700014EE501013");
+ put("a205", "700015EE501013");
+ put("a206", "700016EE501013");
+ put("a207", "700017EE501013");
+ put("a208", "700018EE501013");
+ put("a209", "700019EE501013");
+ put("a210", "700020EE501013");
+ put("a211", "700050EE501013");
+ put("a212", "700051EE501013");
+ put("a213", "700052EE501013");
+ put("a214", "700053EE501013");
+ put("a300", "700031EE501013");
+ put("a301", "700021EE501013");
+ put("a302", "700022EE501013");
+ put("a303", "700023EE501013");
+ put("a304", "700024EE501013");
+ put("a305", "700025EE501013");
+ put("a306", "700026EE501013");
+ put("a307", "700027EE501013");
+ put("a308", "700028EE501013");
+ put("a309", "700029EE501013");
+ put("a310", "700030EE501013");
+ put("a311", "700054EE501013");
+ put("a312", "700055EE501013");
+ put("a313", "700056EE501013");
+ put("a314", "700057EE501013");
+ put("a400", "700033EE501013");
+ put("a401", "700034EE501013");
+ put("a402", "700035EE501013");
+ put("a403", "700036EE501013");
+ put("a404", "700037EE501013");
+ put("a405", "700038EE501013");
+ put("a406", "700039EE501013");
+ put("a407", "700040EE501013");
+ put("a408", "700041EE501013");
+ put("a409", "700058EE501013");
+ put("a410", "700059EE501013");
+ put("a411", "700060EE501013");
+ put("a412", "700061EE501013");
+ put("a500", "700042EE501013");
+ put("a501", "700043EE501013");
+ put("a502", "700044EE501013");
+ put("a503", "700045EE501013");
+ put("aa11", "700062EE501013");
+ put("aa22", "700063EE501013");
+ put("b1", "820001EE501013");
+ put("b2", "820002EE501013");
+ put("b3", "820003EE501013");
+ put("b4", "820004EE501013");
+ put("b5", "820005EE501013");
+ put("b6", "820006EE501013");
+ put("c1", "830001EE501013");
+ put("c2", "830002EE501013");
+ put("c3", "830003EE501013");
+ put("c4", "830004EE501013");
+ put("c5", "830005EE501013");
+ put("c6", "830006EE501013");
+ put("d1", "840001EE501013");
+ put("d2", "840002EE501013");
+ put("d3", "840003EE501013");
+ put("d4", "840004EE501013");
+ put("d5", "840005EE501013");
+ put("d6", "840006EE501013");
+ put("d7", "840007EE501013");
+ put("d8", "840008EE501013");
+ put("d9", "840009EE501013");
+ put("d10", "840010EE501013");
+ put("d11", "840011EE501013");
+ put("d12", "840012EE501013");
+ put("d13", "840013EE501013");
+ put("1040", "800001FF501013");
+ put("1042", "800002FF501013");
+ put("2010", "600001XX501013");
+ put("2012", "600002XX501013");
+ put("2000", "500001HH501013");
+ put("2002", "500002HH501013");
+ put("3010", "400001GG501013");
+ put("3012", "400002GG501013");
+ }};
}
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 7ae4f91..4bb2e42 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -100,7 +100,7 @@
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) &&Cools.eq(dto.getFromOrderNo(),detlDto.getFromOrderNo())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch()) && Cools.eq(dto.getFromOrderNo(), detlDto.getFromOrderNo())) {
return true;
}
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 78030ee..5a7686e 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -5,7 +5,6 @@
import lombok.experimental.Accessors;
import java.util.List;
-import java.util.Map;
/**
* Created by vincent on 2022/3/28
@@ -50,6 +49,7 @@
this.orderNo = orderNo;
this.anfme = anfme;
}
+
public LocDto(String locNo, String matnr, String maktx, String batch, String orderNo, Double anfme) {
this.locNo = locNo;
this.matnr = matnr;
@@ -58,8 +58,9 @@
this.orderNo = orderNo;
this.anfme = anfme;
}
+
@Data
- public static class staListDto{
+ public static class staListDto {
private Integer staNo;
private String staName;
}
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 4ba8064..3e9913b 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,7 +69,7 @@
return null;
}
- public boolean isAll(){
+ public boolean isAll() {
// 姹囨�讳笉鑰冭檻搴忓垪鐮�
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
@@ -84,7 +86,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/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 d5f2fd1..ae7ae7c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,16 +3,13 @@
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.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;
@@ -20,9 +17,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;
@@ -982,11 +976,11 @@
for (LocMast locMastGro1 : locMasts1) {
if (locMastGro1.getLocSts().equals("F")) {
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_No", locMastGro1.getLocNo()));
- if (!Cools.isEmpty(locDetl.getSku())){
+ if (!Cools.isEmpty(locDetl.getSku())) {
if (!locDetl.getMatnr().equals(matnr) || !locDetl.getSku().equals(batch)) {
continue;
}
- }else {
+ } else {
if (!locDetl.getMatnr().equals(matnr)) {
continue;
}
diff --git a/src/main/java/com/zy/common/task/ActivateScheduler.java b/src/main/java/com/zy/common/task/ActivateScheduler.java
index 22b0ff0..32ec715 100644
--- a/src/main/java/com/zy/common/task/ActivateScheduler.java
+++ b/src/main/java/com/zy/common/task/ActivateScheduler.java
@@ -5,10 +5,8 @@
import com.core.common.DateUtils;
import com.zy.common.properties.OSinfo;
import com.zy.common.properties.SystemProperties;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
import java.util.Date;
/**
@@ -17,10 +15,10 @@
@Component
public class ActivateScheduler {
-// @Scheduled(cron = "0/1 * 8 * * ? ") // 姣忓ぉ8鐐�
+ // @Scheduled(cron = "0/1 * 8 * * ? ") // 姣忓ぉ8鐐�
// @Scheduled(cron = "* 0/1 * * * ? ") // 姣忓垎閽�
// @PostConstruct
- private void execute(){
+ private void execute() {
// 鑾峰彇婵�娲荤爜
String activationCode = SystemProperties.getActivationCode(OSinfo.getOSname().getActivationCodePath());
if (!Cools.isEmpty(activationCode)) {
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 b0f9672..48d5fa9 100644
--- a/src/main/java/com/zy/common/utils/Http.java
+++ b/src/main/java/com/zy/common/utils/Http.java
@@ -13,7 +13,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()) {
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/OutStockInterceptUtil.java b/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java
index 9334e90..0c2f8b5 100644
--- a/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java
+++ b/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java
@@ -20,21 +20,26 @@
/**
* 鍫嗗灈鏈哄簱鍏ュ簱绔欑偣
*/
- public static final Map<Integer,Boolean> inSiteMap = new HashMap<Integer,Boolean>();
+ public static final Map<Integer, Boolean> inSiteMap = new HashMap<Integer, Boolean>();
static {
- inSiteMap.put(1040, true);inSiteMap.put(1042, true);
- inSiteMap.put(2010, true);inSiteMap.put(2012, true);
- inSiteMap.put(2000, true);inSiteMap.put(2002, true);
- inSiteMap.put(3010, true);inSiteMap.put(3012, true);
+ inSiteMap.put(1040, true);
+ inSiteMap.put(1042, true);
+ inSiteMap.put(2010, true);
+ inSiteMap.put(2012, true);
+ inSiteMap.put(2000, true);
+ inSiteMap.put(2002, true);
+ inSiteMap.put(3010, true);
+ inSiteMap.put(3012, true);
}
/**
* 鍫嗗灈鏈哄嚭搴撴搷浣滄椂鎷︽埅鍑哄簱绔欑偣锛屽垽鏂嚭鍏ュ簱妯″紡
+ *
* @param site 鍑哄簱绔欑偣
*/
public static void outStockIntercept(Integer site) {
- log.info("鍑哄簱鍒ゆ柇鏄惁鏈夊叆搴撲换鍔★紝鍑哄簱绔欑偣:{}",site);
+ log.info("鍑哄簱鍒ゆ柇鏄惁鏈夊叆搴撲换鍔★紝鍑哄簱绔欑偣:{}", site);
// 鍙垽鏂爢鍨涙満搴撶殑鍏ュ簱绔欑偣
if (inSiteMap.get(site) != null) {
BasDevpMapper basDevpMapper = SpringUtils.getBean(BasDevpMapper.class);
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 3916b1a..2b1327d 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 5fb3b5f..a0e6146 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -54,9 +54,9 @@
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
- public R loginAction(String username, String password){
+ public R loginAction(String username, String password) {
//楠岃瘉璁稿彲璇佹槸鍚︽湁鏁�
- if (!licenseTimer.getSystemSupport()){
+ if (!licenseTimer.getSystemSupport()) {
return R.parse(CodeRes.SYSTEM_20001);
}
if (username.equals("super") && password.equals(Cools.md5(superPwd))) {
@@ -68,13 +68,13 @@
EntityWrapper<User> userWrapper = new EntityWrapper<>();
userWrapper.eq("username", username);
User user = userService.selectOne(userWrapper);
- if (Cools.isEmpty(user)){
+ if (Cools.isEmpty(user)) {
return R.parse(CodeRes.USER_10001);
}
- if (user.getStatus()!=1){
+ if (user.getStatus() != 1) {
return R.parse(CodeRes.USER_10002);
}
- if (!user.getPassword().equals(password)){
+ if (!user.getPassword().equals(password)) {
return R.parse(CodeRes.USER_10003);
}
String token = Cools.enToken(System.currentTimeMillis() + username, user.getPassword());
@@ -107,7 +107,7 @@
int time = 0;
while (time < 3000) {
code = RandomValidateCodeUtil.code.get(sd);
- if (!Cools.isEmpty(code)){
+ if (!Cools.isEmpty(code)) {
break;
} else {
Thread.sleep(10);
@@ -120,13 +120,13 @@
@RequestMapping("/user/detail/auth")
@ManagerAuth
- public R userDetail(){
+ public R userDetail() {
return R.ok(userService.selectById(getUserId()));
}
@RequestMapping("/menu/auth")
@ManagerAuth
- public R menu(){
+ public R menu() {
// 鑾峰彇鎵�鏈変竴绾ц彍鍗�
List<Resource> oneLevel;
User user = null;
@@ -145,7 +145,7 @@
List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", user.getRoleId()));
List<Long> resourceIds = new ArrayList<>();
roleResources.forEach(roleResource -> resourceIds.add(roleResource.getResourceId()));
- if (resourceIds.isEmpty()){
+ if (resourceIds.isEmpty()) {
return R.ok();
}
resourceWrapper = new EntityWrapper<Resource>().in("id", resourceIds).eq("level", 2).eq("status", 1).orderBy("sort");
@@ -163,11 +163,11 @@
// 鏄惁鎷ユ湁鏌ョ湅鏉冮檺
if (getUserId() != 9527) {
Resource view = resourceService.selectOne(new EntityWrapper<Resource>().eq("resource_id", resource.getId()).like("code", "#view"));
- if (!Cools.isEmpty(view)){
+ if (!Cools.isEmpty(view)) {
RoleResource param = new RoleResource();
param.setResourceId(view.getId());
param.setRoleId(user.getRoleId());
- if (null == roleResourceService.selectOne(new EntityWrapper<>(param))){
+ if (null == roleResourceService.selectOne(new EntityWrapper<>(param))) {
continue;
}
}
@@ -192,11 +192,11 @@
@RequestMapping("/power/list/auth")
@ManagerAuth
- public R powerList(){
+ public R powerList() {
List<Resource> oneLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("level", 1).eq("status", 1).orderBy("sort"));
List<Map> result = new ArrayList<>();
// 涓�绾�
- for (Resource oneLevel : oneLevels){
+ for (Resource oneLevel : oneLevels) {
List<Map> twoLevelsList = new ArrayList<>();
Map<String, Object> oneLevelMap = new HashMap<>();
oneLevelMap.put("title", oneLevel.getName());
@@ -205,7 +205,7 @@
oneLevelMap.put("children", twoLevelsList);
List<Resource> twoLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", oneLevel.getId()).eq("level", 2).eq("status", 1).orderBy("sort"));
// 浜岀骇
- for (Resource twoLevel : twoLevels){
+ for (Resource twoLevel : twoLevels) {
Map<String, Object> twoLevelMap = new HashMap<>();
twoLevelMap.put("title", twoLevel.getName());
twoLevelMap.put("id", twoLevel.getId());
@@ -215,7 +215,7 @@
twoLevelMap.put("children", threeLevelsList);
// 涓夌骇
List<Resource> threeLevels = resourceService.selectList(new EntityWrapper<Resource>().eq("resource_id", twoLevel.getId()).eq("level", 3).eq("status", 1).orderBy("sort"));
- for (Resource threeLevel : threeLevels){
+ for (Resource threeLevel : threeLevels) {
Map<String, Object> threeLevelMap = new HashMap<>();
threeLevelMap.put("title", threeLevel.getName());
threeLevelMap.put("id", threeLevel.getId());
@@ -254,19 +254,19 @@
List<Object> result = new ArrayList<>();
// 鑿滃崟
List<RoleResource> roleResources = roleResourceService.selectList(new EntityWrapper<RoleResource>().eq("role_id", roleId));
- for (RoleResource roleResource : roleResources){
+ for (RoleResource roleResource : roleResources) {
Resource resource = resourceService.selectById(roleResource.getResourceId());
- if (!Cools.isEmpty(resource)){
- if (resource.getLevel() == 3){
+ if (!Cools.isEmpty(resource)) {
+ if (resource.getLevel() == 3) {
result.add(resource.getId());
}
}
}
// 鍔熻兘
List<RolePermission> rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
- for (RolePermission rolePermission : rolePermissions){
+ for (RolePermission rolePermission : rolePermissions) {
Permission permission = permissionService.selectById(rolePermission.getPermissionId());
- if (!Cools.isEmpty(permission)){
+ if (!Cools.isEmpty(permission)) {
result.add(permission.getAction());
}
}
@@ -276,12 +276,12 @@
@RequestMapping("/power/auth")
@ManagerAuth(memo = "鎺堟潈")
@Transactional
- public R power(Long roleId, String powers){
+ public R power(Long roleId, String powers) {
Role role = roleService.selectById(roleId);
Long leaderId = role.getLeader();
roleResourceService.delete(new EntityWrapper<RoleResource>().eq("role_id", roleId));
rolePermissionService.delete(new EntityWrapper<RolePermission>().eq("role_id", roleId));
- if (!Cools.isEmpty(powers)){
+ if (!Cools.isEmpty(powers)) {
List<PowerDto> dtos = JSON.parseArray(powers, PowerDto.class);
for (PowerDto dto : dtos) {
Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
@@ -299,14 +299,14 @@
roleResourceService.insert(roleResource);
} else {
Permission permission = permissionService.selectOne(new EntityWrapper<Permission>().eq("action", dto.getTwo()));
- if (!Cools.isEmpty(permission)){
+ if (!Cools.isEmpty(permission)) {
RolePermission rolePermission = new RolePermission();
rolePermission.setRoleId(roleId);
rolePermission.setPermissionId(permission.getId());
rolePermissionService.insert(rolePermission);
}
}
- for (String three : dto.getThree()){
+ for (String three : dto.getThree()) {
Resource resource1 = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", three).eq("level", 3));
if (!Cools.isEmpty(resource1)) {
// 鏍￠獙涓婄骇鏉冮檺
@@ -383,7 +383,7 @@
return R.error("婵�娲诲け璐�");
}
SystemProperties.SYSTEM_ACTIVATION = Boolean.TRUE;
- return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦"+DateUtils.convert(exprTime));
+ return R.ok("婵�娲绘垚鍔燂紝鏈夋晥鏈熻嚦" + DateUtils.convert(exprTime));
}
}
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/erp/kingdee/entity/param/InFormIdParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
index 89c6f06..030acad 100644
--- a/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
+++ b/src/main/java/com/zy/erp/kingdee/entity/param/InFormIdParam.java
@@ -30,9 +30,4 @@
private Integer FieldKeys;
-
-
-
-
-
}
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index 77d827b..cbaeeab 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -1,8 +1,8 @@
package com.zy.erp.kingdee.enums;
public enum KingDeeUtilType {
- BD_MATERIAL(0, "鐗╂枡妗ｆ","BD_MATERIAL","","","",1),
-// STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
+ BD_MATERIAL(0, "鐗╂枡妗ｆ", "BD_MATERIAL", "", "", "", 1),
+ // STK_InStock(1, "閲囪喘鍏ュ簱鍗�","STK_InStock","FRealQty","","",1),
// PUR_MRB(2, "閲囪喘閫�鏂欏崟","PUR_MRB","FRMREALQTY","","",1),
// PRD_PickMtrl(3, "鐢熶骇棰嗘枡鍗�","PRD_PickMtrl","FActualQty","","",1),
// PRD_ReturnMtrl(4, "鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl","FQty","","",1),
@@ -15,14 +15,14 @@
// SP_ReturnMtrl(11, "绠�鍗曠敓浜ч��鏂欏崟","SP_ReturnMtrl","FQty","","",1),
// SAL_OUTSTOCK(12, "閿�鍞嚭搴撳崟","SAL_OUTSTOCK","FRealQty","","",1),
// SAL_RETURNSTOCK(13, "閿�鍞��璐у崟","SAL_RETURNSTOCK","FRealQty","","",1),
- SAL_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0),
- STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS","FQty","鍏朵粬鍏ュ簱鍗�","STK_MISCELLANEOUS",1),
-// BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",1),
- PUR_ReceiveBill(17, "鏀舵枡閫氱煡鍗�","PUR_ReceiveBill","FPOQTY","閲囪喘鍏ュ簱鍗�","STK_InStock",1),
- PRD_MORPT(18, "鐢熶骇姹囨姤鍗�","PRD_MORPT","FFinishQty","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1),
-// PRD_INSTOCK(19, "鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK","","","",1),
- SAL_RETURNNOTICE(20, "閫�璐ч�氱煡鍗�","SAL_RETURNNOTICE","FBaseJunkedQty","閿�鍞��璐у崟","SAL_RETURNSTOCK",1),
- STK_OutStockApply(21, "鍑哄簱鐢宠鍗�","STK_OutStockApply","FTotalSecQty","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0),
+ SAL_DELIVERYNOTICE(14, "鍙戣揣閫氱煡鍗�", "SAL_DELIVERYNOTICE", "FQty", "閿�鍞嚭搴撳崟", "SAL_OUTSTOCK", 0),
+ STK_MISCELLANEOUS(15, "鍏朵粬鍏ュ簱鍗�", "STK_MISCELLANEOUS", "FQty", "鍏朵粬鍏ュ簱鍗�", "STK_MISCELLANEOUS", 1),
+ // BD_Supplier(16, "渚涘簲鍟�","BD_Supplier","","","",1),
+ PUR_ReceiveBill(17, "鏀舵枡閫氱煡鍗�", "PUR_ReceiveBill", "FPOQTY", "閲囪喘鍏ュ簱鍗�", "STK_InStock", 1),
+ PRD_MORPT(18, "鐢熶骇姹囨姤鍗�", "PRD_MORPT", "FFinishQty", "鐢熶骇鍏ュ簱鍗�", "PRD_INSTOCK", 1),
+ // PRD_INSTOCK(19, "鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK","","","",1),
+ SAL_RETURNNOTICE(20, "閫�璐ч�氱煡鍗�", "SAL_RETURNNOTICE", "FBaseJunkedQty", "閿�鍞��璐у崟", "SAL_RETURNSTOCK", 1),
+ STK_OutStockApply(21, "鍑哄簱鐢宠鍗�", "STK_OutStockApply", "FTotalSecQty", "鍏朵粬鍑哄簱鍗�", "STK_MisDelivery", 0),
;
public Integer id;
public String desc;
@@ -32,7 +32,7 @@
public String correspondingFormId;
public Integer pakIn;
- KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn){
+ KingDeeUtilType(Integer id, String desc, String formId, String anfme, String correspondingName, String correspondingFormId, int pakIn) {
this.id = id;
this.desc = desc;
this.formId = formId;
diff --git a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java b/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
index 3373421..40b49c3 100644
--- a/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
+++ b/src/main/java/com/zy/erp/kingdee/utils/KingDeeUtil.java
@@ -10,7 +10,7 @@
//瀵圭編鍥芥椂闂磋繘琛岃浆鎹�
public static Date KingDeeDate(String jsonArrayDate) throws ParseException {
- SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME;
@@ -18,7 +18,6 @@
String format = dateFormat.format(dateTime);
return sdf.parse(format);
}
-
}
diff --git a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
index 1b89571..e21a059 100644
--- a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
@@ -15,12 +15,12 @@
@Slf4j
public class PostMesDataUtils extends AbstractHandler<String> {
- public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam){
+ public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam) {
// if (true){
// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
// return SUCCESS;
// }
- if(combParam != null){
+ if (combParam != null) {
String response = "";
boolean success = false;
try {
@@ -33,17 +33,17 @@
.setJson(JSON.toJSONString(combParam))
.build()
.doPost();
- System.out.println("response:"+response);
+ System.out.println("response:" + response);
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤"+name);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤" + name);
}
} catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
@@ -51,8 +51,8 @@
// 淇濆瓨鎺ュ彛鏃ュ織
ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
apiLogService.save(
- "涓婃姤"+name,
- URL +"/"+ mesPath,
+ "涓婃姤" + name,
+ URL + "/" + mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
@@ -60,18 +60,19 @@
success
);
} catch (Exception e) {
- log.error("", e); }
+ log.error("", e);
+ }
}
}
return SUCCESS;
}
- public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam,Map<String, Object> map){
+ public ReturnT<String> postMesData(String name, String URL, String mesPath, Object combParam, Map<String, Object> map) {
// if (true){
// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
// return SUCCESS;
// }
- if(combParam != null){
+ if (combParam != null) {
String response = "";
boolean success = false;
try {
@@ -84,17 +85,17 @@
.setJson(JSON.toJSONString(combParam))
.build()
.doPost();
- System.out.println("response:"+response);
+ System.out.println("response:" + response);
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
- throw new CoolException("涓婃姤"+name);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException("涓婃姤" + name);
}
} catch (Exception e) {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(combParam), response);
// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg(e.getMessage());
} finally {
@@ -102,8 +103,8 @@
// 淇濆瓨鎺ュ彛鏃ュ織
ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
apiLogService.save(
- "涓婃姤"+name,
- URL +"/"+ mesPath,
+ "涓婃姤" + name,
+ URL + "/" + mesPath,
null,
"127.0.0.1",
JSON.toJSONString(combParam),
@@ -111,7 +112,8 @@
success
);
} catch (Exception e) {
- log.error("", e); }
+ log.error("", e);
+ }
}
}
return SUCCESS;
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 e047700..ed5fe32 100644
--- a/src/main/java/com/zy/system/controller/LicenseCreatorController.java
+++ b/src/main/java/com/zy/system/controller/LicenseCreatorController.java
@@ -2,7 +2,6 @@
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.system.entity.license.LinuxServerInfos;
import com.zy.system.entity.license.*;
import com.zy.system.timer.LicenseTimer;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,6 @@
import java.io.IOException;
/**
- *
* 鐢ㄤ簬鐢熸垚璇佷功鏂囦欢锛屼笉鑳芥斁鍦ㄧ粰瀹㈡埛閮ㄧ讲鐨勪唬鐮侀噷
*/
@RestController
@@ -30,14 +28,16 @@
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();
@@ -49,7 +49,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
@@ -65,7 +65,7 @@
}
@RequestMapping(value = "/updateLicense")
- public R updateLicense(@RequestParam("file") MultipartFile[] files){
+ public R updateLicense(@RequestParam("file") MultipartFile[] files) {
MultipartFile file = files[0];
String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
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 98825f2..498fa3c 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,23 +101,23 @@
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());
}
- if (user.getRoleId()!=null) {
+ if (user.getRoleId() != null) {
entity.setRoleId(user.getRoleId());
}
userService.updateById(entity);
@@ -126,8 +126,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();
@@ -135,7 +135,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"));
@@ -151,7 +151,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 86214e0..faf7c31 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,19 +91,19 @@
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;
}
- public String getLeaderCode(){
+ public String getLeaderCode() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.leader);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return String.valueOf(role.getCode());
}
return null;
@@ -116,9 +117,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 f8251bb..403e2fa 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,18 +209,19 @@
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;
}
- public String getRoleLeaderCode(){
+
+ public String getRoleLeaderCode() {
RoleService service = SpringUtils.getBean(RoleService.class);
Role role = service.selectById(this.roleId);
- if (!Cools.isEmpty(role)){
+ if (!Cools.isEmpty(role)) {
return role.getLeaderCode();
}
return null;
@@ -232,8 +235,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);
@@ -247,9 +250,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 cf79568..67a8dbb 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -61,14 +61,14 @@
public void onApplicationEvent(ContextRefreshedEvent event) {
//root application context 娌℃湁parent
ApplicationContext context = event.getApplicationContext().getParent();
- if(context == null){
+ if (context == null) {
loadLicense();
}
}
//鍔犺浇璇佷功
public boolean loadLicense() {
- if(!Cools.isEmpty(licensePath)){
+ if (!Cools.isEmpty(licensePath)) {
logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
try {
@@ -97,7 +97,7 @@
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
- licenseTimer.setSystemSupport(install!=null);
+ licenseTimer.setSystemSupport(install != null);
if (install != null) {
Date start = new Date();
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/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 dc9a0e0..749de96 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -10,8 +10,10 @@
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);
- };
+ }
+
+ ;
}
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 985ace4..ee5bb5a 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.*;
@@ -81,7 +80,7 @@
abstractServerInfos = new WindowsServerInfos();
} else if (osName.startsWith("linux")) {
abstractServerInfos = new LinuxServerInfos();
- }else{//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
+ } else {//鍏朵粬鏈嶅姟鍣ㄧ被鍨�
abstractServerInfos = new WindowsServerInfos();
}
LicenseCheck serverInfos = abstractServerInfos.getServerInfos();
@@ -138,7 +137,7 @@
int day = (int) (num / 24 / 60 / 60 / 1000);
setLicenseDays(day);
setSystemSupport(true);
- }else {
+ } else {
setLicenseDays(0);
setSystemSupport(false);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6742457..8b4b238 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=fyxcasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms2.1
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml b/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml
deleted file mode 100644
index 25960c8..0000000
--- a/src/main/resources/mapper/InventoryCheckOrderDetlMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.InventoryCheckOrderDetlMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.InventoryCheckOrderDetl">
- <id column="id" property="id" />
- <result column="order_no" property="orderNo" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="batch" property="batch" />
- <result column="anfme" property="anfme" />
- <result column="area" property="area" />
- <result column="loc_no" property="locNo" />
- <result column="io_time" property="ioTime" />
- <result column="status" property="status" />
- <result column="check_anfme" property="checkAnfme" />
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/InventoryCheckOrderMapper.xml b/src/main/resources/mapper/InventoryCheckOrderMapper.xml
deleted file mode 100644
index 4109477..0000000
--- a/src/main/resources/mapper/InventoryCheckOrderMapper.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.InventoryCheckOrderMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.InventoryCheckOrder">
- <result column="id" property="id" />
- <result column="order_no" property="orderNo" />
- <result column="area" property="area" />
- <result column="create_time" property="createTime" />
- <result column="create_by" property="createBy" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/LocCheckMapper.xml b/src/main/resources/mapper/LocCheckMapper.xml
deleted file mode 100644
index 7837e9a..0000000
--- a/src/main/resources/mapper/LocCheckMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.LocCheckMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocCheck">
- <id column="id" property="id" />
- <result column="type" property="type" />
- <result column="loc_no" property="locNo" />
- <result column="matnr" property="matnr" />
- <result column="origin_anfme" property="originAnfme" />
- <result column="real_anfme" property="realAnfme" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="memo" property="memo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
deleted file mode 100644
index a6f79f7..0000000
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ /dev/null
@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.ManLocDetlMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.ManLocDetl">
- <result column="host_id" property="hostId" />
- <result column="loc_no" property="locNo" />
- <result column="node_id" property="nodeId" />
- <result column="zpallet" property="zpallet" />
- <result column="anfme" property="anfme" />
- <result column="matnr" property="matnr" />
- <result column="maktx" property="maktx" />
- <result column="name" property="name" />
- <result column="specs" property="specs" />
- <result column="model" property="model" />
- <result column="batch" property="batch" />
- <result column="unit" property="unit" />
- <result column="barcode" property="barcode" />
- <result column="doc_id" property="docId" />
- <result column="doc_num" property="docNum" />
- <result column="cust_name" property="custName" />
- <result column="item_num" property="itemNum" />
- <result column="count" property="count" />
- <result column="price" property="price" />
- <result column="weight" property="weight" />
- <result column="status" property="status" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="modiTime" />
- <result column="memo" property="memo" />
-
- </resultMap>
-
- <sql id="batchSeq">
- <choose>
- <when test="batch != null and batch != ''">
- and batch = #{batch}
- </when>
- <otherwise>
- and (batch IS NULL OR batch = '')
- </otherwise>
- </choose>
- </sql>
-
- <sql id="locDetlCondition">
- <if test="host_id != null and host_id != ''">
- and mld.host_id = #{host_id}
- </if>
- <if test="loc_no != null and loc_no != ''">
- and mld.loc_no like concat('%',#{loc_no},'%')
- </if>
- <if test="locNo != null and locNo != ''">
- and mld.loc_no like concat('%',#{loc_no},'%')
- </if>
- <if test="matnr != null and matnr != ''">
- and mld.matnr like concat('%',#{matnr},'%')
- </if>
- <if test="maktx != null and maktx != ''">
- and mld.maktx like concat('%',#{maktx},'%')
- </if>
- <if test="startTime!=null and endTime!=null">
- and mld.update_time between #{startTime} and #{endTime}
- </if>
- </sql>
- <sql id="locDetlCondition2">
- <if test="host_id != null and host_id != ''">
- and v.host_id = #{host_id}
- </if>
- <if test="loc_no != null and loc_no != ''">
- and v.loc_no like concat('%',#{loc_no},'%')
- </if>
- <if test="locNo != null and locNo != ''">
- and v.loc_no like concat('%',#{loc_no},'%')
- </if>
- <if test="matnr != null and matnr != ''">
- and v.matnr like concat('%',#{matnr},'%')
- </if>
- <if test="maktx != null and maktx != ''">
- and v.maktx like concat('%',#{maktx},'%')
- </if>
- <if test="startTime!=null and endTime!=null">
- and v.update_time between #{startTime} and #{endTime}
- </if>
- </sql>
-
- <select id="listByPage" resultMap="BaseResultMap">
- select * from
- (
- SELECT
- ROW_NUMBER() over (order by mld.create_time desc) as row,
- mld.*
- FROM man_loc_detl mld
- LEFT JOIN man_node mn ON mld.node_id = mn.id
- LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
- LEFT JOIN man_tag mt ON mm.tag_id = mt.id
- WHERE 1=1
- AND (CHARINDEX(','+#{node_id}+',', ','+mn.path+',') > 0 OR mn.id = #{node_id})
- AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
- <include refid="locDetlCondition"></include>
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
-
- <select id="listByPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
- select
- count(1)
- FROM man_loc_detl mld
- LEFT JOIN man_node mn ON mld.node_id = mn.id
- LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
- LEFT JOIN man_tag mt ON mm.tag_id = mt.id
- WHERE 1=1
- AND (CHARINDEX(','+#{node_id}+',', ','+mn.path+',') > 0 OR mn.id = #{node_id})
- AND (CHARINDEX(','+#{tag_id}+',', ','+mt.path+',') > 0 OR mt.id = #{tag_id})
- <include refid="locDetlCondition"></include>
- </select>
-
- <select id="selectByLocNoAndMatnr" resultMap="BaseResultMap">
- select top 1 *
- from man_loc_detl
- where 1=1
- and anfme > 0
- <if test="nodeId != null and nodeId != ''">
- and node_id = #{nodeId}
- </if>
- <if test="matnr != null and matnr != ''">
- and matnr = #{matnr}
- </if>
- order by create_time asc
- </select>
-
- <select id="selectCountByMatnr" resultType="java.lang.Double">
- select sum(anfme) as count from man_loc_detl where 1=1 and matnr = #{matnr} and host_id = #{hostId}
- </select>
-
- <update id="reduceStock">
- update man_loc_detl
- set anfme = anfme - #{anfme}
- , update_time = getdate()
- where 1=1
- and node_id = #{nodeId}
- and matnr = #{matnr}
- </update>
-
- <update id="incrementStock">
- update man_loc_detl
- set anfme = anfme + #{anfme}
- , update_time = getdate()
- where 1=1
- and node_id = #{nodeId}
- and matnr = #{matnr}
- </update>
-
- <update id="removeStock">
- delete from man_loc_detl
- where 1=1
- and node_id = #{nodeId}
- and matnr = #{matnr}
- </update>
-
- <select id="selectByPrior" resultMap="BaseResultMap">
- select
- mld.*
- from man_loc_detl mld
- left join man_prior mp on mld.node_id = mp.node_id and mld.matnr = mp.matnr
- where 1=1
- <if test="hostId != null and hostId != ''">
- and mld.host_id = #{hostId}
- </if>
- <if test="nodeId != null and nodeId != ''">
- and mld.node_id = #{nodeId}
- </if>
- <if test="matnr != null and matnr != ''">
- and mld.matnr = #{matnr}
- </if>
- and mld.anfme > 0
- and mp.status = 1
- order by mp.prio desc, mld.create_time asc
- </select>
-
- <select id="getLocDetlStatis" resultMap="BaseResultMap">
- select
- ROW_NUMBER() over (order by sum(a.anfme) desc) as row
- , a.matnr
- , sum(a.anfme) as anfme
- from man_loc_detl a
- where 1=1
- group by a.matnr
- </select>
-
- <select id="selectByNodeUuid" resultMap="BaseResultMap">
- select * from man_loc_detl mld left join man_node mn on mld.node_id = mn.id
- where 1=1
- and mn.uuid = #{uuid}
- and mld.hostId = #{hostId}
- and mld.status = 1
- order by mld.create_time
- </select>
-
- <select id="getStockStatis" resultMap="BaseResultMap">
- select * from
- (
- select
- ROW_NUMBER() over (order by a.matnr, sum(a.anfme) desc) as row
- , a.matnr
- , sum(a.anfme) as anfme
- from man_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
-
- <select id="getStockStatisCount" parameterType="java.util.Map" resultType="java.lang.Integer">
- select count(1) as count from
- (
- select
- a.matnr
- from man_loc_detl a
- where 1=1
- <include refid="stockOutCondition"></include>
- group by a.matnr
- ) b
- </select>
-
- <sql id="stockOutCondition">
- <if test="host_id!=null and host_id!='' ">
- and a.host_id = #{host_id}
- </if>
- <if test="node_id!=null and node_id!='' ">
- and a.node_id like '%' + #{node_id} + '%'
- </if>
- <if test="loc_no!=null and loc_no!='' ">
- and a.loc_no like '%' + #{loc_no} + '%'
- </if>
- <if test="matnr!=null and matnr!='' ">
- and a.matnr like '%' + #{matnr} + '%'
- </if>
- <if test="maktx!=null and maktx!='' ">
- and a.maktx like '%' + #{maktx} + '%'
- </if>
- </sql>
-
- <select id="getStockStatisExcel" resultMap="BaseResultMap">
- select
- ROW_NUMBER() over (order by a.matnr, sum(a.anfme) desc) as row
- , a.matnr
- , sum(a.anfme) as anfme
- from man_loc_detl a
- where 1=1
- and a.host_id = #{hostId}
- group by a.matnr
- </select>
- <select id="selectLocDetlSumQty" resultType="java.lang.Double"></select>
-
- <select id="selectLocNo0" resultMap="BaseResultMap">
- select * from man_loc_detl
- where loc_no = #{locNo}
- and matnr = #{matnr}
- </select>
- <select id="selectItem0" resultType="com.zy.asrs.entity.ManLocDetl">
- select top 1 * from man_loc_detl
- where loc_no = #{locNo}
- and matnr = #{matnr}
- </select>
-
- <select id="listByOutPage" resultMap="BaseResultMap">
- select * from
- (
- SELECT
- ROW_NUMBER() over (order by mld.create_time desc) as row,
- mld.*
- FROM man_loc_detl mld
- LEFT JOIN man_node mn ON mld.node_id = mn.id
- LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
- LEFT JOIN man_tag mt ON mm.tag_id = mt.id
- WHERE 1=1
- <include refid="locDetlCondition"></include>
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
- <select id="listByOutPageCount" resultType="java.lang.Long">
- select
- count(1)
- FROM man_loc_detl mld
- LEFT JOIN man_node mn ON mld.node_id = mn.id
- LEFT JOIN man_mat mm ON mld.matnr = mm.matnr
- LEFT JOIN man_tag mt ON mm.tag_id = mt.id
- WHERE 1=1
- <include refid="locDetlCondition"></include>
- </select>
- <select id="selectAllPage" resultMap="BaseResultMap">
- select * from
- (
- SELECT
- ROW_NUMBER() over (order by v.loc_no desc) as row,
- v.*
- FROM [dbo].[man_view_asrs_saas] v
- WHERE 1=1
- <include refid="locDetlCondition2"></include>
- ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
- </select>
- <select id="selectAllPageSize" resultType="java.lang.Long">
- select
- count(1)
- FROM [dbo].[man_view_asrs_saas] v
- WHERE 1=1
- <include refid="locDetlCondition2"></include>
- </select>
- <select id="selectItem" resultMap="BaseResultMap">
- select top 1 *
- from man_loc_detl
- where 1=1
- and loc_no = #{locNo}
- and matnr = #{matnr}
- <include refid="batchSeq"></include>
- </select>
- <select id="sum" resultType="java.lang.Double">
- SELECT SUM(anfme) FROM man_loc_detl
- </select>
- <select id="queryStock" resultMap="BaseResultMap">
- select a.*
- from man_loc_detl a
- where 1=1
- and b.loc_sts = 'F'
- and a.matnr = #{matnr}
- <if test="supp != null and supp != ''">
- and a.supp = #{supp}
- </if>
- <if test="temp1 != null and temp1 != ''">
- and a.temp1 = #{temp1}
- </if>
- <if test="temp2 != null and temp2 != ''">
- and a.temp2 = #{temp2}
- </if>
- <if test="batch != null and batch != ''">
- and a.batch = #{batch}
- </if>
- <if test="orderNo != null and orderNo != ''">
- and a.order_no = #{orderNo}
- </if>
-
- <if test="locNos != null and locNos.size > 0">
- and b.loc_no not in
- <foreach item="item" collection="locNos" index="index" separator="," open="(" close=")">
- #{item}
- </foreach>
- </if>
-
- order by
- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
- desc
-
-
-
- </select>
-
-
- <update id="updateLocNo0">
- update man_loc_detl set loc_no = #{locNo}
- where node_id = #{nodeId}
- </update>
-
- <delete id="deleteLocNo0">
- delete from man_loc_detl
- where loc_no = #{locNo}
- and matnr = #{matnr}
- </delete>
-
- <update id="updateAnfme0">
- update man_loc_detl set anfme = #{anfme}
- where node_id = #{nodeId} ;
- </update>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml b/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
deleted file mode 100644
index 4fb4474..0000000
--- a/src/main/resources/mapper/WrkMastExecuteLogMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastExecuteLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecuteLog">
- <result column="sou_loc_no" property="souLocNo" />
- <result column="end_loc_no" property="endLocNo" />
- <result column="sou_floor" property="souFloor" />
- <result column="end_floor" property="endFloor" />
- <result column="sou_sta_no" property="souStaNo" />
- <result column="end_sta_no" property="endStaNo" />
- <result column="now_position" property="nowPosition" />
- <result column="end_position" property="endPosition" />
- <result column="io_type" property="ioType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
deleted file mode 100644
index b2117ef..0000000
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastExecuteMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastExecute">
- <result column="sou_loc_no" property="souLocNo" />
- <result column="end_loc_no" property="endLocNo" />
- <result column="sou_floor" property="souFloor" />
- <result column="end_floor" property="endFloor" />
- <result column="sou_sta_no" property="souStaNo" />
- <result column="end_sta_no" property="endStaNo" />
- <result column="now_position" property="nowPosition" />
- <result column="end_position" property="endPosition" />
- <result column="io_type" property="ioType" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_time" property="ioTime" />
- <result column="modi_time" property="modiTime" />
- <result column="modi_user" property="modiUser" />
- <result column="appe_time" property="appeTime" />
- <result column="appe_user" property="appeUser" />
- <result column="status" property="status" />
- <result column="wrk_no" property="wrkNo" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml b/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
deleted file mode 100644
index 2d788ff..0000000
--- a/src/main/resources/mapper/WrkMastFourWarVehicleLogMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastFourWarVehicleLogMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastFourWarVehicleLog">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="wrk_crn" property="wrkCrn" />
-
- </resultMap>
-
-</mapper>
diff --git a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml b/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
deleted file mode 100644
index 0ee494b..0000000
--- a/src/main/resources/mapper/WrkMastFourWarVehicleMapper.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zy.asrs.mapper.WrkMastFourWarVehicleMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.zy.asrs.entity.WrkMastFourWarVehicle">
- <id column="id" property="id" />
- <result column="wrk_no" property="wrkNo" />
- <result column="wrk_start" property="wrkStart" />
- <result column="wrk_end" property="wrkEnd" />
- <result column="sta_start" property="staStart" />
- <result column="sta_end" property="staEnd" />
- <result column="create_time" property="createTime" />
- <result column="update_time" property="updateTime" />
- <result column="type" property="type" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="line_number" property="lineNumber" />
- <result column="wrk_type" property="wrkType" />
- <result column="bign_time" property="bignTime" />
- <result column="wrk_crn" property="wrkCrn" />
-
- </resultMap>
-
-</mapper>
--
Gitblit v1.9.1