From 215ec8b5aa5079365f7dbb5903b16333333bb5f5 Mon Sep 17 00:00:00 2001 From: shusir <497819738@qq.com> Date: Mon, 26 Jan 2026 08:59:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=88=86=E7=B1=BB=EF=BC=8C=E7=89=A9=E6=96=99=E5=A4=A7=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=BB=BA=E4=B8=8E=E6=A0=91=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/qms/enums/ErrorCodeConstants.java | 3 +- .../admin/MaterialBatchAssignController.java | 138 --------- .../admin/MaterialBatchController.java | 36 +-- .../admin/MaterialInfomationController.java | 87 +++--- ...MaterialInventoryCheckBatchController.java | 121 -------- .../MaterialInventoryCheckController.java | 138 --------- ...aterialInventoryCheckDetailController.java | 121 -------- .../admin/MaterialInventoryController.java | 153 ---------- .../MaterialInventoryInboundController.java | 135 --------- ...erialInventoryInboundDetailController.java | 127 --------- .../MaterialInventoryOutboundController.java | 129 --------- ...rialInventoryOutboundDetailController.java | 121 -------- .../admin/MaterialLifecycleController.java | 121 -------- .../MaterialLifecycleDetailController.java | 121 -------- .../admin/MaterialLocationController.java | 15 +- .../admin/MaterialProductController.java | 83 +++--- .../vo/MaterialBatchAssignPageReqVO.java | 43 --- .../vo/MaterialBatchAssignRespVO.java | 50 ---- .../vo/MaterialBatchAssignSaveReqVO.java | 34 --- .../controller/vo/MaterialBatchPageReqVO.java | 19 +- .../controller/vo/MaterialBatchRespVO.java | 26 +- .../controller/vo/MaterialBatchSaveReqVO.java | 22 +- .../vo/MaterialInfomationPageReqVO.java | 57 ++-- .../vo/MaterialInfomationRespVO.java | 68 +++-- .../vo/MaterialInfomationSaveReqVO.java | 50 ++-- .../MaterialInventoryCheckBatchPageReqVO.java | 44 --- .../vo/MaterialInventoryCheckBatchRespVO.java | 55 ---- .../MaterialInventoryCheckBatchSaveReqVO.java | 42 --- ...MaterialInventoryCheckDetailPageReqVO.java | 43 --- .../MaterialInventoryCheckDetailRespVO.java | 54 ---- ...MaterialInventoryCheckDetailSaveReqVO.java | 37 --- .../vo/MaterialInventoryCheckPageReqVO.java | 59 ---- .../vo/MaterialInventoryCheckRespVO.java | 74 ----- .../vo/MaterialInventoryCheckSaveReqVO.java | 56 ---- ...terialInventoryInboundDetailPageReqVO.java | 56 ---- .../MaterialInventoryInboundDetailRespVO.java | 68 ----- ...terialInventoryInboundDetailSaveReqVO.java | 64 ----- .../vo/MaterialInventoryInboundPageReqVO.java | 59 ---- .../vo/MaterialInventoryInboundRespVO.java | 74 ----- .../vo/MaterialInventoryInboundSaveReqVO.java | 59 ---- ...erialInventoryOutboundDetailPageReqVO.java | 34 --- ...MaterialInventoryOutboundDetailRespVO.java | 42 --- ...erialInventoryOutboundDetailSaveReqVO.java | 28 -- .../MaterialInventoryOutboundPageReqVO.java | 65 ----- .../vo/MaterialInventoryOutboundRespVO.java | 87 ------ .../MaterialInventoryOutboundSaveReqVO.java | 64 ----- .../vo/MaterialInventoryPageReqVO.java | 102 ------- .../vo/MaterialInventoryRespVO.java | 143 ---------- .../vo/MaterialLifecycleDetailPageReqVO.java | 52 ---- .../vo/MaterialLifecycleDetailRespVO.java | 74 ----- .../vo/MaterialLifecycleDetailSaveReqVO.java | 49 ---- .../vo/MaterialLifecyclePageReqVO.java | 59 ---- .../vo/MaterialLifecycleRespVO.java | 74 ----- .../vo/MaterialLifecycleSaveReqVO.java | 54 ---- .../vo/MaterialLocationPageReqVO.java | 9 +- .../controller/vo/MaterialLocationRespVO.java | 15 +- .../vo/MaterialLocationSaveReqVO.java | 12 +- .../vo/MaterialProductPageReqVO.java | 47 +-- .../controller/vo/MaterialProductRespVO.java | 74 +++-- .../vo/MaterialProductSaveReqVO.java | 67 +++-- .../dal/dataobject/MaterialBatchAssignDO.java | 69 ----- .../dal/dataobject/MaterialBatchDO.java | 27 +- .../dal/dataobject/MaterialInfomationDO.java | 62 ++-- .../MaterialInventoryCheckBatchDO.java | 72 ----- .../dataobject/MaterialInventoryCheckDO.java | 95 ------- .../MaterialInventoryCheckDetailDO.java | 72 ----- .../dal/dataobject/MaterialInventoryDO.java | 169 ----------- .../MaterialInventoryInboundDO.java | 100 ------- .../MaterialInventoryInboundDetailDO.java | 90 ------ .../MaterialInventoryOutboundDO.java | 110 ------- .../MaterialInventoryOutboundDetailDO.java | 57 ---- .../dal/dataobject/MaterialLifecycleDO.java | 100 ------- .../dataobject/MaterialLifecycleDetailDO.java | 82 ------ .../dal/dataobject/MaterialLocationDO.java | 10 +- .../dal/dataobject/MaterialProductDO.java | 54 +++- .../dal/mapper/MaterialBatchAssignMapper.java | 37 --- .../dal/mapper/MaterialBatchMapper.java | 5 +- .../dal/mapper/MaterialInfomationMapper.java | 24 +- .../MaterialInventoryCheckBatchMapper.java | 32 --- .../MaterialInventoryCheckDetailMapper.java | 32 --- .../mapper/MaterialInventoryCheckMapper.java | 36 --- .../MaterialInventoryInboundDetailMapper.java | 53 ---- .../MaterialInventoryInboundMapper.java | 37 --- .../dal/mapper/MaterialInventoryMapper.java | 34 --- ...MaterialInventoryOutboundDetailMapper.java | 29 -- .../MaterialInventoryOutboundMapper.java | 39 --- .../mapper/MaterialLifecycleDetailMapper.java | 35 --- .../dal/mapper/MaterialLifecycleMapper.java | 37 --- .../dal/mapper/MaterialLocationMapper.java | 4 +- .../dal/mapper/MaterialProductMapper.java | 31 +- .../service/MaterialBatchAssignService.java | 80 ------ .../MaterialBatchAssignServiceImpl.java | 134 --------- .../service/MaterialBatchService.java | 8 +- .../service/MaterialBatchServiceImpl.java | 15 +- .../service/MaterialInfomationService.java | 9 +- .../MaterialInfomationServiceImpl.java | 3 +- .../MaterialInventoryCheckBatchService.java | 65 ----- ...aterialInventoryCheckBatchServiceImpl.java | 92 ------ .../MaterialInventoryCheckDetailService.java | 64 ----- ...terialInventoryCheckDetailServiceImpl.java | 92 ------ .../MaterialInventoryCheckService.java | 80 ------ .../MaterialInventoryCheckServiceImpl.java | 183 ------------ ...MaterialInventoryInboundDetailService.java | 69 ----- ...rialInventoryInboundDetailServiceImpl.java | 96 ------- .../MaterialInventoryInboundService.java | 78 ----- .../MaterialInventoryInboundServiceImpl.java | 191 ------------- ...aterialInventoryOutboundDetailService.java | 64 ----- ...ialInventoryOutboundDetailServiceImpl.java | 92 ------ .../MaterialInventoryOutboundService.java | 74 ----- .../MaterialInventoryOutboundServiceImpl.java | 132 --------- .../service/MaterialInventoryService.java | 31 -- .../service/MaterialInventoryServiceImpl.java | 76 ----- .../MaterialLifecycleDetailService.java | 64 ----- .../MaterialLifecycleDetailServiceImpl.java | 92 ------ .../service/MaterialLifecycleService.java | 64 ----- .../service/MaterialLifecycleServiceImpl.java | 92 ------ .../service/MaterialLocationServiceImpl.java | 2 - .../service/MaterialProductService.java | 29 +- .../service/MaterialProductServiceImpl.java | 269 ++++++++++-------- .../qms/resource/material/valid/AddGroup.java | 4 + .../resource/material/valid/UpdateGroup.java | 4 + .../dal/mapper/MaterialBatchAssignMapper.xml | 12 - .../MaterialInventoryCheckBatchMapper.xml | 12 - .../MaterialInventoryCheckDetailMapper.xml | 12 - .../mapper/MaterialInventoryCheckMapper.xml | 12 - .../MaterialInventoryInboundDetailMapper.xml | 12 - .../mapper/MaterialInventoryInboundMapper.xml | 12 - .../dal/mapper/MaterialInventoryMapper.xml | 103 ------- .../MaterialInventoryOutboundDetailMapper.xml | 12 - .../MaterialInventoryOutboundMapper.xml | 12 - .../mapper/MaterialLifecycleDetailMapper.xml | 12 - .../dal/mapper/MaterialLifecycleMapper.xml | 12 - 132 files changed, 683 insertions(+), 7535 deletions(-) delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchAssignController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckBatchController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckDetailController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundDetailController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundDetailController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleDetailController.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailPageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecyclePageReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleRespVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchAssignDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckBatchDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDetailDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDetailDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDetailDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDetailDO.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleService.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/AddGroup.java create mode 100644 zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/UpdateGroup.java delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.xml delete mode 100644 zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.xml diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index 84eeaec..578ffce 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java @@ -172,7 +172,8 @@ public interface ErrorCodeConstants { // -------------物料试剂------------- ErrorCode MATERIAL_INFOMATION_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材不存在"); - ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_150_000, "试剂耗材大类不存在"); + ErrorCode MATERIAL_PRODUCT_NOT_EXISTS = new ErrorCode(1_032_160_000, "物料大类不存在"); + ErrorCode MATERIAL_PRODUCT_CODE_EXISTED = new ErrorCode(1_032_160_000, "物料大类编码重复"); ErrorCode MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程明细不存在"); ErrorCode MATERIAL_LIFECYCLE_NOT_EXISTS = new ErrorCode(1_032_150_000, "物料通用流程不存在"); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchAssignController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchAssignController.java deleted file mode 100644 index fdd87ae..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchAssignController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; -import static com.zt.plat.framework.common.pojo.CommonResult.error; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.MATERIAL_BATCH_ASSIGN_NOT_EXISTS; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO; -import com.zt.plat.module.qms.resource.material.service.MaterialBatchAssignService; - -@Tag(name = "管理后台 - 物料批次分发") -@RestController -@RequestMapping("/qms/resource/material-batch-assign") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialbatchassign") -public class MaterialBatchAssignController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialBatchAssignController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialBatchAssignService materialBatchAssignService; - - @PostMapping("/create") - @Operation(summary = "创建物料批次分发") - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:create')") - public CommonResult createMaterialBatchAssign(@Valid @RequestBody MaterialBatchAssignSaveReqVO createReqVO) { - return success(materialBatchAssignService.createMaterialBatchAssign(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新物料批次分发") - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:update')") - public CommonResult updateMaterialBatchAssign(@Valid @RequestBody MaterialBatchAssignSaveReqVO updateReqVO) { - materialBatchAssignService.updateMaterialBatchAssign(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除物料批次分发") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:delete')") - public CommonResult deleteMaterialBatchAssign(@RequestParam("id") Long id) { - materialBatchAssignService.deleteMaterialBatchAssign(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除物料批次分发") - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:delete')") - public CommonResult deleteMaterialBatchAssignList(@RequestBody BatchDeleteReqVO req) { - materialBatchAssignService.deleteMaterialBatchAssignListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得物料批次分发") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')") - public CommonResult getMaterialBatchAssign(@RequestParam("id") Long id) { - MaterialBatchAssignDO materialBatchAssign = materialBatchAssignService.getMaterialBatchAssign(id); - return success(BeanUtils.toBean(materialBatchAssign, MaterialBatchAssignRespVO.class)); - } - - - @GetMapping("/get-by-inf") - @Operation(summary = "获得物料批次分发") - @Parameter(name = "productId", description = "产品大类编号", required = true) - // @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')") - public CommonResult> getMaterialBatchAssignByInfiId(MaterialBatchAssignPageReqVO pageReqVO) { - - if(pageReqVO.getMaterialInfomationId()==null||pageReqVO.getMaterialInfomationId().length()==0){ - return error(MATERIAL_BATCH_ASSIGN_NOT_EXISTS,"示例编号不能为空"); - } - - PageResult pageResult = materialBatchAssignService.getMaterialBatchAssignByInfId(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialBatchAssignRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得物料批次分发分页") - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:query')") - public CommonResult> getMaterialBatchAssignPage(@Valid MaterialBatchAssignPageReqVO pageReqVO) { - PageResult pageResult = materialBatchAssignService.getMaterialBatchAssignPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialBatchAssignRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出物料批次分发 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-batch-assign:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialBatchAssignExcel(@Valid MaterialBatchAssignPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialBatchAssignService.getMaterialBatchAssignPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "物料批次分发.xls", "数据", MaterialBatchAssignRespVO.class, - BeanUtils.toBean(list, MaterialBatchAssignRespVO.class)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchController.java index 31566f5..8f568e1 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialBatchController.java @@ -1,19 +1,21 @@ package com.zt.plat.module.qms.resource.material.controller.admin; -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.service.MaterialBatchAssignService; +import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchPageReqVO; +import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchRespVO; +import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchSaveReqVO; +import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; +import com.zt.plat.module.qms.resource.material.service.MaterialBatchService; import org.springframework.web.bind.annotation.*; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -24,8 +26,6 @@ import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - import static com.zt.plat.framework.common.pojo.CommonResult.success; import com.zt.plat.framework.excel.core.util.ExcelUtils; @@ -33,26 +33,12 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils; import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; -import com.zt.plat.module.qms.resource.material.service.MaterialBatchService; - @Tag(name = "管理后台 - 物料批次") @RestController -@RequestMapping("/qms/resource/material-batch") +@RequestMapping("/qms/material-batch") @Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialbatch") -public class MaterialBatchController extends AbstractFileUploadController implements BusinessControllerMarker{ +public class MaterialBatchController implements BusinessControllerMarker { - @Resource - private MaterialBatchAssignService materialBatchAssignService; - - static { - FileUploadController annotation = MaterialBatchController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } @Resource private MaterialBatchService materialBatchService; @@ -120,10 +106,4 @@ public class MaterialBatchController extends AbstractFileUploadController implem BeanUtils.toBean(list, MaterialBatchRespVO.class)); } - @PostMapping("/assign") - @Operation(summary = "物料分发") - public CommonResult assign(@Valid @RequestBody MaterialBatchAssignSaveReqVO createReqVO) { - return success(materialBatchAssignService.assignLab(createReqVO)); - } - } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInfomationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInfomationController.java index e31ec87..3824ad9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInfomationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInfomationController.java @@ -1,69 +1,59 @@ package com.zt.plat.module.qms.resource.material.controller.admin; -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; -import com.zt.plat.framework.excel.core.util.ExcelUtils; -import com.zt.plat.module.qms.core.constant.DataTypeConstant; -import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO; import com.zt.plat.module.qms.resource.material.service.MaterialInfomationService; -import com.zt.plat.module.qms.resource.material.service.MaterialProductService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; import java.io.IOException; -import java.util.List; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; import static com.zt.plat.framework.common.pojo.CommonResult.success; +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + + @Tag(name = "管理后台 - 物料实例") @RestController -@RequestMapping("/qms/resource/material-infomation") +@RequestMapping("/qms/material-infomation") @Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "resource.materialinfomation") -public class MaterialInfomationController extends AbstractFileUploadController implements BusinessControllerMarker{ +public class MaterialInfomationController implements BusinessControllerMarker { - static { - FileUploadController annotation = MaterialInfomationController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - @Resource private MaterialInfomationService materialInfomationService; - @Resource private MaterialProductService materialProductService; + @Resource + private MaterialInfomationService materialInfomationService; @PostMapping("/create") @Operation(summary = "创建物料实例") - @PreAuthorize("@ss.hasPermission('resource:material-infomation:create')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:create')") public CommonResult createMaterialInfomation(@Valid @RequestBody MaterialInfomationSaveReqVO createReqVO) { return success(materialInfomationService.createMaterialInfomation(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物料实例") - @PreAuthorize("@ss.hasPermission('resource:material-infomation:update')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:update')") public CommonResult updateMaterialInfomation(@Valid @RequestBody MaterialInfomationSaveReqVO updateReqVO) { materialInfomationService.updateMaterialInfomation(updateReqVO); return success(true); @@ -72,7 +62,7 @@ public class MaterialInfomationController extends AbstractFileUploadController i @DeleteMapping("/delete") @Operation(summary = "删除物料实例") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('resource:material-infomation:delete')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:delete')") public CommonResult deleteMaterialInfomation(@RequestParam("id") Long id) { materialInfomationService.deleteMaterialInfomation(id); return success(true); @@ -81,7 +71,7 @@ public class MaterialInfomationController extends AbstractFileUploadController i @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) @Operation(summary = "批量删除物料实例") - @PreAuthorize("@ss.hasPermission('resource:material-infomation:delete')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:delete')") public CommonResult deleteMaterialInfomationList(@RequestBody BatchDeleteReqVO req) { materialInfomationService.deleteMaterialInfomationListByIds(req.getIds()); return success(true); @@ -90,7 +80,7 @@ public class MaterialInfomationController extends AbstractFileUploadController i @GetMapping("/get") @Operation(summary = "获得物料实例") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('resource:material-infomation:query')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:query')") public CommonResult getMaterialInfomation(@RequestParam("id") Long id) { MaterialInfomationDO materialInfomation = materialInfomationService.getMaterialInfomation(id); return success(BeanUtils.toBean(materialInfomation, MaterialInfomationRespVO.class)); @@ -98,24 +88,15 @@ public class MaterialInfomationController extends AbstractFileUploadController i @GetMapping("/page") @Operation(summary = "获得物料实例分页") - @PreAuthorize("@ss.hasPermission('resource:material-infomation:query')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:query')") public CommonResult> getMaterialInfomationPage(@Valid MaterialInfomationPageReqVO pageReqVO) { - - Long productId = pageReqVO.getProductId(); - if(productId != null){ - List productDOList = materialProductService.listByIdPath(productId, DataTypeConstant.DATA_TYPE_DATA); - List productIds = productDOList.stream().map(MaterialProductDO::getId).toList(); - pageReqVO.setProductIds(productIds); - pageReqVO.setProductId(null); - } - PageResult pageResult = materialInfomationService.getMaterialInfomationPage(pageReqVO); return success(BeanUtils.toBean(pageResult, MaterialInfomationRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出物料实例 Excel") - @PreAuthorize("@ss.hasPermission('resource:material-infomation:export')") + @PreAuthorize("@ss.hasPermission('qms:material-infomation:export')") @ApiAccessLog(operateType = EXPORT) public void exportMaterialInfomationExcel(@Valid MaterialInfomationPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckBatchController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckBatchController.java deleted file mode 100644 index 796ad55..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckBatchController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckBatchService; - -@Tag(name = "管理后台 - 库存盘点项") -@RestController -@RequestMapping("/qms/material-inventory-check-batch") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventorycheckbatch") -public class MaterialInventoryCheckBatchController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryCheckBatchController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryCheckBatchService materialInventoryCheckBatchService; - - @PostMapping("/create") - @Operation(summary = "创建库存盘点项") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:create')") - public CommonResult createMaterialInventoryCheckBatch(@Valid @RequestBody MaterialInventoryCheckBatchSaveReqVO createReqVO) { - return success(materialInventoryCheckBatchService.createMaterialInventoryCheckBatch(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新库存盘点项") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:update')") - public CommonResult updateMaterialInventoryCheckBatch(@Valid @RequestBody MaterialInventoryCheckBatchSaveReqVO updateReqVO) { - materialInventoryCheckBatchService.updateMaterialInventoryCheckBatch(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除库存盘点项") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:delete')") - public CommonResult deleteMaterialInventoryCheckBatch(@RequestParam("id") Long id) { - materialInventoryCheckBatchService.deleteMaterialInventoryCheckBatch(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除库存盘点项") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:delete')") - public CommonResult deleteMaterialInventoryCheckBatchList(@RequestBody BatchDeleteReqVO req) { - materialInventoryCheckBatchService.deleteMaterialInventoryCheckBatchListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得库存盘点项") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:query')") - public CommonResult getMaterialInventoryCheckBatch(@RequestParam("id") Long id) { - MaterialInventoryCheckBatchDO materialInventoryCheckBatch = materialInventoryCheckBatchService.getMaterialInventoryCheckBatch(id); - return success(BeanUtils.toBean(materialInventoryCheckBatch, MaterialInventoryCheckBatchRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得库存盘点项分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:query')") - public CommonResult> getMaterialInventoryCheckBatchPage(@Valid MaterialInventoryCheckBatchPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryCheckBatchService.getMaterialInventoryCheckBatchPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryCheckBatchRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出库存盘点项 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-batch:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryCheckBatchExcel(@Valid MaterialInventoryCheckBatchPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryCheckBatchService.getMaterialInventoryCheckBatchPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "库存盘点项.xls", "数据", MaterialInventoryCheckBatchRespVO.class, - BeanUtils.toBean(list, MaterialInventoryCheckBatchRespVO.class)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckController.java deleted file mode 100644 index adc94f0..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckController.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckService; - -@Tag(name = "管理后台 - 库存盘点") -@RestController -@RequestMapping("/qms/resource/material-inventory-check") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventorycheck") -public class MaterialInventoryCheckController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryCheckController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryCheckService materialInventoryCheckService; - - @PostMapping("/create") - @Operation(summary = "创建库存盘点") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:create')") - public CommonResult createMaterialInventoryCheck(@Valid @RequestBody MaterialInventoryCheckSaveReqVO createReqVO) { - return success(materialInventoryCheckService.createMaterialInventoryCheck(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新库存盘点") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:update')") - public CommonResult updateMaterialInventoryCheck(@Valid @RequestBody MaterialInventoryCheckSaveReqVO updateReqVO) { - materialInventoryCheckService.updateMaterialInventoryCheck(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除库存盘点") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:delete')") - public CommonResult deleteMaterialInventoryCheck(@RequestParam("id") Long id) { - materialInventoryCheckService.deleteMaterialInventoryCheck(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除库存盘点") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:delete')") - public CommonResult deleteMaterialInventoryCheckList(@RequestBody BatchDeleteReqVO req) { - materialInventoryCheckService.deleteMaterialInventoryCheckListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得库存盘点") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')") - public CommonResult getMaterialInventoryCheck(@RequestParam("id") Long id) { - MaterialInventoryCheckDO materialInventoryCheck = materialInventoryCheckService.getMaterialInventoryCheck(id); - return success(BeanUtils.toBean(materialInventoryCheck, MaterialInventoryCheckRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得库存盘点分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')") - public CommonResult> getMaterialInventoryCheckPage(@Valid MaterialInventoryCheckPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryCheckService.getMaterialInventoryCheckPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryCheckRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出库存盘点 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryCheckExcel(@Valid MaterialInventoryCheckPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryCheckService.getMaterialInventoryCheckPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "库存盘点.xls", "数据", MaterialInventoryCheckRespVO.class, - BeanUtils.toBean(list, MaterialInventoryCheckRespVO.class)); - } - - - @PostMapping("/create-form") - @Operation(summary = "创建库存盘点") - public CommonResult createMaterialInventoryCheckForm(@Valid @RequestBody MaterialInventoryCheckSaveReqVO createReqVO) { - - - return success(materialInventoryCheckService.createMaterialInventoryCheckForm(createReqVO)); - } - - @GetMapping("/get-form") - @Operation(summary = "获得库存盘点") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check:query')") - public CommonResult getMaterialInventoryCheckForm(@RequestParam("id") Long id) { - - return success(materialInventoryCheckService.getMaterialInventoryCheckForm(id)); - } -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckDetailController.java deleted file mode 100644 index 6fa6591..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryCheckDetailController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryCheckDetailService; - -@Tag(name = "管理后台 - 库存盘点明细") -@RestController -@RequestMapping("/qms/material-inventory-check-detail") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventorycheckdetail") -public class MaterialInventoryCheckDetailController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryCheckDetailController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryCheckDetailService materialInventoryCheckDetailService; - - @PostMapping("/create") - @Operation(summary = "创建库存盘点明细") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:create')") - public CommonResult createMaterialInventoryCheckDetail(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO createReqVO) { - return success(materialInventoryCheckDetailService.createMaterialInventoryCheckDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新库存盘点明细") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:update')") - public CommonResult updateMaterialInventoryCheckDetail(@Valid @RequestBody MaterialInventoryCheckDetailSaveReqVO updateReqVO) { - materialInventoryCheckDetailService.updateMaterialInventoryCheckDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除库存盘点明细") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:delete')") - public CommonResult deleteMaterialInventoryCheckDetail(@RequestParam("id") Long id) { - materialInventoryCheckDetailService.deleteMaterialInventoryCheckDetail(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除库存盘点明细") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:delete')") - public CommonResult deleteMaterialInventoryCheckDetailList(@RequestBody BatchDeleteReqVO req) { - materialInventoryCheckDetailService.deleteMaterialInventoryCheckDetailListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得库存盘点明细") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:query')") - public CommonResult getMaterialInventoryCheckDetail(@RequestParam("id") Long id) { - MaterialInventoryCheckDetailDO materialInventoryCheckDetail = materialInventoryCheckDetailService.getMaterialInventoryCheckDetail(id); - return success(BeanUtils.toBean(materialInventoryCheckDetail, MaterialInventoryCheckDetailRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得库存盘点明细分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:query')") - public CommonResult> getMaterialInventoryCheckDetailPage(@Valid MaterialInventoryCheckDetailPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryCheckDetailService.getMaterialInventoryCheckDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryCheckDetailRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出库存盘点明细 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-check-detail:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryCheckDetailExcel(@Valid MaterialInventoryCheckDetailPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryCheckDetailService.getMaterialInventoryCheckDetailPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "库存盘点明细.xls", "数据", MaterialInventoryCheckDetailRespVO.class, - BeanUtils.toBean(list, MaterialInventoryCheckDetailRespVO.class)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryController.java deleted file mode 100644 index e1b020d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryController.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; -import com.zt.plat.framework.excel.core.util.ExcelUtils; -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundDetailService; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryService; -import com.zt.plat.module.qms.resource.material.service.MaterialProductService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.util.List; - -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT; -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -@Tag(name = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") -@RestController -@RequestMapping("/qms/resource/material-inventory") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materiainfo") -public class MaterialInventoryController extends AbstractFileUploadController implements BusinessControllerMarker { - - static { - FileUploadController annotation = MaterialInventoryController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryInboundDetailService materialInventoryInboundDetailService; - - @Resource - private MaterialInventoryService mterialInventoryService; - - - @PostMapping("/create") - @Operation(summary = "创建入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:create')") - public CommonResult createMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO createReqVO) { - return success(materialInventoryInboundDetailService.createMaterialInventoryInboundDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:update')") - public CommonResult updateMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO updateReqVO) { - materialInventoryInboundDetailService.updateMaterialInventoryInboundDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')") - public CommonResult deleteMaterialInventoryInboundDetail(@RequestParam("id") Long id) { - materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetail(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')") - public CommonResult deleteMaterialInventoryInboundDetailList(@RequestBody BatchDeleteReqVO req) { - materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetailListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')") - public CommonResult getMaterialInventoryInboundDetail(@RequestParam("id") Long id) { - MaterialInventoryInboundDetailDO materialInventoryInboundDetail = materialInventoryInboundDetailService.getMaterialInventoryInboundDetail(id); - return success(BeanUtils.toBean(materialInventoryInboundDetail, MaterialInventoryInboundDetailRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得库存明细") -// @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')") - public CommonResult> getMaterialInventoryPage(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryInboundDetailExcel(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryInboundDetailRespVO.class, - BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class)); - } - - - @GetMapping("/getList") - @Operation(summary = "获得库存列表") - @Parameter(name = "id", description = "编号", required = true) - public CommonResult> getMaterialProduct(MaterialInventoryRespVO pageReqVO) { - - PageResult pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class)); - } - - @GetMapping("/get_mtrl_inf") - @Operation(summary = "获取实例列表") - @Parameter(name = "id", description = "编号", required = true) - public CommonResult> getInfomation(MaterialInventoryRespVO pageReqVO) { - - PageResult pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class)); - } - - @GetMapping("/agree-out") - @Operation(summary = "同意出库") - @Parameter(name = "id", description = "出库单id", required = true) - public CommonResult agreeOut(@RequestParam("outId") Long outId) { - -// PageResult pageResult = mterialInventoryService.getMaterialInventoryPage(pageReqVO); -// return success(BeanUtils.toBean(pageResult, MaterialInventoryRespVO.class)); - mterialInventoryService.agreeMaterialInventoryOutbound(outId); - return success(true); - } - - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundController.java deleted file mode 100644 index d7743bb..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundSaveReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundService; - -@Tag(name = "管理后台 - 入库") -@RestController -@RequestMapping("/qms/resource/material-inventory-inbound") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventoryinbound") -public class MaterialInventoryInboundController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryInboundController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryInboundService materialInventoryInboundService; - - @PostMapping("/create") - @Operation(summary = "创建入库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:create')") - public CommonResult createMaterialInventoryInbound(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) { - return success(materialInventoryInboundService.createMaterialInventoryInbound(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新入库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:update')") - public CommonResult updateMaterialInventoryInbound(@Valid @RequestBody MaterialInventoryInboundSaveReqVO updateReqVO) { - materialInventoryInboundService.updateMaterialInventoryInbound(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除入库") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:delete')") - public CommonResult deleteMaterialInventoryInbound(@RequestParam("id") Long id) { - materialInventoryInboundService.deleteMaterialInventoryInbound(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除入库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:delete')") - public CommonResult deleteMaterialInventoryInboundList(@RequestBody BatchDeleteReqVO req) { - materialInventoryInboundService.deleteMaterialInventoryInboundListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得入库") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:query')") - public CommonResult getMaterialInventoryInbound(@RequestParam("id") Long id) { - MaterialInventoryInboundDO materialInventoryInbound = materialInventoryInboundService.getMaterialInventoryInbound(id); - return success(BeanUtils.toBean(materialInventoryInbound, MaterialInventoryInboundRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得入库分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:query')") - public CommonResult> getMaterialInventoryInboundPage(@Valid MaterialInventoryInboundPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryInboundService.getMaterialInventoryInboundPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出入库 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryInboundExcel(@Valid MaterialInventoryInboundPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryInboundService.getMaterialInventoryInboundPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "入库.xls", "数据", MaterialInventoryInboundRespVO.class, - BeanUtils.toBean(list, MaterialInventoryInboundRespVO.class)); - } - - - @PostMapping("/multi-put") - @Operation(summary = "批量上架") - public CommonResult createMaterialInventoryInboundMulti(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) { - materialInventoryInboundService.multiCreateMaterialInventoryInbound(createReqVO); - return success(true); - } - - @PostMapping("single-put") - @Operation(summary = "单一上架") - public CommonResult> createMaterialInventoryInboundSingle(@Valid @RequestBody MaterialInventoryInboundSaveReqVO createReqVO) { - return success(materialInventoryInboundService.singleCreateMaterialInventoryInbound(createReqVO)); - } -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundDetailController.java deleted file mode 100644 index 50bc5c9..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryInboundDetailController.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryInboundDetailService; - -@Tag(name = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") -@RestController -@RequestMapping("/qms/resource/material-inventory-inbound-detail") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventoryinbounddetail") -public class MaterialInventoryInboundDetailController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryInboundDetailController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryInboundDetailService materialInventoryInboundDetailService; - - @PostMapping("/create") - @Operation(summary = "创建入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:create')") - public CommonResult createMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO createReqVO) { - return success(materialInventoryInboundDetailService.createMaterialInventoryInboundDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:update')") - public CommonResult updateMaterialInventoryInboundDetail(@Valid @RequestBody MaterialInventoryInboundDetailSaveReqVO updateReqVO) { - materialInventoryInboundDetailService.updateMaterialInventoryInboundDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')") - public CommonResult deleteMaterialInventoryInboundDetail(@RequestParam("id") Long id) { - materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetail(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:delete')") - public CommonResult deleteMaterialInventoryInboundDetailList(@RequestBody BatchDeleteReqVO req) { - materialInventoryInboundDetailService.deleteMaterialInventoryInboundDetailListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')") - public CommonResult getMaterialInventoryInboundDetail(@RequestParam("id") Long id) { - MaterialInventoryInboundDetailDO materialInventoryInboundDetail = materialInventoryInboundDetailService.getMaterialInventoryInboundDetail(id); - return success(BeanUtils.toBean(materialInventoryInboundDetail, MaterialInventoryInboundDetailRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:query')") - public CommonResult> getMaterialInventoryInboundDetailPage(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-inbound-detail:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryInboundDetailExcel(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryInboundDetailRespVO.class, - BeanUtils.toBean(list, MaterialInventoryInboundDetailRespVO.class)); - } - - @GetMapping("/page-list") - @Operation(summary = "获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页") - public CommonResult> getMaterialInventoryInboundDetailPageList(@Valid MaterialInventoryInboundDetailPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryInboundDetailService.getMaterialInventoryInboundDetailPageList(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryInboundDetailRespVO.class)); - } -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundController.java deleted file mode 100644 index e83eb54..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundController.java +++ /dev/null @@ -1,129 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryOutboundService; - -@Tag(name = "管理后台 - 出库") -@RestController -@RequestMapping("/qms/resource/material-inventory-outbound") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventoryoutbound") -public class MaterialInventoryOutboundController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryOutboundController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryOutboundService materialInventoryOutboundService; - - @PostMapping("/create") - @Operation(summary = "创建出库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:create')") - public CommonResult createMaterialInventoryOutbound(@Valid @RequestBody MaterialInventoryOutboundSaveReqVO createReqVO) { - return success(materialInventoryOutboundService.createMaterialInventoryOutbound(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新出库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:update')") - public CommonResult updateMaterialInventoryOutbound(@Valid @RequestBody MaterialInventoryOutboundSaveReqVO updateReqVO) { - materialInventoryOutboundService.updateMaterialInventoryOutbound(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除出库") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:delete')") - public CommonResult deleteMaterialInventoryOutbound(@RequestParam("id") Long id) { - materialInventoryOutboundService.deleteMaterialInventoryOutbound(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除出库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:delete')") - public CommonResult deleteMaterialInventoryOutboundList(@RequestBody BatchDeleteReqVO req) { - materialInventoryOutboundService.deleteMaterialInventoryOutboundListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得出库") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:query')") - public CommonResult getMaterialInventoryOutbound(@RequestParam("id") Long id) { - MaterialInventoryOutboundDO materialInventoryOutbound = materialInventoryOutboundService.getMaterialInventoryOutbound(id); - return success(BeanUtils.toBean(materialInventoryOutbound, MaterialInventoryOutboundRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得出库分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:query')") - public CommonResult> getMaterialInventoryOutboundPage(@Valid MaterialInventoryOutboundPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryOutboundService.getMaterialInventoryOutboundPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryOutboundRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出出库 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryOutboundExcel(@Valid MaterialInventoryOutboundPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryOutboundService.getMaterialInventoryOutboundPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "出库.xls", "数据", MaterialInventoryOutboundRespVO.class, - BeanUtils.toBean(list, MaterialInventoryOutboundRespVO.class)); - } - - - @PostMapping("/create-all") - @Operation(summary = "创建出库") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound:create')") - public CommonResult createMaterialInventoryOutboundAll(@Valid @RequestBody MaterialInventoryOutboundSaveReqVO createReqVO) { - return success(materialInventoryOutboundService.createMaterialInventoryOutboundAll(createReqVO)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundDetailController.java deleted file mode 100644 index a6fa8b6..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialInventoryOutboundDetailController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO; -import com.zt.plat.module.qms.resource.material.service.MaterialInventoryOutboundDetailService; - -@Tag(name = "管理后台 - 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") -@RestController -@RequestMapping("/qms/material-inventory-outbound-detail") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materialinventoryoutbounddetail") -public class MaterialInventoryOutboundDetailController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialInventoryOutboundDetailController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialInventoryOutboundDetailService materialInventoryOutboundDetailService; - - @PostMapping("/create") - @Operation(summary = "创建出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:create')") - public CommonResult createMaterialInventoryOutboundDetail(@Valid @RequestBody MaterialInventoryOutboundDetailSaveReqVO createReqVO) { - return success(materialInventoryOutboundDetailService.createMaterialInventoryOutboundDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:update')") - public CommonResult updateMaterialInventoryOutboundDetail(@Valid @RequestBody MaterialInventoryOutboundDetailSaveReqVO updateReqVO) { - materialInventoryOutboundDetailService.updateMaterialInventoryOutboundDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:delete')") - public CommonResult deleteMaterialInventoryOutboundDetail(@RequestParam("id") Long id) { - materialInventoryOutboundDetailService.deleteMaterialInventoryOutboundDetail(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:delete')") - public CommonResult deleteMaterialInventoryOutboundDetailList(@RequestBody BatchDeleteReqVO req) { - materialInventoryOutboundDetailService.deleteMaterialInventoryOutboundDetailListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:query')") - public CommonResult getMaterialInventoryOutboundDetail(@RequestParam("id") Long id) { - MaterialInventoryOutboundDetailDO materialInventoryOutboundDetail = materialInventoryOutboundDetailService.getMaterialInventoryOutboundDetail(id); - return success(BeanUtils.toBean(materialInventoryOutboundDetail, MaterialInventoryOutboundDetailRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:query')") - public CommonResult> getMaterialInventoryOutboundDetailPage(@Valid MaterialInventoryOutboundDetailPageReqVO pageReqVO) { - PageResult pageResult = materialInventoryOutboundDetailService.getMaterialInventoryOutboundDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialInventoryOutboundDetailRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-inventory-outbound-detail:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialInventoryOutboundDetailExcel(@Valid MaterialInventoryOutboundDetailPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialInventoryOutboundDetailService.getMaterialInventoryOutboundDetailPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等.xls", "数据", MaterialInventoryOutboundDetailRespVO.class, - BeanUtils.toBean(list, MaterialInventoryOutboundDetailRespVO.class)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java deleted file mode 100644 index b5048a4..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecyclePageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDO; -import com.zt.plat.module.qms.resource.material.service.MaterialLifecycleService; - -@Tag(name = "管理后台 - 物料通用流程") -@RestController -@RequestMapping("/qms/material-lifecycle") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materiallifecycle") -public class MaterialLifecycleController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialLifecycleController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialLifecycleService materialLifecycleService; - - @PostMapping("/create") - @Operation(summary = "创建物料通用流程") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:create')") - public CommonResult createMaterialLifecycle(@Valid @RequestBody MaterialLifecycleSaveReqVO createReqVO) { - return success(materialLifecycleService.createMaterialLifecycle(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新物料通用流程") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:update')") - public CommonResult updateMaterialLifecycle(@Valid @RequestBody MaterialLifecycleSaveReqVO updateReqVO) { - materialLifecycleService.updateMaterialLifecycle(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除物料通用流程") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:delete')") - public CommonResult deleteMaterialLifecycle(@RequestParam("id") Long id) { - materialLifecycleService.deleteMaterialLifecycle(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除物料通用流程") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:delete')") - public CommonResult deleteMaterialLifecycleList(@RequestBody BatchDeleteReqVO req) { - materialLifecycleService.deleteMaterialLifecycleListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得物料通用流程") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:query')") - public CommonResult getMaterialLifecycle(@RequestParam("id") Long id) { - MaterialLifecycleDO materialLifecycle = materialLifecycleService.getMaterialLifecycle(id); - return success(BeanUtils.toBean(materialLifecycle, MaterialLifecycleRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得物料通用流程分页") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:query')") - public CommonResult> getMaterialLifecyclePage(@Valid MaterialLifecyclePageReqVO pageReqVO) { - PageResult pageResult = materialLifecycleService.getMaterialLifecyclePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialLifecycleRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出物料通用流程 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialLifecycleExcel(@Valid MaterialLifecyclePageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialLifecycleService.getMaterialLifecyclePage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "物料通用流程.xls", "数据", MaterialLifecycleRespVO.class, - BeanUtils.toBean(list, MaterialLifecycleRespVO.class)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleDetailController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleDetailController.java deleted file mode 100644 index bc24cfc..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLifecycleDetailController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.admin; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailSaveReqVO; -import org.springframework.web.bind.annotation.*; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; - -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.Operation; - -import jakarta.validation.*; -import jakarta.servlet.http.*; -import java.util.*; -import java.io.IOException; - -import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.pojo.CommonResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - -import static com.zt.plat.framework.common.pojo.CommonResult.success; - -import com.zt.plat.framework.excel.core.util.ExcelUtils; - -import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; -import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDetailDO; -import com.zt.plat.module.qms.resource.material.service.MaterialLifecycleDetailService; - -@Tag(name = "管理后台 - 物料通用流程明细,对应生命周期的明细") -@RestController -@RequestMapping("/qms/material-lifecycle-detail") -@Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materiallifecycledetail") -public class MaterialLifecycleDetailController extends AbstractFileUploadController implements BusinessControllerMarker{ - - static { - FileUploadController annotation = MaterialLifecycleDetailController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } - - @Resource - private MaterialLifecycleDetailService materialLifecycleDetailService; - - @PostMapping("/create") - @Operation(summary = "创建物料通用流程明细,对应生命周期的明细") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:create')") - public CommonResult createMaterialLifecycleDetail(@Valid @RequestBody MaterialLifecycleDetailSaveReqVO createReqVO) { - return success(materialLifecycleDetailService.createMaterialLifecycleDetail(createReqVO)); - } - - @PutMapping("/update") - @Operation(summary = "更新物料通用流程明细,对应生命周期的明细") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:update')") - public CommonResult updateMaterialLifecycleDetail(@Valid @RequestBody MaterialLifecycleDetailSaveReqVO updateReqVO) { - materialLifecycleDetailService.updateMaterialLifecycleDetail(updateReqVO); - return success(true); - } - - @DeleteMapping("/delete") - @Operation(summary = "删除物料通用流程明细,对应生命周期的明细") - @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:delete')") - public CommonResult deleteMaterialLifecycleDetail(@RequestParam("id") Long id) { - materialLifecycleDetailService.deleteMaterialLifecycleDetail(id); - return success(true); - } - - @DeleteMapping("/delete-list") - @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除物料通用流程明细,对应生命周期的明细") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:delete')") - public CommonResult deleteMaterialLifecycleDetailList(@RequestBody BatchDeleteReqVO req) { - materialLifecycleDetailService.deleteMaterialLifecycleDetailListByIds(req.getIds()); - return success(true); - } - - @GetMapping("/get") - @Operation(summary = "获得物料通用流程明细,对应生命周期的明细") - @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:query')") - public CommonResult getMaterialLifecycleDetail(@RequestParam("id") Long id) { - MaterialLifecycleDetailDO materialLifecycleDetail = materialLifecycleDetailService.getMaterialLifecycleDetail(id); - return success(BeanUtils.toBean(materialLifecycleDetail, MaterialLifecycleDetailRespVO.class)); - } - - @GetMapping("/page") - @Operation(summary = "获得物料通用流程明细,对应生命周期的明细分页") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:query')") - public CommonResult> getMaterialLifecycleDetailPage(@Valid MaterialLifecycleDetailPageReqVO pageReqVO) { - PageResult pageResult = materialLifecycleDetailService.getMaterialLifecycleDetailPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialLifecycleDetailRespVO.class)); - } - - @GetMapping("/export-excel") - @Operation(summary = "导出物料通用流程明细,对应生命周期的明细 Excel") - @PreAuthorize("@ss.hasPermission('qms:material-lifecycle-detail:export')") - @ApiAccessLog(operateType = EXPORT) - public void exportMaterialLifecycleDetailExcel(@Valid MaterialLifecycleDetailPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { - pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = materialLifecycleDetailService.getMaterialLifecycleDetailPage(pageReqVO).getList(); - // 导出 Excel - ExcelUtils.write(response, "物料通用流程明细,对应生命周期的明细.xls", "数据", MaterialLifecycleDetailRespVO.class, - BeanUtils.toBean(list, MaterialLifecycleDetailRespVO.class)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLocationController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLocationController.java index dd6aae5..05bd2f9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLocationController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialLocationController.java @@ -8,13 +8,12 @@ import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; -import com.zt.plat.framework.business.annotation.FileUploadController; -import com.zt.plat.framework.business.controller.AbstractFileUploadController; import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.constraints.*; import jakarta.validation.*; import jakarta.servlet.http.*; import java.util.*; @@ -25,8 +24,6 @@ import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; - import static com.zt.plat.framework.common.pojo.CommonResult.success; import com.zt.plat.framework.excel.core.util.ExcelUtils; @@ -41,16 +38,8 @@ import com.zt.plat.module.qms.resource.material.service.MaterialLocationService; @RestController @RequestMapping("/qms/material-location") @Validated -@DeptDataPermissionIgnore(enable = "true") -@FileUploadController(source = "qms.materiallocation") -public class MaterialLocationController extends AbstractFileUploadController implements BusinessControllerMarker{ +public class MaterialLocationController implements BusinessControllerMarker { - static { - FileUploadController annotation = MaterialLocationController.class.getAnnotation(FileUploadController.class); - if (annotation != null) { - setFileUploadInfo(annotation); - } - } @Resource private MaterialLocationService materialLocationService; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialProductController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialProductController.java index e5ff66f..3483059 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialProductController.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/admin/MaterialProductController.java @@ -9,10 +9,7 @@ import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.framework.datapermission.core.annotation.DeptDataPermissionIgnore; import com.zt.plat.framework.excel.core.util.ExcelUtils; -import com.zt.plat.module.qms.core.constant.DataTypeConstant; -import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductSaveReqVO; @@ -38,7 +35,6 @@ import static com.zt.plat.framework.common.pojo.CommonResult.success; @RestController @RequestMapping("/qms/resource/material-product") @Validated -@DeptDataPermissionIgnore(enable = "true") @FileUploadController(source = "resource.materialproduct") public class MaterialProductController extends AbstractFileUploadController implements BusinessControllerMarker{ @@ -52,51 +48,54 @@ public class MaterialProductController extends AbstractFileUploadController impl @Resource private MaterialProductService materialProductService; - @PostMapping("/saveData") - @Operation(summary = "保存数据") - public CommonResult saveData(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) { - return materialProductService.saveData(createReqVO); - } - @PostMapping("/saveClassify") + @PostMapping("/save-category") @Operation(summary = "保存分类") - public CommonResult saveClassify(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) { - return materialProductService.saveCategory(createReqVO); +// @PreAuthorize("@ss.hasPermission('qms:material-product:create-category')") + public CommonResult saveMaterialCategory(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) { + return success(materialProductService.saveMaterialCategory(createReqVO)); } - @GetMapping("/getTreeData") - @Operation(summary = "查询分类树") - public CommonResult> getTreeData() { - List list = materialProductService.getTreeData(DataTypeConstant.DATA_TYPE_CATEGORY); - return success(BeanUtils.toBean(list, MaterialProductRespVO.class)); + @GetMapping("/category-tree") + @Operation(summary = "获取分类树") + public CommonResult> getMaterialCategoryTree() { + return success(materialProductService.getMaterialCategoryTree()); } - @GetMapping("/getProductTreeData") - @Operation(summary = "获取分类和产品树") - public CommonResult> getProductTreeData() { - List list = materialProductService.getTreeData(""); - return success(BeanUtils.toBean(list, MaterialProductRespVO.class)); + @GetMapping("/orig-material/{code}") + @Operation(summary = "根据物料编码获取外部系统原始物料") + public CommonResult getOriginalMaterial(@PathVariable String code) { + return null; } - - @PostMapping("/create") - @Operation(summary = "创建物料大类") - @PreAuthorize("@ss.hasPermission('resource:material-product:create')") - public CommonResult createMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) { - return success(materialProductService.createMaterialProduct(createReqVO)); + + @PostMapping("/save-material") + @Operation(summary = "保存物料大类") +// @PreAuthorize("@ss.hasPermission('qms:material-product:create')") + public CommonResult saveMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO createReqVO) { + return success(materialProductService.saveMaterialProduct(createReqVO)); } + @GetMapping("/page") + @Operation(summary = "获得物料大类分页") +// @PreAuthorize("@ss.hasPermission('qms:material-product:query')") + public CommonResult> getMaterialProductPage(@Valid MaterialProductPageReqVO pageReqVO) { + PageResult pageResult = materialProductService.getMaterialProductPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, MaterialProductRespVO.class)); + } + + @PutMapping("/update") - @Operation(summary = "更新物料大类") - @PreAuthorize("@ss.hasPermission('resource:material-product:update')") + @Operation(summary = "更新物料") + @PreAuthorize("@ss.hasPermission('qms:material-product:update')") public CommonResult updateMaterialProduct(@Valid @RequestBody MaterialProductSaveReqVO updateReqVO) { materialProductService.updateMaterialProduct(updateReqVO); return success(true); } @DeleteMapping("/delete") - @Operation(summary = "删除物料大类") + @Operation(summary = "删除物料") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('resource:material-product:delete')") + @PreAuthorize("@ss.hasPermission('qms:material-product:delete')") public CommonResult deleteMaterialProduct(@RequestParam("id") Long id) { materialProductService.deleteMaterialProduct(id); return success(true); @@ -104,33 +103,25 @@ public class MaterialProductController extends AbstractFileUploadController impl @DeleteMapping("/delete-list") @Parameter(name = "ids", description = "编号", required = true) - @Operation(summary = "批量删除物料大类") - @PreAuthorize("@ss.hasPermission('resource:material-product:delete')") + @Operation(summary = "批量删除物料") + @PreAuthorize("@ss.hasPermission('qms:material-product:delete')") public CommonResult deleteMaterialProductList(@RequestBody BatchDeleteReqVO req) { materialProductService.deleteMaterialProductListByIds(req.getIds()); return success(true); } @GetMapping("/get") - @Operation(summary = "获得物料大类") + @Operation(summary = "获得物料") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('resource:material-product:query')") + @PreAuthorize("@ss.hasPermission('qms:material-product:query')") public CommonResult getMaterialProduct(@RequestParam("id") Long id) { MaterialProductDO materialProduct = materialProductService.getMaterialProduct(id); return success(BeanUtils.toBean(materialProduct, MaterialProductRespVO.class)); } - @GetMapping("/page") - @Operation(summary = "获得物料大类分页") - @PreAuthorize("@ss.hasPermission('resource:material-product:query')") - public CommonResult> getMaterialProductPage(@Valid MaterialProductPageReqVO pageReqVO) { - PageResult pageResult = materialProductService.getMaterialProductPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, MaterialProductRespVO.class)); - } - @GetMapping("/export-excel") - @Operation(summary = "导出物料大类 Excel") - @PreAuthorize("@ss.hasPermission('resource:material-product:export')") + @Operation(summary = "导出物料 Excel") + @PreAuthorize("@ss.hasPermission('qms:material-product:export')") @ApiAccessLog(operateType = EXPORT) public void exportMaterialProductExcel(@Valid MaterialProductPageReqVO pageReqVO, HttpServletResponse response) throws IOException { diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignPageReqVO.java deleted file mode 100644 index 84a398f..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignPageReqVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 物料批次分发分页 Request VO") -@Data -public class MaterialBatchAssignPageReqVO extends PageParam { - - @Schema(description = "源批次ID", example = "23099") - private Long batchId; - - @Schema(description = "产品id", example = "10774") - private String productId; - - @Schema(description = "库房ID", example = "24720") - private Long warehouseId; - - @Schema(description = "数量") - private String inboundQuantity; - - @Schema(description = "暂存位置记录", example = "https://www.iocoder.cn") - private String url; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @Schema(description = "实例ID") - private String materialInfomationId; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignRespVO.java deleted file mode 100644 index 4467bc7..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignRespVO.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 物料批次分发 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialBatchAssignRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15114") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "源批次ID", example = "23099") - @ExcelProperty("源批次ID") - private Long batchId; - - @Schema(description = "产品id", example = "10774") - @ExcelProperty("产品id") - private String productId; - - @Schema(description = "库房ID", example = "24720") - @ExcelProperty("库房ID") - private Long warehouseId; - - @Schema(description = "数量") - @ExcelProperty("数量") - private String inboundQuantity; - - @Schema(description = "暂存位置记录", example = "https://www.iocoder.cn") - @ExcelProperty("暂存位置记录") - private String url; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignSaveReqVO.java deleted file mode 100644 index 50c068b..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchAssignSaveReqVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 物料批次分发新增/修改 Request VO") -@Data -public class MaterialBatchAssignSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15114") - private Long id; - - @Schema(description = "源批次ID",requiredMode = Schema.RequiredMode.REQUIRED, example = "23099") - private Long batchId; - - @Schema(description = "产品id", example = "10774") - private String productId; - - @Schema(description = "库房ID",requiredMode = Schema.RequiredMode.REQUIRED, example = "24720") - private Long warehouseId; - - @Schema(description = "数量") - private String inboundQuantity; - - @Schema(description = "暂存位置记录", example = "https://www.iocoder.cn") - private String url; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchPageReqVO.java index 5859a1a..51d2fdd 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchPageReqVO.java @@ -4,6 +4,8 @@ import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; import com.zt.plat.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDate; import java.time.LocalDateTime; import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -12,7 +14,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @Data public class MaterialBatchPageReqVO extends PageParam { - @Schema(description = "产品id", example = "16851") + @Schema(description = "物料大类id", example = "9381") private Long productId; @Schema(description = "批次编号") @@ -24,20 +26,29 @@ public class MaterialBatchPageReqVO extends PageParam { @Schema(description = "存放位置描述") private String location; - @Schema(description = "供应商id", example = "6956") + @Schema(description = "供应商id", example = "3737") private Long supplierId; @Schema(description = "生产日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] manufacturerDate; + private LocalDate[] manufacturerDate; @Schema(description = "到期日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] dueDate; + private LocalDate[] dueDate; @Schema(description = "验收状态", example = "1") private String acceptanceStatus; + @Schema(description = "是否检化验,1-是，0-否") + private Integer assayFlag; + + @Schema(description = "检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过", example = "2") + private String assayStatus; + + @Schema(description = "检化验结果") + private String assayResult; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java index b16bce3..3de390a 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java @@ -2,7 +2,9 @@ package com.zt.plat.module.qms.resource.material.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; @@ -11,12 +13,12 @@ import com.alibaba.excel.annotation.*; @ExcelIgnoreUnannotated public class MaterialBatchRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25470") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9716") @ExcelProperty("主键") private Long id; - @Schema(description = "产品id", example = "16851") - @ExcelProperty("产品id") + @Schema(description = "物料大类id", example = "9381") + @ExcelProperty("物料大类id") private Long productId; @Schema(description = "批次编号") @@ -31,22 +33,34 @@ public class MaterialBatchRespVO { @ExcelProperty("存放位置描述") private String location; - @Schema(description = "供应商id", example = "6956") + @Schema(description = "供应商id", example = "3737") @ExcelProperty("供应商id") private Long supplierId; @Schema(description = "生产日期") @ExcelProperty("生产日期") - private LocalDateTime manufacturerDate; + private LocalDate manufacturerDate; @Schema(description = "到期日期") @ExcelProperty("到期日期") - private LocalDateTime dueDate; + private LocalDate dueDate; @Schema(description = "验收状态", example = "1") @ExcelProperty("验收状态") private String acceptanceStatus; + @Schema(description = "是否检化验,1-是，0-否") + @ExcelProperty("是否检化验,1-是，0-否") + private Integer assayFlag; + + @Schema(description = "检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过", example = "2") + @ExcelProperty("检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过") + private String assayStatus; + + @Schema(description = "检化验结果") + @ExcelProperty("检化验结果") + private String assayResult; + @Schema(description = "所属部门") @ExcelProperty("所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchSaveReqVO.java index f4e1fca..ffb5ca6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchSaveReqVO.java @@ -2,17 +2,18 @@ package com.zt.plat.module.qms.resource.material.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import jakarta.validation.constraints.*; -import java.time.LocalDateTime; +import java.time.LocalDate; @Schema(description = "管理后台 - 物料批次新增/修改 Request VO") @Data public class MaterialBatchSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25470") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9716") private Long id; - @Schema(description = "产品id", example = "16851") + @Schema(description = "物料大类id", example = "9381") private Long productId; @Schema(description = "批次编号") @@ -24,18 +25,27 @@ public class MaterialBatchSaveReqVO { @Schema(description = "存放位置描述") private String location; - @Schema(description = "供应商id", example = "6956") + @Schema(description = "供应商id", example = "3737") private Long supplierId; @Schema(description = "生产日期") - private LocalDateTime manufacturerDate; + private LocalDate manufacturerDate; @Schema(description = "到期日期") - private LocalDateTime dueDate; + private LocalDate dueDate; @Schema(description = "验收状态", example = "1") private String acceptanceStatus; + @Schema(description = "是否检化验,1-是，0-否") + private Integer assayFlag; + + @Schema(description = "检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过", example = "2") + private String assayStatus; + + @Schema(description = "检化验结果") + private String assayResult; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationPageReqVO.java index adbfb68..215b82b 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationPageReqVO.java @@ -1,12 +1,12 @@ package com.zt.plat.module.qms.resource.material.controller.vo; -import com.zt.plat.framework.common.pojo.PageParam; +import lombok.*; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import com.zt.plat.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -14,13 +14,13 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @Data public class MaterialInfomationPageReqVO extends PageParam { - @Schema(description = "物料大类id", example = "23383") + @Schema(description = "物料大类id", example = "2691") private Long productId; - @Schema(description = "批次id", example = "30468") + @Schema(description = "批次id", example = "2703") private Long batchId; - @Schema(description = "存放位置", example = "10632") + @Schema(description = "存放位置", example = "13603") private String locationId; @Schema(description = "编码") @@ -29,34 +29,40 @@ public class MaterialInfomationPageReqVO extends PageParam { @Schema(description = "技术参数") private String parameter; - @Schema(description = "负责人id", example = "10411") + @Schema(description = "上架状态,0-未上架，1-已上架", example = "2") + private Integer publishStatus; + + @Schema(description = "领用状态,0-未领用，1-已领用", example = "1") + private Integer usageStatus; + + @Schema(description = "所属部门ID", example = "16158") + private Integer managerDepartmentId; + + @Schema(description = "领用人部门", example = "王五") + private String managerDepartmentName; + + @Schema(description = "负责人id", example = "7209") private Long managerUserId; @Schema(description = "负责人", example = "张三") private String managerUserName; - @Schema(description = "上架状态,0-未上架；1-已上架，默认0", example = "2") - private String publishStatus; + @Schema(description = "开封状态,0-未开封，1-已开封", example = "2") + private Integer openStatus; - @Schema(description = "领用状态", example = "1") - private String usageStatus; - - @Schema(description = "开封状态", example = "1") - private String openStatus; - - @Schema(description = "开封人", example = "李四") - private String openUserName; - - @Schema(description = "开封人id", example = "3244") + @Schema(description = "开封人id", example = "8280") private Long openUserId; + @Schema(description = "开封人", example = "王五") + private String openUserName; + @Schema(description = "开封日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] openDate; @Schema(description = "到期日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] expirationDate; + private LocalDate[] expirationDate; @Schema(description = "过期状态") private String expirationFlag; @@ -64,6 +70,9 @@ public class MaterialInfomationPageReqVO extends PageParam { @Schema(description = "剩余量") private String remainingVolume; + @Schema(description = "用完标记,0-未标记，1-已用完标记") + private Integer useEndFlag; + @Schema(description = "所属部门") private String systemDepartmentCode; @@ -74,12 +83,4 @@ public class MaterialInfomationPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - //===================扩展属性============== - @Schema(description = "大类ids") - List productIds; - - @Schema(description = "入库id") - private Long inventoryInboundId; - - } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java index 44f73a6..663cf72 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java @@ -1,31 +1,31 @@ package com.zt.plat.module.qms.resource.material.controller.vo; -import com.zt.plat.module.qms.core.aspect.annotation.Dict; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import lombok.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; @Schema(description = "管理后台 - 物料实例 Response VO") @Data @ExcelIgnoreUnannotated public class MaterialInfomationRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25067") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13447") @ExcelProperty("主键") private Long id; - @Schema(description = "物料大类id", example = "23383") + @Schema(description = "物料大类id", example = "2691") @ExcelProperty("物料大类id") private Long productId; - @Schema(description = "批次id", example = "30468") + @Schema(description = "批次id", example = "2703") @ExcelProperty("批次id") private Long batchId; - @Schema(description = "存放位置", example = "10632") + @Schema(description = "存放位置", example = "13603") @ExcelProperty("存放位置") private String locationId; @@ -37,7 +37,23 @@ public class MaterialInfomationRespVO { @ExcelProperty("技术参数") private String parameter; - @Schema(description = "负责人id", example = "10411") + @Schema(description = "上架状态,0-未上架，1-已上架", example = "2") + @ExcelProperty("上架状态,0-未上架，1-已上架") + private Integer publishStatus; + + @Schema(description = "领用状态,0-未领用，1-已领用", example = "1") + @ExcelProperty("领用状态,0-未领用，1-已领用") + private Integer usageStatus; + + @Schema(description = "所属部门ID", example = "16158") + @ExcelProperty("所属部门ID") + private Integer managerDepartmentId; + + @Schema(description = "领用人部门", example = "王五") + @ExcelProperty("领用人部门") + private String managerDepartmentName; + + @Schema(description = "负责人id", example = "7209") @ExcelProperty("负责人id") private Long managerUserId; @@ -45,46 +61,38 @@ public class MaterialInfomationRespVO { @ExcelProperty("负责人") private String managerUserName; - @Schema(description = "上架状态,0-未上架；1-已上架，默认0", example = "2") - @ExcelProperty("上架状态,0-未上架；1-已上架，默认0") - @Dict(dicCode = "yes_or_no") - private String publishStatus; + @Schema(description = "开封状态,0-未开封，1-已开封", example = "2") + @ExcelProperty("开封状态,0-未开封，1-已开封") + private Integer openStatus; - @Schema(description = "领用状态", example = "1") - @ExcelProperty("领用状态") - @Dict(dicCode = "yes_or_no") - private String usageStatus; - - @Schema(description = "开封状态", example = "1") - @ExcelProperty("开封状态") - @Dict(dicCode = "yes_or_no") - private String openStatus; - - @Schema(description = "开封人", example = "李四") - @ExcelProperty("开封人") - private String openUserName; - - @Schema(description = "开封人id", example = "3244") + @Schema(description = "开封人id", example = "8280") @ExcelProperty("开封人id") private Long openUserId; + @Schema(description = "开封人", example = "王五") + @ExcelProperty("开封人") + private String openUserName; + @Schema(description = "开封日期") @ExcelProperty("开封日期") private LocalDateTime openDate; @Schema(description = "到期日期") @ExcelProperty("到期日期") - private LocalDateTime expirationDate; + private LocalDate expirationDate; @Schema(description = "过期状态") @ExcelProperty("过期状态") - @Dict(dicCode = "yes_or_no") private String expirationFlag; @Schema(description = "剩余量") @ExcelProperty("剩余量") private String remainingVolume; + @Schema(description = "用完标记,0-未标记，1-已用完标记") + @ExcelProperty("用完标记,0-未标记，1-已用完标记") + private Integer useEndFlag; + @Schema(description = "所属部门") @ExcelProperty("所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationSaveReqVO.java index f2966db..45d85b0 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationSaveReqVO.java @@ -1,24 +1,27 @@ package com.zt.plat.module.qms.resource.material.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; +import lombok.*; +import jakarta.validation.constraints.*; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDate; import java.time.LocalDateTime; @Schema(description = "管理后台 - 物料实例新增/修改 Request VO") @Data public class MaterialInfomationSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25067") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13447") private Long id; - @Schema(description = "物料大类id", example = "23383") + @Schema(description = "物料大类id", example = "2691") private Long productId; - @Schema(description = "批次id", example = "30468") + @Schema(description = "批次id", example = "2703") private Long batchId; - @Schema(description = "存放位置", example = "10632") + @Schema(description = "存放位置", example = "13603") private String locationId; @Schema(description = "编码") @@ -27,32 +30,38 @@ public class MaterialInfomationSaveReqVO { @Schema(description = "技术参数") private String parameter; - @Schema(description = "负责人id", example = "10411") + @Schema(description = "上架状态,0-未上架，1-已上架", example = "2") + private Integer publishStatus; + + @Schema(description = "领用状态,0-未领用，1-已领用", example = "1") + private Integer usageStatus; + + @Schema(description = "所属部门ID", example = "16158") + private Integer managerDepartmentId; + + @Schema(description = "领用人部门", example = "王五") + private String managerDepartmentName; + + @Schema(description = "负责人id", example = "7209") private Long managerUserId; @Schema(description = "负责人", example = "张三") private String managerUserName; - @Schema(description = "上架状态,0-未上架；1-已上架，默认0", example = "2") - private String publishStatus; + @Schema(description = "开封状态,0-未开封，1-已开封", example = "2") + private Integer openStatus; - @Schema(description = "领用状态", example = "1") - private String usageStatus; - - @Schema(description = "开封状态", example = "1") - private String openStatus; - - @Schema(description = "开封人", example = "李四") - private String openUserName; - - @Schema(description = "开封人id", example = "3244") + @Schema(description = "开封人id", example = "8280") private Long openUserId; + @Schema(description = "开封人", example = "王五") + private String openUserName; + @Schema(description = "开封日期") private LocalDateTime openDate; @Schema(description = "到期日期") - private LocalDateTime expirationDate; + private LocalDate expirationDate; @Schema(description = "过期状态") private String expirationFlag; @@ -60,6 +69,9 @@ public class MaterialInfomationSaveReqVO { @Schema(description = "剩余量") private String remainingVolume; + @Schema(description = "用完标记,0-未标记，1-已用完标记") + private Integer useEndFlag; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchPageReqVO.java deleted file mode 100644 index 2d809ed..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchPageReqVO.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 库存盘点项分页 Request VO") -@Data -public class MaterialInventoryCheckBatchPageReqVO extends PageParam { - - @Schema(description = "父id", example = "9310") - private Long checkId; - - @Schema(description = "盘点物料大类ID", example = "18437") - private Long checkProductId; - - @Schema(description = "盘点部门ID", example = "17789") - private Long checkDepartmentId; - - @Schema(description = "应有量") - private String expected; - - @Schema(description = "实有量") - private String actual; - - @Schema(description = "差异") - private String difference; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchRespVO.java deleted file mode 100644 index 7b6b546..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchRespVO.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 库存盘点项 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryCheckBatchRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12065") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "父id", example = "9310") - @ExcelProperty("父id") - private Long checkId; - - @Schema(description = "盘点物料大类ID", example = "18437") - @ExcelProperty("盘点物料大类ID") - private Long checkProductId; - - @Schema(description = "盘点部门ID", example = "17789") - @ExcelProperty("盘点部门ID") - private Long checkDepartmentId; - - @Schema(description = "应有量") - @ExcelProperty("应有量") - private String expected; - - @Schema(description = "实有量") - @ExcelProperty("实有量") - private String actual; - - @Schema(description = "差异") - @ExcelProperty("差异") - private String difference; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchSaveReqVO.java deleted file mode 100644 index 0c5abc9..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckBatchSaveReqVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; - -@Schema(description = "管理后台 - 库存盘点项新增/修改 Request VO") -@Data -public class MaterialInventoryCheckBatchSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "12065") - private Long id; - - @Schema(description = "父id", example = "9310") - private Long checkId; - - @Schema(description = "盘点物料大类ID", example = "18437") - private Long checkProductId; - - @Schema(description = "盘点部门ID", example = "17789") - private Long checkDepartmentId; - - @Schema(description = "应有量") - private String expected; - - @Schema(description = "实有量") - private String actual; - - @Schema(description = "差异") - private String difference; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "盘点明细") - private List detailList; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailPageReqVO.java deleted file mode 100644 index 3faf5da..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailPageReqVO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 库存盘点明细分页 Request VO") -@Data -public class MaterialInventoryCheckDetailPageReqVO extends PageParam { - - @Schema(description = "盘点批次id", example = "12013") - private Long checkBatchId; - - @Schema(description = "物料实例id", example = "2480") - private Long infomationId; - - @Schema(description = "是否存在") - private String present; - - @Schema(description = "当前数量") - private String currentQuantity; - - @Schema(description = "状态", example = "1") - private String status; - - @Schema(description = "处置方式,字典配置") - private String disposalMethod; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailRespVO.java deleted file mode 100644 index 8f8bb3d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailRespVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 库存盘点明细 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryCheckDetailRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16347") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "盘点批次id", example = "12013") - @ExcelProperty("盘点批次id") - private Long checkBatchId; - - @Schema(description = "物料实例id", example = "2480") - @ExcelProperty("物料实例id") - private Long infomationId; - - @Schema(description = "是否存在") - @ExcelProperty("是否存在") - private String present; - - @Schema(description = "当前数量") - @ExcelProperty("当前数量") - private String currentQuantity; - - @Schema(description = "状态", example = "1") - @ExcelProperty("状态") - private String status; - - @Schema(description = "处置方式,字典配置") - @ExcelProperty("处置方式,字典配置") - private String disposalMethod; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailSaveReqVO.java deleted file mode 100644 index 8fbdd90..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckDetailSaveReqVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 库存盘点明细新增/修改 Request VO") -@Data -public class MaterialInventoryCheckDetailSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "16347") - private Long id; - - @Schema(description = "盘点批次id", example = "12013") - private Long checkBatchId; - - @Schema(description = "物料实例id", example = "2480") - private Long infomationId; - - @Schema(description = "是否存在") - private String present; - - @Schema(description = "当前数量") - private String currentQuantity; - - @Schema(description = "状态", example = "1") - private String status; - - @Schema(description = "处置方式,字典配置") - private String disposalMethod; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckPageReqVO.java deleted file mode 100644 index 679b429..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckPageReqVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import java.util.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 库存盘点分页 Request VO") -@Data -public class MaterialInventoryCheckPageReqVO extends PageParam { - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型", example = "2") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "31128") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "16511") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] applyTime; - - @Schema(description = "流程实例id", example = "6407") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "2") - private String flowStatus; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @Schema(description = "主键") - private Long id; -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckRespVO.java deleted file mode 100644 index 2e1821d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckRespVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 库存盘点 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryCheckRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2275") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "标题") - @ExcelProperty("标题") - private String title; - - @Schema(description = "业务类型", example = "2") - @ExcelProperty("业务类型") - private String businessType; - - @Schema(description = "业务类型编码") - @ExcelProperty("业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - @ExcelProperty("申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "31128") - @ExcelProperty("申请人id") - private Long applyUserId; - - @Schema(description = "申请部门") - @ExcelProperty("申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "16511") - @ExcelProperty("申请部门id") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @ExcelProperty("申请时间") - private LocalDateTime applyTime; - - @Schema(description = "流程实例id", example = "6407") - @ExcelProperty("流程实例id") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "2") - @ExcelProperty("流程审批状态") - private String flowStatus; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "盘点项") - @ExcelProperty("盘点项") - private List batchList; -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckSaveReqVO.java deleted file mode 100644 index 4e794ab..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryCheckSaveReqVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import jakarta.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 库存盘点新增/修改 Request VO") -@Data -public class MaterialInventoryCheckSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2275") - private Long id; - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型", example = "2") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "31128") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "16511") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - private LocalDateTime applyTime; - - @Schema(description = "流程实例id", example = "6407") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "2") - private String flowStatus; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "盘点项") - private List batchList; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailPageReqVO.java deleted file mode 100644 index 1360453..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailPageReqVO.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页 Request VO") -@Data -public class MaterialInventoryInboundDetailPageReqVO extends PageParam { - - @Schema(description = "入库单ID", example = "8031") - private Long inboundId; - - @Schema(description = "分发批次id", example = "24731") - private Long batchAssignId; - - @Schema(description = "入库方式") - private String inboundWay; - - @Schema(description = "物料实例ID", example = "23510") - private Long materialInfomationId; - - @Schema(description = "入库人", example = "赵六") - private String inboundUserName; - - @Schema(description = "入库人id", example = "8857") - private Long inboundUserId; - - @Schema(description = "入库人部门", example = "芋艿") - private String inboundDepartmentName; - - @Schema(description = "入库人部门id", example = "8008") - private Long inboundDepartmentId; - - @Schema(description = "入库时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] inboundTime; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - - @Schema(description = "物料大类Id") - private Long productId; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java deleted file mode 100644 index 654a410..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryInboundDetailRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20724") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "入库单ID", example = "8031") - @ExcelProperty("入库单ID") - private Long inboundId; - - @Schema(description = "分发批次id", example = "24731") - @ExcelProperty("分发批次id") - private Long batchAssignId; - - @Schema(description = "入库方式") - @ExcelProperty("入库方式") - private String inboundWay; - - @Schema(description = "物料实例ID", example = "23510") - @ExcelProperty("物料实例ID") - private Long materialInfomationId; - - @Schema(description = "入库人", example = "赵六") - @ExcelProperty("入库人") - private String inboundUserName; - - @Schema(description = "入库人id", example = "8857") - @ExcelProperty("入库人id") - private Long inboundUserId; - - @Schema(description = "入库人部门", example = "芋艿") - @ExcelProperty("入库人部门") - private String inboundDepartmentName; - - @Schema(description = "入库人部门id", example = "8008") - @ExcelProperty("入库人部门id") - private Long inboundDepartmentId; - - @Schema(description = "入库时间") - @ExcelProperty("入库时间") - private LocalDateTime inboundTime; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - private Long productId; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailSaveReqVO.java deleted file mode 100644 index ff8aa08..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailSaveReqVO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等新增/修改 Request VO") -@Data -public class MaterialInventoryInboundDetailSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20724") - private Long id; - - @Schema(description = "入库单ID", example = "8031") - private Long inboundId; - - @Schema(description = "分发批次id", example = "24731") - private Long batchAssignId; - - @Schema(description = "入库方式") - private String inboundWay; - - @Schema(description = "物料实例ID", example = "23510") - private Long materialInfomationId; - - @Schema(description = "入库人", example = "赵六") - private String inboundUserName; - - @Schema(description = "入库人id", example = "8857") - private Long inboundUserId; - - @Schema(description = "入库人部门", example = "芋艿") - private String inboundDepartmentName; - - @Schema(description = "入库人部门id", example = "8008") - private Long inboundDepartmentId; - - @Schema(description = "入库时间") - private LocalDateTime inboundTime; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "申请数量") - private Long quantity; - - /** - * 存放位置 - */ - @TableField("LOC_ID") - private String locationId; - - /** - * 物料大类id - */ - @TableField("PDT_ID") - private Long productId; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundPageReqVO.java deleted file mode 100644 index 79a9cff..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundPageReqVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 入库分页 Request VO") -@Data -public class MaterialInventoryInboundPageReqVO extends PageParam { - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "30960") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "666") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] applyTime; - - @Schema(description = "流程实例id", example = "654") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "1") - private String flowStatus; - - @Schema(description = "意见json") - private String commentJson; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundRespVO.java deleted file mode 100644 index 7240943..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundRespVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 入库 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryInboundRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15437") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "标题") - @ExcelProperty("标题") - private String title; - - @Schema(description = "业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1") - @ExcelProperty("业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等") - private String businessType; - - @Schema(description = "业务类型编码") - @ExcelProperty("业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - @ExcelProperty("申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "30960") - @ExcelProperty("申请人id") - private Long applyUserId; - - @Schema(description = "申请部门") - @ExcelProperty("申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "666") - @ExcelProperty("申请部门id") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @ExcelProperty("申请时间") - private LocalDateTime applyTime; - - @Schema(description = "流程实例id", example = "654") - @ExcelProperty("流程实例id") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "1") - @ExcelProperty("流程审批状态") - private String flowStatus; - - @Schema(description = "意见json") - @ExcelProperty("意见json") - private String commentJson; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundSaveReqVO.java deleted file mode 100644 index d2d2d4f..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundSaveReqVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 入库新增/修改 Request VO") -@Data -public class MaterialInventoryInboundSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "15437") - private Long id; - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "30960") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "666") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - private LocalDateTime applyTime; - - @Schema(description = "流程实例id", example = "654") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "1") - private String flowStatus; - - @Schema(description = "意见json") - private String commentJson; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "详情",requiredMode = Schema.RequiredMode.REQUIRED) - private MaterialInventoryInboundDetailSaveReqVO detail; - - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailPageReqVO.java deleted file mode 100644 index 6fab815..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailPageReqVO.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页 Request VO") -@Data -public class MaterialInventoryOutboundDetailPageReqVO extends PageParam { - - @Schema(description = "出库单id", example = "21793") - private Long parentId; - - @Schema(description = "物料实例id", example = "13656") - private Long infomationId; - - @Schema(description = "数量") - private String quantity; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailRespVO.java deleted file mode 100644 index 7d9aeda..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailRespVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryOutboundDetailRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20579") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "出库单id", example = "21793") - @ExcelProperty("出库单id") - private Long parentId; - - @Schema(description = "物料实例id", example = "13656") - @ExcelProperty("物料实例id") - private Long infomationId; - - @Schema(description = "数量") - @ExcelProperty("数量") - private String quantity; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailSaveReqVO.java deleted file mode 100644 index f935063..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundDetailSaveReqVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等新增/修改 Request VO") -@Data -public class MaterialInventoryOutboundDetailSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20579") - private Long id; - - @Schema(description = "出库单id", example = "21793") - private Long parentId; - - @Schema(description = "物料实例id", example = "13656") - private Long infomationId; - - @Schema(description = "数量") - private String quantity; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundPageReqVO.java deleted file mode 100644 index bb2f7fd..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundPageReqVO.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 出库分页 Request VO") -@Data -public class MaterialInventoryOutboundPageReqVO extends PageParam { - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "22585") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "22046") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] applyTime; - - @Schema(description = "监督人") - private String checkUser; - - @Schema(description = "监督人id", example = "30131") - private Long checkUserId; - - @Schema(description = "流程实例id", example = "4828") - private String flowInstanceId; - - @Schema(description = "意见json") - private String commentJson; - - @Schema(description = "流程审批状态", example = "1") - private String flowStatus; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundRespVO.java deleted file mode 100644 index 7833d9f..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundRespVO.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.List; - -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 出库 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryOutboundRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28833") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "标题") - @ExcelProperty("标题") - private String title; - - @Schema(description = "业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1") - @ExcelProperty("业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等") - private String businessType; - - @Schema(description = "业务类型编码") - @ExcelProperty("业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - @ExcelProperty("申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "22585") - @ExcelProperty("申请人id") - private Long applyUserId; - - @Schema(description = "申请部门") - @ExcelProperty("申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "22046") - @ExcelProperty("申请部门id") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @ExcelProperty("申请时间") - private LocalDateTime applyTime; - - @Schema(description = "监督人") - @ExcelProperty("监督人") - private String checkUser; - - @Schema(description = "监督人id", example = "30131") - @ExcelProperty("监督人id") - private Long checkUserId; - - @Schema(description = "流程实例id", example = "4828") - @ExcelProperty("流程实例id") - private String flowInstanceId; - - @Schema(description = "意见json") - @ExcelProperty("意见json") - private String commentJson; - - @Schema(description = "流程审批状态", example = "1") - @ExcelProperty("流程审批状态") - private String flowStatus; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @Schema(description = "出库明细") - private List detailReqVoList; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundSaveReqVO.java deleted file mode 100644 index d18d512..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryOutboundSaveReqVO.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import java.util.List; - -@Schema(description = "管理后台 - 出库新增/修改 Request VO") -@Data -public class MaterialInventoryOutboundSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28833") - private Long id; - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等", example = "1") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "22585") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "22046") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - private LocalDateTime applyTime; - - @Schema(description = "监督人") - private String checkUser; - - @Schema(description = "监督人id", example = "30131") - private Long checkUserId; - - @Schema(description = "流程实例id", example = "4828") - private String flowInstanceId; - - @Schema(description = "意见json") - private String commentJson; - - @Schema(description = "流程审批状态", example = "1") - private String flowStatus; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - - @Schema(description = "出库明细") - private List detailSaveReqVoList; -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryPageReqVO.java deleted file mode 100644 index 9ad6f34..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryPageReqVO.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.zt.plat.framework.common.pojo.PageParam; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 库存列表分页 Request VO") -@Data -public class MaterialInventoryPageReqVO extends PageParam { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.AUTO, example = "32133") - private Long id; - - @Schema(description = "父id", example = "6098") - private Long parentId; - - @Schema(description = "id路径") - private String idPath; - - @Schema(description = "节点类型,分类|产品", example = "2") - private String nodeType; - - @Schema(description = "名称", example = "张三") - private String name; - - @Schema(description = "其他配置") - private String customConfig; - - @Schema(description = "自定义表单") - private String customForm; - - @Schema(description = "扩展数据") - private String customData; - - @Schema(description = "标签") - private String tag; - - @Schema(description = "标签模板") - private String labelTemplateKey; - - @Schema(description = "型号") - private String modelNo; - - @Schema(description = "规格") - private String specification; - - @Schema(description = "技术参数") - private String parameter; - - @Schema(description = "制造商") - private String manufacturer; - - @Schema(description = "单位") - private String unit; - - @Schema(description = "允许按量领取") - private String enablePartial; - - @Schema(description = "保质期（天）") - private Integer due; - - @Schema(description = "开封后保质期是否变化") - private String openDueFlag; - - @Schema(description = "开封后保质期（天）") - private Integer openDueAfter; - - @Schema(description = "是否危险品") - private String hazardous; - - @Schema(description = "是否标准溶液") - private String standardSolutionFlag; - - @Schema(description = "是否标准物质") - private String standardMaterialFlag; - - @Schema(description = "复标周期,单位：天。小于等于0-不复标") - private Integer reviewDue; - - @Schema(description = "排序号") - private Integer sortNo; - - @Schema(description = "禁用") - private String cancelFlag; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryRespVO.java deleted file mode 100644 index efd5ab1..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryRespVO.java +++ /dev/null @@ -1,143 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableField; -import com.zt.plat.framework.common.pojo.PageParam; -import com.zt.plat.module.qms.core.aspect.annotation.Dict; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 库存列表 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialInventoryRespVO extends PageParam { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32133") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "父id", example = "6098") - @ExcelProperty("父id") - private Long parentId; - - @Schema(description = "id路径") - @ExcelProperty("id路径") - private String idPath; - - @Schema(description = "节点类型,分类|产品", example = "2") - @ExcelProperty("节点类型,分类|产品") - private String nodeType; - - @Schema(description = "名称", example = "张三") - @ExcelProperty("名称") - private String name; - - @Schema(description = "其他配置") - @ExcelProperty("其他配置") - private String customConfig; - - @Schema(description = "自定义表单") - @ExcelProperty("自定义表单") - private String customForm; - - @Schema(description = "扩展数据") - @ExcelProperty("扩展数据") - private String customData; - - @Schema(description = "标签") - @ExcelProperty("标签") - private String tag; - - @Schema(description = "标签模板") - @ExcelProperty("标签模板") - private String labelTemplateKey; - - @Schema(description = "型号") - @ExcelProperty("型号") - private String modelNo; - - @Schema(description = "规格") - @ExcelProperty("规格") - private String specification; - - @Schema(description = "技术参数") - @ExcelProperty("技术参数") - private String parameter; - - @Schema(description = "制造商") - @ExcelProperty("制造商") - private String manufacturer; - - @Schema(description = "单位") - @ExcelProperty("单位") - private String unit; - - @Schema(description = "允许按量领取") - @ExcelProperty("允许按量领取") - @Dict(dicCode = "yes_or_no") - private String enablePartial; - - @Schema(description = "保质期（天）") - @ExcelProperty("保质期（天）") - private Integer due; - - @Schema(description = "开封后保质期是否变化") - @ExcelProperty("开封后保质期是否变化") - @Dict(dicCode = "yes_or_no") - private String openDueFlag; - - @Schema(description = "开封后保质期（天）") - @ExcelProperty("开封后保质期（天）") - private Integer openDueAfter; - - @Schema(description = "是否危险品") - @ExcelProperty("是否危险品") - @Dict(dicCode = "yes_or_no") - private String hazardous; - - @Schema(description = "是否标准溶液") - @ExcelProperty("是否标准溶液") - @Dict(dicCode = "yes_or_no") - private String standardSolutionFlag; - - @Schema(description = "是否标准物质") - @ExcelProperty("是否标准物质") - @Dict(dicCode = "yes_or_no") - private String standardMaterialFlag; - - @Schema(description = "复标周期,单位：天。小于等于0-不复标") - @ExcelProperty("复标周期") - private Integer reviewDue; - - @Schema(description = "排序号") - @ExcelProperty("排序号") - private Integer sortNo; - - @Schema(description = "禁用") - @ExcelProperty("禁用") - private String cancelFlag; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - /** - * 总数量 - */ - @TableField("INB_QTY") - @Schema(description = "库存总量") - @ExcelProperty("库存总量") - private Long inboundQuantity; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailPageReqVO.java deleted file mode 100644 index 3c76d1d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailPageReqVO.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 物料通用流程明细,对应生命周期的明细分页 Request VO") -@Data -public class MaterialLifecycleDetailPageReqVO extends PageParam { - - @Schema(description = "父ID", example = "24095") - private Long materialLifecycleId; - - @Schema(description = "物料批次编号", example = "30393") - private Long batchId; - - @Schema(description = "物料大类编号", example = "1020") - private String categoryProductId; - - @Schema(description = "物料实例编号", example = "11872") - private Long infomationId; - - @Schema(description = "影响数量", example = "28166") - private String influenceCount; - - @Schema(description = "明细操作类型", example = "2") - private String businessType; - - @Schema(description = "处理状态", example = "1") - private Integer treatmentStatus; - - @Schema(description = "表单数据,表单数据") - private String formData; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "公司名称", example = "赵六") - private String companyName; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java deleted file mode 100644 index bfa9230..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 物料通用流程明细,对应生命周期的明细 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialLifecycleDetailRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30686") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "父ID", example = "24095") - @ExcelProperty("父ID") - private Long materialLifecycleId; - - @Schema(description = "物料批次编号", example = "30393") - @ExcelProperty("物料批次编号") - private Long batchId; - - @Schema(description = "物料大类编号", example = "1020") - @ExcelProperty("物料大类编号") - private String categoryProductId; - - @Schema(description = "物料实例编号", example = "11872") - @ExcelProperty("物料实例编号") - private Long infomationId; - - @Schema(description = "影响数量", example = "28166") - @ExcelProperty("影响数量") - private String influenceCount; - - @Schema(description = "明细操作类型", example = "2") - @ExcelProperty("明细操作类型") - private String businessType; - - @Schema(description = "处理状态", example = "1") - @ExcelProperty("处理状态") - private Integer treatmentStatus; - - @Schema(description = "表单数据,表单数据") - @ExcelProperty("表单数据,表单数据") - private String formData; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "公司编号", example = "2613") - @ExcelProperty("公司编号") - private Long companyId; - - @Schema(description = "公司名称", example = "赵六") - @ExcelProperty("公司名称") - private String companyName; - - @Schema(description = "部门编号", example = "32413") - @ExcelProperty("部门编号") - private Long deptId; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java deleted file mode 100644 index f10eff0..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailSaveReqVO.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -@Schema(description = "管理后台 - 物料通用流程明细,对应生命周期的明细新增/修改 Request VO") -@Data -public class MaterialLifecycleDetailSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "30686") - private Long id; - - @Schema(description = "父ID", example = "24095") - private Long materialLifecycleId; - - @Schema(description = "物料批次编号", example = "30393") - private Long batchId; - - @Schema(description = "物料大类编号", example = "1020") - private String categoryProductId; - - @Schema(description = "物料实例编号", example = "11872") - private Long infomationId; - - @Schema(description = "影响数量", example = "28166") - private String influenceCount; - - @Schema(description = "明细操作类型", example = "2") - private String businessType; - - @Schema(description = "处理状态", example = "1") - private Integer treatmentStatus; - - @Schema(description = "表单数据,表单数据") - private String formData; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "公司编号", example = "2613") - private Long companyId; - - @Schema(description = "公司名称", example = "赵六") - private String companyName; - - @Schema(description = "备注") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecyclePageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecyclePageReqVO.java deleted file mode 100644 index 1eee388..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecyclePageReqVO.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import lombok.*; -import io.swagger.v3.oas.annotations.media.Schema; -import com.zt.plat.framework.common.pojo.PageParam; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; - -@Schema(description = "管理后台 - 物料通用流程分页 Request VO") -@Data -public class MaterialLifecyclePageReqVO extends PageParam { - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "29846") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "7174") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] applyTime; - - @Schema(description = "表单数据,表单数据") - private String formData; - - @Schema(description = "流程实例id", example = "28688") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "2") - private String flowStatus; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - - @Schema(description = "创建时间") - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) - private LocalDateTime[] createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleRespVO.java deleted file mode 100644 index 10c00c1..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleRespVO.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; -import com.alibaba.excel.annotation.*; - -@Schema(description = "管理后台 - 物料通用流程 Response VO") -@Data -@ExcelIgnoreUnannotated -public class MaterialLifecycleRespVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4561") - @ExcelProperty("主键") - private Long id; - - @Schema(description = "标题") - @ExcelProperty("标题") - private String title; - - @Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2") - @ExcelProperty("业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请") - private String businessType; - - @Schema(description = "业务类型编码") - @ExcelProperty("业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - @ExcelProperty("申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "29846") - @ExcelProperty("申请人id") - private Long applyUserId; - - @Schema(description = "申请部门") - @ExcelProperty("申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "7174") - @ExcelProperty("申请部门id") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - @ExcelProperty("申请时间") - private LocalDateTime applyTime; - - @Schema(description = "表单数据,表单数据") - @ExcelProperty("表单数据,表单数据") - private String formData; - - @Schema(description = "流程实例id", example = "28688") - @ExcelProperty("流程实例id") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "2") - @ExcelProperty("流程审批状态") - private String flowStatus; - - @Schema(description = "所属部门") - @ExcelProperty("所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - @ExcelProperty("备注") - private String remark; - - @Schema(description = "创建时间") - @ExcelProperty("创建时间") - private LocalDateTime createTime; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java deleted file mode 100644 index d3a28c0..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleSaveReqVO.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.zt.plat.module.qms.resource.material.controller.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; - -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 物料通用流程新增/修改 Request VO") -@Data -public class MaterialLifecycleSaveReqVO { - - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4561") - private Long id; - - @Schema(description = "标题") - private String title; - - @Schema(description = "业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请", example = "2") - private String businessType; - - @Schema(description = "业务类型编码") - private String businessTypeCode; - - @Schema(description = "申请人") - private String applyUser; - - @Schema(description = "申请人id", example = "29846") - private Long applyUserId; - - @Schema(description = "申请部门") - private String applyDepartment; - - @Schema(description = "申请部门id", example = "7174") - private Long applyDepartmentId; - - @Schema(description = "申请时间") - private LocalDateTime applyTime; - - @Schema(description = "表单数据,表单数据") - private String formData; - - @Schema(description = "流程实例id", example = "28688") - private String flowInstanceId; - - @Schema(description = "流程审批状态", example = "2") - private String flowStatus; - - @Schema(description = "所属部门") - private String systemDepartmentCode; - - @Schema(description = "备注") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationPageReqVO.java index 919bb9a..b005635 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationPageReqVO.java @@ -1,6 +1,7 @@ package com.zt.plat.module.qms.resource.material.controller.vo; import lombok.*; +import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import com.zt.plat.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; @@ -12,7 +13,7 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @Data public class MaterialLocationPageReqVO extends PageParam { - @Schema(description = "上级id", example = "15203") + @Schema(description = "上级id", example = "9092") private Long parentId; @Schema(description = "名称", example = "赵六") @@ -21,12 +22,12 @@ public class MaterialLocationPageReqVO extends PageParam { @Schema(description = "编码") private String code; - @Schema(description = "编码路径") - private String codePath; - @Schema(description = "容量") private String capacity; + @Schema(description = "位置") + private String location; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationRespVO.java index 1977648..8dd33dc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationRespVO.java @@ -2,7 +2,8 @@ package com.zt.plat.module.qms.resource.material.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; - +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; @@ -11,11 +12,11 @@ import com.alibaba.excel.annotation.*; @ExcelIgnoreUnannotated public class MaterialLocationRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7748") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32724") @ExcelProperty("主键") private Long id; - @Schema(description = "上级id", example = "15203") + @Schema(description = "上级id", example = "9092") @ExcelProperty("上级id") private Long parentId; @@ -27,14 +28,14 @@ public class MaterialLocationRespVO { @ExcelProperty("编码") private String code; - @Schema(description = "编码路径") - @ExcelProperty("编码路径") - private String codePath; - @Schema(description = "容量") @ExcelProperty("容量") private String capacity; + @Schema(description = "位置") + @ExcelProperty("位置") + private String location; + @Schema(description = "所属部门") @ExcelProperty("所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationSaveReqVO.java index 0bc7590..1d3b410 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLocationSaveReqVO.java @@ -2,15 +2,17 @@ package com.zt.plat.module.qms.resource.material.controller.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 存放位置新增/修改 Request VO") @Data public class MaterialLocationSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "7748") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32724") private Long id; - @Schema(description = "上级id", example = "15203") + @Schema(description = "上级id", example = "9092") private Long parentId; @Schema(description = "名称", example = "赵六") @@ -19,12 +21,12 @@ public class MaterialLocationSaveReqVO { @Schema(description = "编码") private String code; - @Schema(description = "编码路径") - private String codePath; - @Schema(description = "容量") private String capacity; + @Schema(description = "位置") + private String location; + @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductPageReqVO.java index 4a901a3..a929935 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductPageReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductPageReqVO.java @@ -13,16 +13,16 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH @Data public class MaterialProductPageReqVO extends PageParam { - @Schema(description = "父id", example = "6098") + @Schema(description = "父id", example = "7533") private Long parentId; @Schema(description = "id路径") private String idPath; - @Schema(description = "节点类型,分类|产品", example = "2") - private String nodeType; + @Schema(description = "编码,原始数据编码") + private String code; - @Schema(description = "名称", example = "张三") + @Schema(description = "名称", example = "ZT") private String name; @Schema(description = "其他配置") @@ -55,35 +55,44 @@ public class MaterialProductPageReqVO extends PageParam { @Schema(description = "单位") private String unit; - @Schema(description = "允许按量领取") - private String enablePartial; + @Schema(description = "允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走") + private Integer enablePartial; @Schema(description = "保质期（天）") - private Integer due; + private Integer[] due; - @Schema(description = "开封后保质期是否变化") - private String openDueFlag; + @Schema(description = "开封后保质期是否变化,1-是，0-否") + private Integer openDueFlag; @Schema(description = "开封后保质期（天）") - private Integer openDueAfter; + private Integer[] openDueAfter; - @Schema(description = "是否危险品") - private String hazardous; + @Schema(description = "是否危险品,1-是，0-否") + private Integer hazardous; - @Schema(description = "是否标准溶液") - private String standardSolutionFlag; + @Schema(description = "是否标准溶液,1-是，0-否") + private Integer standardSolutionFlag; - @Schema(description = "是否标准物质") - private String standardMaterialFlag; + @Schema(description = "是否标准物质,1-是，0-否") + private Integer standardMaterialFlag; @Schema(description = "复标周期,单位：天。小于等于0-不复标") - private Integer reviewDue; + private Integer[] reviewDue; @Schema(description = "排序号") private Integer sortNo; - @Schema(description = "禁用") - private String cancelFlag; + @Schema(description = "禁用标识") + private Integer cancelFlag; + + @Schema(description = "是否检化验,1-是，0-否") + private Integer assayFlag; + + @Schema(description = "是否进行库存预警,1-是，0-否") + private Integer InventoryAlarmFlag; + + @Schema(description = "库存预警区间,json格式配置") + private String InventoryAlarmRange; @Schema(description = "所属部门") private String systemDepartmentCode; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductRespVO.java index dc51e5e..4da4890 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductRespVO.java @@ -1,23 +1,23 @@ package com.zt.plat.module.qms.resource.material.controller.vo; -import com.zt.plat.module.qms.core.aspect.annotation.Dict; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; +import java.util.List; @Schema(description = "管理后台 - 物料大类 Response VO") @Data @ExcelIgnoreUnannotated public class MaterialProductRespVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32133") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "23369") @ExcelProperty("主键") private Long id; - @Schema(description = "父id", example = "6098") + @Schema(description = "父id", example = "7533") @ExcelProperty("父id") private Long parentId; @@ -25,11 +25,15 @@ public class MaterialProductRespVO { @ExcelProperty("id路径") private String idPath; - @Schema(description = "节点类型,分类|产品", example = "2") - @ExcelProperty("节点类型,分类|产品") + @Schema(description = "节点类型,分类|物料", example = "1") + @ExcelProperty("节点类型,分类|物料") private String nodeType; - @Schema(description = "名称", example = "张三") + @Schema(description = "编码,原始数据编码") + @ExcelProperty("编码,原始数据编码") + private String code; + + @Schema(description = "名称", example = "ZT") @ExcelProperty("名称") private String name; @@ -73,50 +77,57 @@ public class MaterialProductRespVO { @ExcelProperty("单位") private String unit; - @Schema(description = "允许按量领取") - @ExcelProperty("允许按量领取") - @Dict(dicCode = "yes_or_no") - private String enablePartial; + @Schema(description = "允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走") + @ExcelProperty("允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走") + private Integer enablePartial; @Schema(description = "保质期（天）") @ExcelProperty("保质期（天）") private Integer due; - @Schema(description = "开封后保质期是否变化") - @ExcelProperty("开封后保质期是否变化") - @Dict(dicCode = "yes_or_no") - private String openDueFlag; + @Schema(description = "开封后保质期是否变化,1-是，0-否") + @ExcelProperty("开封后保质期是否变化,1-是，0-否") + private Integer openDueFlag; @Schema(description = "开封后保质期（天）") @ExcelProperty("开封后保质期（天）") private Integer openDueAfter; - @Schema(description = "是否危险品") - @ExcelProperty("是否危险品") - @Dict(dicCode = "yes_or_no") - private String hazardous; + @Schema(description = "是否危险品,1-是，0-否") + @ExcelProperty("是否危险品,1-是，0-否") + private Integer hazardous; - @Schema(description = "是否标准溶液") - @ExcelProperty("是否标准溶液") - @Dict(dicCode = "yes_or_no") - private String standardSolutionFlag; + @Schema(description = "是否标准溶液,1-是，0-否") + @ExcelProperty("是否标准溶液,1-是，0-否") + private Integer standardSolutionFlag; - @Schema(description = "是否标准物质") - @ExcelProperty("是否标准物质") - @Dict(dicCode = "yes_or_no") - private String standardMaterialFlag; + @Schema(description = "是否标准物质,1-是，0-否") + @ExcelProperty("是否标准物质,1-是，0-否") + private Integer standardMaterialFlag; @Schema(description = "复标周期,单位：天。小于等于0-不复标") - @ExcelProperty("复标周期") + @ExcelProperty("复标周期,单位：天。小于等于0-不复标") private Integer reviewDue; @Schema(description = "排序号") @ExcelProperty("排序号") private Integer sortNo; - @Schema(description = "禁用") - @ExcelProperty("禁用") - private String cancelFlag; + @Schema(description = "禁用标识") + @ExcelProperty("禁用标识") + private Integer cancelFlag; + + @Schema(description = "是否检化验,1-是，0-否") + @ExcelProperty("是否检化验,1-是，0-否") + private Integer assayFlag; + + @Schema(description = "是否进行库存预警,1-是，0-否") + @ExcelProperty("是否进行库存预警,1-是，0-否") + private Integer InventoryAlarmFlag; + + @Schema(description = "库存预警区间,json格式配置") + @ExcelProperty("库存预警区间,json格式配置") + private String InventoryAlarmRange; @Schema(description = "所属部门") @ExcelProperty("所属部门") @@ -130,4 +141,7 @@ public class MaterialProductRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; + @Schema(description = "子物料分类") + private List children; + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductSaveReqVO.java index 12b9244..0669cb3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductSaveReqVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialProductSaveReqVO.java @@ -1,42 +1,44 @@ package com.zt.plat.module.qms.resource.material.controller.vo; +import com.baomidou.mybatisplus.annotation.TableField; +import com.zt.plat.module.qms.resource.material.valid.AddGroup; +import com.zt.plat.module.qms.resource.material.valid.UpdateGroup; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Null; import lombok.Data; @Schema(description = "管理后台 - 物料大类新增/修改 Request VO") @Data public class MaterialProductSaveReqVO { - @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "32133") + @NotNull(groups = {UpdateGroup.class}, message = "更新操作 ID 不能为空") + @Null(groups = {AddGroup.class}, message = "新增操作 ID 必须为空") + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "23369") private Long id; - @Schema(description = "父id", example = "6098") - private Long parentId; + @Schema(description = "父id", example = "7533") + private Long parentId = 0L; - @Schema(description = "id路径") - private String idPath; + @Schema(description = "编码,原始数据编码") + private String code; - @Schema(description = "节点类型,分类|产品", example = "2") - private String nodeType; - - @Schema(description = "名称", example = "张三") + @Schema(description = "名称", example = "ZT") private String name; @Schema(description = "其他配置") private String customConfig; - @Schema(description = "自定义表单") + @Schema(description = "自定义表单（预留的扩展字段）") private String customForm; - @Schema(description = "扩展数据") + @Schema(description = "扩展数据（预留的扩展字段）") private String customData; - @Schema(description = "标签") + @Schema(description = "标签（预留的扩展字段）") private String tag; - @Schema(description = "标签模板") - private String labelTemplateKey; - @Schema(description = "型号") private String modelNo; @@ -52,38 +54,47 @@ public class MaterialProductSaveReqVO { @Schema(description = "单位") private String unit; - @Schema(description = "允许按量领取") - private String enablePartial; + @Schema(description = "允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走") + private Integer enablePartial; @Schema(description = "保质期（天）") + @Min(value = 0, message = "保质期不能小于0") private Integer due; - @Schema(description = "开封后保质期是否变化") + @Schema(description = "开封后保质期是否变化,1-是，0-否") private Integer openDueFlag; @Schema(description = "开封后保质期（天）") + @Min(value = 0, message = "保质期不能小于0") private Integer openDueAfter; - @Schema(description = "是否危险品") - private String hazardous; + @Schema(description = "是否危险品,1-是，0-否") + private Integer hazardous; - @Schema(description = "是否标准溶液") - private String standardSolutionFlag; + @Schema(description = "是否标准溶液,1-是，0-否") + private Integer standardSolutionFlag; - @Schema(description = "是否标准物质") - private String standardMaterialFlag; + @Schema(description = "是否标准物质,1-是，0-否") + private Integer standardMaterialFlag; @Schema(description = "复标周期,单位：天。小于等于0-不复标") + @Min(value = 0, message = "复标周期不能小于0") private Integer reviewDue; @Schema(description = "排序号") private Integer sortNo; - @Schema(description = "禁用") - private String cancelFlag; + @Schema(description = "禁用标识") + private Integer cancelFlag; - @Schema(description = "所属部门") - private String systemDepartmentCode; + @Schema(description = "是否检化验,1-是，0-否") + private Integer assayFlag; + + @Schema(description = "是否进行库存预警,1-是，0-否") + private Integer InventoryAlarmFlag; + + @Schema(description = "库存预警区间,json格式配置") + private String InventoryAlarmRange; @Schema(description = "备注") private String remark; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchAssignDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchAssignDO.java deleted file mode 100644 index 0cf96fc..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchAssignDO.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 物料批次分发 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_bat_asn") -@KeySequence("t_mtrl_bat_asn_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialBatchAssignDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 源批次ID - */ - @TableField("BAT_ID") - private Long batchId; - /** - * 产品id - */ - @TableField("PDT_ID") - private Long productId; - /** - * 库房ID - */ - @TableField("WRH_ID") - private Long warehouseId; - /** - * 数量 - */ - @TableField("INB_QTY") - private Long inboundQuantity; - /** - * 暂存位置记录 - */ - @TableField("URL") - private String url; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - - - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchDO.java index 44b4eb1..7583491 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialBatchDO.java @@ -1,11 +1,11 @@ package com.zt.plat.module.qms.resource.material.dal.dataobject; import lombok.*; - -import java.time.LocalDateTime; - import com.baomidou.mybatisplus.annotation.*; import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; + +import java.time.LocalDate; + /** * 物料批次 DO * @@ -32,7 +32,7 @@ public class MaterialBatchDO extends BusinessBaseDO { @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * 产品id + * 物料大类id */ @TableField("PDT_ID") private Long productId; @@ -60,18 +60,33 @@ public class MaterialBatchDO extends BusinessBaseDO { * 生产日期 */ @TableField("MFR_DT") - private LocalDateTime manufacturerDate; + private LocalDate manufacturerDate; /** * 到期日期 */ @TableField("DUE_DT") - private LocalDateTime dueDate; + private LocalDate dueDate; /** * 验收状态 */ @TableField("ACPT_STS") private String acceptanceStatus; /** + * 是否检化验,1-是，0-否 + */ + @TableField("ASY_FLG") + private Integer assayFlag; + /** + * 检化验状态,NOT_STARTED-未开始，IN_PROGRESS-进行中，PASSED-通过，NOT_PASSED-未通过 + */ + @TableField("ASY_STS") + private String assayStatus; + /** + * 检化验结果 + */ + @TableField("ASY_RSLT") + private String assayResult; + /** * 所属部门 */ @TableField("SYS_DEPT_CD") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInfomationDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInfomationDO.java index 93a436a..4184d26 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInfomationDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInfomationDO.java @@ -1,10 +1,12 @@ package com.zt.plat.module.qms.resource.material.dal.dataobject; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -import com.baomidou.mybatisplus.annotation.*; import lombok.*; +import java.time.LocalDate; import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; /** * 物料实例 DO * @@ -56,6 +58,26 @@ public class MaterialInfomationDO extends BusinessBaseDO { @TableField("PRM") private String parameter; /** + * 上架状态,0-未上架，1-已上架 + */ + @TableField("PUB_STS") + private Integer publishStatus; + /** + * 领用状态,0-未领用，1-已领用 + */ + @TableField("USG_STS") + private Integer usageStatus; + /** + * 所属部门ID + */ + @TableField("MNGR_DEPT_ID") + private Integer managerDepartmentId; + /** + * 领用人部门 + */ + @TableField("MNGR_DEPT_NAME") + private String managerDepartmentName; + /** * 负责人id */ @TableField("MNGR_USER_ID") @@ -66,31 +88,21 @@ public class MaterialInfomationDO extends BusinessBaseDO { @TableField("MNGR_USER_NAME") private String managerUserName; /** - * 上架状态,0-未上架；1-已上架，默认0 - */ - @TableField("PUB_STS") - private String publishStatus; - /** - * 领用状态 - */ - @TableField("USG_STS") - private String usageStatus; - /** - * 开封状态 + * 开封状态,0-未开封，1-已开封 */ @TableField("OPN_STS") - private String openStatus; - /** - * 开封人 - */ - @TableField("OPN_USER_NAME") - private String openUserName; + private Integer openStatus; /** * 开封人id */ @TableField("OPN_USER_ID") private Long openUserId; /** + * 开封人 + */ + @TableField("OPN_USER_NAME") + private String openUserName; + /** * 开封日期 */ @TableField("OPN_DT") @@ -99,7 +111,7 @@ public class MaterialInfomationDO extends BusinessBaseDO { * 到期日期 */ @TableField("EXPR_DT") - private LocalDateTime expirationDate; + private LocalDate expirationDate; /** * 过期状态 */ @@ -111,6 +123,11 @@ public class MaterialInfomationDO extends BusinessBaseDO { @TableField("RMNG_VOL") private String remainingVolume; /** + * 用完标记,0-未标记，1-已用完标记 + */ + @TableField("USE_END_FLG") + private Integer useEndFlag; + /** * 所属部门 */ @TableField("SYS_DEPT_CD") @@ -121,9 +138,4 @@ public class MaterialInfomationDO extends BusinessBaseDO { @TableField("RMK") private String remark; - /** - * 库存入库id - */ - @TableField("INVT_INB_ID") - private long inventoryInboundId; } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckBatchDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckBatchDO.java deleted file mode 100644 index 9b07804..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckBatchDO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 库存盘点项 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_chk_bat") -@KeySequence("t_mtrl_invt_chk_bat_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryCheckBatchDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 父id - */ - @TableField("CHK_ID") - private Long checkId; - /** - * 盘点物料大类ID - */ - @TableField("CHK_PDT_ID") - private Long checkProductId; - /** - * 盘点部门ID - */ - @TableField("CHK_DEPT_ID") - private Long checkDepartmentId; - /** - * 应有量 - */ - @TableField("EXPT") - private String expected; - /** - * 实有量 - */ - @TableField("ACT") - private String actual; - /** - * 差异 - */ - @TableField("DIFF") - private String difference; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDO.java deleted file mode 100644 index a7bd635..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDO.java +++ /dev/null @@ -1,95 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 库存盘点 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_chk") -@KeySequence("t_mtrl_invt_chk_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryCheckDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 标题 - */ - @TableField("TTL") - private String title; - /** - * 业务类型 - */ - @TableField("BSN_TP") - private String businessType; - /** - * 业务类型编码 - */ - @TableField("BSN_TP_CD") - private String businessTypeCode; - /** - * 申请人 - */ - @TableField("APL_USER") - private String applyUser; - /** - * 申请人id - */ - @TableField("APL_USER_ID") - private Long applyUserId; - /** - * 申请部门 - */ - @TableField("APL_DEPT") - private String applyDepartment; - /** - * 申请部门id - */ - @TableField("APL_DEPT_ID") - private Long applyDepartmentId; - /** - * 申请时间 - */ - @TableField("APL_TM") - private LocalDateTime applyTime; - /** - * 流程实例id - */ - @TableField("FLW_INSC_ID") - private String flowInstanceId; - /** - * 流程审批状态 - */ - @TableField("FLW_STS") - private String flowStatus; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDetailDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDetailDO.java deleted file mode 100644 index 2a268c3..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryCheckDetailDO.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 库存盘点明细 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_chk_dtl") -@KeySequence("t_mtrl_invt_chk_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryCheckDetailDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 盘点批次id - */ - @TableField("CHK_BAT_ID") - private Long checkBatchId; - /** - * 物料实例id - */ - @TableField("INF_ID") - private Long infomationId; - /** - * 是否存在 - */ - @TableField("PRST") - private String present; - /** - * 当前数量 - */ - @TableField("CRNT_QTY") - private String currentQuantity; - /** - * 状态 - */ - @TableField("STS") - private String status; - /** - * 处置方式,字典配置 - */ - @TableField("DSPL_MTHD") - private String disposalMethod; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryDO.java deleted file mode 100644 index 18a099d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryDO.java +++ /dev/null @@ -1,169 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -import lombok.*; - -/** -* 物料大类 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_pdt") -@KeySequence("t_mtrl_pdt_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 父id - */ - @TableField("PRN_ID") - private Long parentId; - /** - * id路径 - */ - @TableField("ID_PATH") - private String idPath; - /** - * 节点类型,分类|产品 - */ - @TableField("NDE_TP") - private String nodeType; - /** - * 名称 - */ - @TableField("NAME") - private String name; - /** - * 其他配置 - */ - @TableField("CST_CFG") - private String customConfig; - /** - * 自定义表单 - */ - @TableField("CST_FORM") - private String customForm; - /** - * 扩展数据 - */ - @TableField("CST_DAT") - private String customData; - /** - * 标签 - */ - @TableField("TAG") - private String tag; - /** - * 标签模板 - */ - @TableField("LBL_TMPL_KY") - private String labelTemplateKey; - /** - * 型号 - */ - @TableField("MDL_NO") - private String modelNo; - /** - * 规格 - */ - @TableField("SPEC") - private String specification; - /** - * 技术参数 - */ - @TableField("PRM") - private String parameter; - /** - * 制造商 - */ - @TableField("MFR") - private String manufacturer; - /** - * 单位 - */ - @TableField("UNT") - private String unit; - /** - * 允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走 - */ - @TableField("ENB_PRTL") - private String enablePartial; - /** - * 保质期（天） - */ - @TableField("DUE") - private Integer due; - /** - * 开封后保质期是否变化 - */ - @TableField("OPN_DUE_FLG") - private String openDueFlag; - /** - * 开封后保质期（天） - */ - @TableField("OPN_DUE_AFT") - private Integer openDueAfter; - /** - * 是否危险品 - */ - @TableField("HZRD") - private String hazardous; - /** - * 是否标准溶液 - */ - @TableField("STD_SOL_FLG") - private String standardSolutionFlag; - /** - * 是否标准物质 - */ - @TableField("STD_MTRL_FLG") - private String standardMaterialFlag; - /** - * 复标周期,单位：天。小于等于0-不复标 - */ - @TableField("RVW_DUE") - private Integer reviewDue; - /** - * 排序号 - */ - @TableField("SRT_NO") - private Integer sortNo; - /** - * 禁用 - */ - @TableField("CNL_FLG") - private String cancelFlag; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - - /** - * 总数量 - */ - @TableField("INB_QTY") - private Long inboundQuantity; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDO.java deleted file mode 100644 index 5d2509f..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 入库 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_inb") -@KeySequence("t_mtrl_invt_inb_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryInboundDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 标题 - */ - @TableField("TTL") - private String title; - /** - * 业务类型1.验收上架,【字典】【jy_material_in_bsn_type】领用出库、盘亏出库、损坏出库等 - */ - @TableField("BSN_TP") - private String businessType; - /** - * 业务类型编码 - */ - @TableField("BSN_TP_CD") - private String businessTypeCode; - /** - * 申请人 - */ - @TableField("APL_USER") - private String applyUser; - /** - * 申请人id - */ - @TableField("APL_USER_ID") - private Long applyUserId; - /** - * 申请部门 - */ - @TableField("APL_DEPT") - private String applyDepartment; - /** - * 申请部门id - */ - @TableField("APL_DEPT_ID") - private Long applyDepartmentId; - /** - * 申请时间 - */ - @TableField("APL_TM") - private LocalDateTime applyTime; - /** - * 流程实例id - */ - @TableField("FLW_INSC_ID") - private String flowInstanceId; - /** - * 流程审批状态 - */ - @TableField("FLW_STS") - private String flowStatus; - /** - * 意见json - */ - @TableField("CMT_JSON") - private String commentJson; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDetailDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDetailDO.java deleted file mode 100644 index 85180d7..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryInboundDetailDO.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_inb_dtl") -@KeySequence("t_mtrl_invt_inb_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryInboundDetailDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 入库单ID - */ - @TableField("INB_ID") - private Long inboundId; - /** - * 分发批次id - */ - @TableField("BAT_ASN_ID") - private Long batchAssignId; - /** - * 入库方式 - */ - @TableField("INB_WY") - private String inboundWay; - /** - * 物料实例ID - */ - @TableField("MTRL_INF_ID") - private Long materialInfomationId; - /** - * 入库人 - */ - @TableField("INB_USER_NAME") - private String inboundUserName; - /** - * 入库人id - */ - @TableField("INB_USER_ID") - private Long inboundUserId; - /** - * 入库人部门 - */ - @TableField("INB_DEPT_NAME") - private String inboundDepartmentName; - /** - * 入库人部门id - */ - @TableField("INB_DEPT_ID") - private Long inboundDepartmentId; - /** - * 入库时间 - */ - @TableField("INB_TM") - private LocalDateTime inboundTime; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDO.java deleted file mode 100644 index 3dc7a8d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDO.java +++ /dev/null @@ -1,110 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 出库 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_outb") -@KeySequence("t_mtrl_invt_outb_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryOutboundDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 标题 - */ - @TableField("TTL") - private String title; - /** - * 业务类型,【字典】【jy_material_out_bsn_type】领用出库、盘亏出库、损坏出库等 - */ - @TableField("BSN_TP") - private String businessType; - /** - * 业务类型编码 - */ - @TableField("BSN_TP_CD") - private String businessTypeCode; - /** - * 申请人 - */ - @TableField("APL_USER") - private String applyUser; - /** - * 申请人id - */ - @TableField("APL_USER_ID") - private Long applyUserId; - /** - * 申请部门 - */ - @TableField("APL_DEPT") - private String applyDepartment; - /** - * 申请部门id - */ - @TableField("APL_DEPT_ID") - private Long applyDepartmentId; - /** - * 申请时间 - */ - @TableField("APL_TM") - private LocalDateTime applyTime; - /** - * 监督人 - */ - @TableField("CHK_USER") - private String checkUser; - /** - * 监督人id - */ - @TableField("CHK_USER_ID") - private Long checkUserId; - /** - * 流程实例id - */ - @TableField("FLW_INSC_ID") - private String flowInstanceId; - /** - * 意见json - */ - @TableField("CMT_JSON") - private String commentJson; - /** - * 流程审批状态 - */ - @TableField("FLW_STS") - private String flowStatus; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDetailDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDetailDO.java deleted file mode 100644 index d83121c..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialInventoryOutboundDetailDO.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_invt_outb_dtl") -@KeySequence("t_mtrl_invt_outb_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialInventoryOutboundDetailDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 出库单id - */ - @TableField("PRN_ID") - private Long parentId; - /** - * 物料实例id - */ - @TableField("INF_ID") - private Long infomationId; - /** - * 数量 - */ - @TableField("QTY") - private String quantity; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDO.java deleted file mode 100644 index a5af068..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; - -import java.time.LocalDateTime; - -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 物料通用流程 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_lfc") -@KeySequence("t_mtrl_lfc_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialLifecycleDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 标题 - */ - @TableField("TTL") - private String title; - /** - * 业务类型,【字典】【jy_material_lifecycle_bsn_type】验收、退换货、配置申请 - */ - @TableField("BSN_TP") - private String businessType; - /** - * 业务类型编码 - */ - @TableField("BSN_TP_CD") - private String businessTypeCode; - /** - * 申请人 - */ - @TableField("APL_USER") - private String applyUser; - /** - * 申请人id - */ - @TableField("APL_USER_ID") - private Long applyUserId; - /** - * 申请部门 - */ - @TableField("APL_DEPT") - private String applyDepartment; - /** - * 申请部门id - */ - @TableField("APL_DEPT_ID") - private Long applyDepartmentId; - /** - * 申请时间 - */ - @TableField("APL_TM") - private LocalDateTime applyTime; - /** - * 表单数据,表单数据 - */ - @TableField("FORM_DAT") - private String formData; - /** - * 流程实例id - */ - @TableField("FLW_INSC_ID") - private String flowInstanceId; - /** - * 流程审批状态 - */ - @TableField("FLW_STS") - private String flowStatus; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDetailDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDetailDO.java deleted file mode 100644 index 05ed59f..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLifecycleDetailDO.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.dataobject; - -import lombok.*; -import com.baomidou.mybatisplus.annotation.*; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; -/** -* 物料通用流程明细,对应生命周期的明细 DO -* -* @author 后台管理 -*/ -@TableName("t_mtrl_lfc_dtl") -@KeySequence("t_mtrl_lfc_dtl_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Builder -@NoArgsConstructor -@AllArgsConstructor -/** -* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO -*/ -public class MaterialLifecycleDetailDO extends BusinessBaseDO { - - - - /** - * 主键 - */ - @TableId(type = IdType.ASSIGN_ID) - private Long id; - /** - * 父ID - */ - @TableField("MTRL_LFC_ID") - private Long materialLifecycleId; - /** - * 物料批次编号 - */ - @TableField("BAT_ID") - private Long batchId; - /** - * 物料大类编号 - */ - @TableField("CTGR_PDT_ID") - private String categoryProductId; - /** - * 物料实例编号 - */ - @TableField("INF_ID") - private Long infomationId; - /** - * 影响数量 - */ - @TableField("INFL_CNT") - private String influenceCount; - /** - * 明细操作类型 - */ - @TableField("BSN_TP") - private String businessType; - /** - * 处理状态 - */ - @TableField("TMT_STS") - private Integer treatmentStatus; - /** - * 表单数据,表单数据 - */ - @TableField("FORM_DAT") - private String formData; - /** - * 所属部门 - */ - @TableField("SYS_DEPT_CD") - private String systemDepartmentCode; - /** - * 备注 - */ - @TableField("RMK") - private String remark; - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLocationDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLocationDO.java index d9a6fc1..726b981 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLocationDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialLocationDO.java @@ -44,16 +44,16 @@ public class MaterialLocationDO extends BusinessBaseDO { @TableField("CD") private String code; /** - * 编码路径 - */ - @TableField("CD_PATH") - private String codePath; - /** * 容量 */ @TableField("CPY") private String capacity; /** + * 位置 + */ + @TableField("LOC") + private String location; + /** * 所属部门 */ @TableField("SYS_DEPT_CD") diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialProductDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialProductDO.java index cb76421..461f43c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialProductDO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/dataobject/MaterialProductDO.java @@ -1,8 +1,9 @@ package com.zt.plat.module.qms.resource.material.dal.dataobject; -import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; import lombok.*; + /** * 物料大类 DO * @@ -21,8 +22,6 @@ import lombok.*; */ public class MaterialProductDO extends BusinessBaseDO { - - /** * 主键 */ @@ -39,11 +38,21 @@ public class MaterialProductDO extends BusinessBaseDO { @TableField("ID_PATH") private String idPath; /** - * 节点类型,分类|产品 + * 节点类型,分类|物料 */ @TableField("NDE_TP") private String nodeType; /** + * 主数据ID,原始数据id + */ + @TableField("ORIG_MTRL_ID") + private Long originalMaterialId; + /** + * 编码,原始数据编码 + */ + @TableField("CD") + private String code; + /** * 名称 */ @TableField("NAME") @@ -102,37 +111,37 @@ public class MaterialProductDO extends BusinessBaseDO { * 允许按量领取,1-领用时输入量，按量领取；0-领用时不能输入量，整个领走 */ @TableField("ENB_PRTL") - private String enablePartial; + private Integer enablePartial; /** * 保质期（天） */ @TableField("DUE") private Integer due; /** - * 开封后保质期是否变化 + * 开封后保质期是否变化,1-是，0-否 */ @TableField("OPN_DUE_FLG") - private String openDueFlag; + private Integer openDueFlag; /** * 开封后保质期（天） */ @TableField("OPN_DUE_AFT") private Integer openDueAfter; /** - * 是否危险品 + * 是否危险品,1-是，0-否 */ @TableField("HZRD") - private String hazardous; + private Integer hazardous; /** - * 是否标准溶液 + * 是否标准溶液,1-是，0-否 */ @TableField("STD_SOL_FLG") - private String standardSolutionFlag; + private Integer standardSolutionFlag; /** - * 是否标准物质 + * 是否标准物质,1-是，0-否 */ @TableField("STD_MTRL_FLG") - private String standardMaterialFlag; + private Integer standardMaterialFlag; /** * 复标周期,单位：天。小于等于0-不复标 */ @@ -144,10 +153,25 @@ public class MaterialProductDO extends BusinessBaseDO { @TableField("SRT_NO") private Integer sortNo; /** - * 禁用 + * 禁用标识 */ @TableField("CNL_FLG") - private String cancelFlag; + private Integer cancelFlag; + /** + * 是否检化验,1-是，0-否 + */ + @TableField("ASY_FLG") + private Integer assayFlag; + /** + * 是否进行库存预警,1-是，0-否 + */ + @TableField("INVT_ALM_FLG") + private Integer InventoryAlarmFlag; + /** + * 库存预警区间,json格式配置 + */ + @TableField("INVT_ALM_RNG") + private String InventoryAlarmRange; /** * 所属部门 */ diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.java deleted file mode 100644 index 0c26169..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 物料批次分发 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialBatchAssignMapper extends BaseMapperX { - - default PageResult selectPage(MaterialBatchAssignPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialBatchAssignDO::getBatchId, reqVO.getBatchId()) - .eqIfPresent(MaterialBatchAssignDO::getProductId, reqVO.getProductId()) - .eqIfPresent(MaterialBatchAssignDO::getWarehouseId, reqVO.getWarehouseId()) - .eqIfPresent(MaterialBatchAssignDO::getInboundQuantity, reqVO.getInboundQuantity()) - .eqIfPresent(MaterialBatchAssignDO::getUrl, reqVO.getUrl()) - .eqIfPresent(MaterialBatchAssignDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialBatchAssignDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialBatchAssignDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialBatchAssignDO::getId)); - } - -// default PageResult selectByInfId(MaterialBatchAssignPageReqVO reqVO) { -// return selectPage(reqVO, new LambdaQueryWrapperX() -// .eqIfPresent(MaterialBatchAssignDO::getMaterialInfomationId, reqVO.getMaterialInfomationId()) -// .orderByDesc(MaterialBatchAssignDO::getCreateTime)); -// } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java index f47e65d..aef04e6 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java @@ -3,8 +3,8 @@ package com.zt.plat.module.qms.resource.material.dal.mapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchPageReqVO; +import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; import org.apache.ibatis.annotations.Mapper; /** @@ -25,6 +25,9 @@ public interface MaterialBatchMapper extends BaseMapperX { .betweenIfPresent(MaterialBatchDO::getManufacturerDate, reqVO.getManufacturerDate()) .betweenIfPresent(MaterialBatchDO::getDueDate, reqVO.getDueDate()) .eqIfPresent(MaterialBatchDO::getAcceptanceStatus, reqVO.getAcceptanceStatus()) + .eqIfPresent(MaterialBatchDO::getAssayFlag, reqVO.getAssayFlag()) + .eqIfPresent(MaterialBatchDO::getAssayStatus, reqVO.getAssayStatus()) + .eqIfPresent(MaterialBatchDO::getAssayResult, reqVO.getAssayResult()) .eqIfPresent(MaterialBatchDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(MaterialBatchDO::getRemark, reqVO.getRemark()) .betweenIfPresent(MaterialBatchDO::getCreateTime, reqVO.getCreateTime()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java index 24ae0b3..4801b1c 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInfomationMapper.java @@ -1,9 +1,8 @@ package com.zt.plat.module.qms.resource.material.dal.mapper; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.qms.resource.material.controller.vo.*; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; import org.apache.ibatis.annotations.Mapper; @@ -19,37 +18,28 @@ public interface MaterialInfomationMapper extends BaseMapperX selectPage(MaterialInfomationPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId()) - .inIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductIds()) .eqIfPresent(MaterialInfomationDO::getBatchId, reqVO.getBatchId()) .eqIfPresent(MaterialInfomationDO::getLocationId, reqVO.getLocationId()) .eqIfPresent(MaterialInfomationDO::getCode, reqVO.getCode()) .eqIfPresent(MaterialInfomationDO::getParameter, reqVO.getParameter()) - .eqIfPresent(MaterialInfomationDO::getManagerUserId, reqVO.getManagerUserId()) - .likeIfPresent(MaterialInfomationDO::getManagerUserName, reqVO.getManagerUserName()) .eqIfPresent(MaterialInfomationDO::getPublishStatus, reqVO.getPublishStatus()) .eqIfPresent(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus()) + .eqIfPresent(MaterialInfomationDO::getManagerDepartmentId, reqVO.getManagerDepartmentId()) + .likeIfPresent(MaterialInfomationDO::getManagerDepartmentName, reqVO.getManagerDepartmentName()) + .eqIfPresent(MaterialInfomationDO::getManagerUserId, reqVO.getManagerUserId()) + .likeIfPresent(MaterialInfomationDO::getManagerUserName, reqVO.getManagerUserName()) .eqIfPresent(MaterialInfomationDO::getOpenStatus, reqVO.getOpenStatus()) - .likeIfPresent(MaterialInfomationDO::getOpenUserName, reqVO.getOpenUserName()) .eqIfPresent(MaterialInfomationDO::getOpenUserId, reqVO.getOpenUserId()) + .likeIfPresent(MaterialInfomationDO::getOpenUserName, reqVO.getOpenUserName()) .betweenIfPresent(MaterialInfomationDO::getOpenDate, reqVO.getOpenDate()) .betweenIfPresent(MaterialInfomationDO::getExpirationDate, reqVO.getExpirationDate()) .eqIfPresent(MaterialInfomationDO::getExpirationFlag, reqVO.getExpirationFlag()) .eqIfPresent(MaterialInfomationDO::getRemainingVolume, reqVO.getRemainingVolume()) + .eqIfPresent(MaterialInfomationDO::getUseEndFlag, reqVO.getUseEndFlag()) .eqIfPresent(MaterialInfomationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(MaterialInfomationDO::getRemark, reqVO.getRemark()) .betweenIfPresent(MaterialInfomationDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(MaterialInfomationDO::getId)); } - default PageResult selectAll(MaterialInfomationPageReqVO reqVO) { - reqVO.setPageSize(-1); - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId()) - .eqIfPresent(MaterialInfomationDO::getBatchId, reqVO.getBatchId()) - .eqIfPresent(MaterialInfomationDO::getUsageStatus, reqVO.getUsageStatus()) - .eqIfPresent(MaterialInfomationDO::getInventoryInboundId, reqVO.getInventoryInboundId() - ) - ); - } - } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.java deleted file mode 100644 index d494500..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 库存盘点项 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryCheckBatchMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryCheckBatchPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryCheckBatchDO::getCheckId, reqVO.getCheckId()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getCheckProductId, reqVO.getCheckProductId()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getCheckDepartmentId, reqVO.getCheckDepartmentId()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getExpected, reqVO.getExpected()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getActual, reqVO.getActual()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getDifference, reqVO.getDifference()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryCheckBatchDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryCheckBatchDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryCheckBatchDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.java deleted file mode 100644 index e894456..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 库存盘点明细 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryCheckDetailMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryCheckDetailPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryCheckDetailDO::getCheckBatchId, reqVO.getCheckBatchId()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getInfomationId, reqVO.getInfomationId()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getPresent, reqVO.getPresent()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getCurrentQuantity, reqVO.getCurrentQuantity()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getStatus, reqVO.getStatus()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getDisposalMethod, reqVO.getDisposalMethod()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryCheckDetailDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryCheckDetailDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryCheckDetailDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.java deleted file mode 100644 index dc8c5b8..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 库存盘点 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryCheckMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryCheckPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryCheckDO::getTitle, reqVO.getTitle()) - .eqIfPresent(MaterialInventoryCheckDO::getBusinessType, reqVO.getBusinessType()) - .eqIfPresent(MaterialInventoryCheckDO::getBusinessTypeCode, reqVO.getBusinessTypeCode()) - .eqIfPresent(MaterialInventoryCheckDO::getApplyUser, reqVO.getApplyUser()) - .eqIfPresent(MaterialInventoryCheckDO::getApplyUserId, reqVO.getApplyUserId()) - .eqIfPresent(MaterialInventoryCheckDO::getApplyDepartment, reqVO.getApplyDepartment()) - .eqIfPresent(MaterialInventoryCheckDO::getApplyDepartmentId, reqVO.getApplyDepartmentId()) - .betweenIfPresent(MaterialInventoryCheckDO::getApplyTime, reqVO.getApplyTime()) - .eqIfPresent(MaterialInventoryCheckDO::getFlowInstanceId, reqVO.getFlowInstanceId()) - .eqIfPresent(MaterialInventoryCheckDO::getFlowStatus, reqVO.getFlowStatus()) - .eqIfPresent(MaterialInventoryCheckDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryCheckDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryCheckDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryCheckDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java deleted file mode 100644 index 97a94ef..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectAndParameterRespVO; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessAssayProjectDataExtendRespVO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessAssayParameterDataDO; -import com.zt.plat.module.qms.business.dic.dal.dataobject.DictionaryProjectDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryInboundDetailMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryInboundDetailPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryInboundDetailDO::getInboundId, reqVO.getInboundId()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getBatchAssignId, reqVO.getBatchAssignId()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getInboundWay, reqVO.getInboundWay()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getMaterialInfomationId, reqVO.getMaterialInfomationId()) - .likeIfPresent(MaterialInventoryInboundDetailDO::getInboundUserName, reqVO.getInboundUserName()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getInboundUserId, reqVO.getInboundUserId()) - .likeIfPresent(MaterialInventoryInboundDetailDO::getInboundDepartmentName, reqVO.getInboundDepartmentName()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getInboundDepartmentId, reqVO.getInboundDepartmentId()) - .betweenIfPresent(MaterialInventoryInboundDetailDO::getInboundTime, reqVO.getInboundTime()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryInboundDetailDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryInboundDetailDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryInboundDetailDO::getId)); - } - - default PageResult selectPageList(MaterialInventoryInboundDetailPageReqVO reqVO) { - return selectJoinPage(reqVO, MaterialInventoryInboundDetailRespVO.class, new MPJLambdaWrapperX() - .selectAll(MaterialInventoryInboundDetailDO.class) - .selectAs(MaterialInfomationDO::getProductId, MaterialInventoryInboundDetailRespVO::getProductId) - .leftJoin(MaterialInfomationDO.class, MaterialInfomationDO::getId, MaterialInventoryInboundDetailDO::getMaterialInfomationId) - .eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId()) - ); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.java deleted file mode 100644 index d16c1c3..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 入库 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryInboundMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryInboundPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryInboundDO::getTitle, reqVO.getTitle()) - .eqIfPresent(MaterialInventoryInboundDO::getBusinessType, reqVO.getBusinessType()) - .eqIfPresent(MaterialInventoryInboundDO::getBusinessTypeCode, reqVO.getBusinessTypeCode()) - .eqIfPresent(MaterialInventoryInboundDO::getApplyUser, reqVO.getApplyUser()) - .eqIfPresent(MaterialInventoryInboundDO::getApplyUserId, reqVO.getApplyUserId()) - .eqIfPresent(MaterialInventoryInboundDO::getApplyDepartment, reqVO.getApplyDepartment()) - .eqIfPresent(MaterialInventoryInboundDO::getApplyDepartmentId, reqVO.getApplyDepartmentId()) - .betweenIfPresent(MaterialInventoryInboundDO::getApplyTime, reqVO.getApplyTime()) - .eqIfPresent(MaterialInventoryInboundDO::getFlowInstanceId, reqVO.getFlowInstanceId()) - .eqIfPresent(MaterialInventoryInboundDO::getFlowStatus, reqVO.getFlowStatus()) - .eqIfPresent(MaterialInventoryInboundDO::getCommentJson, reqVO.getCommentJson()) - .eqIfPresent(MaterialInventoryInboundDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryInboundDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryInboundDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryInboundDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.java deleted file mode 100644 index aa3cc30..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * 入库 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryMapper extends BaseMapperX { - -// default PageResult selectPage(MaterialInventoryRespVO reqVO) { -// return selectPage(reqVO, new LambdaQueryWrapperX() -// -// .eqIfPresent(MaterialInventoryDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) -// .eqIfPresent(MaterialInventoryDO::getRemark, reqVO.getRemark()) -// .betweenIfPresent(MaterialInventoryDO::getCreateTime, reqVO.getCreateTime()) -// .orderByDesc(MaterialInventoryDO::getId)); -// } - - IPage selectPageList (IPage page,@Param("param")MaterialInventoryRespVO RespVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.java deleted file mode 100644 index ace8f14..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryOutboundDetailMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryOutboundDetailPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryOutboundDetailDO::getParentId, reqVO.getParentId()) - .eqIfPresent(MaterialInventoryOutboundDetailDO::getInfomationId, reqVO.getInfomationId()) - .eqIfPresent(MaterialInventoryOutboundDetailDO::getQuantity, reqVO.getQuantity()) - .eqIfPresent(MaterialInventoryOutboundDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryOutboundDetailDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryOutboundDetailDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryOutboundDetailDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.java deleted file mode 100644 index dcfbbcf..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundPageReqVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 出库 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialInventoryOutboundMapper extends BaseMapperX { - - default PageResult selectPage(MaterialInventoryOutboundPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialInventoryOutboundDO::getTitle, reqVO.getTitle()) - .eqIfPresent(MaterialInventoryOutboundDO::getBusinessType, reqVO.getBusinessType()) - .eqIfPresent(MaterialInventoryOutboundDO::getBusinessTypeCode, reqVO.getBusinessTypeCode()) - .eqIfPresent(MaterialInventoryOutboundDO::getApplyUser, reqVO.getApplyUser()) - .eqIfPresent(MaterialInventoryOutboundDO::getApplyUserId, reqVO.getApplyUserId()) - .eqIfPresent(MaterialInventoryOutboundDO::getApplyDepartment, reqVO.getApplyDepartment()) - .eqIfPresent(MaterialInventoryOutboundDO::getApplyDepartmentId, reqVO.getApplyDepartmentId()) - .betweenIfPresent(MaterialInventoryOutboundDO::getApplyTime, reqVO.getApplyTime()) - .eqIfPresent(MaterialInventoryOutboundDO::getCheckUser, reqVO.getCheckUser()) - .eqIfPresent(MaterialInventoryOutboundDO::getCheckUserId, reqVO.getCheckUserId()) - .eqIfPresent(MaterialInventoryOutboundDO::getFlowInstanceId, reqVO.getFlowInstanceId()) - .eqIfPresent(MaterialInventoryOutboundDO::getCommentJson, reqVO.getCommentJson()) - .eqIfPresent(MaterialInventoryOutboundDO::getFlowStatus, reqVO.getFlowStatus()) - .eqIfPresent(MaterialInventoryOutboundDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialInventoryOutboundDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialInventoryOutboundDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialInventoryOutboundDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java deleted file mode 100644 index ce42a1d..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDetailDO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 物料通用流程明细,对应生命周期的明细 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialLifecycleDetailMapper extends BaseMapperX { - - default PageResult selectPage(MaterialLifecycleDetailPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialLifecycleDetailDO::getMaterialLifecycleId, reqVO.getMaterialLifecycleId()) - .eqIfPresent(MaterialLifecycleDetailDO::getBatchId, reqVO.getBatchId()) - .eqIfPresent(MaterialLifecycleDetailDO::getCategoryProductId, reqVO.getCategoryProductId()) - .eqIfPresent(MaterialLifecycleDetailDO::getInfomationId, reqVO.getInfomationId()) - .eqIfPresent(MaterialLifecycleDetailDO::getInfluenceCount, reqVO.getInfluenceCount()) - .eqIfPresent(MaterialLifecycleDetailDO::getBusinessType, reqVO.getBusinessType()) - .eqIfPresent(MaterialLifecycleDetailDO::getTreatmentStatus, reqVO.getTreatmentStatus()) - .eqIfPresent(MaterialLifecycleDetailDO::getFormData, reqVO.getFormData()) - .eqIfPresent(MaterialLifecycleDetailDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .likeIfPresent(MaterialLifecycleDetailDO::getCompanyName, reqVO.getCompanyName()) - .eqIfPresent(MaterialLifecycleDetailDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialLifecycleDetailDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialLifecycleDetailDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.java deleted file mode 100644 index 0241370..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.zt.plat.module.qms.resource.material.dal.mapper; - -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecyclePageReqVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 物料通用流程 Mapper - * - * @author 后台管理 - */ -@Mapper -public interface MaterialLifecycleMapper extends BaseMapperX { - - default PageResult selectPage(MaterialLifecyclePageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(MaterialLifecycleDO::getTitle, reqVO.getTitle()) - .eqIfPresent(MaterialLifecycleDO::getBusinessType, reqVO.getBusinessType()) - .eqIfPresent(MaterialLifecycleDO::getBusinessTypeCode, reqVO.getBusinessTypeCode()) - .eqIfPresent(MaterialLifecycleDO::getApplyUser, reqVO.getApplyUser()) - .eqIfPresent(MaterialLifecycleDO::getApplyUserId, reqVO.getApplyUserId()) - .eqIfPresent(MaterialLifecycleDO::getApplyDepartment, reqVO.getApplyDepartment()) - .eqIfPresent(MaterialLifecycleDO::getApplyDepartmentId, reqVO.getApplyDepartmentId()) - .betweenIfPresent(MaterialLifecycleDO::getApplyTime, reqVO.getApplyTime()) - .eqIfPresent(MaterialLifecycleDO::getFormData, reqVO.getFormData()) - .eqIfPresent(MaterialLifecycleDO::getFlowInstanceId, reqVO.getFlowInstanceId()) - .eqIfPresent(MaterialLifecycleDO::getFlowStatus, reqVO.getFlowStatus()) - .eqIfPresent(MaterialLifecycleDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) - .eqIfPresent(MaterialLifecycleDO::getRemark, reqVO.getRemark()) - .betweenIfPresent(MaterialLifecycleDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialLifecycleDO::getId)); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLocationMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLocationMapper.java index 42302d9..44f3779 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLocationMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLocationMapper.java @@ -3,8 +3,8 @@ package com.zt.plat.module.qms.resource.material.dal.mapper; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLocationDO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLocationPageReqVO; +import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLocationDO; import org.apache.ibatis.annotations.Mapper; /** @@ -20,8 +20,8 @@ public interface MaterialLocationMapper extends BaseMapperX .eqIfPresent(MaterialLocationDO::getParentId, reqVO.getParentId()) .likeIfPresent(MaterialLocationDO::getName, reqVO.getName()) .eqIfPresent(MaterialLocationDO::getCode, reqVO.getCode()) - .eqIfPresent(MaterialLocationDO::getCodePath, reqVO.getCodePath()) .eqIfPresent(MaterialLocationDO::getCapacity, reqVO.getCapacity()) + .eqIfPresent(MaterialLocationDO::getLocation, reqVO.getLocation()) .eqIfPresent(MaterialLocationDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(MaterialLocationDO::getRemark, reqVO.getRemark()) .betweenIfPresent(MaterialLocationDO::getCreateTime, reqVO.getCreateTime()) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialProductMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialProductMapper.java index e4bea35..f86a7ce 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialProductMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialProductMapper.java @@ -1,9 +1,9 @@ package com.zt.plat.module.qms.resource.material.dal.mapper; +import cn.hutool.core.util.StrUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO; import org.apache.ibatis.annotations.Mapper; @@ -20,31 +20,32 @@ public interface MaterialProductMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(MaterialProductDO::getParentId, reqVO.getParentId()) .likeIfPresent(MaterialProductDO::getIdPath, reqVO.getIdPath()) - .eqIfPresent(MaterialProductDO::getNodeType, reqVO.getNodeType()) .likeIfPresent(MaterialProductDO::getName, reqVO.getName()) - .eqIfPresent(MaterialProductDO::getCustomConfig, reqVO.getCustomConfig()) - .eqIfPresent(MaterialProductDO::getCustomForm, reqVO.getCustomForm()) - .eqIfPresent(MaterialProductDO::getCustomData, reqVO.getCustomData()) - .eqIfPresent(MaterialProductDO::getTag, reqVO.getTag()) - .eqIfPresent(MaterialProductDO::getLabelTemplateKey, reqVO.getLabelTemplateKey()) - .eqIfPresent(MaterialProductDO::getModelNo, reqVO.getModelNo()) - .eqIfPresent(MaterialProductDO::getSpecification, reqVO.getSpecification()) - .eqIfPresent(MaterialProductDO::getParameter, reqVO.getParameter()) - .eqIfPresent(MaterialProductDO::getManufacturer, reqVO.getManufacturer()) + .likeIfPresent(MaterialProductDO::getCustomConfig, reqVO.getCustomConfig()) + .likeIfPresent(MaterialProductDO::getCustomForm, reqVO.getCustomForm()) + .likeIfPresent(MaterialProductDO::getCustomData, reqVO.getCustomData()) + .likeIfPresent(MaterialProductDO::getTag, reqVO.getTag()) + .likeIfPresent(MaterialProductDO::getLabelTemplateKey, reqVO.getLabelTemplateKey()) + .likeIfPresent(MaterialProductDO::getModelNo, reqVO.getModelNo()) + .likeIfPresent(MaterialProductDO::getSpecification, reqVO.getSpecification()) + .likeIfPresent(MaterialProductDO::getParameter, reqVO.getParameter()) + .likeIfPresent(MaterialProductDO::getManufacturer, reqVO.getManufacturer()) .eqIfPresent(MaterialProductDO::getUnit, reqVO.getUnit()) .eqIfPresent(MaterialProductDO::getEnablePartial, reqVO.getEnablePartial()) - .eqIfPresent(MaterialProductDO::getDue, reqVO.getDue()) + .betweenIfPresent(MaterialProductDO::getDue, reqVO.getDue()) .eqIfPresent(MaterialProductDO::getOpenDueFlag, reqVO.getOpenDueFlag()) - .eqIfPresent(MaterialProductDO::getOpenDueAfter, reqVO.getOpenDueAfter()) + .betweenIfPresent(MaterialProductDO::getOpenDueAfter, reqVO.getOpenDueAfter()) .eqIfPresent(MaterialProductDO::getHazardous, reqVO.getHazardous()) .eqIfPresent(MaterialProductDO::getStandardSolutionFlag, reqVO.getStandardSolutionFlag()) .eqIfPresent(MaterialProductDO::getStandardMaterialFlag, reqVO.getStandardMaterialFlag()) - .eqIfPresent(MaterialProductDO::getReviewDue, reqVO.getReviewDue()) - .eqIfPresent(MaterialProductDO::getSortNo, reqVO.getSortNo()) + .betweenIfPresent(MaterialProductDO::getReviewDue, reqVO.getReviewDue()) .eqIfPresent(MaterialProductDO::getCancelFlag, reqVO.getCancelFlag()) + .eqIfPresent(MaterialProductDO::getAssayFlag, reqVO.getAssayFlag()) .eqIfPresent(MaterialProductDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) .eqIfPresent(MaterialProductDO::getRemark, reqVO.getRemark()) .betweenIfPresent(MaterialProductDO::getCreateTime, reqVO.getCreateTime()) + .orderByAsc(MaterialProductDO::getSortNo) + .orderByAsc(MaterialProductDO::getIdPath) .orderByDesc(MaterialProductDO::getId)); } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignService.java deleted file mode 100644 index 05764a7..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 物料批次分发 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialBatchAssignService { - - /** - * 创建物料批次分发 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialBatchAssignRespVO createMaterialBatchAssign(@Valid MaterialBatchAssignSaveReqVO createReqVO); - - /** - * 更新物料批次分发 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialBatchAssign(@Valid MaterialBatchAssignSaveReqVO updateReqVO); - - /** - * 删除物料批次分发 - * - * @param id 编号 - */ - void deleteMaterialBatchAssign(Long id); - - /** - * 批量删除物料批次分发 - * - * @param ids 编号 - */ - void deleteMaterialBatchAssignListByIds(List ids); - - /** - * 获得物料批次分发 - * - * @param id 编号 - * @return 物料批次分发 - */ - MaterialBatchAssignDO getMaterialBatchAssign(Long id); - - /** - * 用物料实例Id获得物料批次 - * - * @param pageReqVO 分页查询 - * @return 物料批次分发 - */ - public PageResult getMaterialBatchAssignByInfId(MaterialBatchAssignPageReqVO pageReqVO); - - /** - * 获得物料批次分发分页 - * - * @param pageReqVO 分页查询 - * @return 物料批次分发分页 - */ - PageResult getMaterialBatchAssignPage(MaterialBatchAssignPageReqVO pageReqVO); - - - /** - * 分发到实验室 - * @param createReqVO - * @return - */ - MaterialBatchAssignRespVO assignLab(@Valid MaterialBatchAssignSaveReqVO createReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignServiceImpl.java deleted file mode 100644 index 758ef44..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchAssignServiceImpl.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchAssignSaveReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInfomationMapper; -import jakarta.validation.Valid; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchAssignMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 物料批次分发 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialBatchAssignServiceImpl implements MaterialBatchAssignService { - - @Resource - private MaterialBatchAssignMapper materialBatchAssignMapper; - - @Resource - private MaterialInfomationMapper materialInfomationMapper; - - @Override - public MaterialBatchAssignRespVO createMaterialBatchAssign(MaterialBatchAssignSaveReqVO createReqVO) { - // 插入 - MaterialBatchAssignDO materialBatchAssign = BeanUtils.toBean(createReqVO, MaterialBatchAssignDO.class); - materialBatchAssignMapper.insert(materialBatchAssign); - // 返回 - return BeanUtils.toBean(materialBatchAssign, MaterialBatchAssignRespVO.class); - } - - @Override - public void updateMaterialBatchAssign(MaterialBatchAssignSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialBatchAssignExists(updateReqVO.getId()); - // 更新 - MaterialBatchAssignDO updateObj = BeanUtils.toBean(updateReqVO, MaterialBatchAssignDO.class); - materialBatchAssignMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialBatchAssign(Long id) { - // 校验存在 - validateMaterialBatchAssignExists(id); - // 删除 - materialBatchAssignMapper.deleteById(id); - } - - @Override - public void deleteMaterialBatchAssignListByIds(List ids) { - // 校验存在 - validateMaterialBatchAssignExists(ids); - // 删除 - materialBatchAssignMapper.deleteByIds(ids); - } - - private void validateMaterialBatchAssignExists(List ids) { - List list = materialBatchAssignMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_BATCH_ASSIGN_NOT_EXISTS); - } - } - - private void validateMaterialBatchAssignExists(Long id) { - if (materialBatchAssignMapper.selectById(id) == null) { - throw exception(MATERIAL_BATCH_ASSIGN_NOT_EXISTS); - } - } - - @Override - public MaterialBatchAssignDO getMaterialBatchAssign(Long id) { - return materialBatchAssignMapper.selectById(id); - } - - @Override - public PageResult getMaterialBatchAssignByInfId(MaterialBatchAssignPageReqVO pageReqVO){ - return materialBatchAssignMapper.selectPage(pageReqVO); - } - - @Override - public PageResult getMaterialBatchAssignPage(MaterialBatchAssignPageReqVO pageReqVO) { - PageResult pageResult = materialBatchAssignMapper.selectPage(pageReqVO); - - - - /** 统计批次剩余量需要除去已上架（存在实例）的部分 */ - pageResult.getList().forEach(item -> { - MaterialInfomationPageReqVO infomationPageReqVO = new MaterialInfomationPageReqVO(); - infomationPageReqVO.setBatchId(item.getId()); - infomationPageReqVO.setProductId(item.getProductId()); - infomationPageReqVO.setUsageStatus("0"); - PageResult materialInfomationDOPageResult = materialInfomationMapper.selectAll(infomationPageReqVO); - Long totalCount = materialInfomationDOPageResult.getTotalCount(); -// item.setInboundQuantity(item.getInboundQuantity()-totalCount); - // 方案2: 添加边界检查，防止负数 - long calculatedQuantity = item.getInboundQuantity() - totalCount; - item.setInboundQuantity(Math.max(0L, calculatedQuantity)); - }); - - - return pageResult; - } - - - @Override - public MaterialBatchAssignRespVO assignLab(MaterialBatchAssignSaveReqVO createReqVO){ - // 插入 - MaterialBatchAssignDO materialBatchAssign = BeanUtils.toBean(createReqVO, MaterialBatchAssignDO.class); - materialBatchAssignMapper.insert(materialBatchAssign); - // 返回 - return BeanUtils.toBean(materialBatchAssign, MaterialBatchAssignRespVO.class); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchService.java index 152f7af..ad71bf5 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchService.java @@ -1,13 +1,13 @@ package com.zt.plat.module.qms.resource.material.service; -import java.util.*; - +import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchSaveReqVO; -import jakarta.validation.*; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; -import com.zt.plat.framework.common.pojo.PageResult; +import jakarta.validation.*; + +import java.util.List; /** * 物料批次 Service 接口 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchServiceImpl.java index a801e0f..f60f9f9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialBatchServiceImpl.java @@ -1,23 +1,20 @@ package com.zt.plat.module.qms.resource.material.service; import cn.hutool.core.collection.CollUtil; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialBatchSaveReqVO; -import org.springframework.stereotype.Service; +import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; +import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchMapper; import jakarta.annotation.Resource; +import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchMapper; +import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; /** diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationService.java index b507cba..07388f9 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationService.java @@ -1,14 +1,13 @@ package com.zt.plat.module.qms.resource.material.service; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.module.qms.resource.material.controller.vo.*; +import java.util.*; + import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import jakarta.validation.Valid; - -import java.util.List; +import jakarta.validation.*; +import com.zt.plat.framework.common.pojo.PageResult; /** * 物料实例 Service 接口 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationServiceImpl.java index 4c76626..0254e34 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInfomationServiceImpl.java @@ -3,7 +3,6 @@ package com.zt.plat.module.qms.resource.material.service; import cn.hutool.core.collection.CollUtil; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInfomationSaveReqVO; @@ -16,7 +15,7 @@ import org.springframework.validation.annotation.Validated; import java.util.List; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.MATERIAL_INFOMATION_NOT_EXISTS; /** * 物料实例 Service 实现类 diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchService.java deleted file mode 100644 index 2f3ae1e..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchService.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 库存盘点项 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryCheckBatchService { - - /** - * 创建库存盘点项 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryCheckBatchRespVO createMaterialInventoryCheckBatch(@Valid MaterialInventoryCheckBatchSaveReqVO createReqVO); - - /** - * 更新库存盘点项 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryCheckBatch(@Valid MaterialInventoryCheckBatchSaveReqVO updateReqVO); - - /** - * 删除库存盘点项 - * - * @param id 编号 - */ - void deleteMaterialInventoryCheckBatch(Long id); - - /** - * 批量删除库存盘点项 - * - * @param ids 编号 - */ - void deleteMaterialInventoryCheckBatchListByIds(List ids); - - /** - * 获得库存盘点项 - * - * @param id 编号 - * @return 库存盘点项 - */ - MaterialInventoryCheckBatchDO getMaterialInventoryCheckBatch(Long id); - - /** - * 获得库存盘点项分页 - * - * @param pageReqVO 分页查询 - * @return 库存盘点项分页 - */ - PageResult getMaterialInventoryCheckBatchPage(MaterialInventoryCheckBatchPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchServiceImpl.java deleted file mode 100644 index c2573df..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckBatchServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckBatchSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckBatchMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 库存盘点项 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryCheckBatchServiceImpl implements MaterialInventoryCheckBatchService { - - @Resource - private MaterialInventoryCheckBatchMapper materialInventoryCheckBatchMapper; - - @Override - public MaterialInventoryCheckBatchRespVO createMaterialInventoryCheckBatch(MaterialInventoryCheckBatchSaveReqVO createReqVO) { - // 插入 - MaterialInventoryCheckBatchDO materialInventoryCheckBatch = BeanUtils.toBean(createReqVO, MaterialInventoryCheckBatchDO.class); - materialInventoryCheckBatchMapper.insert(materialInventoryCheckBatch); - // 返回 - return BeanUtils.toBean(materialInventoryCheckBatch, MaterialInventoryCheckBatchRespVO.class); - } - - @Override - public void updateMaterialInventoryCheckBatch(MaterialInventoryCheckBatchSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryCheckBatchExists(updateReqVO.getId()); - // 更新 - MaterialInventoryCheckBatchDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryCheckBatchDO.class); - materialInventoryCheckBatchMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryCheckBatch(Long id) { - // 校验存在 - validateMaterialInventoryCheckBatchExists(id); - // 删除 - materialInventoryCheckBatchMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryCheckBatchListByIds(List ids) { - // 校验存在 - validateMaterialInventoryCheckBatchExists(ids); - // 删除 - materialInventoryCheckBatchMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryCheckBatchExists(List ids) { - List list = materialInventoryCheckBatchMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS); - } - } - - private void validateMaterialInventoryCheckBatchExists(Long id) { - if (materialInventoryCheckBatchMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_CHECK_BATCH_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryCheckBatchDO getMaterialInventoryCheckBatch(Long id) { - return materialInventoryCheckBatchMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryCheckBatchPage(MaterialInventoryCheckBatchPageReqVO pageReqVO) { - return materialInventoryCheckBatchMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailService.java deleted file mode 100644 index 91b79da..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 库存盘点明细 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryCheckDetailService { - - /** - * 创建库存盘点明细 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryCheckDetailRespVO createMaterialInventoryCheckDetail(@Valid MaterialInventoryCheckDetailSaveReqVO createReqVO); - - /** - * 更新库存盘点明细 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryCheckDetail(@Valid MaterialInventoryCheckDetailSaveReqVO updateReqVO); - - /** - * 删除库存盘点明细 - * - * @param id 编号 - */ - void deleteMaterialInventoryCheckDetail(Long id); - - /** - * 批量删除库存盘点明细 - * - * @param ids 编号 - */ - void deleteMaterialInventoryCheckDetailListByIds(List ids); - - /** - * 获得库存盘点明细 - * - * @param id 编号 - * @return 库存盘点明细 - */ - MaterialInventoryCheckDetailDO getMaterialInventoryCheckDetail(Long id); - - /** - * 获得库存盘点明细分页 - * - * @param pageReqVO 分页查询 - * @return 库存盘点明细分页 - */ - PageResult getMaterialInventoryCheckDetailPage(MaterialInventoryCheckDetailPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailServiceImpl.java deleted file mode 100644 index 3387b48..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckDetailServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckDetailSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckDetailMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 库存盘点明细 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryCheckDetailServiceImpl implements MaterialInventoryCheckDetailService { - - @Resource - private MaterialInventoryCheckDetailMapper materialInventoryCheckDetailMapper; - - @Override - public MaterialInventoryCheckDetailRespVO createMaterialInventoryCheckDetail(MaterialInventoryCheckDetailSaveReqVO createReqVO) { - // 插入 - MaterialInventoryCheckDetailDO materialInventoryCheckDetail = BeanUtils.toBean(createReqVO, MaterialInventoryCheckDetailDO.class); - materialInventoryCheckDetailMapper.insert(materialInventoryCheckDetail); - // 返回 - return BeanUtils.toBean(materialInventoryCheckDetail, MaterialInventoryCheckDetailRespVO.class); - } - - @Override - public void updateMaterialInventoryCheckDetail(MaterialInventoryCheckDetailSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryCheckDetailExists(updateReqVO.getId()); - // 更新 - MaterialInventoryCheckDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryCheckDetailDO.class); - materialInventoryCheckDetailMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryCheckDetail(Long id) { - // 校验存在 - validateMaterialInventoryCheckDetailExists(id); - // 删除 - materialInventoryCheckDetailMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryCheckDetailListByIds(List ids) { - // 校验存在 - validateMaterialInventoryCheckDetailExists(ids); - // 删除 - materialInventoryCheckDetailMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryCheckDetailExists(List ids) { - List list = materialInventoryCheckDetailMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS); - } - } - - private void validateMaterialInventoryCheckDetailExists(Long id) { - if (materialInventoryCheckDetailMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_CHECK_DETAIL_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryCheckDetailDO getMaterialInventoryCheckDetail(Long id) { - return materialInventoryCheckDetailMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryCheckDetailPage(MaterialInventoryCheckDetailPageReqVO pageReqVO) { - return materialInventoryCheckDetailMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckService.java deleted file mode 100644 index f1b88cb..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckService.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 库存盘点 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryCheckService { - - /** - * 创建库存盘点 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryCheckRespVO createMaterialInventoryCheck(@Valid MaterialInventoryCheckSaveReqVO createReqVO); - - /** - * 更新库存盘点 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryCheck(@Valid MaterialInventoryCheckSaveReqVO updateReqVO); - - /** - * 删除库存盘点 - * - * @param id 编号 - */ - void deleteMaterialInventoryCheck(Long id); - - /** - * 批量删除库存盘点 - * - * @param ids 编号 - */ - void deleteMaterialInventoryCheckListByIds(List ids); - - /** - * 获得库存盘点 - * - * @param id 编号 - * @return 库存盘点 - */ - MaterialInventoryCheckDO getMaterialInventoryCheck(Long id); - - /** - * 获得库存盘点分页 - * - * @param pageReqVO 分页查询 - * @return 库存盘点分页 - */ - PageResult getMaterialInventoryCheckPage(MaterialInventoryCheckPageReqVO pageReqVO); - - - /** - * 创建库存盘点表单 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryCheckRespVO createMaterialInventoryCheckForm(@Valid MaterialInventoryCheckSaveReqVO createReqVO); - - /** - * 获得库存盘点表单 - * - * @param id 编号 - * @return 库存盘点 - */ - MaterialInventoryCheckRespVO getMaterialInventoryCheckForm(Long id); -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckServiceImpl.java deleted file mode 100644 index 7b2d646..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryCheckServiceImpl.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryCheckSaveReqVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckBatchDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDetailDO; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInfomationMapper; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckBatchMapper; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckDetailMapper; -import jakarta.validation.Valid; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryCheckDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryCheckMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 库存盘点 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryCheckServiceImpl implements MaterialInventoryCheckService { - - @Resource - private MaterialInventoryCheckMapper materialInventoryCheckMapper; - - @Resource - private MaterialInventoryCheckBatchMapper materialInventoryCheckBatchMapper;//盘点项目 - - @Resource - private MaterialInventoryCheckDetailMapper materialInventoryCheckDetailMapper;//盘点明细 - - - @Resource - private MaterialInfomationMapper materialInfomationMapper;//物料实例 - - @Override - public MaterialInventoryCheckRespVO createMaterialInventoryCheck(MaterialInventoryCheckSaveReqVO createReqVO) { - // 插入 - MaterialInventoryCheckDO materialInventoryCheck = BeanUtils.toBean(createReqVO, MaterialInventoryCheckDO.class); - materialInventoryCheckMapper.insert(materialInventoryCheck); - // 返回 - return BeanUtils.toBean(materialInventoryCheck, MaterialInventoryCheckRespVO.class); - } - - @Override - public void updateMaterialInventoryCheck(MaterialInventoryCheckSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryCheckExists(updateReqVO.getId()); - // 更新 - MaterialInventoryCheckDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryCheckDO.class); - materialInventoryCheckMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryCheck(Long id) { - // 校验存在 - validateMaterialInventoryCheckExists(id); - // 删除 - materialInventoryCheckMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryCheckListByIds(List ids) { - // 校验存在 - validateMaterialInventoryCheckExists(ids); - // 删除 - materialInventoryCheckMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryCheckExists(List ids) { - List list = materialInventoryCheckMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_CHECK_NOT_EXISTS); - } - } - - private void validateMaterialInventoryCheckExists(Long id) { - if (materialInventoryCheckMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_CHECK_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryCheckDO getMaterialInventoryCheck(Long id) { - return materialInventoryCheckMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryCheckPage(MaterialInventoryCheckPageReqVO pageReqVO) { - return materialInventoryCheckMapper.selectPage(pageReqVO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public MaterialInventoryCheckRespVO createMaterialInventoryCheckForm(@Valid MaterialInventoryCheckSaveReqVO createReqVO) { - // 校验 batchList 不为空 - if (CollUtil.isEmpty(createReqVO.getBatchList())) { - throw exception(MATERIAL_INVENTORY_CHECK_NOT_EXISTS); - } - - /** 插入库存盘点数据 */ - MaterialInventoryCheckDO materialInventoryCheck = BeanUtils.toBean(createReqVO, MaterialInventoryCheckDO.class); - materialInventoryCheckMapper.insert(materialInventoryCheck); - - MaterialInventoryCheckRespVO resultVo = BeanUtils.toBean(materialInventoryCheck, MaterialInventoryCheckRespVO.class); - - // 获取生成的ID作为父ID - Long parentId = materialInventoryCheck.getId(); - - - /** 插入库存盘点项目数据 */ - List batchList = createReqVO.getBatchList(); - List BatchRespVOList = new ArrayList<>(); - for (MaterialInventoryCheckBatchSaveReqVO batchItem : batchList) { - batchItem.setCheckId(parentId); - // 插入 - MaterialInventoryCheckBatchDO materialInventoryCheckBatch = BeanUtils.toBean(batchItem, MaterialInventoryCheckBatchDO.class); - materialInventoryCheckBatchMapper.insert(materialInventoryCheckBatch); - BatchRespVOList.add(BeanUtils.toBean(materialInventoryCheckBatch, MaterialInventoryCheckBatchRespVO.class)); - } - - /** 根据盘点数据自动填入盘点明细 */ - for (MaterialInventoryCheckBatchRespVO materialInventoryCheckBatchRespVO : BatchRespVOList) { - MaterialInfomationPageReqVO reqVO = new MaterialInfomationPageReqVO(); - reqVO.setProductId(materialInventoryCheckBatchRespVO.getCheckProductId()); - - PageResult materialInfomationDOPageResult = materialInfomationMapper.selectAll(reqVO); - - materialInventoryCheckBatchRespVO.setExpected(String.valueOf(materialInfomationDOPageResult.getList().size()));//以实例数量为应盘数量 - - materialInfomationDOPageResult.getList().forEach(materialInfomationDO -> { - // 插入 - MaterialInventoryCheckDetailDO materialInventoryCheckDetail = new MaterialInventoryCheckDetailDO(); - materialInventoryCheckDetail.setCheckBatchId(materialInventoryCheckBatchRespVO.getId());//盘点项目ID - materialInventoryCheckDetail.setInfomationId(materialInfomationDO.getId());//物料实例ID - materialInventoryCheckDetail.setStatus("0");//待盘点状态 - materialInventoryCheckDetailMapper.insert(materialInventoryCheckDetail); - }); - - } - - - resultVo.setBatchList(BatchRespVOList); - // 返回结果 - return resultVo; - - } - - - @Override - public MaterialInventoryCheckRespVO getMaterialInventoryCheckForm(Long id) { - MaterialInventoryCheckDO micDo = materialInventoryCheckMapper.selectById(id); - if (micDo == null) { - throw exception(MATERIAL_INVENTORY_CHECK_NOT_EXISTS); - } - List BatchDOList= materialInventoryCheckBatchMapper.selectList(new LambdaQueryWrapperX() - .eq(MaterialInventoryCheckBatchDO::getCheckId, micDo.getId())); - - MaterialInventoryCheckRespVO resultVo =BeanUtils.toBean(micDo, MaterialInventoryCheckRespVO.class); - resultVo.setBatchList(BeanUtils.toBean(BatchDOList, MaterialInventoryCheckBatchRespVO.class)); - return resultVo; - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailService.java deleted file mode 100644 index 551af01..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryInboundDetailService { - - /** - * 创建入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryInboundDetailRespVO createMaterialInventoryInboundDetail(@Valid MaterialInventoryInboundDetailSaveReqVO createReqVO); - - /** - * 更新入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryInboundDetail(@Valid MaterialInventoryInboundDetailSaveReqVO updateReqVO); - - /** - * 删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param id 编号 - */ - void deleteMaterialInventoryInboundDetail(Long id); - - /** - * 批量删除入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param ids 编号 - */ - void deleteMaterialInventoryInboundDetailListByIds(List ids); - - /** - * 获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param id 编号 - * @return 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - */ - MaterialInventoryInboundDetailDO getMaterialInventoryInboundDetail(Long id); - - /** - * 获得入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页 - * - * @param pageReqVO 分页查询 - * @return 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页 - */ - PageResult getMaterialInventoryInboundDetailPage(MaterialInventoryInboundDetailPageReqVO pageReqVO); - - - - - PageResult getMaterialInventoryInboundDetailPageList(MaterialInventoryInboundDetailPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailServiceImpl.java deleted file mode 100644 index bce83ee..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundDetailServiceImpl.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryInboundDetailMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 入库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryInboundDetailServiceImpl implements MaterialInventoryInboundDetailService { - - @Resource - private MaterialInventoryInboundDetailMapper materialInventoryInboundDetailMapper; - - @Override - public MaterialInventoryInboundDetailRespVO createMaterialInventoryInboundDetail(MaterialInventoryInboundDetailSaveReqVO createReqVO) { - // 插入 - MaterialInventoryInboundDetailDO materialInventoryInboundDetail = BeanUtils.toBean(createReqVO, MaterialInventoryInboundDetailDO.class); - materialInventoryInboundDetailMapper.insert(materialInventoryInboundDetail); - // 返回 - return BeanUtils.toBean(materialInventoryInboundDetail, MaterialInventoryInboundDetailRespVO.class); - } - - @Override - public void updateMaterialInventoryInboundDetail(MaterialInventoryInboundDetailSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryInboundDetailExists(updateReqVO.getId()); - // 更新 - MaterialInventoryInboundDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryInboundDetailDO.class); - materialInventoryInboundDetailMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryInboundDetail(Long id) { - // 校验存在 - validateMaterialInventoryInboundDetailExists(id); - // 删除 - materialInventoryInboundDetailMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryInboundDetailListByIds(List ids) { - // 校验存在 - validateMaterialInventoryInboundDetailExists(ids); - // 删除 - materialInventoryInboundDetailMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryInboundDetailExists(List ids) { - List list = materialInventoryInboundDetailMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS); - } - } - - private void validateMaterialInventoryInboundDetailExists(Long id) { - if (materialInventoryInboundDetailMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_INBOUND_DETAIL_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryInboundDetailDO getMaterialInventoryInboundDetail(Long id) { - return materialInventoryInboundDetailMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryInboundDetailPage(MaterialInventoryInboundDetailPageReqVO pageReqVO) { - return materialInventoryInboundDetailMapper.selectPage(pageReqVO); - } - - @Override - public PageResult getMaterialInventoryInboundDetailPageList(MaterialInventoryInboundDetailPageReqVO pageReqVO) { - return materialInventoryInboundDetailMapper.selectPageList(pageReqVO); - } -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundService.java deleted file mode 100644 index 249e7dc..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundService.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 入库 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryInboundService { - - /** - * 创建入库 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryInboundRespVO createMaterialInventoryInbound(@Valid MaterialInventoryInboundSaveReqVO createReqVO); - - /** - * 更新入库 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryInbound(@Valid MaterialInventoryInboundSaveReqVO updateReqVO); - - /** - * 删除入库 - * - * @param id 编号 - */ - void deleteMaterialInventoryInbound(Long id); - - /** - * 批量删除入库 - * - * @param ids 编号 - */ - void deleteMaterialInventoryInboundListByIds(List ids); - - /** - * 获得入库 - * - * @param id 编号 - * @return 入库 - */ - MaterialInventoryInboundDO getMaterialInventoryInbound(Long id); - - /** - * 获得入库分页 - * - * @param pageReqVO 分页查询 - * @return 入库分页 - */ - PageResult getMaterialInventoryInboundPage(MaterialInventoryInboundPageReqVO pageReqVO); - - - /*** - * 批量入库/上架 - * @param createReqVO - * @return - */ - void multiCreateMaterialInventoryInbound(MaterialInventoryInboundSaveReqVO createReqVO); - - /** - * 单个入库/上架 - */ - PageResultsingleCreateMaterialInventoryInbound(MaterialInventoryInboundSaveReqVO createReqVO); - - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundServiceImpl.java deleted file mode 100644 index 5024f5e..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryInboundServiceImpl.java +++ /dev/null @@ -1,191 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.framework.common.exception.ErrorCode; -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialBatchAssignDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialBatchAssignMapper; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInfomationMapper; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryInboundDetailMapper; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryInboundMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 入库 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryInboundServiceImpl implements MaterialInventoryInboundService { - - @Resource - private MaterialInventoryInboundMapper materialInventoryInboundMapper;//入库 - - @Resource - private MaterialInventoryInboundDetailMapper materialInventoryInboundDetailMapper;//入库明细 - - @Resource - private MaterialInfomationMapper materialInfomationMapper;//物料实例 - - @Resource - private MaterialBatchAssignMapper materialBatchAssignMapper;//批次分配 - - @Override - public MaterialInventoryInboundRespVO createMaterialInventoryInbound(MaterialInventoryInboundSaveReqVO createReqVO) { - // 插入 - MaterialInventoryInboundDO materialInventoryInbound = BeanUtils.toBean(createReqVO, MaterialInventoryInboundDO.class); - materialInventoryInboundMapper.insert(materialInventoryInbound); - // 返回 - return BeanUtils.toBean(materialInventoryInbound, MaterialInventoryInboundRespVO.class); - } - - @Override - public void updateMaterialInventoryInbound(MaterialInventoryInboundSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryInboundExists(updateReqVO.getId()); - // 更新 - MaterialInventoryInboundDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryInboundDO.class); - materialInventoryInboundMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryInbound(Long id) { - // 校验存在 - validateMaterialInventoryInboundExists(id); - // 删除 - materialInventoryInboundMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryInboundListByIds(List ids) { - // 校验存在 - validateMaterialInventoryInboundExists(ids); - // 删除 - materialInventoryInboundMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryInboundExists(List ids) { - List list = materialInventoryInboundMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_INBOUND_NOT_EXISTS); - } - } - - private void validateMaterialInventoryInboundExists(Long id) { - if (materialInventoryInboundMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_INBOUND_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryInboundDO getMaterialInventoryInbound(Long id) { - return materialInventoryInboundMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryInboundPage(MaterialInventoryInboundPageReqVO pageReqVO) { - return materialInventoryInboundMapper.selectPage(pageReqVO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void multiCreateMaterialInventoryInbound(MaterialInventoryInboundSaveReqVO createReqVO) { - MaterialInventoryInboundDetailSaveReqVO detail = createReqVO.getDetail(); - - //判断输入数量是否大于批次剩余数据 - this.quantityCheck(detail); - //生成入库头数据 - MaterialInventoryInboundDO materialInventoryInbound = BeanUtils.toBean(createReqVO, MaterialInventoryInboundDO.class); - materialInventoryInboundMapper.insert(materialInventoryInbound); - - - - //根据入库数量创建实例数据 - List MaterialInfomationDO = new ArrayList(); - for (int i = 0; i < detail.getQuantity(); i++) { - MaterialInfomationDO materialInfomation = new MaterialInfomationDO(); - materialInfomation.setBatchId(detail.getBatchAssignId());//分发批次ID - materialInfomation.setLocationId(detail.getLocationId());//货位Id - materialInfomation.setInventoryInboundId(materialInventoryInbound.getId());//入库ID，批量入库的，所以为同一ID，主要是验收申请入库时不一样 - materialInfomation.setProductId(detail.getProductId());//分类ID - materialInfomation.setPublishStatus("1");//批量入库默认上架 - MaterialInfomationDO.add(materialInfomation); - } - - materialInfomationMapper.insert(MaterialInfomationDO); - - - //根据实例数据创建入库明细 - MaterialInfomationPageReqVO InfomationVO = new MaterialInfomationPageReqVO(); - InfomationVO.setInventoryInboundId(materialInventoryInbound.getId()); - PageResult InfomationList = materialInfomationMapper.selectPage(InfomationVO); - InfomationList.getList().forEach(item -> { - MaterialInventoryInboundDetailDO detailDO = new MaterialInventoryInboundDetailDO(); - detailDO.setInboundId(materialInventoryInbound.getId()); - detailDO.setMaterialInfomationId(item.getId()); - detailDO.setInboundWay("批量入库"); - materialInventoryInboundDetailMapper.insert(detailDO); - }); - } - - @Override - public PageResult singleCreateMaterialInventoryInbound(MaterialInventoryInboundSaveReqVO createReqVO) { - - MaterialInventoryInboundDetailSaveReqVO detail = createReqVO.getDetail(); - - //判断输入数量是否大于批次剩余数据 - this.quantityCheck(detail); - //生成入库头数据 - MaterialInventoryInboundDO materialInventoryInbound = BeanUtils.toBean(createReqVO, MaterialInventoryInboundDO.class); - materialInventoryInboundMapper.insert(materialInventoryInbound); - - //根据实例数据创建入库明细 - MaterialInfomationPageReqVO InfomationVO = new MaterialInfomationPageReqVO(); - InfomationVO.setInventoryInboundId(materialInventoryInbound.getId()); - PageResult InfomationList = materialInfomationMapper.selectPage(InfomationVO); - InfomationList.getList().forEach(item -> { - MaterialInventoryInboundDetailDO detailDO = new MaterialInventoryInboundDetailDO(); - detailDO.setInboundId(materialInventoryInbound.getId()); - detailDO.setMaterialInfomationId(item.getId()); - detailDO.setInboundWay("采购入库"); - materialInventoryInboundDetailMapper.insert(detailDO); - }); - - return null; - } - - private void quantityCheck(MaterialInventoryInboundDetailSaveReqVO detail) { - if (detail.getBatchAssignId() == null || detail.getQuantity() == null) { - throw exception(MATERIAL_BATCH_ASSIGN_NOT_EXISTS); - } - - MaterialBatchAssignDO materialBatchAssignDO = materialBatchAssignMapper.selectById(detail.getBatchAssignId()); - if (materialBatchAssignDO==null){ - throw exception(new ErrorCode(1_032_150_000, "批次信息错误-"+detail.getBatchAssignId())); - } - - //判断输入数量是否大于批次剩余数据 - if (materialBatchAssignDO.getInboundQuantity() < detail.getQuantity()) { - throw exception(new ErrorCode(1_032_150_000, "批次剩余量不足")); - } - } - - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailService.java deleted file mode 100644 index ab949c0..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryOutboundDetailService { - - /** - * 创建出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryOutboundDetailRespVO createMaterialInventoryOutboundDetail(@Valid MaterialInventoryOutboundDetailSaveReqVO createReqVO); - - /** - * 更新出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryOutboundDetail(@Valid MaterialInventoryOutboundDetailSaveReqVO updateReqVO); - - /** - * 删除出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param id 编号 - */ - void deleteMaterialInventoryOutboundDetail(Long id); - - /** - * 批量删除出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param ids 编号 - */ - void deleteMaterialInventoryOutboundDetailListByIds(List ids); - - /** - * 获得出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - * - * @param id 编号 - * @return 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 - */ - MaterialInventoryOutboundDetailDO getMaterialInventoryOutboundDetail(Long id); - - /** - * 获得出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页 - * - * @param pageReqVO 分页查询 - * @return 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等分页 - */ - PageResult getMaterialInventoryOutboundDetailPage(MaterialInventoryOutboundDetailPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailServiceImpl.java deleted file mode 100644 index f671f57..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundDetailServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryOutboundDetailMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 出库明细,出库明细，含领用出库、退货出库、盘亏出库、销毁出库等 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryOutboundDetailServiceImpl implements MaterialInventoryOutboundDetailService { - - @Resource - private MaterialInventoryOutboundDetailMapper materialInventoryOutboundDetailMapper; - - @Override - public MaterialInventoryOutboundDetailRespVO createMaterialInventoryOutboundDetail(MaterialInventoryOutboundDetailSaveReqVO createReqVO) { - // 插入 - MaterialInventoryOutboundDetailDO materialInventoryOutboundDetail = BeanUtils.toBean(createReqVO, MaterialInventoryOutboundDetailDO.class); - materialInventoryOutboundDetailMapper.insert(materialInventoryOutboundDetail); - // 返回 - return BeanUtils.toBean(materialInventoryOutboundDetail, MaterialInventoryOutboundDetailRespVO.class); - } - - @Override - public void updateMaterialInventoryOutboundDetail(MaterialInventoryOutboundDetailSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryOutboundDetailExists(updateReqVO.getId()); - // 更新 - MaterialInventoryOutboundDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryOutboundDetailDO.class); - materialInventoryOutboundDetailMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryOutboundDetail(Long id) { - // 校验存在 - validateMaterialInventoryOutboundDetailExists(id); - // 删除 - materialInventoryOutboundDetailMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryOutboundDetailListByIds(List ids) { - // 校验存在 - validateMaterialInventoryOutboundDetailExists(ids); - // 删除 - materialInventoryOutboundDetailMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryOutboundDetailExists(List ids) { - List list = materialInventoryOutboundDetailMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS); - } - } - - private void validateMaterialInventoryOutboundDetailExists(Long id) { - if (materialInventoryOutboundDetailMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryOutboundDetailDO getMaterialInventoryOutboundDetail(Long id) { - return materialInventoryOutboundDetailMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryOutboundDetailPage(MaterialInventoryOutboundDetailPageReqVO pageReqVO) { - return materialInventoryOutboundDetailMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundService.java deleted file mode 100644 index dc531df..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundService.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 出库 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryOutboundService { - - /** - * 创建出库 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryOutboundRespVO createMaterialInventoryOutbound(@Valid MaterialInventoryOutboundSaveReqVO createReqVO); - - /** - * 更新出库 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialInventoryOutbound(@Valid MaterialInventoryOutboundSaveReqVO updateReqVO); - - /** - * 删除出库 - * - * @param id 编号 - */ - void deleteMaterialInventoryOutbound(Long id); - - /** - * 批量删除出库 - * - * @param ids 编号 - */ - void deleteMaterialInventoryOutboundListByIds(List ids); - - /** - * 获得出库 - * - * @param id 编号 - * @return 出库 - */ - MaterialInventoryOutboundDO getMaterialInventoryOutbound(Long id); - - /** - * 获得出库分页 - * - * @param pageReqVO 分页查询 - * @return 出库分页 - */ - PageResult getMaterialInventoryOutboundPage(MaterialInventoryOutboundPageReqVO pageReqVO); - - /** - * 创建出库 - * - * 连带出库明细一起创建 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialInventoryOutboundRespVO createMaterialInventoryOutboundAll(@Valid MaterialInventoryOutboundSaveReqVO createReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundServiceImpl.java deleted file mode 100644 index 1224937..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryOutboundServiceImpl.java +++ /dev/null @@ -1,132 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryOutboundDetailMapper; -import jakarta.validation.Valid; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryOutboundMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 出库 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialInventoryOutboundServiceImpl implements MaterialInventoryOutboundService { - - @Resource - private MaterialInventoryOutboundMapper materialInventoryOutboundMapper; - - @Resource - private MaterialInventoryOutboundDetailMapper materialInventoryOutboundDetailMapper; - - @Override - public MaterialInventoryOutboundRespVO createMaterialInventoryOutbound(MaterialInventoryOutboundSaveReqVO createReqVO) { - // 插入 - MaterialInventoryOutboundDO materialInventoryOutbound = BeanUtils.toBean(createReqVO, MaterialInventoryOutboundDO.class); - materialInventoryOutboundMapper.insert(materialInventoryOutbound); - // 返回 - return BeanUtils.toBean(materialInventoryOutbound, MaterialInventoryOutboundRespVO.class); - } - - @Override - public void updateMaterialInventoryOutbound(MaterialInventoryOutboundSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialInventoryOutboundExists(updateReqVO.getId()); - // 更新 - MaterialInventoryOutboundDO updateObj = BeanUtils.toBean(updateReqVO, MaterialInventoryOutboundDO.class); - materialInventoryOutboundMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialInventoryOutbound(Long id) { - // 校验存在 - validateMaterialInventoryOutboundExists(id); - // 删除 - materialInventoryOutboundMapper.deleteById(id); - } - - @Override - public void deleteMaterialInventoryOutboundListByIds(List ids) { - // 校验存在 - validateMaterialInventoryOutboundExists(ids); - // 删除 - materialInventoryOutboundMapper.deleteByIds(ids); - } - - private void validateMaterialInventoryOutboundExists(List ids) { - List list = materialInventoryOutboundMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS); - } - } - - private void validateMaterialInventoryOutboundExists(Long id) { - if (materialInventoryOutboundMapper.selectById(id) == null) { - throw exception(MATERIAL_INVENTORY_OUTBOUND_NOT_EXISTS); - } - } - - @Override - public MaterialInventoryOutboundDO getMaterialInventoryOutbound(Long id) { - return materialInventoryOutboundMapper.selectById(id); - } - - @Override - public PageResult getMaterialInventoryOutboundPage(MaterialInventoryOutboundPageReqVO pageReqVO) { - return materialInventoryOutboundMapper.selectPage(pageReqVO); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public MaterialInventoryOutboundRespVO createMaterialInventoryOutboundAll(@Valid MaterialInventoryOutboundSaveReqVO createReqVO) { - - - /** 创建出库头 */ - // 插入 - MaterialInventoryOutboundDO materialInventoryOutbound = BeanUtils.toBean(createReqVO, MaterialInventoryOutboundDO.class); - materialInventoryOutboundMapper.insert(materialInventoryOutbound); - - MaterialInventoryOutboundRespVO respVO = BeanUtils.toBean(materialInventoryOutbound, MaterialInventoryOutboundRespVO.class); - - /** 创建出出库明细 */ - // 校验存在 - if (createReqVO.getDetailSaveReqVoList() == null || createReqVO.getDetailSaveReqVoList().size() == 0) - throw exception(MATERIAL_INVENTORY_OUTBOUND_DETAIL_NOT_EXISTS); - - List detailReqVoList = new ArrayList<>(); - - for (MaterialInventoryOutboundDetailSaveReqVO itemVo : createReqVO.getDetailSaveReqVoList()) { - MaterialInventoryOutboundDetailDO materialInventoryOutboundDetail = BeanUtils.toBean(itemVo, MaterialInventoryOutboundDetailDO.class); - - // 设置出库单id - materialInventoryOutboundDetail.setParentId(materialInventoryOutbound.getId()); - - materialInventoryOutboundDetailMapper.insert(materialInventoryOutboundDetail); - detailReqVoList.add(BeanUtils.toBean(materialInventoryOutboundDetail, MaterialInventoryOutboundDetailRespVO.class)); - } - - respVO.setDetailReqVoList(detailReqVoList); - - - // 返回 - return respVO; - } -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryService.java deleted file mode 100644 index b597c11..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import com.zt.plat.framework.common.pojo.PageResult; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO; -import jakarta.validation.Valid; - -import java.util.List; - -/** - * 库存管理 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialInventoryService { - - - /** - * 单个入库/上架 - */ - PageResult getMaterialInventoryPage(MaterialInventoryRespVO pageReqVO); - - /** - * 同意出库 - */ - - void agreeMaterialInventoryOutbound(Long id); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryServiceImpl.java deleted file mode 100644 index 42182d9..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialInventoryServiceImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; -import com.zt.plat.module.qms.business.bus.controller.vo.BusinessSampleEntrustRegistrationExtendRespVO; -import com.zt.plat.module.qms.business.bus.dal.dataobject.BusinessSampleEntrustRegistrationDO; -import com.zt.plat.module.qms.enums.QmsCommonConstant; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryRespVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDetailDO; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInfomationMapper; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryMapper; -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialInventoryOutboundDetailMapper; -import jakarta.annotation.Resource; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.stream.Collectors; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.MATERIAL_INFOMATION_NOT_EXISTS; - -@Service -public class MaterialInventoryServiceImpl implements MaterialInventoryService { - @Resource - private MaterialInventoryMapper materialInventoryMapper; - - @Resource - private MaterialInventoryOutboundDetailMapper materialInventoryOutboundDetailMapper;//出库明细 - - @Resource - private MaterialInfomationMapper materialInfomationMapper;//物料实例 - @Override - public PageResult getMaterialInventoryPage(MaterialInventoryRespVO pageReqVO) { - IPage page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - - IPage pageList = materialInventoryMapper.selectPageList(page, pageReqVO); - PageResult pageResult = new PageResult<>(pageList.getRecords(), pageList.getTotal()); - return BeanUtils.toBean(pageResult, MaterialInventoryDO.class); - - } - - @Override - @Transactional - public void agreeMaterialInventoryOutbound(Long outId) { - MaterialInventoryOutboundDetailPageReqVO pageReqVO = new MaterialInventoryOutboundDetailPageReqVO(); - pageReqVO.setParentId(outId); - pageReqVO.setPageSize(-1);//不分页 - PageResult materialInventoryOutboundDetailDOPageResult = materialInventoryOutboundDetailMapper.selectPage(pageReqVO); - - List list = materialInventoryOutboundDetailDOPageResult.getList(); - for (MaterialInventoryOutboundDetailDO item : list) { - // 校验存在 - validateMaterialInfomationExists(item.getInfomationId()); - // 更新 - MaterialInfomationDO updateObj = new MaterialInfomationDO(); - updateObj.setId(item.getInfomationId()); - updateObj.setUsageStatus("1"); - materialInfomationMapper.updateById(updateObj); - } - - - } - - private void validateMaterialInfomationExists(Long id) { - if (materialInfomationMapper.selectById(id) == null) { - throw exception(MATERIAL_INFOMATION_NOT_EXISTS); - } - } -} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailService.java deleted file mode 100644 index e6ce97c..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 物料通用流程明细,对应生命周期的明细 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialLifecycleDetailService { - - /** - * 创建物料通用流程明细,对应生命周期的明细 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialLifecycleDetailRespVO createMaterialLifecycleDetail(@Valid MaterialLifecycleDetailSaveReqVO createReqVO); - - /** - * 更新物料通用流程明细,对应生命周期的明细 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialLifecycleDetail(@Valid MaterialLifecycleDetailSaveReqVO updateReqVO); - - /** - * 删除物料通用流程明细,对应生命周期的明细 - * - * @param id 编号 - */ - void deleteMaterialLifecycleDetail(Long id); - - /** - * 批量删除物料通用流程明细,对应生命周期的明细 - * - * @param ids 编号 - */ - void deleteMaterialLifecycleDetailListByIds(List ids); - - /** - * 获得物料通用流程明细,对应生命周期的明细 - * - * @param id 编号 - * @return 物料通用流程明细,对应生命周期的明细 - */ - MaterialLifecycleDetailDO getMaterialLifecycleDetail(Long id); - - /** - * 获得物料通用流程明细,对应生命周期的明细分页 - * - * @param pageReqVO 分页查询 - * @return 物料通用流程明细,对应生命周期的明细分页 - */ - PageResult getMaterialLifecycleDetailPage(MaterialLifecycleDetailPageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java deleted file mode 100644 index aee89af..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleDetailServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailPageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleDetailSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDetailDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialLifecycleDetailMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS; - -/** - * 物料通用流程明细,对应生命周期的明细 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialLifecycleDetailServiceImpl implements MaterialLifecycleDetailService { - - @Resource - private MaterialLifecycleDetailMapper materialLifecycleDetailMapper; - - @Override - public MaterialLifecycleDetailRespVO createMaterialLifecycleDetail(MaterialLifecycleDetailSaveReqVO createReqVO) { - // 插入 - MaterialLifecycleDetailDO materialLifecycleDetail = BeanUtils.toBean(createReqVO, MaterialLifecycleDetailDO.class); - materialLifecycleDetailMapper.insert(materialLifecycleDetail); - // 返回 - return BeanUtils.toBean(materialLifecycleDetail, MaterialLifecycleDetailRespVO.class); - } - - @Override - public void updateMaterialLifecycleDetail(MaterialLifecycleDetailSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialLifecycleDetailExists(updateReqVO.getId()); - // 更新 - MaterialLifecycleDetailDO updateObj = BeanUtils.toBean(updateReqVO, MaterialLifecycleDetailDO.class); - materialLifecycleDetailMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialLifecycleDetail(Long id) { - // 校验存在 - validateMaterialLifecycleDetailExists(id); - // 删除 - materialLifecycleDetailMapper.deleteById(id); - } - - @Override - public void deleteMaterialLifecycleDetailListByIds(List ids) { - // 校验存在 - validateMaterialLifecycleDetailExists(ids); - // 删除 - materialLifecycleDetailMapper.deleteByIds(ids); - } - - private void validateMaterialLifecycleDetailExists(List ids) { - List list = materialLifecycleDetailMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS); - } - } - - private void validateMaterialLifecycleDetailExists(Long id) { - if (materialLifecycleDetailMapper.selectById(id) == null) { - throw exception(MATERIAL_LIFECYCLE_DETAIL_NOT_EXISTS); - } - } - - @Override - public MaterialLifecycleDetailDO getMaterialLifecycleDetail(Long id) { - return materialLifecycleDetailMapper.selectById(id); - } - - @Override - public PageResult getMaterialLifecycleDetailPage(MaterialLifecycleDetailPageReqVO pageReqVO) { - return materialLifecycleDetailMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleService.java deleted file mode 100644 index 930593a..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecyclePageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleSaveReqVO; -import jakarta.validation.*; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDO; -import com.zt.plat.framework.common.pojo.PageResult; - -/** - * 物料通用流程 Service 接口 - * - * @author 后台管理 - */ -public interface MaterialLifecycleService { - - /** - * 创建物料通用流程 - * - * @param createReqVO 创建信息 - * @return 编号 - */ - MaterialLifecycleRespVO createMaterialLifecycle(@Valid MaterialLifecycleSaveReqVO createReqVO); - - /** - * 更新物料通用流程 - * - * @param updateReqVO 更新信息 - */ - void updateMaterialLifecycle(@Valid MaterialLifecycleSaveReqVO updateReqVO); - - /** - * 删除物料通用流程 - * - * @param id 编号 - */ - void deleteMaterialLifecycle(Long id); - - /** - * 批量删除物料通用流程 - * - * @param ids 编号 - */ - void deleteMaterialLifecycleListByIds(List ids); - - /** - * 获得物料通用流程 - * - * @param id 编号 - * @return 物料通用流程 - */ - MaterialLifecycleDO getMaterialLifecycle(Long id); - - /** - * 获得物料通用流程分页 - * - * @param pageReqVO 分页查询 - * @return 物料通用流程分页 - */ - PageResult getMaterialLifecyclePage(MaterialLifecyclePageReqVO pageReqVO); - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java deleted file mode 100644 index 05a8579..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLifecycleServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.zt.plat.module.qms.resource.material.service; - -import cn.hutool.core.collection.CollUtil; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecyclePageReqVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleRespVO; -import com.zt.plat.module.qms.resource.material.controller.vo.MaterialLifecycleSaveReqVO; -import org.springframework.stereotype.Service; -import jakarta.annotation.Resource; -import org.springframework.validation.annotation.Validated; - -import java.util.*; - -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLifecycleDO; -import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.framework.common.util.object.BeanUtils; - -import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialLifecycleMapper; - -import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; -import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; - -/** - * 物料通用流程 Service 实现类 - * - * @author 后台管理 - */ -@Service -@Validated -public class MaterialLifecycleServiceImpl implements MaterialLifecycleService { - - @Resource - private MaterialLifecycleMapper materialLifecycleMapper; - - @Override - public MaterialLifecycleRespVO createMaterialLifecycle(MaterialLifecycleSaveReqVO createReqVO) { - // 插入 - MaterialLifecycleDO materialLifecycle = BeanUtils.toBean(createReqVO, MaterialLifecycleDO.class); - materialLifecycleMapper.insert(materialLifecycle); - // 返回 - return BeanUtils.toBean(materialLifecycle, MaterialLifecycleRespVO.class); - } - - @Override - public void updateMaterialLifecycle(MaterialLifecycleSaveReqVO updateReqVO) { - // 校验存在 - validateMaterialLifecycleExists(updateReqVO.getId()); - // 更新 - MaterialLifecycleDO updateObj = BeanUtils.toBean(updateReqVO, MaterialLifecycleDO.class); - materialLifecycleMapper.updateById(updateObj); - } - - @Override - public void deleteMaterialLifecycle(Long id) { - // 校验存在 - validateMaterialLifecycleExists(id); - // 删除 - materialLifecycleMapper.deleteById(id); - } - - @Override - public void deleteMaterialLifecycleListByIds(List ids) { - // 校验存在 - validateMaterialLifecycleExists(ids); - // 删除 - materialLifecycleMapper.deleteByIds(ids); - } - - private void validateMaterialLifecycleExists(List ids) { - List list = materialLifecycleMapper.selectByIds(ids); - if (CollUtil.isEmpty(list) || list.size() != ids.size()) { - throw exception(MATERIAL_LIFECYCLE_NOT_EXISTS); - } - } - - private void validateMaterialLifecycleExists(Long id) { - if (materialLifecycleMapper.selectById(id) == null) { - throw exception(MATERIAL_LIFECYCLE_NOT_EXISTS); - } - } - - @Override - public MaterialLifecycleDO getMaterialLifecycle(Long id) { - return materialLifecycleMapper.selectById(id); - } - - @Override - public PageResult getMaterialLifecyclePage(MaterialLifecyclePageReqVO pageReqVO) { - return materialLifecycleMapper.selectPage(pageReqVO); - } - -} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLocationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLocationServiceImpl.java index a6e755e..0b1a656 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLocationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialLocationServiceImpl.java @@ -9,7 +9,6 @@ import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import java.util.*; - import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialLocationDO; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; @@ -17,7 +16,6 @@ import com.zt.plat.framework.common.util.object.BeanUtils; import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialLocationMapper; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; /** diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java index 5e56951..bf59481 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductService.java @@ -1,8 +1,6 @@ package com.zt.plat.module.qms.resource.material.service; -import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; -import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductSaveReqVO; @@ -18,26 +16,28 @@ import java.util.List; */ public interface MaterialProductService { - //保存分类 - CommonResult saveCategory(@Valid MaterialProductSaveReqVO createReqVO); + /** + * 新增分类 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + MaterialProductRespVO saveMaterialCategory(@Valid MaterialProductSaveReqVO createReqVO); - //保存数据 - CommonResult saveData(@Valid MaterialProductSaveReqVO createReqVO); + /** + * 获取分类树 + * + * @return 树列表 + */ + List getMaterialCategoryTree(); - /*获取分类树数据*/ - List getTreeData(String nodeType); - - List listByParId(Long parId, String nodeType); - List listByIdPath(Long id, String nodeType); - - CommonResult updateAllIdPath(Long parentId, Integer level); /** * 创建物料大类 * * @param createReqVO 创建信息 * @return 编号 */ - MaterialProductRespVO createMaterialProduct(@Valid MaterialProductSaveReqVO createReqVO); + MaterialProductRespVO saveMaterialProduct(@Valid MaterialProductSaveReqVO createReqVO); /** * 更新物料大类 @@ -75,5 +75,4 @@ public interface MaterialProductService { * @return 物料大类分页 */ PageResult getMaterialProductPage(MaterialProductPageReqVO pageReqVO); - } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java index 2f156a0..6e301cc 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/service/MaterialProductServiceImpl.java @@ -1,26 +1,26 @@ package com.zt.plat.module.qms.resource.material.service; import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zt.plat.framework.common.exception.ServiceException; -import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.framework.common.pojo.PageResult; import com.zt.plat.framework.common.util.object.BeanUtils; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; import com.zt.plat.module.qms.core.constant.DataTypeConstant; import com.zt.plat.module.qms.enums.ErrorCodeConstants; -import com.zt.plat.module.qms.resource.material.controller.vo.*; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductRespVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialProductSaveReqVO; import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO; import com.zt.plat.module.qms.resource.material.dal.mapper.MaterialProductMapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; @@ -33,125 +33,170 @@ import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; @Service @Validated public class MaterialProductServiceImpl implements MaterialProductService { - private int id_path_update_level_limit = 7; @Resource private MaterialProductMapper materialProductMapper; - + + /** + * 保存分类 + * + */ + @Transactional @Override - @Transactional(rollbackFor = Exception.class) - public CommonResult saveCategory(MaterialProductSaveReqVO entity) { - if(entity.getParentId() == null || entity.getParentId() == 0L) - entity.setParentId(0L); - Long parentId = entity.getParentId(); - List checkList = listByParId(parentId, DataTypeConstant.DATA_TYPE_CATEGORY); - boolean duplicate = false; - MaterialProductDO duplicateEntity = checkList.stream().filter(e->e.getName().equals(entity.getName())).findFirst().orElse(null); - if(duplicateEntity != null && !duplicateEntity.getId().equals(entity.getId())) - duplicate = true; - if(duplicate) - throw exception(ErrorCodeConstants.DICTIONARY_BUSINESS_CLASSIFY_DUPLICATE); - entity.setNodeType(DataTypeConstant.DATA_TYPE_CATEGORY); - Long id = entity.getId(); - MaterialProductDO dic = BeanUtils.toBean(entity, MaterialProductDO.class); - if(ObjectUtils.isEmpty(id)){ - materialProductMapper.insert(dic); - id = dic.getId(); + public MaterialProductRespVO saveMaterialCategory(MaterialProductSaveReqVO createReqVO) { + Long reqId = createReqVO.getId(); + + MaterialProductDO mtrl = BeanUtils.toBean(createReqVO, MaterialProductDO.class); + + LambdaQueryWrapperX queryWrapperX = new LambdaQueryWrapperX() + .eqIfPresent(MaterialProductDO::getParentId, createReqVO.getParentId()) + .eqIfPresent(MaterialProductDO::getName, createReqVO.getName()); + // 新增 + if (reqId == null) { + // 检查分类名称是否重复 + MaterialProductDO one = materialProductMapper.selectOne(queryWrapperX); + if (one != null) throw exception(DICTIONARY_BUSINESS_CLASSIFY_DUPLICATE); + + mtrl.setNodeType(DataTypeConstant.DATA_TYPE_CATEGORY); + + materialProductMapper.insert(mtrl); + + String newIdPath = getIdPath(mtrl); + mtrl.setIdPath(newIdPath); } - MaterialProductDO backData = this.getMaterialProduct(id); - Long parentId_ = backData.getParentId(); - //检查parId，避免父节点设置为本节点的后代节点 - if(parentId_.equals(id)) - throw new ServiceException(ErrorCodeConstants.DATA_COLLECTION_CLASSIFY_PARENT_ERROR); - String idPath = getIdPath(dic); - int curIdIndex = idPath.indexOf("/" + id.toString() + "/"); - int parIdIndex = idPath.indexOf("/" + parentId.toString() + "/"); - if(curIdIndex <= parIdIndex) - throw new ServiceException(ErrorCodeConstants.DATA_COLLECTION_CLASSIFY_PARENT_ERROR); - dic.setIdPath(idPath); + // 修改 + else { + // 校验存在 + MaterialProductDO origDO = materialProductMapper.selectById(reqId); + if (origDO == null) throw exception(MATERIAL_PRODUCT_NOT_EXISTS); + // 检查分类名称是否重复 + queryWrapperX.ne(MaterialProductDO::getId, reqId); + MaterialProductDO one = materialProductMapper.selectOne(queryWrapperX); + if (one != null) throw exception(DICTIONARY_BUSINESS_CLASSIFY_DUPLICATE); - //更新后代节点路径 - updateAllIdPath(id, 1); - materialProductMapper.updateById(dic); - return CommonResult.success(BeanUtils.toBean(dic, MaterialProductRespVO.class)); - } + Long parentId = mtrl.getParentId(); + // 当前节点的父节点不能是当前节点 + if (parentId.equals(reqId)) + throw new ServiceException(DATA_COLLECTION_CLASSIFY_PARENT_ERROR); + + // 父节点没有变更 + if (origDO.getParentId().equals(parentId)) { + materialProductMapper.updateById(mtrl); + return BeanUtils.toBean(mtrl, MaterialProductRespVO.class); + } + // 检查是否存在父子节点反向嵌套冲突 + if (parentId != 0) { + MaterialProductDO prnDO = materialProductMapper.selectById(parentId); + if (prnDO != null && prnDO.getIdPath().contains("/" + reqId + "/")) + throw new ServiceException(DATA_COLLECTION_CLASSIFY_PARENT_ERROR); + } + + String oldIdPath = origDO.getIdPath(); + String newIdPath = getIdPath(mtrl); + // 更新后代节点路径 + updateChrIdPath(reqId, oldIdPath, newIdPath); + mtrl.setIdPath(newIdPath); - @Override - public CommonResult saveData(MaterialProductSaveReqVO createReqVO) { - Long id = createReqVO.getId(); - MaterialProductDO entity = BeanUtils.toBean(createReqVO, MaterialProductDO.class); - entity.setNodeType(DataTypeConstant.DATA_TYPE_DATA); - Long parentId = createReqVO.getParentId(); - if(id == null){ - materialProductMapper.insert(entity); - }else{ - materialProductMapper.updateById(entity); } - if(parentId != null && parentId != 0L){ - MaterialProductDO parEntity = this.getMaterialProduct(parentId); - String parPath = parEntity.getIdPath(); - entity.setIdPath(parPath + "/" + entity.getId() + "/"); - materialProductMapper.updateById(entity); + materialProductMapper.updateById(mtrl); + return BeanUtils.toBean(mtrl, MaterialProductRespVO.class); + + } + + /** + * 获取分类树 + * + * @return 树列表 + */ + @Override + public List getMaterialCategoryTree() { + List list = materialProductMapper.selectList(Wrappers.lambdaQuery(MaterialProductDO.class) + .eq(MaterialProductDO::getNodeType, DataTypeConstant.DATA_TYPE_CATEGORY) + .orderByAsc(MaterialProductDO::getSortNo)); + if (CollUtil.isEmpty(list)) return List.of(); + + List voList = list.stream().map(m -> BeanUtils.toBean(m, MaterialProductRespVO.class)).toList(); + // 返回分类树 + return listTransTree(voList, 0L); + } + + private void updateChrIdPath(Long reqId, String oldIdPath, String newIdPath) { + List children = materialProductMapper.selectList(Wrappers.lambdaQuery(MaterialProductDO.class) + .like(MaterialProductDO::getIdPath, "/" + reqId + "/") + .ne(MaterialProductDO::getId, reqId)); + if (CollUtil.isNotEmpty(children)) { + List toUpdateChildren = children.stream().peek(m -> { + String idPath = m.getIdPath().replace(oldIdPath, newIdPath); + m.setIdPath(idPath); + }).toList(); + materialProductMapper.updateBatch(toUpdateChildren); } - MaterialProductRespVO vo = BeanUtils.toBean(entity, MaterialProductRespVO.class); - return CommonResult.success( vo); } - @Override - public List listByParId(Long parId, String nodeType) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(MaterialProductDO::getParentId, parId); - if(!ObjectUtils.isEmpty(nodeType)) - query.eq(MaterialProductDO::getNodeType, nodeType); - query.orderByAsc(MaterialProductDO::getSortNo); - return materialProductMapper.selectList(query); - } - - @Override - public List listByIdPath(Long id, String nodeType) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.like(MaterialProductDO::getIdPath, id); - if(!ObjectUtils.isEmpty(nodeType)) - query.eq(MaterialProductDO::getNodeType, nodeType); - query.orderByAsc(MaterialProductDO::getSortNo); - return materialProductMapper.selectList(query); - } - - @Override - public CommonResult updateAllIdPath(Long parentId, Integer level) { - if(level > id_path_update_level_limit) - return CommonResult.success("更新完成（超出层数限制："+id_path_update_level_limit+"）"); - List list = listByParId(parentId, ""); - MaterialProductDO parEntity = this.getMaterialProduct(parentId); - if(list.isEmpty()) - return CommonResult.success(""); - String parIdPath = "/0/"; - if(parEntity != null) - parIdPath = parEntity.getIdPath(); - for(MaterialProductDO entity : list){ - entity.setIdPath(parIdPath + "/" + entity.getId() + "/"); - materialProductMapper.updateById( entity); - updateAllIdPath(entity.getId(),level+1); + private String getIdPath(MaterialProductDO mtrl) { + String idPath = ""; + Long parentId = mtrl.getParentId(); + if (parentId == 0) { + idPath = "/" + 0 + "/" + mtrl.getId() + "/"; + } else { + MaterialProductDO mtrlPrn = materialProductMapper.selectById(parentId); + if (mtrlPrn != null) idPath = mtrlPrn.getIdPath() + mtrl.getId() + "/" ; } - return CommonResult.success(""); + return idPath; + } + + /** + * 组装分类树 + * + */ + private List listTransTree(List mtrlVOList, Long parentId) { + + // 获取父级节点 + List parentMtrlVOs = mtrlVOList.stream().filter(mtrlVo -> + mtrlVo.getParentId().equals(parentId)).collect(Collectors.toList()); + // 设置响应的子节点 + parentMtrlVOs.forEach(mtrlVO -> mtrlVO.setChildren(listTransTree(mtrlVOList, mtrlVO.getId()))); + + return parentMtrlVOs; } @Override - public List getTreeData(String nodeType) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - if(!ObjectUtils.isEmpty(nodeType)) - query.eq(MaterialProductDO::getNodeType, nodeType); - query.orderByAsc(MaterialProductDO::getSortNo); - return materialProductMapper.selectList(query); - } + public MaterialProductRespVO saveMaterialProduct(MaterialProductSaveReqVO createReqVO) { + Long reqId = createReqVO.getId(); + MaterialProductDO mtrl = BeanUtils.toBean(createReqVO, MaterialProductDO.class); + mtrl.setNodeType(DataTypeConstant.DATA_TYPE_DATA); - @Override - public MaterialProductRespVO createMaterialProduct(MaterialProductSaveReqVO createReqVO) { - // 插入 - MaterialProductDO materialProduct = BeanUtils.toBean(createReqVO, MaterialProductDO.class); - materialProductMapper.insert(materialProduct); - // 返回 - return BeanUtils.toBean(materialProduct, MaterialProductRespVO.class); + LambdaQueryWrapperX queryWrapperX = new LambdaQueryWrapperX() + .eqIfPresent(MaterialProductDO::getCode, createReqVO.getCode()) + .eqIfPresent(MaterialProductDO::getNodeType, DataTypeConstant.DATA_TYPE_DATA); + // 新增 + if (reqId == null) { + MaterialProductDO one = materialProductMapper.selectOne(queryWrapperX); + if (one != null) throw exception(MATERIAL_PRODUCT_CODE_EXISTED); + // 从直接父分类获取是否危险品、是否标准物质、是否标准溶液 + MaterialProductDO prnCtg = materialProductMapper.selectById(mtrl.getParentId()); + if (prnCtg != null) { + mtrl.setHazardous(prnCtg.getHazardous()) + .setStandardMaterialFlag(prnCtg.getStandardMaterialFlag()) + .setStandardSolutionFlag(prnCtg.getStandardSolutionFlag()); + } + + materialProductMapper.insert(mtrl); + return BeanUtils.toBean(mtrl, MaterialProductRespVO.class); + } + // 修改 + MaterialProductDO origDO = materialProductMapper.selectById(reqId); + if (origDO == null) throw exception(MATERIAL_PRODUCT_NOT_EXISTS); + Long newParentId = createReqVO.getParentId(); + if (origDO.getParentId().equals(newParentId)) { + materialProductMapper.updateById(mtrl); + return BeanUtils.toBean(mtrl, MaterialProductRespVO.class); + } + // 父节点有变更时更新 idPath + String newIdPath = getIdPath(mtrl); + mtrl.setIdPath(newIdPath); + materialProductMapper.updateById(mtrl); + return BeanUtils.toBean(mtrl, MaterialProductRespVO.class); } @Override @@ -202,14 +247,4 @@ public class MaterialProductServiceImpl implements MaterialProductService { return materialProductMapper.selectPage(pageReqVO); } - private String getIdPath(MaterialProductDO entity){ - String parIdPath = ""; - if(ObjectUtils.isEmpty(entity.getParentId()) || 0L == entity.getParentId()) - parIdPath = "/0/"; - MaterialProductDO parEntity = this.getMaterialProduct(entity.getParentId()); - if(parEntity != null){ - parIdPath = parEntity.getIdPath(); - } - return parIdPath + entity.getId() + "/"; - } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/AddGroup.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/AddGroup.java new file mode 100644 index 0000000..68cc97e --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/AddGroup.java @@ -0,0 +1,4 @@ +package com.zt.plat.module.qms.resource.material.valid; + +public interface AddGroup { +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/UpdateGroup.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/UpdateGroup.java new file mode 100644 index 0000000..1ecb5f2 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/valid/UpdateGroup.java @@ -0,0 +1,4 @@ +package com.zt.plat.module.qms.resource.material.valid; + +public interface UpdateGroup { +} diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.xml deleted file mode 100644 index a4f6f96..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchAssignMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.xml deleted file mode 100644 index 5d4fcb8..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckBatchMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.xml deleted file mode 100644 index 3a412d5..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckDetailMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.xml deleted file mode 100644 index 74020bc..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryCheckMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.xml deleted file mode 100644 index d592317..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.xml deleted file mode 100644 index 89e7439..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.xml deleted file mode 100644 index e1be1da..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryMapper.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.xml deleted file mode 100644 index b9650aa..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundDetailMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.xml deleted file mode 100644 index 49373b9..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryOutboundMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.xml deleted file mode 100644 index 5e1e665..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.xml deleted file mode 100644 index 27a70af..0000000 --- a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - \ No newline at end of file