From a37aaf90f363f028e374b9e3f399606d5fc00e08 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sat, 8 Jul 2023 09:26:06 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E9=94=80=E5=94=AE=E5=8D=95=E5=90=8C?= =?UTF-8?q?=E6=AD=A5/=E7=BB=93=E6=9E=84=E5=8F=98=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/common/publish/event/PointEvent.java | 2 +- .../java/org/nl/common/utils/AcsUtil.java | 10 +- .../java/org/nl/config/ConventConfig.java | 2 +- .../modules/common/config/SwaggerConfig.java | 57 ++--- .../generator/rest/GenConfigController.java | 4 +- .../generator/rest/GeneratorController.java | 12 +- .../modules/logging/rest/EsLogController.java | 6 +- .../logging/rest/InterfaceLogController.java | 6 +- .../modules/logging/rest/LogController.java | 12 +- .../service/impl/EsLogServiceImpl.java | 10 - .../logicflow/rest/StageController.java | 14 +- .../logicflow/rest/StageImageController.java | 10 +- .../org/nl/modules/schedule/ApsSchedule.java | 3 +- .../rest/MobileAuthorizationController.java | 2 +- .../modules/system/rest/GridController.java | 10 +- .../system/rest/GridFieldController.java | 14 +- .../modules/system/rest/RedisController.java | 8 +- .../tools/rest/LocalStorageController.java | 14 +- .../PersoncorrdeviceController.java | 20 +- .../org/nl/wms/{ext => ext_manage}/acs/2.txt | 0 .../acs/rest/AcsToWmsController.java | 26 +- .../acs/rest/WmsToAcsController.java | 18 +- .../acs/service/AcsToWmsService.java | 2 +- .../acs/service/WmsToAcsService.java | 2 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 32 ++- .../acs/service/impl/AgvInstService.java | 10 +- .../acs/service/impl/WmsToAcsServiceImpl.java | 21 +- .../bigScreen/DeviceUtils.java | 4 +- .../bigScreen/OrderDto.java | 3 +- .../bigScreen/SwitchOnOff.java | 2 +- .../bigScreen/WordOrderUtils.java | 5 +- .../rest/AgvBigScreenController.java | 13 +- .../bigScreen/rest/BigScreenController.java | 19 +- .../rest/DeviceScreenController.java | 25 +- .../bigScreen/rest/ProductController.java | 21 +- .../service/AgvBigScreenService.java | 3 +- .../bigScreen/service/BigScreenService.java | 2 +- .../service/DeviceScreenService.java | 2 +- .../bigScreen/service/ProductService.java | 2 +- .../bigScreen/service/dto/ShopinfoDto.java | 3 +- .../bigScreen/service/dto/StockDto.java | 3 +- .../bigScreen/service/dto/SupplyDto.java | 3 +- .../service/dto/TodayandplannumDto.java | 3 +- .../bigScreen/service/dto/YearinoutDto.java | 3 +- .../service/impl/AgvBigScreenServiceImpl.java | 4 +- .../service/impl/BigScreenServiceImpl.java | 9 +- .../service/impl/DeviceScreenServiceImpl.java | 10 +- .../service/impl/ProductServiceImpl.java | 9 +- .../bigScreen/test/rest/BigController.java | 13 +- .../test/service/BigTestService.java | 2 +- .../test/service/impl/BigTestServiceImpl.java | 19 +- .../bigScreen/wql/AGVBIGSCREEN01.wql | 0 .../bigScreen/wql/BIGSCREENPRODUCT.wql | 0 .../bigScreen/wql/QDEVICE_SCREEN.wql | 0 .../bigScreen/wql/bigScreen.xls | Bin .../bigScreen/wql/ds_agv.xls | Bin .../sap/rest/WmsToSapController.java | 15 +- .../sap/service/WmsToSapService.java | 5 +- .../sap/service/impl/WmsToSapServiceImpl.java | 72 +++--- .../wms/{ext => ext_manage}/sap/wql/QERP.wql | 0 .../vehicle/MdPbBucketrecordController.java | 2 +- .../MdPbStoragevehicleinfoController.java | 12 +- .../ClassstandardController.java | 22 +- .../customer/MdCsCustomerbaseController.java | 8 +- .../MdPbMeasureunitController.java | 8 +- .../material/MaterialsafeivtController.java | 4 +- .../StructrelamaterialController.java | 12 +- .../storage/SectattrController.java | 12 +- .../storage/StorattrController.java | 12 +- .../storage/StructattrController.java | 12 +- .../StructrelavehicletypeController.java | 10 +- .../rest/MaterialbaseController.java | 16 +- .../rest/SemirealrawmaterialController.java | 8 +- .../rest/SupplierbaseController.java | 8 +- .../oderExt/MpsSaleOrderIcExtController.java | 4 +- .../mps/rest/TeamcorrpersonController.java | 8 +- .../nl/wms/mps/rest/WorkteamController.java | 12 +- .../impl/ProduceshiftorderServiceImpl.java | 3 +- .../PcsDeliveryOrderController.java | 73 ++++++ .../service/IPcsDeliveryOrderService.java | 29 +++ .../service/dao/PcsDeliveryOrder.java | 138 +++++++++++ .../dao/mapper/PcsDeliveryOrderMapper.java | 20 ++ .../dao/mapper/xml/PcsDeliveryOrderMapper.xml | 40 +++ .../impl/PcsDeliveryOrderServiceImpl.java | 90 +++++++ .../saleOrder/MpsSaleOrderController.java | 59 ----- .../{procure_manage => mps_manage}/pcs.xls | Bin .../controller/MpsSaleOrderController.java | 96 ++++++++ .../service}/IMpsSaleOrderService.java | 20 +- .../service}/dao/MpsSaleOrder.java | 11 +- .../dao/mapper/MpsSaleOrderMapper.java | 8 +- .../dao/mapper/xml/MpsSaleOrderMapper.xml | 42 +++- .../service}/dto/OrderQuery.java | 4 +- .../impl/MpsSaleOrderServiceImpl.java | 82 +++++-- .../PcsIfPurchaseorderController.java | 20 +- .../controller/CacheLineHandController.java | 60 ++--- .../controller/PdaProductIosController.java | 25 +- .../pda/controller/TmpKZController.java | 11 +- .../impl/CacheLineHandServiceImpl.java | 2 +- .../org/nl/wms/procure_manage/备份pcs/1.txt | 0 .../rest/DeliveryOrderController.java | 68 ------ .../备份pcs/rest/SaleOrderController.java | 68 ------ .../service/DeliveryOrderService.java | 65 ----- .../备份pcs/service/SaleOrderService.java | 65 ----- .../service/dto/DeliveryOrderDto.java | 80 ------ .../备份pcs/service/dto/SaleOrderDto.java | 78 ------ .../impl/DeliveryOrderServiceImpl.java | 160 ------------ .../service/impl/SaleOrderServiceImpl.java | 159 ------------ .../备份pcs/wql/PCS_DELIVERYORDER001.wql | 89 ------- .../备份pcs/wql/PCS_SALEORDER001.wql | 90 ------- .../wms/procure_manage/备份pcs/wql/pcs.xls | Bin 292864 -> 0 bytes .../device/PdmBiDeviceController.java | 14 +- .../device/SpecialDeviceController.java | 6 +- .../processroute/ProcessrouteController.java | 16 +- .../ProductprocessrouteController.java | 18 +- .../PdmBiTeamcorrpersonController.java | 10 +- .../PdmProduceWorkorderController.java | 32 +-- .../ProduceshiftorderController.java | 32 +-- .../PdmBiWorkprocedureController.java | 12 +- .../wms/product_manage/sch/PointListener.java | 2 +- .../sch/manage/AutoImportDeliverOrder.java | 2 +- .../sch/manage/AutoImportSaleOrder.java | 2 +- .../sch/service/impl/TaskServiceImpl.java | 7 +- .../sch/tasks/SpeMachinery/SpeEmpTask.java | 2 +- .../sch/tasks/SpeMachinery/SpeFullTask.java | 3 +- .../sch/tasks/TaskScheduleService.java | 13 +- .../sch/tasks/WashMachineryTask.java | 3 +- .../packageWrap/WrapCallMaterialTask.java | 7 +- .../tasks/packageWrap/WrapSendEmptyTask.java | 2 +- .../tasks/plotter/PlotterCallEmptyTask.java | 6 +- .../plotter/PlotterSendMaterialTask.java | 7 +- .../sch/tasks/wash/WashCallEmptyTask.java | 230 ++++++++++-------- .../tasks/wash/WashSendMaterialQZTask.java | 87 ++++--- .../sch/tasks/wash/WashSendMaterialTask.java | 52 ++-- .../PdmBiProductprocessrouteServiceImpl.java | 2 +- .../impl/IPdmProduceWorkorderServiceImpl.java | 13 +- .../备份pdm/rest/BomController.java | 18 +- .../备份pdm/rest/DeviceController.java | 12 +- .../备份pdm/rest/DeviceitemController.java | 8 +- .../rest/FactoryCalendarController.java | 18 +- .../QlTestInspectionitempointController.java | 8 +- ...ionschemedtlproductstandardController.java | 8 +- .../QlTestInspectionschememstController.java | 12 +- .../QlTestInspectionsheetmstController.java | 14 +- .../CachelinePositionController.java | 8 +- .../point/SchBasePointController.java | 24 +- .../region/SchBaseRegionController.java | 16 +- .../controller/task/TaskController.java | 20 +- .../point/dao/mapper/SchBasePointMapper.xml | 2 +- .../point/impl/SchBasePointServiceImpl.java | 6 + .../task/impl/SchBaseTaskServiceImpl.java | 8 +- .../StIvtStructivtflowBcpController.java | 2 +- .../nl/wms/storage_manage/pda/PDAEnum.java | 2 +- .../controller/PdaStBcpCheckController.java | 18 +- .../pda/controller/PdaStBcpInController.java | 16 +- .../pda/controller/PdaStBcpOutController.java | 14 +- .../controller/PdaStBcpShutController.java | 8 +- .../pda/controller/PdaStCpInController.java | 14 +- .../service/impl/PdaStBcpInServiceImpl.java | 139 +++++------ .../service/impl/PdaStCpInServiceImpl.java | 2 +- .../check/StIvtCheckmstCpController.java | 24 +- .../IStivtlostorivnCpInController.java | 32 +-- .../IStivtlostorivnCpOutController.java | 32 +-- .../StIfDeliveryorderCpController.java | 2 +- .../StIvtMoreorlessmstCpController.java | 12 +- .../structIvt/StIvtStructivtCpController.java | 4 +- .../StIvtStructivtflowCpController.java | 2 +- .../impl/StIvtCheckmstCpServiceImpl.java | 11 +- .../impl/StIvtIostorinvCpOutServiceImpl.java | 4 +- .../impl/StIvtIostorinvCpServiceImpl.java | 14 +- .../impl/StIvtIostorinvdtlCpServiceImpl.java | 5 +- .../check/StIvtCheckmstYlController.java | 18 +- .../iostorInv/StIvtIostorinvYlController.java | 12 +- .../StIvtIostorinvYlOutController.java | 12 +- .../StIvtMoreorlessmstYlController.java | 12 +- .../structIvt/StIvtStructivtYlController.java | 10 +- .../StIvtStructivtflowYlController.java | 2 +- .../check/StIvtCheckmstBcpController.java | 20 +- .../StIvtIostorinvBcpController.java | 16 +- .../StIvtIostorinvBcpOutController.java | 16 +- .../StIvtMoreorlessmstBcpController.java | 12 +- .../StIvtShutframeinvBcpController.java | 18 +- .../StIvtStructivtBcpController.java | 6 +- .../impl/StIvtCheckmstBcpServiceImpl.java | 13 +- .../impl/StIvtIostorinvBcpOutServiceImpl.java | 8 +- .../impl/StIvtIostorinvBcpServiceImpl.java | 24 +- .../shutFrame/dao/StIvtShutframedtlBcp.java | 2 +- .../impl/StIvtShutframedtlBcpServiceImpl.java | 2 +- .../impl/StIvtShutframeinvBcpServiceImpl.java | 13 +- .../coderule/SysCodeRuleController.java | 10 +- .../coderule/SysCodeRuleDetailController.java | 8 +- .../controller/dept/DeptController.java | 14 +- .../controller/dict/SysDictController.java | 20 +- .../generator/CodeColumnConfigController.java | 2 +- .../generator/CodeGenConfigController.java | 4 +- .../controller/menu/SysMenuController.java | 18 +- .../controller/monitor/MonitorController.java | 2 +- .../controller/notice/NoticeController.java | 10 +- .../controller/param/SysParamController.java | 10 +- .../SysDataPermissionController.java | 18 +- .../quartz/SysQuartzJobController.java | 14 +- .../controller/role/SysRoleController.java | 12 +- .../secutiry/AuthorizationController.java | 10 +- .../secutiry/HandLoginController.java | 6 +- .../controller/user/OnlineController.java | 6 +- .../controller/user/UserController.java | 16 +- .../resources/config/application-dev3.yml | 3 +- .../template/generator/admin/Controller.ftl | 8 +- 207 files changed, 1776 insertions(+), 2276 deletions(-) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/2.txt (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/rest/AcsToWmsController.java (87%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/rest/WmsToAcsController.java (86%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/service/AcsToWmsService.java (97%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/service/WmsToAcsService.java (97%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/service/impl/AcsToWmsServiceImpl.java (92%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/service/impl/AgvInstService.java (95%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/acs/service/impl/WmsToAcsServiceImpl.java (90%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/DeviceUtils.java (98%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/OrderDto.java (92%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/SwitchOnOff.java (81%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/WordOrderUtils.java (99%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/rest/AgvBigScreenController.java (75%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/rest/BigScreenController.java (81%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/rest/DeviceScreenController.java (84%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/rest/ProductController.java (85%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/AgvBigScreenService.java (68%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/BigScreenService.java (95%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/DeviceScreenService.java (92%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/ProductService.java (97%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/dto/ShopinfoDto.java (96%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/dto/StockDto.java (91%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/dto/SupplyDto.java (91%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/dto/TodayandplannumDto.java (91%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/dto/YearinoutDto.java (93%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/impl/AgvBigScreenServiceImpl.java (97%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/impl/BigScreenServiceImpl.java (99%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/impl/DeviceScreenServiceImpl.java (99%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/service/impl/ProductServiceImpl.java (98%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/test/rest/BigController.java (83%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/test/service/BigTestService.java (91%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/test/service/impl/BigTestServiceImpl.java (98%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/wql/AGVBIGSCREEN01.wql (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/wql/BIGSCREENPRODUCT.wql (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/wql/QDEVICE_SCREEN.wql (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/wql/bigScreen.xls (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/bigScreen/wql/ds_agv.xls (100%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/sap/rest/WmsToSapController.java (81%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/sap/service/WmsToSapService.java (86%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/sap/service/impl/WmsToSapServiceImpl.java (84%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{ext => ext_manage}/sap/wql/QERP.wql (100%) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/IPcsDeliveryOrderService.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/PcsDeliveryOrder.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/PcsDeliveryOrderMapper.java create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/xml/PcsDeliveryOrderMapper.xml create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/impl/PcsDeliveryOrderServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java rename mes/hd/nladmin-system/src/main/java/org/nl/wms/{procure_manage => mps_manage}/pcs.xls (100%) create mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java rename mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/{ordermanage/service/saleOrder => saleorder/service}/IMpsSaleOrderService.java (64%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/{ordermanage/service/saleOrder => saleorder/service}/dao/MpsSaleOrder.java (92%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/{ordermanage/service/saleOrder => saleorder/service}/dao/mapper/MpsSaleOrderMapper.java (76%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/{ordermanage/service/saleOrder => saleorder/service}/dao/mapper/xml/MpsSaleOrderMapper.xml (75%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/{ordermanage/service/saleOrder => saleorder/service}/dto/OrderQuery.java (80%) rename mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/{ordermanage/service/saleOrder => saleorder/service}/impl/MpsSaleOrderServiceImpl.java (74%) delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/1.txt delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/pcs.xls diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java index cd9770ef..c0b3416e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/publish/event/PointEvent.java @@ -21,7 +21,7 @@ public class PointEvent extends PublishEvent { private String type; private String acs_task_type; private String point_code1; - private String point_code2; + private String point_code3; private String vehicle_code; private String product_area; private String task_group_id; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java index db1cd620..ada1fcc5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java @@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.StatusEnum; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.system_manage.service.param.impl.SysParamServiceImpl; @@ -29,7 +30,7 @@ public class AcsUtil { String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue(); JSONObject result = new JSONObject(); if (StrUtil.equals(StatusEnum.STATUS_FLASE.getCode(), isConnect)) { - result.put("status", HttpStatus.OK.value()); + result.put("status", "200"); result.put("message", "下发成功，但未连接ACS!"); result.put("data", new JSONObject()); return result; @@ -48,10 +49,7 @@ public class AcsUtil { } catch (Exception e) { log.info("ACS反馈异常----------------------------------------+"+api+",---"+e.getMessage()); - result.put("status", "400"); - result.put("message", "网络不通,操作失败!"); - result.put("data", new JSONObject()); - result.put("error", e.getMessage()); + throw new BadRequestException("网络不同"); } //acs抛异常这里 if (api.equals("api/wms/task")){ @@ -64,6 +62,8 @@ public class AcsUtil { } result.put("message", result.getString("message")); result.put("data", new JSONObject()); + }else { + result.put("status", "200"); } for (int i = 0; i < list.size(); i++) { JSONObject task_jo = list.getJSONObject(i); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java index 7652fb26..b1ce08da 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/ConventConfig.java @@ -4,7 +4,7 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.nl.common.enums.AcsTaskEnum; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl; +import org.nl.wms.ext_manage.acs.service.impl.AcsToWmsServiceImpl; import org.nl.wms.product_manage.sch.tasks.SpeMachinery.SpeEmpTask; import org.nl.wms.product_manage.sch.tasks.SpeMachinery.SpeFullTask; import org.nl.wms.product_manage.sch.tasks.WashMachineryTask; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java index 4ba6bb6e..d8af8f30 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/common/config/SwaggerConfig.java @@ -16,6 +16,7 @@ package org.nl.modules.common.config; import com.fasterxml.classmate.TypeResolver; +import com.google.common.base.Predicates; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -77,7 +78,7 @@ public class SwaggerConfig { .apiInfo(apiInfo()) .select() // .paths(Predicates.not(PathSelectors.regex("/error.*"))) - .paths(PathSelectors.any()) + .paths(Predicates.isNull()) .build() // .globalOperationParameters(pars) //添加登陆认证 @@ -133,31 +134,31 @@ public class SwaggerConfig { @Configuration class SwaggerDataConfig { - @Bean - public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) { - return new AlternateTypeRuleConvention() { - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } - - @Override - public List rules() { - return newArrayList(newRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))); - } - }; - } - - @ApiModel - @Data - private static class Page { - @ApiModelProperty("页码 (0..N)") - private Integer page; - - @ApiModelProperty("每页显示的数目") - private Integer size; - - @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") - private List sort; - } +// @Bean +// public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) { +// return new AlternateTypeRuleConvention() { +// @Override +// public int getOrder() { +// return Ordered.HIGHEST_PRECEDENCE; +// } +// +// @Override +// public List rules() { +// return newArrayList(newRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))); +// } +// }; +// } +// +// @ApiModel +// @Data +// private static class Page { +// @ApiModelProperty("页码 (0..N)") +// private Integer page; +// +// @ApiModelProperty("每页显示的数目") +// private Integer size; +// +// @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") +// private List sort; +// } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java index 75ee5b51..974ea0cb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GenConfigController.java @@ -37,13 +37,13 @@ public class GenConfigController { private final GenConfigService genConfigService; - @ApiOperation("查询") + //("查询") @GetMapping(value = "/{tableName}") public ResponseEntity query(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK); } - @ApiOperation("修改") + //("修改") @PutMapping public ResponseEntity update(@Validated @RequestBody GenConfig genConfig){ return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java index 10238435..1348373f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/generator/rest/GeneratorController.java @@ -48,13 +48,13 @@ public class GeneratorController { @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + //("查询数据库数据") @GetMapping(value = "/tables/all") public ResponseEntity queryTables(){ return new ResponseEntity<>(generatorService.getTables(), HttpStatus.OK); } - @ApiOperation("查询数据库数据") + //("查询数据库数据") @GetMapping(value = "/tables") public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "0")Integer page, @@ -63,21 +63,21 @@ public class GeneratorController { return new ResponseEntity<>(generatorService.getTables(name,startEnd), HttpStatus.OK); } - @ApiOperation("查询字段数据") + //("查询字段数据") @GetMapping(value = "/columns") public ResponseEntity queryColumns(@RequestParam String tableName){ List columnInfos = generatorService.getColumns(tableName); return new ResponseEntity<>(PageUtil.toPage(columnInfos,columnInfos.size()), HttpStatus.OK); } - @ApiOperation("保存字段数据") + //("保存字段数据") @PutMapping public ResponseEntity save(@RequestBody List columnInfos){ generatorService.save(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("同步字段数据") + //("同步字段数据") @PostMapping(value = "sync") public ResponseEntity sync(@RequestBody List tables){ for (String table : tables) { @@ -86,7 +86,7 @@ public class GeneratorController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("生成代码") + //("生成代码") @PostMapping(value = "/{tableName}/{type}") public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){ if(!generatorEnabled && type == 0){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java index 2ac1cd5d..800febdf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/EsLogController.java @@ -25,18 +25,18 @@ public class EsLogController { @GetMapping("/labels/{type}") - @ApiOperation("获取标签") + //("获取标签") public ResponseEntity labelsValues(@PathVariable String type) { return new ResponseEntity<>(esLogService.getLabelsValues(type), HttpStatus.OK); } @PostMapping("/query") - @ApiOperation("日志查询") + //("日志查询") public ResponseEntity queryAll(@RequestBody LogQuery query) { return new ResponseEntity<>(esLogService.query(query), HttpStatus.OK); } @DeleteMapping("/clearLogs") - @ApiOperation("清空日志") + //("清空日志") public ResponseEntity clearLogs(@RequestBody LogQuery query) { esLogService.clearLogs(query); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java index b298af6e..a96ca224 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/InterfaceLogController.java @@ -29,7 +29,7 @@ public class InterfaceLogController { @GetMapping @Log("查询接口日志") - @ApiOperation("查询接口日志") + //("查询接口日志") //@SaCheckPermission("point:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(interfaceLogService.queryAll(whereJson, page), HttpStatus.OK); @@ -37,7 +37,7 @@ public class InterfaceLogController { @DeleteMapping(value = "/delLogs") @Log("删除所有接口日志") - @ApiOperation("删除所有接口日志") + //("删除所有接口日志") public ResponseEntity delLogs(){ interfaceLogService.delLogs(); return new ResponseEntity<>(HttpStatus.OK); @@ -45,7 +45,7 @@ public class InterfaceLogController { @GetMapping("/logTypeList") @Log("查询接口日志类型下拉框") - @ApiOperation("查询接口日志类型下拉框") + //("查询接口日志类型下拉框") public ResponseEntity logTypeList() { return new ResponseEntity<>(interfaceLogService.logTypeList(), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java index b065a49a..9fc889a8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/rest/LogController.java @@ -40,7 +40,7 @@ public class LogController { private final LogService logService; @GetMapping - @ApiOperation("日志查询") + //("日志查询") //@SaCheckPermission("@el.check()") public ResponseEntity query(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("INFO"); @@ -48,7 +48,7 @@ public class LogController { } @GetMapping(value = "/user") - // @ApiOperation("用户日志查询") + // //("用户日志查询") public ResponseEntity queryUserLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("INFO"); criteria.setBlurry(SecurityUtils.getCurrentUsername()); @@ -56,7 +56,7 @@ public class LogController { } @GetMapping(value = "/error") - @ApiOperation("错误日志查询") + //("错误日志查询") // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLog(LogQueryCriteria criteria, Pageable pageable){ criteria.setLogType("ERROR"); @@ -64,14 +64,14 @@ public class LogController { } @GetMapping(value = "/error/{id}") - @ApiOperation("日志异常详情查询") + //("日志异常详情查询") // @SaCheckPermission("@el.check()") public ResponseEntity queryErrorLogs(@PathVariable Long id){ return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); } @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") - @ApiOperation("删除所有ERROR日志") + //("删除所有ERROR日志") // @SaCheckPermission("@el.check()") public ResponseEntity delAllErrorLog(){ logService.delAllByError(); @@ -80,7 +80,7 @@ public class LogController { @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") - @ApiOperation("删除所有INFO日志") + //("删除所有INFO日志") // @SaCheckPermission("@el.check()") public ResponseEntity delAllInfoLog(){ logService.delAllByInfo(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java index 68bf2d8d..a6f340b8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java @@ -2,13 +2,10 @@ package org.nl.modules.logging.service.impl; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; -import cn.hutool.http.HttpRequest; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.elasticsearch.action.search.SearchResponse; @@ -18,14 +15,11 @@ import org.elasticsearch.script.Script; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.Aggregations; import org.elasticsearch.search.aggregations.bucket.terms.Terms; -import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.LevelEnum; import org.nl.modules.logging.repository.EsLogRepository; import org.nl.modules.logging.service.EsLogService; import org.nl.modules.logging.service.dto.LogQuery; import org.nl.modules.logging.service.dto.LogRepositoryDTO; -import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate; @@ -37,11 +31,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.function.Function; /** * @author ldjun diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java index b2d16235..296826a0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageController.java @@ -30,7 +30,7 @@ public class StageController { private final StageService stageService; @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //("查询舞台") //@SaCheckPermission("stage:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(stageService.queryAll(whereJson, page), HttpStatus.OK); @@ -38,7 +38,7 @@ public class StageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //("新增舞台") //@SaCheckPermission("stage:add") public ResponseEntity create(@Validated @RequestBody StageDto dto) { stageService.create(dto); @@ -47,7 +47,7 @@ public class StageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //("修改舞台") //@SaCheckPermission("stage:edit") public ResponseEntity update(@Validated @RequestBody StageDto dto) { stageService.update(dto); @@ -55,7 +55,7 @@ public class StageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //("删除舞台") //@SaCheckPermission("stage:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +65,7 @@ public class StageController { @GetMapping("/selectList") @Log("下拉选舞台") - @ApiOperation("下拉选舞台") + //("下拉选舞台") //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK); @@ -73,7 +73,7 @@ public class StageController { @PostMapping("/addNewStage") @Log("保存舞台数据") - @ApiOperation("保存舞台数据") + //("保存舞台数据") public ResponseEntity addNewStage(@Validated @RequestBody StageDto dto) { log.info("dto{}",dto); stageService.addNewStage(dto); @@ -82,7 +82,7 @@ public class StageController { @PostMapping("/getNewStageDataByCode") @Log("根据stage_code获取舞台数据") - @ApiOperation("根据stage_code获取舞台数据") + //("根据stage_code获取舞台数据") public ResponseEntity getNewStageDataByCode(@RequestBody String code) { return new ResponseEntity<>(stageService.findByCode(code), HttpStatus.CREATED); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java index 610bc64d..7579e379 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/logicflow/rest/StageImageController.java @@ -31,7 +31,7 @@ public class StageImageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //("查询舞台") //@SaCheckPermission("stageImage:list") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(stageImageService.queryAll(whereJson, page), HttpStatus.OK); @@ -39,7 +39,7 @@ public class StageImageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //("新增舞台") //@SaCheckPermission("stageImage:add") public ResponseEntity create(@Validated @RequestBody StageImageDto dto) { stageImageService.create(dto); @@ -48,7 +48,7 @@ public class StageImageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //("修改舞台") //@SaCheckPermission("stageImage:edit") public ResponseEntity update(@Validated @RequestBody StageImageDto dto) { stageImageService.update(dto); @@ -56,7 +56,7 @@ public class StageImageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //("删除舞台") //@SaCheckPermission("stageImage:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,7 @@ public class StageImageController { @GetMapping("/selectList") @Log("下拉选设备图标") - @ApiOperation("下拉选设备图标") + //("下拉选设备图标") //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/schedule/ApsSchedule.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/schedule/ApsSchedule.java index 28fc975d..7bb01889 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/schedule/ApsSchedule.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/schedule/ApsSchedule.java @@ -1,9 +1,8 @@ package org.nl.modules.schedule; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java index 276fec54..c499a654 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/security/rest/MobileAuthorizationController.java @@ -47,7 +47,7 @@ public class MobileAuthorizationController{ private final ISysUserService userService; private final ISysRoleService roleService; - @ApiOperation("登录授权") + //("登录授权") @PostMapping(value = "/login") @SaIgnore public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java index 7b61c626..1721952d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridController.java @@ -31,14 +31,14 @@ public class GridController { @GetMapping @Log("查询系统表格") - @ApiOperation("查询系统表格") + //("查询系统表格") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(gridService.queryAll(whereJson,page),HttpStatus.OK); } @PostMapping @Log("新增系统表格") - @ApiOperation("新增系统表格") + //("新增系统表格") public ResponseEntity create(@Validated @RequestBody GridDto dto){ gridService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -46,14 +46,14 @@ public class GridController { @PutMapping @Log("修改系统表格") - @ApiOperation("修改系统表格") + //("修改系统表格") public ResponseEntity update(@Validated @RequestBody GridDto dto){ gridService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除系统表格") - @ApiOperation("删除系统表格") + //("删除系统表格") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { gridService.deleteAll(ids); @@ -62,7 +62,7 @@ public class GridController { @GetMapping("/selectList") @Log("下拉框获取表格数据") - @ApiOperation("下拉框获取表格数据") + //("下拉框获取表格数据") public ResponseEntity getGridList(){ return new ResponseEntity<>(gridService.getGridList(),HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java index 7ff3b227..1f4ea168 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/GridFieldController.java @@ -32,14 +32,14 @@ public class GridFieldController { @GetMapping @Log("查询系统表格") - @ApiOperation("查询系统表格") + //("查询系统表格") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(gridFieldService.queryAll(whereJson,page),HttpStatus.OK); } @PostMapping @Log("单个新增表格字段") - @ApiOperation("单个新增表格字段") + //("单个新增表格字段") public ResponseEntity create(@Validated @RequestBody GridFieldDto dto){ gridFieldService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -47,14 +47,14 @@ public class GridFieldController { @PutMapping @Log("修改表格字段") - @ApiOperation("修改表格字段") + //("修改表格字段") public ResponseEntity update(@Validated @RequestBody GridFieldDto dto){ gridFieldService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除表格字段") - @ApiOperation("删除表格字段") + //("删除表格字段") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { gridFieldService.deleteAll(ids); @@ -63,7 +63,7 @@ public class GridFieldController { @PostMapping("/batchAdd") @Log("批量新增表格字段") - @ApiOperation("批量新增表格字段") + //("批量新增表格字段") public ResponseEntity batchAdd(@RequestBody JSONObject json){ // log.info("json{}",json); gridFieldService.batchAdd(json); @@ -72,7 +72,7 @@ public class GridFieldController { @PostMapping("/getGridFields") @Log("根据gridId获取所有字段") - @ApiOperation("根据gridId获取所有字段") + //("根据gridId获取所有字段") public ResponseEntity getGridFieldsById(@RequestBody String id){ log.info("dto:{}",id); return new ResponseEntity<>(gridFieldService.getGridFieldsById(id),HttpStatus.CREATED); @@ -80,7 +80,7 @@ public class GridFieldController { @PostMapping("/getGridFieldsByCode") @Log("根据gridCode获取所有字段") - @ApiOperation("根据gridCode获取所有字段") + //("根据gridCode获取所有字段") public ResponseEntity getGridFieldsByCode(@RequestBody String grid_code){ log.info("dto:{}",grid_code); return new ResponseEntity<>(gridFieldService.getGridFieldsByCode(grid_code),HttpStatus.CREATED); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java index cc6129f4..f1a770fb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/rest/RedisController.java @@ -27,27 +27,27 @@ public class RedisController { @GetMapping("/get-monitor-info") @Log("查询redis的信息") - @ApiOperation("查询redis的信息") + //("查询redis的信息") public ResponseEntity getRedisMonitorInfo() { return new ResponseEntity<>(redisService.getRedisMonitorInfo(),HttpStatus.OK); } @GetMapping("/get-key-define-list") @Log("获得 Redis Key 模板列表") - @ApiOperation("获得 Redis Key 模板列表") + //("获得 Redis Key 模板列表") public ResponseEntity getKeyDefineList() { return new ResponseEntity<>(redisService.getKeyDefineList(),HttpStatus.OK); } @GetMapping("/get-key-value-list") @Log("获得 Redis Key Value列表") - @ApiOperation("获得 Redis Key Value列表") + //("获得 Redis Key Value列表") public ResponseEntity getKeyValueList() { return new ResponseEntity<>( redisService.getKeyValueList(),HttpStatus.OK); } @Log("根据key删除Redis数据") - @ApiOperation("根据key删除Redis数据") + //("根据key删除Redis数据") @DeleteMapping public ResponseEntity deleteByKey(@RequestBody String[] ids) { redisService.deleteByKey(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index 984d7ff4..f845047b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -49,21 +49,21 @@ public class LocalStorageController { private final LocalStorageService localStorageService; - @ApiOperation("查询文件") + //("查询文件") @GetMapping @SaCheckPermission("storage:list") public ResponseEntity query(LocalStorageQueryCriteria criteria, Pageable pageable) { return new ResponseEntity<>(localStorageService.queryAll(criteria, pageable), HttpStatus.OK); } - @ApiOperation("导出数据") + //("导出数据") @GetMapping(value = "/download") @SaCheckPermission("storage:list") public void download(HttpServletResponse response, LocalStorageQueryCriteria criteria) throws IOException { localStorageService.download(localStorageService.queryAll(criteria), response); } - @ApiOperation("上传文件") + //("上传文件") @PostMapping @SaCheckPermission("storage:add") public ResponseEntity create(@RequestParam String name, @RequestParam("file") MultipartFile file) { @@ -72,7 +72,7 @@ public class LocalStorageController { } @PostMapping("/pictures") - @ApiOperation("上传图片") + //("上传图片") public ResponseEntity upload(@RequestParam MultipartFile file) { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); @@ -84,7 +84,7 @@ public class LocalStorageController { } @Log("修改文件") - @ApiOperation("修改文件") + //("修改文件") @PutMapping @SaCheckPermission("storage:edit") public ResponseEntity update(@Validated @RequestBody LocalStorage resources) { @@ -94,13 +94,13 @@ public class LocalStorageController { @Log("删除文件") @DeleteMapping - @ApiOperation("多选删除") + //("多选删除") public ResponseEntity delete(@RequestBody Long[] ids) { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("导入数据") + //("导入数据") @PostMapping("/importExcel") @SaIgnore public ResponseEntity importExcel(@RequestBody String path) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java index 691f7e18..78700c57 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/device_manage/controller/userdevice/PersoncorrdeviceController.java @@ -46,7 +46,7 @@ public class PersoncorrdeviceController { @GetMapping @Log("查询人员设备维护") - @ApiOperation("查询人员设备维护") + //("查询人员设备维护") public ResponseEntity query(DeviceUserQuery query, PageQuery page){ Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); List list = pdmBiPersoncorrdeviceService.queryAll(query); @@ -57,7 +57,7 @@ public class PersoncorrdeviceController { @GetMapping("/device") @Log("查询设备") - @ApiOperation("查询设备") + //("查询设备") public ResponseEntity device(DeviceUserQuery query, PageQuery page){ Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); List list = pdmBiPersoncorrdeviceService.queryAllDevice(query); @@ -68,7 +68,7 @@ public class PersoncorrdeviceController { @PostMapping @Log("新增人员设备维护") - @ApiOperation("新增人员设备维护") + //("新增人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:add')") public ResponseEntity create(@RequestBody JSONObject entity){ Assert.notNull(entity,"请求参数不能为空"); @@ -89,7 +89,7 @@ public class PersoncorrdeviceController { @PutMapping @Log("修改人员设备维护") - @ApiOperation("修改人员设备维护") + //("修改人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:add')") public ResponseEntity update(@RequestBody JSONObject entity){ @@ -109,7 +109,7 @@ public class PersoncorrdeviceController { @Log("删除人员设备维护") - @ApiOperation("删除人员设备维护") + //("删除人员设备维护") //@PreAuthorize("@el.check('personcorrdevice:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -122,7 +122,7 @@ public class PersoncorrdeviceController { @GetMapping("/getDeviceByPerson") @Log("查询设备") - @ApiOperation("查询设备") + //("查询设备") //@PreAuthorize("@el.check('personcorrdevice:list')") public ResponseEntity getDeviceByPerson(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(personcorrdeviceService.getDeviceByPerson(whereJson,page),HttpStatus.OK); @@ -130,7 +130,7 @@ public class PersoncorrdeviceController { @PostMapping("/getHeader") @Log("查询表头") - @ApiOperation("查询表头") + //("查询表头") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity getHeader(@RequestBody JSONObject param) { return new ResponseEntity<>( personcorrdeviceService.getHeader(param),HttpStatus.OK); @@ -138,7 +138,7 @@ public class PersoncorrdeviceController { @PostMapping("/getDeviceIdByUserId") @Log("查询人员的设备") - @ApiOperation("查询人员的设备") + //("查询人员的设备") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity getDeviceIdByUserId(@RequestBody JSONObject param) { return new ResponseEntity<>( personcorrdeviceService.getDeviceIdByUserId(param),HttpStatus.OK); @@ -146,7 +146,7 @@ public class PersoncorrdeviceController { @PostMapping("/addDevices") @Log("添加人员的设备") - @ApiOperation("添加人员的设备") + //("添加人员的设备") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity addDevices(@RequestBody JSONObject param) { personcorrdeviceService.addDevices(param); @@ -155,7 +155,7 @@ public class PersoncorrdeviceController { @DeleteMapping("/deleteRow") @Log("删除人员的设备") - @ApiOperation("删除人员的设备") + //("删除人员的设备") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity deleteRow(@RequestBody JSONObject param) { personcorrdeviceService.deleteRow(param); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/2.txt b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/2.txt similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/2.txt rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/2.txt diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java similarity index 87% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java index 5b91a24d..d0c9092d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/AcsToWmsController.java @@ -1,5 +1,5 @@ -package org.nl.wms.ext.acs.rest; +package org.nl.wms.ext_manage.acs.rest; import cn.dev33.satoken.annotation.SaIgnore; @@ -11,7 +11,7 @@ import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.api.ResultCode; import org.nl.modules.common.exception.BizCoreException; -import org.nl.wms.ext.acs.service.AcsToWmsService; +import org.nl.wms.ext_manage.acs.service.AcsToWmsService; import org.nl.wms.product_manage.sch.tasks.TaskScheduleService; import org.nl.wms.product_manage.sch.tasks.WashMachineryTask; import org.springframework.beans.factory.annotation.Autowired; @@ -40,7 +40,7 @@ public class AcsToWmsController { @PostMapping("/apply") @Log("ACS给WMS发送任务") - @ApiOperation("ACS给WMS发送任务") + //("ACS给WMS发送任务") @SaIgnore public ResponseEntity receiveTaskFromAcs(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(acsToWmsService.apply(whereJson), HttpStatus.OK); @@ -48,7 +48,7 @@ public class AcsToWmsController { @PostMapping("/receiveTaskIdToCacheLine") @Log("acs给wms发送缓存线的实时任务编号") - @ApiOperation("acs给wms发送缓存线的实时任务编号") + //("acs给wms发送缓存线的实时任务编号") @SaIgnore public ResponseEntity receiveTaskIdToCacheLine(@RequestBody JSONObject whereJson) { //参数校验 @@ -60,7 +60,7 @@ public class AcsToWmsController { @PostMapping("/status") @Log("ACS给WMS反馈任务状态") - @ApiOperation("ACS给WMS反馈任务状态") + //("ACS给WMS反馈任务状态") @SaIgnore public ResponseEntity receiveTaskStatusAcs(@RequestBody String string) { return new ResponseEntity<>(acsToWmsService.receiveTaskStatusAcs(string), HttpStatus.OK); @@ -68,7 +68,7 @@ public class AcsToWmsController { @PostMapping("/orderStatus") @Log("ACS给WMS下发工单完成状态") - @ApiOperation("ACS给WMS下发工单完成状态") + //("ACS给WMS下发工单完成状态") @SaIgnore public ResponseEntity orderStatus(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.orderStatus(param), HttpStatus.OK); @@ -76,7 +76,7 @@ public class AcsToWmsController { @PostMapping("/washOrder") @Log("ACS给WMS反馈清洗工单完成") - @ApiOperation("ACS给WMS反馈清洗工单完成") + //("ACS给WMS反馈清洗工单完成") @SaIgnore public ResponseEntity washOrderFinish(@RequestBody JSONObject param) { washMachineryTask.updateTaskStatus( param, param.getString("status")); @@ -84,7 +84,7 @@ public class AcsToWmsController { } @PostMapping("/feedDeviceStatusType") - @ApiOperation("向wms反馈设备状态") + //("向wms反馈设备状态") @SaIgnore public ResponseEntity feedDeviceStatusType(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.feedDeviceStatusType(param), HttpStatus.OK); @@ -93,7 +93,7 @@ public class AcsToWmsController { @PostMapping("/feedDeviceQty") - @ApiOperation("向wms反馈设备实时数量") + //("向wms反馈设备实时数量") @SaIgnore public ResponseEntity feedDeviceRealQty(@RequestBody Map param) { acsToWmsService.feedDevQty(param); @@ -101,7 +101,7 @@ public class AcsToWmsController { } @PostMapping("/feedDeviceQty2") - @ApiOperation("反馈深坑数量") + //("反馈深坑数量") @SaIgnore @Log("反馈深坑数量") public ResponseEntity feedDeviceRealQty2(@RequestBody Map param) { @@ -111,7 +111,7 @@ public class AcsToWmsController { @PostMapping("/feedCacheLineBarcodes") @Log("向wms反馈缓存载具信息") - @ApiOperation("向wms反馈缓存载具信息") + //("向wms反馈缓存载具信息") @SaIgnore public ResponseEntity feedcachelineVe(@RequestBody JSONObject param) { acsToWmsService.feedcachelineVe(param); @@ -121,7 +121,7 @@ public class AcsToWmsController { @PostMapping("/feedOrderRealQty") @Log("向wms反实施数量") - @ApiOperation("向wms反订单实施数量") + //("向wms反订单实施数量") @SaIgnore public ResponseEntity feedOrderRealQty(@RequestBody JSONObject string) { acsToWmsService.feedOrderRealQty(string); @@ -131,7 +131,7 @@ public class AcsToWmsController { @GetMapping("/taskPublish") @Log("taskPublish") - @ApiOperation("taskPublish") + //("taskPublish") @SaIgnore public void taskScheduleService(){ taskScheduleService.taskPublish(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java similarity index 86% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java index cc4e0e22..83adb066 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/WmsToAcsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/rest/WmsToAcsController.java @@ -1,17 +1,15 @@ -package org.nl.wms.ext.acs.rest; +package org.nl.wms.ext_manage.acs.rest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; -import org.nl.common.enums.WorkerOrderEnum; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -35,7 +33,7 @@ public class WmsToAcsController { @PostMapping @Log("WMS给ACS发送任务") - @ApiOperation("WMS给ACS发送任务") + //("WMS给ACS发送任务") public ResponseEntity issueTaskToAcs(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.issueTaskToAcs(arr), HttpStatus.OK); @@ -43,7 +41,7 @@ public class WmsToAcsController { @PostMapping("/cancel") @Log("WMS主动取消ACS任务") - @ApiOperation("WMS主动取消ACS任务") + //("WMS主动取消ACS任务") public ResponseEntity cancelToAcs(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.cancelToAcs(arr), HttpStatus.OK); @@ -51,7 +49,7 @@ public class WmsToAcsController { @PostMapping("/updatePointStatus") @Log("WMS更新ACS点位状态") - @ApiOperation("WMS更新ACS点位状态") + //("WMS更新ACS点位状态") public ResponseEntity updatePointStatus(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.updatePointStatus(arr), HttpStatus.OK); @@ -59,7 +57,7 @@ public class WmsToAcsController { @PostMapping("/order") @Log("WMS开工向acs下发工单") - @ApiOperation("WMS开工向acs下发工单") + //("WMS开工向acs下发工单") public ResponseEntity startWork(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.order(arr), HttpStatus.OK); @@ -72,7 +70,7 @@ public class WmsToAcsController { */ @PostMapping("/orderStatusUpdate") @Log("WMS向acs发送强制完成") - @ApiOperation("WMS强制完成向acs发送强制完成") + //("WMS强制完成向acs发送强制完成") public ResponseEntity orderStatusUpdate(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.orderStatusUpdate(arr), HttpStatus.OK); @@ -80,7 +78,7 @@ public class WmsToAcsController { @PostMapping("/replaceDevice") @Log("更换工单设备") - @ApiOperation("更换工单设备") + //("更换工单设备") public ResponseEntity replaceDevice(@RequestBody Map whereJson) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(whereJson.get("data"))); return new ResponseEntity<>(wmsToAcsService.replaceDevice(arr), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/AcsToWmsService.java similarity index 97% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/AcsToWmsService.java index 3992c8a4..f34d183e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/AcsToWmsService.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.acs.service; +package org.nl.wms.ext_manage.acs.service; import com.alibaba.fastjson.JSONObject; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/WmsToAcsService.java similarity index 97% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/WmsToAcsService.java index 77f08514..f28f090f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/WmsToAcsService.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.acs.service; +package org.nl.wms.ext_manage.acs.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java similarity index 92% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java index 669ac300..ca675f53 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.acs.service.impl; +package org.nl.wms.ext_manage.acs.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; @@ -13,16 +13,14 @@ import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.publish.BussEventMulticaster; -import org.nl.common.publish.event.PointEvent; import org.nl.common.publish.event.TaskEvent; import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; -import org.nl.common.utils.OptionRecord; import org.nl.common.utils.RedissonUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.AcsToWmsService; +import org.nl.wms.ext_manage.acs.service.AcsToWmsService; import org.nl.wms.pda_manage.pda.service.CacheLineHandService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.service.TaskService; @@ -32,7 +30,8 @@ import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; import org.nl.wms.product_manage.service.device.dao.PdmBiDevice; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; -import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; +import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; +import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.http.HttpStatus; @@ -41,15 +40,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.annotation.Resource; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.function.Consumer; @Service @Slf4j @@ -65,6 +59,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ private IPdmProduceWorkorderService workorderService; @Autowired private IPdmBiDeviceService deviceService; + @Autowired + private ISchBaseTaskService itaskService; @@ -133,8 +129,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ for (int i = 0; i < array.size(); i++) { JSONObject row = array.getJSONObject(i); String task_id = row.getString("task_id"); - TaskDto taskDto = taskService.findById(task_id); - String processing_class = taskDto.getHandle_class(); + SchBaseTask one = itaskService.getOne(new QueryWrapper().eq("task_id", row.getString("task_id"))); + String processing_class = one.getHandle_class(); String status = row.getString("status"); // 任务处理类 try { @@ -143,11 +139,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ if (taskHandler!=null){ taskHandler.updateTaskStatus(row,status); } + }else { +// EXECUTING("6", "执行中"), +// FINISHED("7", "完成"), +// CANCEL("8", "取消"); +// //回调状态 +// STATUS_START("1","执行中"), +// STATUS_FINISH("2","完成"), +// STATUS_CANNEL("3","取消"), + itaskService.update(new UpdateWrapper().set("task_status",String.valueOf(Integer.valueOf(status)+5))); + } //发布一个任务执行事件:服务跟任务不一样，可以同事存在 TaskEvent event = TaskEvent.builder() .task_id(task_id) - .task_type(taskDto.getTask_type()) + .task_type(one.getTask_type()) .status(status) .build(); BussEventMulticaster.Publish(event); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java similarity index 95% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java index 7b8deaeb..8c86457b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AgvInstService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AgvInstService.java @@ -1,23 +1,17 @@ -package org.nl.wms.ext.acs.service.impl; +package org.nl.wms.ext_manage.acs.service.impl; -import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.MapOf; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.core.bean.WQLObject; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; -import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; -import org.nl.wms.scheduler_manage.service.cacheline.ISchCachelineVehicleService; import org.nl.wms.scheduler_manage.service.cacheline.ISchCachelineVehilematerialService; -import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelineVehicle; import org.nl.wms.scheduler_manage.service.cacheline.dao.SchCachelineVehilematerial; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; @@ -31,9 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.math.BigDecimal; import java.util.*; -import java.util.function.Predicate; import java.util.stream.Collectors; /* diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java similarity index 90% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java index d5084f9b..d5870dc8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java @@ -1,6 +1,5 @@ -package org.nl.wms.ext.acs.service.impl; +package org.nl.wms.ext_manage.acs.service.impl; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -9,11 +8,9 @@ import org.apache.commons.lang3.StringUtils; import org.nl.common.utils.AcsUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; -import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.springframework.context.annotation.Lazy; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.springframework.stereotype.Service; -import java.util.HashMap; import java.util.Map; @@ -56,10 +53,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ JSONObject param = new JSONObject(MapOf.of("task_id", task.getString("task_id") , "task_code", task.getString("task_code") , "start_point_code", task.getString("point_code1")//起点 - , "next_point_code", task.getString("point_code2")//空盘返回点 + , "next_point_code", task.getString("point_code3")//空盘返回点 , "task_type", task.getString("acs_task_type") , "priority", task.getString("priority") - , "is_send", task.getString("is_send") + , "task_group_id", StringUtils.isBlank(task.getString("task_group_id"))? IdUtil.getStringId():task.getString("task_group_id") + , "is_send", task.getBoolean("is_send")?"1":"0" , "vehicle_code", task.getString("vehicle_code") , "agv_system_type", task.getString("agv_system_type") )); @@ -74,18 +72,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ JSONArray form = new JSONArray(); for (Object o : arr) { JSONObject task = (JSONObject) o; - Boolean is_send = task.getBoolean("is_send"); - String send = "1"; - if (!is_send) send = "0"; - JSONObject param = new JSONObject(MapOf.of("task_id", task.getString("task_id") , "task_code", task.getString("task_code") , "task_group_id", task.getString("task_group_id") , "start_point_code", task.getString("point_code1") - , "next_point_code", task.getString("point_code2") + , "next_point_code", task.getString("point_code3") , "task_type", task.getString("acs_task_type") + , "task_group_id", StringUtils.isBlank(task.getString("task_group_id"))? IdUtil.getStringId():task.getString("task_group_id") , "priority", task.getString("priority") - , "is_send", send + , "is_send", task.getBoolean("is_send")?"1":"0" , "vehicle_code", task.getString("vehicle_code") , "agv_system_type", task.getString("agv_system_type") )); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/DeviceUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/DeviceUtils.java similarity index 98% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/DeviceUtils.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/DeviceUtils.java index 34dcc944..6168711d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/DeviceUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/DeviceUtils.java @@ -1,10 +1,8 @@ -package org.nl.wms.ext.bigScreen; +package org.nl.wms.ext_manage.bigScreen; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.models.auth.In; -import org.nl.wms.ext.bigScreen.service.DeviceScreenService; import java.util.*; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/OrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/OrderDto.java similarity index 92% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/OrderDto.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/OrderDto.java index 5ec5c5dc..4c441001 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/OrderDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/OrderDto.java @@ -1,7 +1,6 @@ -package org.nl.wms.ext.bigScreen; +package org.nl.wms.ext_manage.bigScreen; import lombok.Data; -import java.util.Date; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/SwitchOnOff.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/SwitchOnOff.java similarity index 81% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/SwitchOnOff.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/SwitchOnOff.java index 22824412..8c84db1a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/SwitchOnOff.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/SwitchOnOff.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen; +package org.nl.wms.ext_manage.bigScreen; /** * @author: geng by diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/WordOrderUtils.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/WordOrderUtils.java similarity index 99% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/WordOrderUtils.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/WordOrderUtils.java index 1009067a..8fa2f79f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/WordOrderUtils.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/WordOrderUtils.java @@ -1,17 +1,14 @@ -package org.nl.wms.ext.bigScreen; +package org.nl.wms.ext_manage.bigScreen; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import io.swagger.models.auth.In; import org.nl.modules.wql.core.bean.WQLObject; import java.text.DecimalFormat; import java.util.*; -import java.util.stream.Collectors; /** * @author: geng by diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java similarity index 75% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java index 91c4e64b..f0709a86 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/AgvBigScreenController.java @@ -1,20 +1,15 @@ -package org.nl.wms.ext.bigScreen.rest; +package org.nl.wms.ext_manage.bigScreen.rest; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.AgvBigScreenService; -import org.nl.wms.ext.bigScreen.service.BigScreenService; -import org.springframework.data.domain.Pageable; +import org.nl.wms.ext_manage.bigScreen.service.AgvBigScreenService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.util.Map; - /** * @author liuxy * @date 2022-07-27 @@ -30,13 +25,13 @@ public class AgvBigScreenController { private final AgvBigScreenService agvBigScreenService; @PostMapping("/getTask") - @ApiOperation("查询任务") + //("查询任务") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(agvBigScreenService.getTask(whereJson), HttpStatus.OK); } @PostMapping("/getAgvMsg") - @ApiOperation("查询车辆信息") + //("查询车辆信息") public ResponseEntity getAgvMsg(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(agvBigScreenService.getAgvMsg(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java similarity index 81% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java index 27e350ea..c91fd276 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/BigScreenController.java @@ -1,13 +1,12 @@ -package org.nl.wms.ext.bigScreen.rest; +package org.nl.wms.ext_manage.bigScreen.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.BigScreenService; +import org.nl.wms.ext_manage.bigScreen.service.BigScreenService; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -29,31 +28,31 @@ import java.util.Map; public class BigScreenController { private final BigScreenService bigScreenService; @PostMapping("/zk") - @ApiOperation("查询中控室监控大屏") + //("查询中控室监控大屏") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.getData(whereJson), HttpStatus.OK); } @PostMapping("/query3Dcartoon") - @ApiOperation("查询三维动画大屏") + //("查询三维动画大屏") public ResponseEntity query3Dcartoon(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.query3Dcartoon(whereJson), HttpStatus.OK); } @PostMapping("/workScreen") - @ApiOperation("查询工序看板") + //("查询工序看板") public ResponseEntity workScreen(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.workScreen(whereJson), HttpStatus.OK); } @GetMapping("/queryInfo") - @ApiOperation("查询中控室监控大屏手动设置数据") + //("查询中控室监控大屏手动设置数据") public ResponseEntity queryInfo(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(bigScreenService.queryInfo(whereJson,page), HttpStatus.OK); } @PostMapping("/add") - @ApiOperation("手动添加监控大屏数据") + //("手动添加监控大屏数据") public ResponseEntity add(@RequestBody JSONObject param) throws Exception { bigScreenService.add(param); return new ResponseEntity<>( HttpStatus.OK); @@ -61,14 +60,14 @@ public class BigScreenController { @PutMapping("/edit") - @ApiOperation("手动修改监控大屏数据") + //("手动修改监控大屏数据") public ResponseEntity edit(@RequestBody JSONObject param) throws Exception { bigScreenService.edit(param); return new ResponseEntity<>( HttpStatus.OK); } @DeleteMapping("/del") - @ApiOperation("手动删除监控大屏数据") + //("手动删除监控大屏数据") public ResponseEntity del(@RequestBody Long[] ids) throws Exception { bigScreenService.del(ids); return new ResponseEntity<>( HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/DeviceScreenController.java similarity index 84% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/DeviceScreenController.java index 54faceba..115dbf64 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/DeviceScreenController.java @@ -1,13 +1,12 @@ -package org.nl.wms.ext.bigScreen.rest; +package org.nl.wms.ext_manage.bigScreen.rest; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.DeviceScreenService; +import org.nl.wms.ext_manage.bigScreen.service.DeviceScreenService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -25,61 +24,61 @@ public class DeviceScreenController { private final DeviceScreenService deviceScreenService; @PostMapping("/deviceStatus") - @ApiOperation("设备实时状态") + //("设备实时状态") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceStatus(whereJson), HttpStatus.OK); } @PostMapping("/oeeAndTeep") - @ApiOperation("设备综合效率OEE&产能利用效率TEEP") + //("设备综合效率OEE&产能利用效率TEEP") public ResponseEntity oeeAndTeep(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.oeeAndTeep(whereJson), HttpStatus.OK); } @PostMapping("/queryDeviceByWork") - @ApiOperation("运行设备大类产能比") + //("运行设备大类产能比") public ResponseEntity queryDeviceByWork(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.queryDeviceByWork(whereJson), HttpStatus.OK); } @PostMapping("/deviceErrorNum") - @ApiOperation("设备TOP10故障次数") + //("设备TOP10故障次数") public ResponseEntity deviceErrorNum(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceErrorNum(whereJson), HttpStatus.OK); } @PostMapping("/deviceManage") - @ApiOperation("设备管理") + //("设备管理") public ResponseEntity deviceManage(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceManage(whereJson), HttpStatus.OK); } @PostMapping("/deviceCensus") - @ApiOperation("设备综合统计") + //("设备综合统计") public ResponseEntity deviceCensus(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceCensus(whereJson), HttpStatus.OK); } @PostMapping("/deviceErrorInfo") - @ApiOperation("设备报警信息") + //("设备报警信息") public ResponseEntity deviceErrorInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceErrorInfo(whereJson), HttpStatus.OK); } @PostMapping("/deviceUseRate") - @ApiOperation("设备产能利用") + //("设备产能利用") public ResponseEntity deviceUseRate(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceUseRate(whereJson), HttpStatus.OK); } @PostMapping("/deviceStatusList") - @ApiOperation("设备状态列表") + //("设备状态列表") public ResponseEntity deviceStatusList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceStatusList(whereJson), HttpStatus.OK); } @PostMapping("/errCensus") - @ApiOperation("近30天设备故障统计") + //("近30天设备故障统计") public ResponseEntity errCensus(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.errCensus(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java similarity index 85% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java index 8669419a..f6b966f1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/rest/ProductController.java @@ -1,15 +1,14 @@ -package org.nl.wms.ext.bigScreen.rest; +package org.nl.wms.ext_manage.bigScreen.rest; import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.service.ProductService; +import org.nl.wms.ext_manage.bigScreen.service.ProductService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -34,43 +33,43 @@ public class ProductController { private final ProductService pdaBindingService; @PostMapping("/planReached") - @ApiOperation("计划达成") + //("计划达成") public ResponseEntity planReached(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.planReached(param), HttpStatus.OK); } @PostMapping("/productSchedule") - @ApiOperation("今日排产生产进度跟踪") + //("今日排产生产进度跟踪") public ResponseEntity productSchedule(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.productSchedule(param), HttpStatus.OK); } @PostMapping("/output") - @ApiOperation("今日产量") + //("今日产量") public ResponseEntity output(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.output(param), HttpStatus.OK); } @PostMapping("/worksectionHarvest") - @ApiOperation("近一周工段产量") + //("近一周工段产量") public ResponseEntity worksectionHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.worksectionHarvest(param), HttpStatus.OK); } @PostMapping("/topHarvest") - @ApiOperation("今日Top10产量") + //("今日Top10产量") public ResponseEntity topHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.topHarvest(param), HttpStatus.OK); } @PostMapping("/monthHarvest") - @ApiOperation("30天产量走势") + //("30天产量走势") public ResponseEntity monthHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.monthHarvest(param), HttpStatus.OK); } @PostMapping("/unfinishOrder") - @ApiOperation("今日未完成订单") + //("今日未完成订单") public ResponseEntity unfinishOrder(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.unfinishOrder(param), HttpStatus.OK); } @PostMapping("/monthOrder") - @ApiOperation("30天生产订单分布") + //("30天生产订单分布") public ResponseEntity monthOrder(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.monthOrder(param), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/AgvBigScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/AgvBigScreenService.java similarity index 68% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/AgvBigScreenService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/AgvBigScreenService.java index 10e8dffb..cec137e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/AgvBigScreenService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/AgvBigScreenService.java @@ -1,6 +1,5 @@ -package org.nl.wms.ext.bigScreen.service; +package org.nl.wms.ext_manage.bigScreen.service; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; public interface AgvBigScreenService { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/BigScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/BigScreenService.java similarity index 95% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/BigScreenService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/BigScreenService.java index 5844b893..5e14f900 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/BigScreenService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/BigScreenService.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.service; +package org.nl.wms.ext_manage.bigScreen.service; import com.alibaba.fastjson.JSONObject; import org.springframework.data.domain.Pageable; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/DeviceScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/DeviceScreenService.java similarity index 92% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/DeviceScreenService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/DeviceScreenService.java index d8254e8f..99a0d079 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/DeviceScreenService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/DeviceScreenService.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.service; +package org.nl.wms.ext_manage.bigScreen.service; import com.alibaba.fastjson.JSONObject; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/ProductService.java similarity index 97% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/ProductService.java index 40530827..9554aa4b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/ProductService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/ProductService.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.service; +package org.nl.wms.ext_manage.bigScreen.service; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/ShopinfoDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/ShopinfoDto.java similarity index 96% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/ShopinfoDto.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/ShopinfoDto.java index d9621c7c..f4baeeb8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/ShopinfoDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/ShopinfoDto.java @@ -1,7 +1,6 @@ -package org.nl.wms.ext.bigScreen.service.dto; +package org.nl.wms.ext_manage.bigScreen.service.dto; import lombok.Data; -import java.util.Date; import java.math.BigDecimal; import java.io.Serializable; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/StockDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/StockDto.java similarity index 91% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/StockDto.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/StockDto.java index ab442b8a..32694666 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/StockDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/StockDto.java @@ -1,7 +1,6 @@ -package org.nl.wms.ext.bigScreen.service.dto; +package org.nl.wms.ext_manage.bigScreen.service.dto; import lombok.Data; -import java.util.Date; import java.math.BigDecimal; import java.io.Serializable; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/SupplyDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/SupplyDto.java similarity index 91% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/SupplyDto.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/SupplyDto.java index 64741015..2be13a68 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/SupplyDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/SupplyDto.java @@ -1,7 +1,6 @@ -package org.nl.wms.ext.bigScreen.service.dto; +package org.nl.wms.ext_manage.bigScreen.service.dto; import lombok.Data; -import java.util.Date; import java.math.BigDecimal; import java.io.Serializable; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/TodayandplannumDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/TodayandplannumDto.java similarity index 91% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/TodayandplannumDto.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/TodayandplannumDto.java index 26a648fc..131c9912 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/TodayandplannumDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/TodayandplannumDto.java @@ -1,7 +1,6 @@ -package org.nl.wms.ext.bigScreen.service.dto; +package org.nl.wms.ext_manage.bigScreen.service.dto; import lombok.Data; -import java.util.Date; import java.math.BigDecimal; import java.io.Serializable; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/YearinoutDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/YearinoutDto.java similarity index 93% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/YearinoutDto.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/YearinoutDto.java index a7abab3b..95ca9478 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/dto/YearinoutDto.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/dto/YearinoutDto.java @@ -1,7 +1,6 @@ -package org.nl.wms.ext.bigScreen.service.dto; +package org.nl.wms.ext_manage.bigScreen.service.dto; import lombok.Data; -import java.util.Date; import java.math.BigDecimal; import java.io.Serializable; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/AgvBigScreenServiceImpl.java similarity index 97% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/AgvBigScreenServiceImpl.java index 98d2aaac..0d48a9f6 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/AgvBigScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/AgvBigScreenServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.service.impl; +package org.nl.wms.ext_manage.bigScreen.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; @@ -9,7 +9,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.bigScreen.service.AgvBigScreenService; +import org.nl.wms.ext_manage.bigScreen.service.AgvBigScreenService; import org.springframework.stereotype.Service; import java.util.HashMap; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/BigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/BigScreenServiceImpl.java similarity index 99% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/BigScreenServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/BigScreenServiceImpl.java index 5482716e..a94b9449 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/BigScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/BigScreenServiceImpl.java @@ -1,11 +1,8 @@ -package org.nl.wms.ext.bigScreen.service.impl; +package org.nl.wms.ext_manage.bigScreen.service.impl; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -15,8 +12,8 @@ import org.nl.modules.wql.core.bean.ResultBean; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.nl.start.auto.initial.ApplicationAutoInitial; -import org.nl.wms.ext.bigScreen.service.BigScreenService; -import org.nl.wms.ext.bigScreen.service.dto.*; +import org.nl.wms.ext_manage.bigScreen.service.BigScreenService; +import org.nl.wms.ext_manage.bigScreen.service.dto.*; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/DeviceScreenServiceImpl.java similarity index 99% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/DeviceScreenServiceImpl.java index eea4ef60..154257bf 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/DeviceScreenServiceImpl.java @@ -1,6 +1,5 @@ -package org.nl.wms.ext.bigScreen.service.impl; +package org.nl.wms.ext_manage.bigScreen.service.impl; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; @@ -9,13 +8,12 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.bigScreen.DeviceUtils; -import org.nl.wms.ext.bigScreen.SwitchOnOff; -import org.nl.wms.ext.bigScreen.service.DeviceScreenService; +import org.nl.wms.ext_manage.bigScreen.DeviceUtils; +import org.nl.wms.ext_manage.bigScreen.SwitchOnOff; +import org.nl.wms.ext_manage.bigScreen.service.DeviceScreenService; import org.springframework.stereotype.Service; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/ProductServiceImpl.java similarity index 98% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/ProductServiceImpl.java index 0b03751a..3a615e87 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/ProductServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/service/impl/ProductServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.service.impl; +package org.nl.wms.ext_manage.bigScreen.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; @@ -6,12 +6,11 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.WQL; -import org.nl.wms.ext.bigScreen.SwitchOnOff; -import org.nl.wms.ext.bigScreen.WordOrderUtils; -import org.nl.wms.ext.bigScreen.service.ProductService; +import org.nl.wms.ext_manage.bigScreen.SwitchOnOff; +import org.nl.wms.ext_manage.bigScreen.WordOrderUtils; +import org.nl.wms.ext_manage.bigScreen.service.ProductService; import org.springframework.stereotype.Service; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/rest/BigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java similarity index 83% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/rest/BigController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java index 58a07c17..a3872d69 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/rest/BigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/rest/BigController.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.test.rest; +package org.nl.wms.ext_manage.bigScreen.test.rest; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; @@ -6,10 +6,9 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.common.anno.Log; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.bigScreen.test.service.BigTestService; +import org.nl.wms.ext_manage.bigScreen.test.service.BigTestService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -31,7 +30,7 @@ public class BigController { @PostMapping("/save") @Log("保存虚拟大屏工单信息") - @ApiOperation("保存虚拟大屏工单信息") + //("保存虚拟大屏工单信息") public ResponseEntity save(@RequestBody JSONObject jsonObject) { bigTestService.save(jsonObject); return new ResponseEntity<>(HttpStatus.OK); @@ -39,7 +38,7 @@ public class BigController { @PostMapping("/saveDevice") @Log("保存虚拟大屏设备信息") - @ApiOperation("保存虚拟大屏设备信息") + //("保存虚拟大屏设备信息") public ResponseEntity saveDevice(@RequestBody JSONObject jsonObject) { bigTestService.saveDevice(jsonObject); return new ResponseEntity<>(HttpStatus.OK); @@ -47,7 +46,7 @@ public class BigController { @PostMapping("/switchOnOff") @Log("切换虚拟、真实数据") - @ApiOperation("切换虚拟、真实数据") + //("切换虚拟、真实数据") public ResponseEntity switch_on_off(@RequestBody JSONObject jsonObject) { bigTestService.switch_on_off(jsonObject); return new ResponseEntity<>(HttpStatus.OK); @@ -55,7 +54,7 @@ public class BigController { @PostMapping("/excelImport") @Log("excel导入虚拟工单") - @ApiOperation("excel导入虚拟工单") + //("excel导入虚拟工单") public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { bigTestService.excelImport(file, request); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/service/BigTestService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/service/BigTestService.java similarity index 91% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/service/BigTestService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/service/BigTestService.java index 180c3975..467fe338 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/service/BigTestService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/service/BigTestService.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.bigScreen.test.service; +package org.nl.wms.ext_manage.bigScreen.test.service; import com.alibaba.fastjson.JSONObject; import org.springframework.web.multipart.MultipartFile; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/service/impl/BigTestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/service/impl/BigTestServiceImpl.java similarity index 98% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/service/impl/BigTestServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/service/impl/BigTestServiceImpl.java index a6ee9e5a..00f84165 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/test/service/impl/BigTestServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/test/service/impl/BigTestServiceImpl.java @@ -1,25 +1,20 @@ -package org.nl.wms.ext.bigScreen.test.service.impl; +package org.nl.wms.ext_manage.bigScreen.test.service.impl; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; import com.alibaba.fastjson.JSONObject; -import com.mchange.lang.IntegerUtils; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.bigScreen.DeviceUtils; -import org.nl.wms.ext.bigScreen.OrderDto; -import org.nl.wms.ext.bigScreen.SwitchOnOff; -import org.nl.wms.ext.bigScreen.WordOrderUtils; -import org.nl.wms.ext.bigScreen.test.service.BigTestService; -import org.nl.wms.mps.service.WorkOrderImportEnum; +import org.nl.wms.ext_manage.bigScreen.DeviceUtils; +import org.nl.wms.ext_manage.bigScreen.OrderDto; +import org.nl.wms.ext_manage.bigScreen.SwitchOnOff; +import org.nl.wms.ext_manage.bigScreen.WordOrderUtils; +import org.nl.wms.ext_manage.bigScreen.test.service.BigTestService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/AGVBIGSCREEN01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/AGVBIGSCREEN01.wql similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/AGVBIGSCREEN01.wql rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/AGVBIGSCREEN01.wql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/BIGSCREENPRODUCT.wql similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/BIGSCREENPRODUCT.wql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/QDEVICE_SCREEN.wql similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/QDEVICE_SCREEN.wql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/bigScreen.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/bigScreen.xls similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/bigScreen.xls rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/bigScreen.xls diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/ds_agv.xls similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/ds_agv.xls rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/bigScreen/wql/ds_agv.xls diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java similarity index 81% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java index 689cbad4..377f2c65 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/rest/WmsToSapController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/rest/WmsToSapController.java @@ -1,18 +1,15 @@ -package org.nl.wms.ext.sap.rest; +package org.nl.wms.ext_manage.sap.rest; import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.anno.Log; -import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.ext.sap.service.WmsToSapService; +import org.nl.wms.ext_manage.sap.service.WmsToSapService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -20,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - /** * @author zhouz * @date 2021-07-21 @@ -37,21 +32,21 @@ public class WmsToSapController { @PostMapping("/getMater") @Log("获取物料基础信息") - @ApiOperation("获取物料基础信息") + //("获取物料基础信息") public ResponseEntity getMater(@RequestBody JSONObject form) { return new ResponseEntity<>(wmsToSapService.getMater(form), HttpStatus.OK); } @PostMapping("/getSaleOrder") @Log("获取销售订单") - @ApiOperation("获取销售订单") + //("获取销售订单") public ResponseEntity getSaleOrder(@RequestBody JSONObject form) { return new ResponseEntity<>(wmsToSapService.getSaleOrder(form), HttpStatus.OK); } @PostMapping("/getDeliveryNote") @Log("获取物料基础信息") - @ApiOperation("获取物料基础信息") + //("获取物料基础信息") @SaIgnore public ResponseEntity getDeliveryNote(@RequestBody JSONObject form) { return new ResponseEntity<>(wmsToSapService.getDeliveryNote(form), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/WmsToSapService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/WmsToSapService.java similarity index 86% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/WmsToSapService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/WmsToSapService.java index af616dfd..7bce67e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/WmsToSapService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/WmsToSapService.java @@ -1,10 +1,7 @@ -package org.nl.wms.ext.sap.service; +package org.nl.wms.ext_manage.sap.service; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import java.util.Map; - /** * */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java similarity index 84% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java index 0a0cfe7c..f99517d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/WmsToSapServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/service/impl/WmsToSapServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.ext.sap.service.impl; +package org.nl.wms.ext_manage.sap.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; @@ -14,15 +14,15 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.common.utils.WebServiceUtil; -import org.nl.wms.ext.sap.service.WmsToSapService; +import org.nl.wms.ext_manage.sap.service.WmsToSapService; import org.nl.wms.masterdata_manage.master.service.customer.IMdCsCustomerbaseService; import org.nl.wms.masterdata_manage.master.service.customer.dao.MdCsCustomerbase; import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -60,7 +60,6 @@ public class WmsToSapServiceImpl implements WmsToSapService { @Override public JSONObject getSaleOrder(JSONObject form) { - log.info("导入方法开始"); JSONObject result = new JSONObject(); String url = "http://192.168.0.82:8000/sap/bc/srt/rfc/sap/zfg_ecc_to_zhwl/800/zfg_ecc_to_zhwl/binding"; @@ -122,71 +121,62 @@ public class WmsToSapServiceImpl implements WmsToSapService { for (int i = 0; i < item.size(); i++) { JSONObject row = item.getJSONObject(i); boolean need_update = false; - JSONObject sale_jo = WQLObject.getWQLObject("pcs_sale_order").query("sale_code = '" + row.getString("Vbeln") + "' AND seq_no = '" + row.getString("Posnr") + "'").uniqueResult(0); + MpsSaleOrder sale_jo = saleOrderService.getOne(new QueryWrapper() + .eq("sale_code", row.getString("Vbeln")).eq("seq_no", row.getString("Posnr"))); if (ObjectUtil.isEmpty(sale_jo)) { - sale_jo = new JSONObject(); - sale_jo.put("sale_id", IdUtil.getSnowflake(1, 1).nextId()); + sale_jo = new MpsSaleOrder(); + sale_jo.setSale_id(org.nl.common.utils.IdUtil.getStringId()); } else { need_update = true; - if (!sale_jo.getString("status").equals("10")) { + if (!sale_jo.getStatus().equals("10")) { continue; } } - sale_jo.put("is_success", "1"); - sale_jo.put("sale_code", row.getString("Vbeln")); - sale_jo.put("seq_no", row.getString("Posnr")); - sale_jo.put("sale_type", row.getString("Auart")); + sale_jo.setSale_code(row.getString("Vbeln")); + sale_jo.setSeq_no(row.getString("Posnr")); + sale_jo.setSale_type(row.getString("Auart")); String material_code = row.getString("Matnr").replaceAll("^(0+)", ""); //获取物料对应的物料标识 MdMeMaterialbase mater_jo = materialbaseService.getOne(new QueryWrapper().eq("material_code", material_code)); if (ObjectUtil.isEmpty(mater_jo)) { - sale_jo.put("material_id", "0"); - sale_jo.put("is_success", "0"); - sale_jo.put("remark", "未查询到该销售订单对应的物料主数据：" + material_code); + sale_jo.setMaterial_id(""); + sale_jo.setRemark("未查询到该销售订单对应的物料主数据：" + material_code); err_num++; } else { - String material_id =mater_jo.getMaterial_id(); - sale_jo.put("material_id", material_id); + sale_jo.setMaterial_id(mater_jo.getMaterial_id()); } - sale_jo.put("status", "10"); - sale_jo.put("sale_qty", row.getString("Kwmeng")); - sale_jo.put("produce_seq", "1"); + sale_jo.setStatus( "10"); + sale_jo.setSale_qty(row.getBigDecimal("Kwmeng")); + sale_jo.setProduce_seq(1); String cust_code = row.getString("Kunnr"); MdCsCustomerbase cust_jo = customerbaseService.getOne(new QueryWrapper().eq("cust_code", cust_code)); if (ObjectUtil.isNotEmpty(cust_jo)) { - sale_jo.put("cust_id", cust_jo.getCust_id()); - sale_jo.put("cust_code", cust_jo.getCust_code()); - sale_jo.put("cust_name", cust_jo.getCust_name()); + sale_jo.setCust_id(cust_jo.getCust_id()); + sale_jo.setCust_code(cust_jo.getCust_code()); + sale_jo.setCust_name(cust_jo.getCust_name()); } else { - sale_jo.put("is_success", "0"); - sale_jo.put("remark", "未查询到该销售订单对应的客户信息：" + cust_code); + sale_jo.setRemark("未查询到该销售订单对应的客户信息：" + cust_code); err_num++; } String unit_code = row.getString("Vrkme"); MdPbMeasureunit unit_jo = mdPbMeasureunitService.getOne(new QueryWrapper() .eq("unit_name", unit_code)); if (ObjectUtil.isEmpty(unit_jo)) { - sale_jo.put("qty_unit_id", "0"); - sale_jo.put("remark", "未查询到该销售订单对应的单位信息：" + unit_code); + sale_jo.setQty_unit_id(" "); + sale_jo.setRemark("未查询到该销售订单对应的单位信息：" + unit_code); err_num++; } else { - sale_jo.put("qty_unit_id", unit_jo.getMeasure_unit_id()); + sale_jo.setQty_unit_id(unit_jo.getMeasure_unit_id()); } - sale_jo.put("plandeliver_date", row.getString("Edatu")); - sale_jo.put("create_id", SecurityUtils.getCurrentUserId()); - sale_jo.put("create_name", SecurityUtils.getCurrentNickName()); - sale_jo.put("create_time", DateUtil.now()); - sale_jo.put("update_optid", SecurityUtils.getCurrentUserId()); - sale_jo.put("update_optname", SecurityUtils.getCurrentNickName()); - sale_jo.put("update_time", DateUtil.now()); - + sale_jo.setPlandeliver_date(row.getString("Edatu")); + sale_jo.setCreate_id(SecurityUtils.getCurrentUserId()); + sale_jo.setCreate_time(DateUtil.now()); + sale_jo.setCreate_name(SecurityUtils.getCurrentNickName()); if (need_update) { - WQLObject.getWQLObject("pcs_sale_order").update(sale_jo); + saleOrderService.updateById(sale_jo); } else { - WQLObject.getWQLObject("pcs_sale_order").insert(sale_jo); + saleOrderService.save(sale_jo); } - - } if (err_num > 0) { result.put("message", "导入成功！一共导入:" + item.size() + "条数据,其中有误数据：" + err_num + "条！"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/wql/QERP.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/wql/QERP.wql similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/sap/wql/QERP.wql rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/sap/wql/QERP.wql diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java index 40e3da77..e5cbb117 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbBucketrecordController.java @@ -34,7 +34,7 @@ public class MdPbBucketrecordController { @GetMapping @Log("查询桶记录表") - @ApiOperation("查询桶记录表") + //("查询桶记录表") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(iMdPbBucketrecordService.queryAll(whereJson,page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java index 50f4e48e..6b0bbd6b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/controller/vehicle/MdPbStoragevehicleinfoController.java @@ -48,21 +48,21 @@ public class MdPbStoragevehicleinfoController { @GetMapping @Log("查询载具") - @ApiOperation("查询载具") + //("查询载具") public ResponseEntity query(VehicleQuery whereJson, PageQuery page){ return new ResponseEntity<>(TableDataInfo.build(storagevehicleinfoService.queryAll(whereJson,page)),HttpStatus.OK); } @PostMapping @Log("新增载具") - @ApiOperation("新增载具") + //("新增载具") public ResponseEntity create(@RequestBody JSONObject map){ return new ResponseEntity<>(istoragevehicleinfoService.create(map),HttpStatus.CREATED); } @PutMapping @Log("修改载具") - @ApiOperation("修改载具") + //("修改载具") //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:edit')") public ResponseEntity update(@Validated @RequestBody JSONObject dto){ storagevehicleinfoService.update(dto); @@ -70,7 +70,7 @@ public class MdPbStoragevehicleinfoController { } @Log("删除载具") - @ApiOperation("删除载具") + //("删除载具") //@PreAuthorize("@el.check('mdPbStoragevehicleinfo:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -80,7 +80,7 @@ public class MdPbStoragevehicleinfoController { @PutMapping("/changeActive") @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") + //("修改点位启用状态") //@PreAuthorize("@el.check('store:edit')") public ResponseEntity changeActive(@RequestBody JSONObject json) { storagevehicleinfoService.changeActive(json); @@ -89,7 +89,7 @@ public class MdPbStoragevehicleinfoController { @GetMapping("/getVehicle/{code}") @Log("获取起始载具号") - @ApiOperation("获取起始载具号") + //("获取起始载具号") //@PreAuthorize("@el.check('store:edit')") public ResponseEntity getVehicle(@PathVariable String code) { JSONObject json = storagevehicleinfoService.getVehicle(code); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java index 0033725e..da8dbfb9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/classstandard/ClassstandardController.java @@ -44,14 +44,14 @@ public class ClassstandardController { @GetMapping @Log("查询基础类别") - @ApiOperation("查询基础类别") + //("查询基础类别") public ResponseEntity queryList(@RequestParam Map whereJson) { return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.dropdownList(whereJson)), HttpStatus.OK); } @PostMapping @Log("新增基础类别") - @ApiOperation("新增基础类别") + //("新增基础类别") //@PreAuthorize("@el.check('Classstandard:add')") public ResponseEntity create(@Validated @RequestBody JSONObject form) { mdPbClassstandardService.create(form); @@ -60,7 +60,7 @@ public class ClassstandardController { @PutMapping @Log("修改基础类别") - @ApiOperation("修改基础类别") + //("修改基础类别") //@PreAuthorize("@el.check('Classstandard:edit')") public ResponseEntity update(@Validated @RequestBody JSONObject form) { mdPbClassstandardService.updateForm(form); @@ -68,7 +68,7 @@ public class ClassstandardController { } @Log("删除基础类别") - @ApiOperation("删除基础类别") + //("删除基础类别") //@PreAuthorize("@el.check('Classstandard:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -78,7 +78,7 @@ public class ClassstandardController { @GetMapping("/loadClass") @Log("查询基础类型") - @ApiOperation("查询基础类型") + //("查询基础类型") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity query(@RequestParam Map whereJson) { return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.loadClass(whereJson)), HttpStatus.OK); @@ -86,7 +86,7 @@ public class ClassstandardController { @GetMapping("/getClass") @Log("查询基础类型") - @ApiOperation("查询基础类型") + //("查询基础类型") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassBycode(@RequestParam Map whereJson) { return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassBycode(whereJson)), HttpStatus.OK); @@ -95,7 +95,7 @@ public class ClassstandardController { @GetMapping("/queryClassById") @Log("查询分类基础列表") - @ApiOperation("查询分类基础列表") + //("查询分类基础列表") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassById(@RequestParam Map whereJson) { return new ResponseEntity<>(TableDataInfo.build(mdPbClassstandardService.queryClassById(whereJson)), HttpStatus.OK); @@ -103,13 +103,13 @@ public class ClassstandardController { @GetMapping("/getClassTable") @Log("查询物料基础类型") - @ApiOperation("查询物料基础类型") + //("查询物料基础类型") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity queryClassTable(@RequestParam Map whereJson,Pageable page) { return new ResponseEntity<>(ClassstandardService.queryClassTable(whereJson,page), HttpStatus.OK); } - @ApiOperation("查询类别:根据ID获取同级与上级数据") + //("查询类别:根据ID获取同级与上级数据") @PostMapping("/superior") //@PreAuthorize("@el.check('user:list','dept:list')") public ResponseEntity getSuperior(@RequestBody Long id) { @@ -120,7 +120,7 @@ public class ClassstandardController { @GetMapping("/getType") @Log("获取分类类型") - @ApiOperation("获取分类类型") + //("获取分类类型") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getType(@RequestParam Map whereJson) { String type_id = MapUtil.getStr(whereJson, "type_id"); @@ -130,7 +130,7 @@ public class ClassstandardController { @GetMapping("/getClassName") @Log("获取分类名称下拉框") - @ApiOperation("获取分类名称下拉框") + //("获取分类名称下拉框") public ResponseEntity getClassName() { return new ResponseEntity<>(ClassstandardService.getClassName(), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java index 1deb9f7b..4a11c8d9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java @@ -39,14 +39,14 @@ public class MdCsCustomerbaseController { @GetMapping @Log("查询客户基础表") - @ApiOperation("查询客户基础表") + //("查询客户基础表") public ResponseEntity query(CustomerQuery whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(icustomerbaseService.page(page.build(), whereJson.build())), HttpStatus.OK); } @PostMapping @Log("新增客户基础表") - @ApiOperation("新增客户基础表") + //("新增客户基础表") public ResponseEntity create(@Validated @RequestBody JSONObject dto) { icustomerbaseService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -54,14 +54,14 @@ public class MdCsCustomerbaseController { @PutMapping @Log("修改客户基础表") - @ApiOperation("修改客户基础表") + //("修改客户基础表") public ResponseEntity update(@Validated @RequestBody JSONObject dto) { icustomerbaseService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除客户基础表") - @ApiOperation("删除客户基础表") + //("删除客户基础表") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { if (ids.length>0) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java index 3b016e2a..44a4b860 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/measureunit/MdPbMeasureunitController.java @@ -40,14 +40,14 @@ public class MdPbMeasureunitController { @GetMapping @Log("查询单位") - @ApiOperation("查询计量单位") + //("查询计量单位") public ResponseEntity query(UnitQuery query, PageQuery page) { return new ResponseEntity<>(measureunitService.pageQuery(query, page), HttpStatus.OK); } @PostMapping("/add") @Log("新增计量单位") - @ApiOperation("新增计量单位") + //("新增计量单位") public ResponseEntity create(@RequestBody JSONObject whereJson) { measureunitService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -55,7 +55,7 @@ public class MdPbMeasureunitController { @PostMapping("/update") @Log("修改计量单位") - @ApiOperation("修改计量单位") + //("修改计量单位") public ResponseEntity update(@RequestBody JSONObject whereJson) { measureunitService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -63,7 +63,7 @@ public class MdPbMeasureunitController { @PostMapping("/delete") @Log("删除计量单位") - @ApiOperation("删除计量单位") + //("删除计量单位") public ResponseEntity delete(@RequestBody Long[] ids){ for (Long id : ids) { measureunitService.removeById(id); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java index c39d4c54..5f77f4ed 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/MaterialsafeivtController.java @@ -30,7 +30,7 @@ public class MaterialsafeivtController { @GetMapping @Log("查询安全库存") - @ApiOperation("查询安全库存") + //("查询安全库存") //@PreAuthorize("@el.check('materialsafeivt:list')") public ResponseEntity query(SafeIvtQuery query, PageQuery page){ return new ResponseEntity<>(materialsafeivtService.pageQuery(query,page),HttpStatus.OK); @@ -38,7 +38,7 @@ public class MaterialsafeivtController { @PostMapping("/save") @Log("保存安全库存") - @ApiOperation("保存安全库存") + //("保存安全库存") //@PreAuthorize("@el.check('materialsafeivt:list')") public ResponseEntity save(@RequestBody JSONObject form){ materialsafeivtService.save(form); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java index 336f2e48..7bcbb210 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/material/StructrelamaterialController.java @@ -33,7 +33,7 @@ public class StructrelamaterialController { @GetMapping @Log("查询物料存放设置") - @ApiOperation("查询物料存放设置") + //("查询物料存放设置") //@PreAuthorize("@el.check('structrelamaterial:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(structrelamaterialService.queryAll(whereJson,page),HttpStatus.OK); @@ -41,7 +41,7 @@ public class StructrelamaterialController { @PostMapping @Log("新增物料存放设置") - @ApiOperation("新增物料存放设置") + //("新增物料存放设置") //@PreAuthorize("@el.check('structrelamaterial:add')") public ResponseEntity create(@Validated @RequestBody StructrelamaterialDto dto){ structrelamaterialService.create(dto); @@ -50,7 +50,7 @@ public class StructrelamaterialController { @PutMapping @Log("修改物料存放设置") - @ApiOperation("修改物料存放设置") + //("修改物料存放设置") //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity update(@Validated @RequestBody StructrelamaterialDto dto){ structrelamaterialService.update(dto); @@ -58,7 +58,7 @@ public class StructrelamaterialController { } @Log("删除物料存放设置") - @ApiOperation("删除物料存放设置") + //("删除物料存放设置") //@PreAuthorize("@el.check('structrelamaterial:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +68,7 @@ public class StructrelamaterialController { @PostMapping("/insertSet") @Log("插入物料存放设置") - @ApiOperation("插入物料存放设置") + //("插入物料存放设置") //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity insertSet(@RequestBody Map whereJson){ structrelamaterialService.insertSet(whereJson); @@ -77,7 +77,7 @@ public class StructrelamaterialController { @PostMapping("/delSet") @Log("删除物料存放设置") - @ApiOperation("删除物料存放设置") + //("删除物料存放设置") //@PreAuthorize("@el.check('structrelamaterial:edit')") public ResponseEntity delSet(@RequestBody Map whereJson){ structrelamaterialService.delSet(whereJson); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java index 8b0df038..9a27e470 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/SectattrController.java @@ -40,7 +40,7 @@ public class SectattrController { @GetMapping @Log("查询库区") - @ApiOperation("查询库区") + //("查询库区") public ResponseEntity query(SectattrQuery query, PageQuery page){ Page list = isectattrService.page(page.build(StIvtSectattr.class), query.build()); return new ResponseEntity<>(TableDataInfo.build(list),HttpStatus.OK); @@ -48,7 +48,7 @@ public class SectattrController { @PostMapping @Log("新增库区") - @ApiOperation("新增库区") + //("新增库区") public ResponseEntity create(@Validated @RequestBody JSONObject form){ isectattrService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); @@ -56,14 +56,14 @@ public class SectattrController { @PutMapping @Log("修改库区") - @ApiOperation("修改库区") + //("修改库区") public ResponseEntity updateForm(@Validated @RequestBody JSONObject form){ isectattrService.updateForm(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除库区") - @ApiOperation("删除库区") + //("删除库区") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { if (ids !=null && ids.length>0){ @@ -74,7 +74,7 @@ public class SectattrController { @PostMapping("/getSect") @Log("查询库区下拉框") - @ApiOperation("查询库区下拉框") + //("查询库区下拉框") public ResponseEntity querySect(@RequestBody JSONObject query) { List list = isectattrService.getSect(query); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); @@ -82,7 +82,7 @@ public class SectattrController { @PutMapping("/changeActive") @Log("修改库区状态") - @ApiOperation("修改库区状态") + //("修改库区状态") public ResponseEntity update(@RequestBody JSONObject json) { isectattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java index 1141217f..363091ab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StorattrController.java @@ -40,7 +40,7 @@ public class StorattrController { @PostMapping("/queryStor") @Log("查询仓库") - @ApiOperation("查询仓库") + //("查询仓库") public ResponseEntity queryStor(@RequestBody JSONObject jo) { String stor_type = jo.getString("stor_type"); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -54,7 +54,7 @@ public class StorattrController { @PostMapping @Log("新增仓库") - @ApiOperation("新增仓库") + //("新增仓库") public ResponseEntity create(@Validated @RequestBody JSONObject form){ stIvtBsrealstorattrService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); @@ -62,14 +62,14 @@ public class StorattrController { @PutMapping @Log("修改仓库") - @ApiOperation("修改仓库") + //("修改仓库") public ResponseEntity update(@Validated @RequestBody JSONObject form){ stIvtBsrealstorattrService.updateForm(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除仓库") - @ApiOperation("删除仓库") + //("删除仓库") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { if (ids != null && ids.length>0){ @@ -80,7 +80,7 @@ public class StorattrController { @GetMapping("/getStor") @Log("查询仓库下拉框") - @ApiOperation("查询仓库下拉框") + //("查询仓库下拉框") public ResponseEntity queryStor(StorattrQuery query) { List list = stIvtBsrealstorattrService.list(query.build()); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); @@ -88,7 +88,7 @@ public class StorattrController { @PutMapping("/changeActive") @Log("修改仓库管理状态") - @ApiOperation("修改仓库管理状态") + //("修改仓库管理状态") public ResponseEntity changeActive(@RequestBody JSONObject json) { stIvtBsrealstorattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java index a63a67c7..b778817e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/storage/StructattrController.java @@ -36,7 +36,7 @@ public class StructattrController { @GetMapping @Log("查询仓位") - @ApiOperation("查询仓位") + //("查询仓位") //@PreAuthorize("@el.check('structattr:list')") public ResponseEntity queryAll(StructarrQuery query, PageQuery page) { page.setSort("struct_code ASC"); @@ -46,7 +46,7 @@ public class StructattrController { @PostMapping @Log("新增仓位") - @ApiOperation("新增仓位") + //("新增仓位") //@PreAuthorize("@el.check('structattr:add')") public ResponseEntity create(@Validated @RequestBody JSONObject form) { ivtStructattrService.create(form); @@ -55,7 +55,7 @@ public class StructattrController { @PutMapping @Log("修改仓位") - @ApiOperation("修改仓位") + //("修改仓位") //@PreAuthorize("@el.check('structattr:edit')") public ResponseEntity updateForm(@Validated @RequestBody JSONObject form) { ivtStructattrService.updateForm(form); @@ -63,7 +63,7 @@ public class StructattrController { } @Log("删除仓位") - @ApiOperation("删除仓位") + //("删除仓位") //@PreAuthorize("@el.check('structattr:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -75,7 +75,7 @@ public class StructattrController { @PutMapping("/changeActive") @Log("修改仓位状态") - @ApiOperation("修改仓位状态") + //("修改仓位状态") public ResponseEntity update(@RequestBody JSONObject json) { ivtStructattrService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -83,7 +83,7 @@ public class StructattrController { @PostMapping("/getSectCascader") @Log("查询联级仓位") - @ApiOperation("查询联级仓位") + //("查询联级仓位") public ResponseEntity getSectCascader(@RequestBody JSONObject json) { return new ResponseEntity<>(ivtStructattrService.getSectCascader(json),HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java index f0de9c20..2dec76c8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/vehicle/StructrelavehicletypeController.java @@ -31,7 +31,7 @@ public class StructrelavehicletypeController { @GetMapping @Log("查询仓位载具关联") - @ApiOperation("查询仓位载具关联") + //("查询仓位载具关联") //@PreAuthorize("@el.check('structrelavehicletype:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(structrelavehicletypeService.queryAll(whereJson,page),HttpStatus.OK); @@ -39,7 +39,7 @@ public class StructrelavehicletypeController { @PostMapping @Log("新增仓位载具关联") - @ApiOperation("新增仓位载具关联") + //("新增仓位载具关联") //@PreAuthorize("@el.check('structrelavehicletype:add')") public ResponseEntity create(@RequestBody JSONObject param){ structrelavehicletypeService.create(param); @@ -48,7 +48,7 @@ public class StructrelavehicletypeController { @PutMapping @Log("修改仓位载具关联") - @ApiOperation("修改仓位载具关联") + //("修改仓位载具关联") //@PreAuthorize("@el.check('structrelavehicletype:edit')") public ResponseEntity update(@RequestBody JSONObject param){ structrelavehicletypeService.update(param); @@ -56,7 +56,7 @@ public class StructrelavehicletypeController { } @Log("删除仓位载具关联") - @ApiOperation("删除仓位载具关联") + //("删除仓位载具关联") //@PreAuthorize("@el.check('structrelavehicletype:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,7 @@ public class StructrelavehicletypeController { @GetMapping("/getStruct") @Log("查询仓位") - @ApiOperation("查询仓位") + //("查询仓位") //@PreAuthorize("@el.check('iodisstruct:list')") public ResponseEntity getStruct(){ return new ResponseEntity<>(structrelavehicletypeService.getStruct(),HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java index 6904fa19..f941f6e7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/MaterialbaseController.java @@ -35,7 +35,7 @@ public class MaterialbaseController { @GetMapping @Log("查询物料") - @ApiOperation("查询物料") + //("查询物料") //@PreAuthorize("@el.check('Materialbase:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(materialBaseService.queryAll(whereJson, page), HttpStatus.OK); @@ -43,7 +43,7 @@ public class MaterialbaseController { @PostMapping @Log("新增物料") - @ApiOperation("新增物料") + //("新增物料") //@PreAuthorize("@el.check('Materialbase:add')") public ResponseEntity create(@Validated @RequestBody MaterialbaseDto dto) { materialBaseService.create(dto); @@ -52,7 +52,7 @@ public class MaterialbaseController { @PutMapping @Log("修改物料") - @ApiOperation("修改物料") + //("修改物料") //@PreAuthorize("@el.check('Materialbase:edit')") public ResponseEntity update(@Validated @RequestBody JSONObject dto) { materialBaseService.update(dto); @@ -60,7 +60,7 @@ public class MaterialbaseController { } @Log("删除物料") - @ApiOperation("删除物料") + //("删除物料") //@PreAuthorize("@el.check('Materialbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -70,7 +70,7 @@ public class MaterialbaseController { @Log("判断物料操作类型") - @ApiOperation("判断物料操作类型") + //("判断物料操作类型") @PostMapping("/isAlongMaterType") public ResponseEntity isAlongMaterType(@RequestBody Map map) { String materOpt_code = MapUtil.getStr(map, "materOpt_code"); @@ -80,7 +80,7 @@ public class MaterialbaseController { } @Log("查询物料操作类型") - @ApiOperation("查询物料操作类型") + //("查询物料操作类型") @PostMapping("/getMaterOptType") public ResponseEntity getMaterOptType(@RequestBody Map map) { String materOpt_code = MapUtil.getStr(map, "materOpt_code"); @@ -89,14 +89,14 @@ public class MaterialbaseController { @PostMapping("/synchronize") @Log("物料同步") - @ApiOperation("物料同步") + //("物料同步") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity synchronize(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(materialBaseService.synchronize(whereJson), HttpStatus.OK); } @Log("查询产品系列类型") - @ApiOperation("查询产品系列类型") + //("查询产品系列类型") @GetMapping("/getProductSeries") public ResponseEntity getProductSeries() { return new ResponseEntity<>(materialBaseService.getProductSeries("1527572574832300032"), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java index af1d4ec5..c77af9c5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SemirealrawmaterialController.java @@ -33,7 +33,7 @@ public class SemirealrawmaterialController { @GetMapping @Log("查询半成品") - @ApiOperation("查询半成品") + //("查询半成品") //@PreAuthorize("@el.check('semirealrawmaterial:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(semirealrawmaterialService.queryAll(whereJson,page),HttpStatus.OK); @@ -41,7 +41,7 @@ public class SemirealrawmaterialController { @PostMapping @Log("新增半成品对应原材料") - @ApiOperation("新增半成品对应原材料") + //("新增半成品对应原材料") //@PreAuthorize("@el.check('semirealrawmaterial:add')") public ResponseEntity create(@Validated @RequestBody SemirealrawmaterialDto dto){ semirealrawmaterialService.create(dto); @@ -49,7 +49,7 @@ public class SemirealrawmaterialController { } @Log("删除半成品对应原材料") - @ApiOperation("删除半成品对应原材料") + //("删除半成品对应原材料") //@PreAuthorize("@el.check('semirealrawmaterial:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -59,7 +59,7 @@ public class SemirealrawmaterialController { @PutMapping("/updateRawmaterial") @Log("修改半成品对应原材料") - @ApiOperation("修改半成品对应原材料") + //("修改半成品对应原材料") //@PreAuthorize("@el.check('semirealrawmaterial:edit')") public ResponseEntity updateRawmaterial(@RequestBody JSONObject param){ semirealrawmaterialService.updateRawmaterial(param); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java index a3172aa9..e11d7a32 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/rest/SupplierbaseController.java @@ -32,14 +32,14 @@ public class SupplierbaseController { @GetMapping @Log("查询供应商") - @ApiOperation("查询供应商") + //("查询供应商") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(supplierbaseService.queryAll(whereJson, page), HttpStatus.OK); } @PostMapping @Log("新增供应商") - @ApiOperation("新增供应商") + //("新增供应商") public ResponseEntity create(@Validated @RequestBody SupplierbaseDto dto) { supplierbaseService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -47,14 +47,14 @@ public class SupplierbaseController { @PutMapping @Log("修改供应商") - @ApiOperation("修改供应商") + //("修改供应商") public ResponseEntity update(@Validated @RequestBody SupplierbaseDto dto) { supplierbaseService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除供应商") - @ApiOperation("删除供应商") + //("删除供应商") //@PreAuthorize("@el.check('mdCsSupplierbase:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java index 15c7e88d..e7300bfd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/controller/oderExt/MpsSaleOrderIcExtController.java @@ -32,7 +32,7 @@ public class MpsSaleOrderIcExtController { @PostMapping @Log("新增订单扩展表") - @ApiOperation("新增订单扩展表") + //("新增订单扩展表") public ResponseEntity create(@RequestBody JSONObject whereJson) { extService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -40,7 +40,7 @@ public class MpsSaleOrderIcExtController { @PostMapping("/getExtList") @Log("根据工单获取条码") - @ApiOperation("根据工单获取条码") + //("根据工单获取条码") public ResponseEntity getExtList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(extService.list(new QueryWrapper().eq("remark1",whereJson.getString("workorder_code"))),HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java index 974c67ba..7f8e6473 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/TeamcorrpersonController.java @@ -31,7 +31,7 @@ public class TeamcorrpersonController { @GetMapping @Log("查询班组人员维护") - @ApiOperation("查询班组人员维护") + //("查询班组人员维护") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(teamcorrpersonService.queryAll(whereJson, page), HttpStatus.OK); @@ -39,7 +39,7 @@ public class TeamcorrpersonController { @PostMapping("/getPersonIdByTeamId") @Log("根据班组查询人员id") - @ApiOperation("根据班组查询人员id") + //("根据班组查询人员id") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity getPersonIdByTeamId(@RequestBody JSONObject param) { return new ResponseEntity<>(teamcorrpersonService.getPersonIdByTeamId(param), HttpStatus.OK); @@ -47,7 +47,7 @@ public class TeamcorrpersonController { @PostMapping("/addPersons") @Log("添加班组人员关系") - @ApiOperation("添加班组人员关系") + //("添加班组人员关系") //@PreAuthorize("@el.check('teamcorrperson:list')") public ResponseEntity addPersons(@RequestBody JSONObject param) { teamcorrpersonService.addPersons(param); @@ -55,7 +55,7 @@ public class TeamcorrpersonController { } @Log("删除") - @ApiOperation("删除") + //("删除") //@PreAuthorize("@el.check('workteam:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java index 01e14bc6..3cf316ec 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/rest/WorkteamController.java @@ -33,7 +33,7 @@ public class WorkteamController { @GetMapping @Log("查询班组") - @ApiOperation("查询班组") + //("查询班组") //@PreAuthorize("@el.check('workteam:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(workteamService.queryAll(whereJson,page),HttpStatus.OK); @@ -41,7 +41,7 @@ public class WorkteamController { @PostMapping @Log("新增班组") - @ApiOperation("新增班组") + //("新增班组") //@PreAuthorize("@el.check('workteam:add')") public ResponseEntity create(@Validated @RequestBody WorkteamDto dto){ workteamService.create(dto); @@ -50,7 +50,7 @@ public class WorkteamController { @PutMapping @Log("修改班组") - @ApiOperation("修改班组") + //("修改班组") //@PreAuthorize("@el.check('workteam:edit')") public ResponseEntity update(@Validated @RequestBody WorkteamDto dto){ workteamService.update(dto); @@ -58,7 +58,7 @@ public class WorkteamController { } @Log("删除班组") - @ApiOperation("删除班组") + //("删除班组") //@PreAuthorize("@el.check('workteam:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -68,7 +68,7 @@ public class WorkteamController { @GetMapping("/getClasssystem") @Log("查询班制下拉") - @ApiOperation("查询班制下拉") + //("查询班制下拉") //@PreAuthorize("@el.check('workteam:list')") public ResponseEntity getClasssystem(){ return new ResponseEntity<>(workteamService.getClasssystem(),HttpStatus.OK); @@ -76,7 +76,7 @@ public class WorkteamController { @PutMapping("/changeActive") @Log("修改状态") - @ApiOperation("修改状态") + //("修改状态") public ResponseEntity update(@RequestBody JSONObject json) { workteamService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java index 8eda207f..e007db61 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java @@ -18,7 +18,6 @@ import org.jetbrains.annotations.NotNull; import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.MapOf; -import org.nl.common.utils.OptionRecord; import org.nl.common.utils.api.CommonResult; import org.nl.common.utils.api.RestBusinessTemplate; import org.nl.modules.common.exception.BadRequestException; @@ -31,7 +30,7 @@ import org.nl.wms.system_manage.service.user.ISysUserService; import org.nl.wms.system_manage.service.user.dao.SysUser; import org.nl.wms.system_manage.service.user.dto.CurrentUser; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.mps.service.ProduceshiftorderService; import org.nl.wms.mps.service.WorkOrderImportEnum; import org.nl.wms.mps.service.dto.DeviceDto; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java new file mode 100644 index 00000000..dd09973e --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/controller/PcsDeliveryOrderController.java @@ -0,0 +1,73 @@ +package org.nl.wms.mps_manage.deliveryorder.controller; + + +import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.swagger.annotations.ApiOperation; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.mps_manage.deliveryorder.service.IPcsDeliveryOrderService; +import org.nl.wms.mps_manage.deliveryorder.service.dao.PcsDeliveryOrder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + *

+ * SAP发货单表 前端控制器 + *

+ * + * @author generator + * @since 2023-07-07 + */ +@RestController +@RequestMapping("/api/deliveryOrder") +public class PcsDeliveryOrderController { + @Autowired + private IPcsDeliveryOrderService ideliveryOrderService; + + @GetMapping + @Log("查询发货单") + public ResponseEntity query(@RequestParam Map whereJson, PageQuery pagequery){ + Page page = PageHelper.startPage(pagequery.getPage() + 1, pagequery.getSize()); + List maps = ideliveryOrderService.queryAll(whereJson); + TableDataInfo build = TableDataInfo.build(maps); + build.setTotalElements(page.getTotal()); + return new ResponseEntity<>(build, HttpStatus.OK); + } + + @PostMapping + @Log("新增发货单") + public ResponseEntity create(@Validated @RequestBody JSONObject dto){ + ideliveryOrderService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改发货单") + public ResponseEntity update(@Validated @RequestBody JSONObject dto){ + ideliveryOrderService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除发货单") + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids) { + if (ids.length>0){ + ideliveryOrderService.update(new UpdateWrapper() + .set("is_delete","1").in("deliver_id",ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/IPcsDeliveryOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/IPcsDeliveryOrderService.java new file mode 100644 index 00000000..cf4ac5a4 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/IPcsDeliveryOrderService.java @@ -0,0 +1,29 @@ +package org.nl.wms.mps_manage.deliveryorder.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.mps_manage.deliveryorder.service.dao.PcsDeliveryOrder; + +import java.util.List; +import java.util.Map; + +/** + *

+ * SAP发货单表 服务类 + *

+ * + * @author generator + * @since 2023-07-07 + */ +public interface IPcsDeliveryOrderService extends IService { + /** + * 创建 + * @param form + * @return + */ + void create(JSONObject form); + + void update(JSONObject form); + + List queryAll(Map whereJson); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/PcsDeliveryOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/PcsDeliveryOrder.java new file mode 100644 index 00000000..ef896d9b --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/PcsDeliveryOrder.java @@ -0,0 +1,138 @@ +package org.nl.wms.mps_manage.deliveryorder.service.dao; + +import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * SAP发货单表 + *

+ * + * @author generator + * @since 2023-07-07 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("pcs_delivery_order") +public class PcsDeliveryOrder implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 发货单标识 + */ + @TableId(value = "deliver_id") + private String deliver_id; + + /** + * 发货单号 + */ + private String deliver_code; + + /** + * 明细序号 + */ + private Integer seq_no; + + /** + * 发货单类型 + */ + private String deliver_type; + + /** + * 物料标识 + */ + private String material_id; + + /** + * 状态 + */ + private String status; + + /** + * 发货数量 + */ + private BigDecimal delivery_qty; + + /** + * 客户标识 + */ + private String cust_id; + + /** + * 客户编码 + */ + private String cust_code; + + /** + * 客户名称 + */ + private String cust_name; + + /** + * 计量单位标识 + */ + private String qty_unit_id; + + /** + * 销售单标识 + */ + private String sale_id; + + /** + * 销售单号 + */ + private String sale_code; + + /** + * 销售明细序号 + */ + private Integer sale_seq_no; + + /** + * 创建人 + */ + private String create_id; + + /** + * 创建人姓名 + */ + private String create_name; + + /** + * 创建时间 + */ + private String create_time; + + /** + * 修改人 + */ + private String update_id; + + /** + * 修改人姓名 + */ + private String update_name; + + /** + * 修改时间 + */ + private String update_time; + + /** + * 是否成功 + */ + private String is_success; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/PcsDeliveryOrderMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/PcsDeliveryOrderMapper.java new file mode 100644 index 00000000..dab6b3b7 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/PcsDeliveryOrderMapper.java @@ -0,0 +1,20 @@ +package org.nl.wms.mps_manage.deliveryorder.service.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.mps_manage.deliveryorder.service.dao.PcsDeliveryOrder; + +import java.util.List; +import java.util.Map; + +/** + *

+ * SAP发货单表 Mapper 接口 + *

+ * + * @author generator + * @since 2023-07-07 + */ +public interface PcsDeliveryOrderMapper extends BaseMapper { + + List queryMap(Map query); +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/xml/PcsDeliveryOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/xml/PcsDeliveryOrderMapper.xml new file mode 100644 index 00000000..c6f4e5ed --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/dao/mapper/xml/PcsDeliveryOrderMapper.xml @@ -0,0 +1,40 @@ + + + + + + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/impl/PcsDeliveryOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/impl/PcsDeliveryOrderServiceImpl.java new file mode 100644 index 00000000..f9464875 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/deliveryorder/service/impl/PcsDeliveryOrderServiceImpl.java @@ -0,0 +1,90 @@ +package org.nl.wms.mps_manage.deliveryorder.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; +import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; +import org.nl.wms.mps_manage.deliveryorder.service.dao.PcsDeliveryOrder; +import org.nl.wms.mps_manage.deliveryorder.service.dao.mapper.PcsDeliveryOrderMapper; +import org.nl.wms.mps_manage.deliveryorder.service.IPcsDeliveryOrderService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + *

+ * SAP发货单表 服务实现类 + *

+ * + * @author generator + * @since 2023-07-07 + */ +@Service +public class PcsDeliveryOrderServiceImpl extends ServiceImpl implements IPcsDeliveryOrderService { + + @Autowired + private IMdPbClassstandardService classstandardService; + @Autowired + private IMdMeMaterialbaseService materialbaseService; + + @Override + public void create(JSONObject form) { + PcsDeliveryOrder order = form.toJavaObject(PcsDeliveryOrder.class); + String currentUserId = SecurityUtils.getCurrentUserId(); + String nickName = SecurityUtils.getCurrentNickName(); + order.setDeliver_id(IdUtil.getStringId()); + order.setCreate_id(currentUserId); + order.setCreate_name(nickName); + order.setCreate_time(DateUtil.now()); + this.save(order); + } + + @Override + public void update(JSONObject form) { + PcsDeliveryOrder order = form.toJavaObject(PcsDeliveryOrder.class); + this.updateById(order); + } + + @Override + public List queryAll(Map whereJson) { + String deliver_code = MapUtil.getStr(whereJson, "deliver_code"); + String material = MapUtil.getStr(whereJson, "material"); + String parent_id = MapUtil.getStr(whereJson, "product_series"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + String status = MapUtil.getStr(whereJson, "status"); + String is_success = MapUtil.getStr(whereJson, "is_success"); + String product_series = ""; + HashMap map = new HashMap<>(); + map.put("flag", "1"); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + map.put("status", status); + map.put("is_success", is_success); + if (StrUtil.isNotEmpty(material)) { + map.put("material",material); + } + if (StrUtil.isNotEmpty(parent_id)) { + List childIdStr = classstandardService.getChildIdStr(parent_id); + if (!CollectionUtils.isEmpty(childIdStr)){ + map.put("product_series", "('"+childIdStr.stream().collect(Collectors.joining("','"))+"')"); + } + } + if (StrUtil.isNotEmpty(deliver_code)) { + map.put("deliver_code",deliver_code); + } + return this.baseMapper.queryMap(map); + } +} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java deleted file mode 100644 index 586dc3eb..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.nl.wms.mps_manage.ordermanage.controller.saleOrder; - - -import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.common.anno.Log; -import org.nl.common.domain.query.PageQuery; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dto.OrderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import javax.servlet.http.HttpServletRequest; - -/** - *

- * 生产订单表 前端控制器 - *

- * - * @author generator - * @since 2023-05-25 - */ -@RestController -@RequiredArgsConstructor -@Api(tags = "生产订单") -@Slf4j -@SaIgnore -@RequestMapping("/api/mpsSaleOrder") -public class MpsSaleOrderController { - - @Autowired - private IMpsSaleOrderService iMpsSaleOrderService; - - @GetMapping - @Log("查询生产订单") - @ApiOperation("查询生产订单") - public ResponseEntity query(OrderQuery query, PageQuery page){ - return new ResponseEntity<>(iMpsSaleOrderService.pageQuery(query,page), HttpStatus.OK); - } - - - - @PostMapping("/excelImport") - @Log("excel导入") - @ApiOperation("excel导入") - public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { - iMpsSaleOrderService.excelImport(file,request); - return new ResponseEntity<>(HttpStatus.OK); - } - - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/pcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/pcs.xls similarity index 100% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/pcs.xls rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/pcs.xls diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java new file mode 100644 index 00000000..831a25f3 --- /dev/null +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/controller/MpsSaleOrderController.java @@ -0,0 +1,96 @@ +package org.nl.wms.mps_manage.saleorder.controller; + + +import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.common.TableDataInfo; +import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; +import org.nl.wms.mps_manage.saleorder.service.dto.OrderQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + +/** + *

+ * 生产订单表 前端控制器 + *

+ * + * @author generator + * @since 2023-05-25 + */ +@RestController +@RequiredArgsConstructor +@Api(tags = "生产订单") +@Slf4j +@SaIgnore +@RequestMapping("/api/mpsSaleOrder") +public class MpsSaleOrderController { + + @Autowired + private IMpsSaleOrderService iMpsSaleOrderService; + + @GetMapping + @Log("查询生产订单") + //("查询生产订单") + public ResponseEntity query(OrderQuery query, PageQuery pageQuery){ + Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List maps = iMpsSaleOrderService.pageQuery(query, pageQuery); + TableDataInfo build = TableDataInfo.build(maps); + build.setTotalElements(page.getTotal()); + return new ResponseEntity<>(build, HttpStatus.OK); + } + + + @PostMapping("/excelImport") + public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request) { + iMpsSaleOrderService.excelImport(file,request); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping + @Log("新增销售订单") + //("新增销售订单") + public ResponseEntity create(@Validated @RequestBody JSONObject dto){ + iMpsSaleOrderService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改销售订单") + //("修改销售订单") + public ResponseEntity update(@Validated @RequestBody JSONObject dto){ + iMpsSaleOrderService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除销售订单") + //("删除销售订单") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + if (ids.length>0){ + iMpsSaleOrderService.update(new UpdateWrapper() + .set("is_delete","1").in("sale_id",ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + +} + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/IMpsSaleOrderService.java similarity index 64% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/IMpsSaleOrderService.java index 2666f8cd..eeee01f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/IMpsSaleOrderService.java @@ -1,10 +1,10 @@ -package org.nl.wms.mps_manage.ordermanage.service.saleOrder; +package org.nl.wms.mps_manage.saleorder.service; import com.alibaba.fastjson.JSONObject; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dto.OrderQuery; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; +import org.nl.wms.mps_manage.saleorder.service.dto.OrderQuery; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; @@ -27,7 +27,19 @@ public interface IMpsSaleOrderService extends IService { * @param query,page / * @return JSONObject */ - Object pageQuery(OrderQuery query, PageQuery page); + List pageQuery(OrderQuery query, PageQuery page); + + List queryAll(Map whereJson); + + + /** + * 创建 + * @param form + * @return + */ + void create(JSONObject form); + + void update(JSONObject form); List getPdaMaterial(JSONObject json); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java similarity index 92% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java index eba55a5f..82b087aa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/MpsSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/MpsSaleOrder.java @@ -1,4 +1,4 @@ -package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao; +package org.nl.wms.mps_manage.saleorder.service.dao; import java.math.BigDecimal; @@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; -import jdk.nashorn.internal.ir.annotations.Ignore; import lombok.Data; import lombok.EqualsAndHashCode; @@ -30,7 +29,7 @@ public class MpsSaleOrder implements Serializable{ * 销售单标识 */ @TableId - private Long sale_id; + private String sale_id; /** * 销售单号 */ @@ -38,7 +37,7 @@ public class MpsSaleOrder implements Serializable{ /** * 明细序号 */ - private BigDecimal seq_no; + private String seq_no; /** * aps映射订单编码 */ @@ -78,11 +77,11 @@ public class MpsSaleOrder implements Serializable{ /** * 生产顺序 */ - private BigDecimal produce_seq; + private Integer produce_seq; /** * 客户标识 */ - private Long cust_id; + private String cust_id; /** * 客户编码 */ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/MpsSaleOrderMapper.java similarity index 76% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/MpsSaleOrderMapper.java index 4788b71d..28465fdd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/MpsSaleOrderMapper.java @@ -1,12 +1,12 @@ -package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.mapper; +package org.nl.wms.mps_manage.saleorder.service.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import org.nl.common.domain.query.PageQuery; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dto.OrderQuery; +import org.nl.wms.mps_manage.saleorder.service.dto.OrderQuery; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; import java.util.List; import java.util.Map; @@ -30,4 +30,6 @@ public interface MpsSaleOrderMapper extends BaseMapper { @MapKey("sale_id") List queryAll(@Param("query") OrderQuery query); + List queryMap(Map query); + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml similarity index 75% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml index cf695a6c..ef875e0c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dao/mapper/xml/MpsSaleOrderMapper.xml @@ -1,6 +1,6 @@ - + - - - - + diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dto/OrderQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dto/OrderQuery.java similarity index 80% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dto/OrderQuery.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dto/OrderQuery.java index a9c961e7..6d044029 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dto/OrderQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/dto/OrderQuery.java @@ -1,10 +1,10 @@ -package org.nl.wms.mps_manage.ordermanage.service.saleOrder.dto; +package org.nl.wms.mps_manage.saleorder.service.dto; import lombok.Data; import org.nl.common.domain.query.BaseQuery; import org.nl.common.domain.query.QParam; import org.nl.common.enums.QueryTEnum; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; /* * @author ZZQ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java similarity index 74% rename from mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java rename to mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java index 8d5495f0..f6e811c3 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/saleorder/service/impl/MpsSaleOrderServiceImpl.java @@ -1,25 +1,26 @@ -package org.nl.wms.mps_manage.ordermanage.service.saleOrder.impl; +package org.nl.wms.mps_manage.saleorder.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; -import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; +import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.mapper.MpsSaleOrderMapper; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dto.OrderQuery; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; +import org.nl.wms.mps_manage.saleorder.service.dao.mapper.MpsSaleOrderMapper; +import org.nl.wms.mps_manage.saleorder.service.dto.OrderQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +30,7 @@ import javax.servlet.http.HttpServletRequest; import java.io.InputStream; import java.math.BigDecimal; import java.util.*; +import java.util.stream.Collectors; /** @@ -41,16 +43,58 @@ import java.util.*; */ @Service public class MpsSaleOrderServiceImpl extends ServiceImpl implements IMpsSaleOrderService{ + @Autowired private IMdMeMaterialbaseService materialbaseService; + @Autowired + private IMdPbClassstandardService classstandardService; @Override - public Object pageQuery(OrderQuery query, PageQuery pageQuery) { - Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + public List pageQuery(OrderQuery query, PageQuery pageQuery) { List mst_detail = baseMapper.pageQuery(query, pageQuery); - TableDataInfo build = TableDataInfo.build(mst_detail); - build.setTotalElements(page.getTotal()); - return build; + return mst_detail; + } + + @Override + public List queryAll(Map whereJson) { + String sale_code = MapUtil.getStr(whereJson, "sale_code"); + String material = MapUtil.getStr(whereJson, "material"); + String parent_id = MapUtil.getStr(whereJson, "product_series"); + String begin_time = MapUtil.getStr(whereJson, "begin_time"); + String end_time = MapUtil.getStr(whereJson, "end_time"); + String status = MapUtil.getStr(whereJson, "status"); + String is_success = MapUtil.getStr(whereJson, "is_success"); + String product_series = ""; + HashMap map = new HashMap<>(); + map.put("flag", "1"); + map.put("begin_time", begin_time); + map.put("end_time", end_time); + map.put("status", status); + map.put("is_success", is_success); + if (StrUtil.isNotEmpty(sale_code)) { + map.put("sale_code",sale_code); + } + if (StrUtil.isNotEmpty(material)) { + map.put("material",material); + } + if (StrUtil.isNotEmpty(parent_id)) { + List childIdStr = classstandardService.getChildIdStr(parent_id); + if (!CollectionUtils.isEmpty(childIdStr)){ + map.put("product_series", "('"+childIdStr.stream().collect(Collectors.joining("','"))+"')"); + } + } + List maps = this.baseMapper.queryMap(map); + return maps; + } + + @Override + public void create(JSONObject form) { + MpsSaleOrder mpsSaleOrder = form.toJavaObject(MpsSaleOrder.class); + mpsSaleOrder.setSale_id(IdUtil.getStringId()); + mpsSaleOrder.setCreate_id(SecurityUtils.getCurrentUserId()); + mpsSaleOrder.setCreate_name(SecurityUtils.getCurrentNickName()); + mpsSaleOrder.setCreate_time(DateUtil.now()); + this.save(mpsSaleOrder); } @Override @@ -80,7 +124,7 @@ public class MpsSaleOrderServiceImpl extends ServiceImpl queryRawIn(PurchaseOrderQuery query, PageQuery page) { return new ResponseEntity<>(purchaseorderService.queryRawIn(query, page), HttpStatus.OK); } @GetMapping @Log("原料需求分页查询") - @ApiOperation("原料需求分页查询") + //("原料需求分页查询") public ResponseEntity pageQuery(PurchaseOrderQuery query, PageQuery page) { return new ResponseEntity<>(purchaseorderService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("新增原料需求") - @ApiOperation("新增原料需求") + //("新增原料需求") public ResponseEntity create(@RequestBody JSONObject whereJson) { purchaseorderService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -63,7 +63,7 @@ public class PcsIfPurchaseorderController { @PostMapping("/update") @Log("修改原料需求") - @ApiOperation("修改原料需求") + //("修改原料需求") public ResponseEntity update(@RequestBody JSONObject whereJson) { purchaseorderService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -71,7 +71,7 @@ public class PcsIfPurchaseorderController { @PostMapping("/commit") @Log("提交原料需求") - @ApiOperation("提交原料需求") + //("提交原料需求") public ResponseEntity commit(@RequestBody List list) { list.forEach(order -> { order.setStatus(PCSEnum.BILL_STATUS.code("提交")); @@ -85,7 +85,7 @@ public class PcsIfPurchaseorderController { @PostMapping("/confirm") @Log("强制确认原料需求") - @ApiOperation("强制确认原料需求") + //("强制确认原料需求") public ResponseEntity confirm(@RequestBody List list) { list.forEach(order -> { order.setStatus(PCSEnum.BILL_STATUS.code("完成")); @@ -99,14 +99,14 @@ public class PcsIfPurchaseorderController { @PostMapping("/getDtl") @Log("获取原料需求明细") - @ApiOperation("获取原料需求明细") + //("获取原料需求明细") public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(purchaseorderService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/delete") @Log("删除原料需求") - @ApiOperation("删除原料需求") + //("删除原料需求") public ResponseEntity delete(@RequestBody Long[] ids) { for (Long id : ids) { purchaseorderService.update(new UpdateWrapper().eq("id", id).set("is_delete", true)); @@ -115,7 +115,7 @@ public class PcsIfPurchaseorderController { } @Log("导出数据") - @ApiOperation("导出数据") + //("导出数据") @GetMapping(value = "/download") public void download(PurchaseOrderQuery query, HttpServletResponse response) throws IOException { purchaseorderService.download(query, response); @@ -123,7 +123,7 @@ public class PcsIfPurchaseorderController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + //("excel导入") public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { purchaseorderService.excelImport(file, request, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java index 874273e0..7800cb4d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/CacheLineHandController.java @@ -45,7 +45,7 @@ public class CacheLineHandController { @PostMapping("/queryMaterial") @Log("物料查询") - @ApiOperation("物料查询") + //("物料查询") public ResponseEntity> queryMaterial(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [查询物料] 接口被请求, 请求参数-{}", form); String params = form.getString("search_bar"); @@ -55,7 +55,7 @@ public class CacheLineHandController { @PostMapping("/materialQuery") @Log("物料模糊查询") - @ApiOperation("物料模糊查询") + //("物料模糊查询") public ResponseEntity materialQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [查询物料] 接口被请求, 请求参数-{}", form); //String params = form.getString("search_bar"); @@ -65,7 +65,7 @@ public class CacheLineHandController { @PostMapping("/appUpdate") @Log("app更新") - @ApiOperation("app更新") + //("app更新") @SaIgnore public ResponseEntity appUpdate() { log.info("海亮缓存线手持服务 [app更新] 接口被请求"); @@ -95,7 +95,7 @@ public class CacheLineHandController { @PostMapping("/semiMaterialSpecQuery") @Log("规格下拉框查询") - @ApiOperation("规格下拉框查询") + //("规格下拉框查询") public ResponseEntity semiMaterialSpecQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [规格下拉框查询] 接口被请求, 请求参数-{}", form); return new ResponseEntity<>(cacheLineHandService.semiMaterialSpecQuery(form.getString("search_bar")), HttpStatus.OK); @@ -103,7 +103,7 @@ public class CacheLineHandController { @PostMapping("/workprocedureQuery") @Log("工序下拉框查询") - @ApiOperation("工序下拉框查询") + //("工序下拉框查询") public ResponseEntity workProcedureQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [工序下拉框查询] 接口被请求, 请求参数-{}", form); return new ResponseEntity<>(cacheLineHandService.workProcedureQuery(form.getString("search_bar")), HttpStatus.OK); @@ -111,7 +111,7 @@ public class CacheLineHandController { @PostMapping("/deviceQuery") @Log("缓存线设备下拉框查询") - @ApiOperation("缓存线设备下拉框查询") + //("缓存线设备下拉框查询") public ResponseEntity deviceQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [缓存线设备下拉框查询] 接口被请求, 请求参数-{}", form); return new ResponseEntity<>(cacheLineHandService.deviceQuery(form.getString("search_bar")), HttpStatus.OK); @@ -119,7 +119,7 @@ public class CacheLineHandController { @PostMapping("/instStatusQuery") @Log("指令状态下拉框查询") - @ApiOperation("指令状态下拉框查询") + //("指令状态下拉框查询") public ResponseEntity instStatusQuery(@RequestBody JSONObject form) { log.info("海亮缓存线手持服务 [指令状态下拉框查询] 接口被请求, 请求参数-{}", form); return new ResponseEntity<>(cacheLineHandService.instStatusQuery(form.getString("search_bar")), HttpStatus.OK); @@ -127,7 +127,7 @@ public class CacheLineHandController { @PostMapping("/instPageQuery") @Log("任务操作-查询") - @ApiOperation("任务操作-查询") + //("任务操作-查询") public ResponseEntity instPageQuery(@RequestBody Map param, Pageable page) { log.info("海亮缓存线手持服务 [任务操作-查询] 接口被请求, 请求参数-{}", param); if (null == param) { @@ -138,7 +138,7 @@ public class CacheLineHandController { @PostMapping("/instOperation") @Log("任务操作") - @ApiOperation("任务操作") + //("任务操作") public ResponseEntity instOperation(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [任务操作] 接口被请求, 请求参数-{}", param); //任务类型和任务ID校验，instruct_uuid为前端参数命名，本来应为task_id @@ -150,7 +150,7 @@ public class CacheLineHandController { @PostMapping("/cacheLineOutBoxExceptionQuery") @Log("缓存线出箱异常-查询") - @ApiOperation("缓存线出箱异常-查询") + //("缓存线出箱异常-查询") public ResponseEntity cacheLineOutBoxExceptionQuery(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线出箱异常-查询] 接口被请求, 请求参数-{}", param); //参数校验 @@ -165,7 +165,7 @@ public class CacheLineHandController { @PostMapping("/cacheLineOutBoxExceptionConfirm") @Log("缓存线出箱异常-确认") - @ApiOperation("缓存线出箱异常-确认") + //("缓存线出箱异常-确认") public ResponseEntity cacheLineOutBoxExceptionConfirm(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线出箱异常-确认] 接口被请求, 请求参数-{}", param); //参数校验 @@ -180,7 +180,7 @@ public class CacheLineHandController { @PostMapping("/inOutExceptionInstQuery") @Log("缓存线扫码异常-查询") - @ApiOperation("缓存线扫码异常-查询") + //("缓存线扫码异常-查询") public ResponseEntity inOutExceptionInstQuery(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线扫码异常-查询] 接口被·请求, 请求参数-{}", param); //参数校验 @@ -192,7 +192,7 @@ public class CacheLineHandController { @PostMapping("/inOutExceptionInstConfirm") @Log("扫码异常确认") - @ApiOperation("扫码异常确认") + //("扫码异常确认") public ResponseEntity inOutExceptionInstConfirm(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [扫码异常确认] 接口被请求, 请求参数-{}", param); //参数校验 @@ -204,7 +204,7 @@ public class CacheLineHandController { @PostMapping("/cacheLineMaterInfoQuery") @Log("缓存线料箱条码查询料箱信息") - @ApiOperation("缓存线料箱条码查询料箱信息") + //("缓存线料箱条码查询料箱信息") public ResponseEntity cacheLineMaterInfoQuery(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线料箱条码查询料箱信息] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.cacheLineMaterInfoQuery(param), HttpStatus.OK); @@ -212,7 +212,7 @@ public class CacheLineHandController { @PostMapping("/inOutEmptyBox") @Log("空箱初始化--出入空箱") - @ApiOperation("空箱初始化--出入空箱") + //("空箱初始化--出入空箱") public ResponseEntity inOutEmptyBox(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [空箱初始化--出入空箱] 接口被请求, 请求参数-{}", param); //参数校验 @@ -224,7 +224,7 @@ public class CacheLineHandController { @PostMapping("/setfullBox") @Log("设置满框") - @ApiOperation("设置满框") + //("设置满框") public ResponseEntity setfullBox(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [设置满框] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.setfullBox(param), HttpStatus.OK); @@ -232,7 +232,7 @@ public class CacheLineHandController { @PostMapping("/setEmptyBox") @Log("设置空框") - @ApiOperation("设置空框") + //("设置空框") public ResponseEntity setEmptyBox(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [设置空框] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.setEmptyBox(param), HttpStatus.OK); @@ -240,7 +240,7 @@ public class CacheLineHandController { @PostMapping("/deleteBox") @Log("删除箱子") - @ApiOperation("删除箱子") + //("删除箱子") public ResponseEntity deleteBox(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [设置空框] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.deleteBox(param), HttpStatus.OK); @@ -248,7 +248,7 @@ public class CacheLineHandController { @PostMapping("/check") @Log("修改缓存线盘点状态") - @ApiOperation("修改缓存线盘点状态") + //("修改缓存线盘点状态") public ResponseEntity check(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [盘点] 接口被请求, 请求参数-{}", param); cacheLineHandService.check(param); @@ -257,7 +257,7 @@ public class CacheLineHandController { @PostMapping("/checkEnd") @Log("修改缓存线盘点状态") - @ApiOperation("修改缓存线盘点状态") + //("修改缓存线盘点状态") public ResponseEntity checkEnd(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [盘点] 接口被请求, 请求参数-{}", param); cacheLineHandService.check(param); @@ -266,7 +266,7 @@ public class CacheLineHandController { @PostMapping("/agvInBoxExceptionQuery") @Log("AGV入箱异常-查询") - @ApiOperation("AGV入箱异常-查询") + //("AGV入箱异常-查询") public ResponseEntity agvInBoxExceptionQuery(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [AGV入箱异常-查询] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.agvInBoxExceptionQuery(param), HttpStatus.OK); @@ -274,7 +274,7 @@ public class CacheLineHandController { @PostMapping("/agvInBoxExceptionConfirm") @Log("AGV入箱异常-确认") - @ApiOperation("AGV入箱异常-确认") + //("AGV入箱异常-确认") public ResponseEntity agvInBoxExceptionConfirm(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [AGV入箱异常-确认] 接口被请求, 请求参数-{}", param); cacheLineHandService.agvInBoxExceptionConfirm(param); @@ -283,7 +283,7 @@ public class CacheLineHandController { @PostMapping("/agvOutBoxExceptionQuery") @Log("AGV异常-查询") - @ApiOperation("AGV异常-查询") + //("AGV异常-查询") public ResponseEntity agvOutBoxExceptionQuery(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [AGV异常-查询] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.agvOutBoxExceptionQuery(param), HttpStatus.OK); @@ -291,7 +291,7 @@ public class CacheLineHandController { @PostMapping("/agvOutBoxExceptionConfirm") @Log("AGV异常-确认") - @ApiOperation("AGV异常-确认") + //("AGV异常-确认") public ResponseEntity agvOutBoxExceptionConfirm(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [AGV异常-确认] 接口被请求, 请求参数-{}", param); cacheLineHandService.agvOutBoxExceptionConfirm(param); @@ -300,7 +300,7 @@ public class CacheLineHandController { @PostMapping("/cacheLineExcepOpt") @Log("缓存线异常处理") - @ApiOperation("缓存线异常处理") + //("缓存线异常处理") public ResponseEntity cacheLineExcepOpt(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线异常处理] 接口被请求, 请求参数-{}", param); //参数校验 @@ -312,7 +312,7 @@ public class CacheLineHandController { @PostMapping("/pourMaterial") @Log("倒料操作") - @ApiOperation("倒料操作") + //("倒料操作") public ResponseEntity pourMaterial(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [倒料操作] 接口被请求, 请求参数-{}", param); cacheLineHandService.pourMaterial(param); @@ -321,7 +321,7 @@ public class CacheLineHandController { @PostMapping("/getCacheLine") @Log("缓存线下拉框") - @ApiOperation("缓存线下拉框") + //("缓存线下拉框") public ResponseEntity getCacheLine(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线盘点-缓存线下拉框] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.getCacheLine(param), HttpStatus.OK); @@ -329,14 +329,14 @@ public class CacheLineHandController { @PostMapping("/getProductArea") @Log("获取生产区域下拉框") - @ApiOperation("获取生产区域下拉框") + //("获取生产区域下拉框") public ResponseEntity getProductArea() { return new ResponseEntity<>(cacheLineHandService.getProductArea(), HttpStatus.OK); } @PostMapping("/getCacheLineMaterialInfo") @Log("缓存线物料信息盘点") - @ApiOperation("缓存线物料信息盘点") + //("缓存线物料信息盘点") public ResponseEntity getCacheLineMaterialInfo(@RequestBody JSONObject param) { log.info("海亮缓存线手持服务 [缓存线盘点-缓存线物料信息盘点] 接口被请求, 请求参数-{}", param); return new ResponseEntity<>(cacheLineHandService.getCacheLineMaterialInfo(param), HttpStatus.OK); @@ -344,7 +344,7 @@ public class CacheLineHandController { @PostMapping("/getWorkprocedure") @Log("工序下拉") - @ApiOperation("工序下拉") + //("工序下拉") @SaIgnore public ResponseEntity getWorkprocedure () { return new ResponseEntity<>(workprocedureService.list(), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java index 051e1519..7900d918 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaProductIosController.java @@ -3,19 +3,25 @@ package org.nl.wms.pda_manage.pda.controller; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.lang.Assert; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; +import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; +import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.MapOf; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; -import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; import org.nl.wms.product_manage.sch.service.PointService; import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivtCpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -41,41 +47,40 @@ public class PdaProductIosController { @Autowired private IStIvtSectattrService sectattrService; @Autowired - private SaleOrderService saleOrderService; + private IMpsSaleOrderService saleOrderService; @Autowired private PointService pointService; @PostMapping("/order") @Log("根据订单获取订单物料信息") - @ApiOperation("根据订单获取订单物料信息") public ResponseEntity getOrderMaterial(@RequestBody JSONObject param) { Assert.notNull(param,"请求参数不能为空"); param.put("sale_code",param.getString("order")); - Map data = saleOrderService.queryAll(param, PageRequest.of(param.getInteger("page")-1,param.getInteger("size"))); - return new ResponseEntity<>(data,HttpStatus.OK); + Page page = PageHelper.startPage(param.getInteger("page"), param.getInteger("size")); + List maps = saleOrderService.queryAll(param); + TableDataInfo build = TableDataInfo.build(maps); + build.setTotalElements(page.getTotal()); + return new ResponseEntity<>(build,HttpStatus.OK); } @PostMapping("/in") @Log("新增入库单") - @ApiOperation("新增入库单") + //("新增入库单") public ResponseEntity in(@RequestBody JSONObject whereJson) { - //productInService.createPdaTask(whereJson); return new ResponseEntity<>(MapOf.of("message","创建成功","status", HttpStatus.OK.value()),HttpStatus.OK); } @PostMapping("/releasepoint") @Log("发货确认") - @ApiOperation("发货确认") public ResponseEntity out(@RequestBody JSONObject param) { Assert.notEmpty(new Object[]{param, param.getString("option")}, "操作类型不能为空"); if (param.getString("option").equals("one")){ Assert.notNull(param.getString("point"),"发货区点位不能为空"); } - //structivtService.releasePoint(param.getString("point"),StringUtils.isEmpty(param.getString("sect_code"))?ConstantParam.FHQ:param.getString("sect_code")); return new ResponseEntity<>(MapOf.of("message","创建成功","status", HttpStatus.OK.value()),HttpStatus.OK); } @PostMapping("/point") @Log("根据订单获取订单物料信息") - @ApiOperation("根据订单获取订单物料信息") + //("根据订单获取订单物料信息") public ResponseEntity getPoint(@RequestBody JSONObject param) { Assert.notNull(param,"请求参数不能为空"); String type = param.getString("type"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java index ce5dbc14..3c5716ce 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/TmpKZController.java @@ -13,11 +13,10 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.modules.common.exception.BadRequestException; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.product_manage.sch.tasks.plotter.PlotterCallEmptyTask; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; @@ -95,7 +94,7 @@ public class TmpKZController { public ResponseEntity kzresidue(@RequestBody JSONObject param){ JSONObject jo = new JSONObject(); jo.put("next_point_code", param.getString("device_code")); - jo.put("start_point_code", param.getString("A1_KZ_SL")); + jo.put("start_point_code", "A1_KZ_SL"); jo.put("weight", param.getString("qty")); JSONObject result = wmsToAcsService.request(jo, "api/wms/putOver"); if (!StrUtil.equals(result.getString("status"), "200")) { @@ -106,26 +105,28 @@ public class TmpKZController { @RequestMapping("tmpcallVechile") @SaIgnore public ResponseEntity tmpcallVechile(@RequestBody JSONObject param){ - JSONObject moveTask =taskService.createMoveTask("", "", AcsTaskEnum.TASK_POINT_TO_POINT, AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20); + JSONObject moveTask =taskService.createMoveTask("A1_BCPRKW_SD", "A1_KZ_SL", AcsTaskEnum.TASK_POINT_TO_POINT, AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20); JSONArray data = new JSONArray(); data.add(moveTask); Map result = wmsToAcsService.issueTaskToAcs2(data); if (StrUtil.equals((String)result.get("status"), "400")) { throw new BadRequestException((String)result.get("message")); } + moveTask.put("task_status",StatusEnum.TASK_PUBLISH.getCode()); taskService.save(moveTask.toJavaObject(SchBaseTask.class)); return new ResponseEntity<>( HttpStatus.OK); } @RequestMapping("tmpsendVechile") @SaIgnore public ResponseEntity tmpsendVechile(@RequestBody JSONObject param){ - JSONObject moveTask = taskService.createMoveTask("", "", AcsTaskEnum.TASK_POINT_TO_POINT, AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20); + JSONObject moveTask = taskService.createMoveTask("A1_KZ_SL", "A1_BCPRKW_SD", AcsTaskEnum.TASK_POINT_TO_POINT, AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20); JSONArray data = new JSONArray(); data.add(moveTask); Map result = wmsToAcsService.issueTaskToAcs2(data); if (StrUtil.equals((String)result.get("status"), "400")) { throw new BadRequestException((String)result.get("message")); } + moveTask.put("task_status",StatusEnum.TASK_PUBLISH.getCode()); taskService.save(moveTask.toJavaObject(SchBaseTask.class)); return new ResponseEntity<>( HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java index 07a944c6..82c41aff 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/service/impl/CacheLineHandServiceImpl.java @@ -22,7 +22,7 @@ import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.pda_manage.pda.service.dto.MaterialDto; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/1.txt b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java deleted file mode 100644 index d80507cb..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/DeliveryOrderController.java +++ /dev/null @@ -1,68 +0,0 @@ - -package org.nl.wms.procure_manage.备份pcs.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService; -import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-06-01 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "发货单管理") -@RequestMapping("/api/deliveryOrder") -@Slf4j -public class DeliveryOrderController { - - private final DeliveryOrderService deliveryOrderService; - - @GetMapping - @Log("查询发货单") - @ApiOperation("查询发货单") - //@PreAuthorize("@el.check('deliveryOrder:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(deliveryOrderService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增发货单") - @ApiOperation("新增发货单") - //@PreAuthorize("@el.check('deliveryOrder:add')") - public ResponseEntity create(@Validated @RequestBody DeliveryOrderDto dto){ - deliveryOrderService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改发货单") - @ApiOperation("修改发货单") - //@PreAuthorize("@el.check('deliveryOrder:edit')") - public ResponseEntity update(@Validated @RequestBody DeliveryOrderDto dto){ - deliveryOrderService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除发货单") - @ApiOperation("删除发货单") - //@PreAuthorize("@el.check('deliveryOrder:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - deliveryOrderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java deleted file mode 100644 index dae11327..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/rest/SaleOrderController.java +++ /dev/null @@ -1,68 +0,0 @@ - -package org.nl.wms.procure_manage.备份pcs.rest; - - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; - import lombok.RequiredArgsConstructor; -import org.nl.common.anno.Log; -import lombok.extern.slf4j.Slf4j; -import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService; -import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** -* @author geng by -* @date 2022-06-01 -**/ -@RestController -@RequiredArgsConstructor -@Api(tags = "销售订单管理") -@RequestMapping("/api/saleOrder") -@Slf4j -public class SaleOrderController { - - private final SaleOrderService saleOrderService; - - @GetMapping - @Log("查询销售订单") - @ApiOperation("查询销售订单") - //@PreAuthorize("@el.check('saleOrder:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ - return new ResponseEntity<>(saleOrderService.queryAll(whereJson,page),HttpStatus.OK); - } - - @PostMapping - @Log("新增销售订单") - @ApiOperation("新增销售订单") - //@PreAuthorize("@el.check('saleOrder:add')") - public ResponseEntity create(@Validated @RequestBody SaleOrderDto dto){ - saleOrderService.create(dto); - return new ResponseEntity<>(HttpStatus.CREATED); - } - - @PutMapping - @Log("修改销售订单") - @ApiOperation("修改销售订单") - //@PreAuthorize("@el.check('saleOrder:edit')") - public ResponseEntity update(@Validated @RequestBody SaleOrderDto dto){ - saleOrderService.update(dto); - return new ResponseEntity<>(HttpStatus.NO_CONTENT); - } - - @Log("删除销售订单") - @ApiOperation("删除销售订单") - //@PreAuthorize("@el.check('saleOrder:del')") - @DeleteMapping - public ResponseEntity delete(@RequestBody Long[] ids) { - saleOrderService.deleteAll(ids); - return new ResponseEntity<>(HttpStatus.OK); - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java deleted file mode 100644 index 7d4a41e5..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/DeliveryOrderService.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.nl.wms.procure_manage.备份pcs.service; - -import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-06-01 -**/ -public interface DeliveryOrderService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param deliver_id ID - * @return DeliveryOrder - */ - DeliveryOrderDto findById(Long deliver_id); - - /** - * 根据编码查询 - * @param code code - * @return DeliveryOrder - */ - DeliveryOrderDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(DeliveryOrderDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(DeliveryOrderDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java deleted file mode 100644 index f81c9e03..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/SaleOrderService.java +++ /dev/null @@ -1,65 +0,0 @@ - -package org.nl.wms.procure_manage.备份pcs.service; - -import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto; -import org.springframework.data.domain.Pageable; - -import java.util.List; -import java.util.Map; - -/** -* @description 服务接口 -* @author geng by -* @date 2022-06-01 -**/ -public interface SaleOrderService { - - /** - * 查询数据分页 - * @param whereJson 条件 - * @param page 分页参数 - * @return Map - */ - Map queryAll(Map whereJson, Pageable page); - - /** - * 查询所有数据不分页 - * @param whereJson 条件参数 - * @return List - */ - List queryAll(Map whereJson); - - /** - * 根据ID查询 - * @param sale_id ID - * @return SaleOrder - */ - SaleOrderDto findById(Long sale_id); - - /** - * 根据编码查询 - * @param code code - * @return SaleOrder - */ - SaleOrderDto findByCode(String code); - - - /** - * 创建 - * @param dto / - */ - void create(SaleOrderDto dto); - - /** - * 编辑 - * @param dto / - */ - void update(SaleOrderDto dto); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Long[] ids); - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java deleted file mode 100644 index 990b8e45..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/DeliveryOrderDto.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.nl.wms.procure_manage.备份pcs.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author geng by -* @date 2022-06-01 -**/ -@Data -public class DeliveryOrderDto implements Serializable { - - /** 发货单标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long deliver_id; - - /** 发货单号 */ - private String deliver_code; - - /** 明细序号 */ - private BigDecimal seq_no; - - /** 发货单类型 */ - private String deliver_type; - - /** 物料标识 */ - private Long material_id; - - /** 状态 */ - private String status; - - /** 发货数量 */ - private BigDecimal delivery_qty; - - /** 客户标识 */ - private Long cust_id; - - /** 计量单位标识 */ - private Long qty_unit_id; - - /** 销售单标识 */ - private Long sale_id; - - /** 销售单号 */ - private String sale_code; - - /** 销售明细序号 */ - private BigDecimal sale_seq_no; - - /** 创建人 */ - private String create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private String update_id; - - /** 修改人 */ - private String update_name; - - /** 修改时间 */ - private String update_time; - - /** 客户编码 */ - private String cust_code; - - /** 客户名称 */ - private String cust_name; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java deleted file mode 100644 index 5d784206..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/dto/SaleOrderDto.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.procure_manage.备份pcs.service.dto; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; - - -import java.io.Serializable; -import java.math.BigDecimal; - -/** -* @description / -* @author geng by -* @date 2022-06-01 -**/ -@Data -public class SaleOrderDto implements Serializable { - - /** 销售单标识 */ - /** 防止精度丢失 */ - @JsonSerialize(using= ToStringSerializer.class) - private Long sale_id; - - /** 销售单号 */ - private String sale_code; - - /** 明细序号 */ - private BigDecimal seq_no; - - /** 销售单类型 */ - private String sale_type; - - /** 物料标识 */ - private Long material_id; - - /** 状态 */ - private String status; - - /** 销售数量 */ - private BigDecimal sale_qty; - - /** 生产顺序 */ - private BigDecimal produce_seq; - - /** 客户标识 */ - private Long cust_id; - - /** 计量单位标识 */ - private Long qty_unit_id; - - /** 计划交期 */ - private String plandeliver_date; - - /** 创建人 */ - private String create_id; - - /** 创建人 */ - private String create_name; - - /** 创建时间 */ - private String create_time; - - /** 修改人 */ - private String update_id; - - /** 修改人 */ - private String update_name; - - /** 修改时间 */ - private String update_time; - - - /** 客户编码 */ - private String cust_code; - - /** 客户名称 */ - private String cust_name; -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java deleted file mode 100644 index a4f8a64f..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/DeliveryOrderServiceImpl.java +++ /dev/null @@ -1,160 +0,0 @@ - -package org.nl.wms.procure_manage.备份pcs.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; - import org.nl.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; -import org.nl.wms.procure_manage.备份pcs.service.DeliveryOrderService; -import org.nl.wms.procure_manage.备份pcs.service.dto.DeliveryOrderDto; - -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author geng by -* @date 2022-06-01 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class DeliveryOrderServiceImpl implements DeliveryOrderService { - private final ClassstandardService classstandardService; - @Override - public Map queryAll(Map whereJson, Pageable page){ - String deliver_code = MapUtil.getStr(whereJson, "deliver_code"); - String material = MapUtil.getStr(whereJson, "material"); - String parent_id = MapUtil.getStr(whereJson, "product_series"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); - String status = MapUtil.getStr(whereJson, "status"); - String is_success = MapUtil.getStr(whereJson, "is_success"); - String product_series = ""; - HashMap map = new HashMap<>(); - map.put("flag", "1"); - map.put("begin_time", begin_time); - map.put("end_time", end_time); - map.put("status", status); - map.put("is_success", is_success); - if (StrUtil.isNotEmpty(material)) { - map.put("material", "%" + material + "%"); - } - if (StrUtil.isNotEmpty(parent_id)) { - product_series = classstandardService.getChildIdStr(parent_id); - map.put("product_series", product_series); - } - if (StrUtil.isNotEmpty(deliver_code)) { - map.put("deliver_code", "%" + deliver_code + "%"); - } - JSONObject json = WQL.getWO("PCS_DELIVERYORDER001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "deliveryorder.create_time desc"); - return json; - } - - @Override - @SneakyThrows - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(DeliveryOrderDto.class); - return null; - } - - @Override - public DeliveryOrderDto findById(Long deliver_id) { - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = wo.query("deliver_id = '" + deliver_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( DeliveryOrderDto.class); - } - return null; - } - - @Override - public DeliveryOrderDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( DeliveryOrderDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(DeliveryOrderDto dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - dto.setDeliver_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - dto.setUpdate_time(DateUtil.now()); - dto.setCreate_time(DateUtil.now()); - - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(DeliveryOrderDto dto) { - DeliveryOrderDto entity = this.findById(dto.getDeliver_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - dto.setUpdate_time(DateUtil.now()); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject wo = WQLObject.getWQLObject("pcs_delivery_order"); - for (Long deliver_id: ids) { - JSONObject param = new JSONObject(); - param.put("deliver_id", String.valueOf(deliver_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java deleted file mode 100644 index 0ba44236..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/service/impl/SaleOrderServiceImpl.java +++ /dev/null @@ -1,159 +0,0 @@ - -package org.nl.wms.procure_manage.备份pcs.service.impl; - - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; -import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; - import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - - import org.nl.common.utils.SecurityUtils; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.WqlUtil; -import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; -import org.nl.wms.procure_manage.备份pcs.service.SaleOrderService; -import org.nl.wms.procure_manage.备份pcs.service.dto.SaleOrderDto; - -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** -* @description 服务实现 -* @author geng by -* @date 2022-06-01 -**/ -@Service -@RequiredArgsConstructor -@Slf4j -public class SaleOrderServiceImpl implements SaleOrderService { - private final ClassstandardService classstandardService; - @Override - public Map queryAll(Map whereJson, Pageable page){ - String sale_code = MapUtil.getStr(whereJson, "sale_code"); - String material = MapUtil.getStr(whereJson, "material"); - String parent_id = MapUtil.getStr(whereJson, "product_series"); - String begin_time = MapUtil.getStr(whereJson, "begin_time"); - String end_time = MapUtil.getStr(whereJson, "end_time"); - String status = MapUtil.getStr(whereJson, "status"); - String is_success = MapUtil.getStr(whereJson, "is_success"); - String product_series = ""; - HashMap map = new HashMap<>(); - map.put("flag", "1"); - map.put("begin_time", begin_time); - map.put("end_time", end_time); - map.put("status", status); - map.put("is_success", is_success); - if (StrUtil.isNotEmpty(sale_code)) { - map.put("sale_code", "%" + sale_code + "%"); - } - if (StrUtil.isNotEmpty(material)) { - map.put("material", "%" + material + "%"); - } - if (StrUtil.isNotEmpty(parent_id)) { - product_series = classstandardService.getChildIdStr(parent_id); - map.put("product_series", product_series); - } - JSONObject json = WQL.getWO("PCS_SALEORDER001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "saleorder.create_time desc"); - return json; - } - - @Override - public List queryAll(Map whereJson){ - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONArray arr = wo.query().getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(SaleOrderDto.class); - return null; - } - - @Override - public SaleOrderDto findById(Long sale_id) { - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = wo.query("sale_id = '" + sale_id + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( SaleOrderDto.class); - } - return null; - } - - @Override - public SaleOrderDto findByCode(String code) { - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(json)){ - return json.toJavaObject( SaleOrderDto.class); - } - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void create(SaleOrderDto dto) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - dto.setSale_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - dto.setUpdate_time(DateUtil.now()); - dto.setCreate_time(DateUtil.now()); - - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SaleOrderDto dto) { - SaleOrderDto entity = this.findById(dto.getSale_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - dto.setUpdate_time(DateUtil.now()); - dto.setUpdate_id(currentUserId); - dto.setUpdate_name(nickName); - - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.update(json); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteAll(Long[] ids) { - String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - - WQLObject wo = WQLObject.getWQLObject("pcs_sale_order"); - for (Long sale_id: ids) { - JSONObject param = new JSONObject(); - param.put("sale_id", String.valueOf(sale_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", DateUtil.now()); - wo.update(param); - } - } - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql deleted file mode 100644 index 998d8866..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_DELIVERYORDER001.wql +++ /dev/null @@ -1,89 +0,0 @@ -[交易说明] - 交易名： 发货单查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.deliver_code TYPEAS s_string - 输入.material TYPEAS s_string - 输入.product_series TYPEAS f_string - 输入.status TYPEAS s_string - 输入.is_success TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - deliveryorder.*, - material.material_code, - material.material_name, - unit.unit_name - FROM - PCS_delivery_order deliveryorder - left join md_me_materialbase material on deliveryorder.material_id = material.material_id - left join md_pb_measureunit unit on deliveryorder.qty_unit_id = unit.measure_unit_id - WHERE - 1 = 1 - OPTION 输入.deliver_code <> "" - (deliveryorder.deliver_code like 输入.deliver_code) - ENDOPTION - OPTION 输入.status <> "" - deliveryorder.status = 输入.status - ENDOPTION - OPTION 输入.is_success <> "" - deliveryorder.is_success = 输入.is_success - ENDOPTION - OPTION 输入.product_series <> "" - material.product_series in 输入.product_series - ENDOPTION - OPTION 输入.begin_time <> "" - deliveryorder.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - deliveryorder.create_time <= 输入.end_time - ENDOPTION - OPTION 输入.material <> "" - ( - material.material_code like 输入.material or - material.material_name like 输入.material or - material.material_spec like 输入.material - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql deleted file mode 100644 index 661b0df4..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/PCS_SALEORDER001.wql +++ /dev/null @@ -1,90 +0,0 @@ -[交易说明] - 交易名： 销售订单查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.sale_code TYPEAS s_string - 输入.material TYPEAS s_string - 输入.product_series TYPEAS f_string - 输入.status TYPEAS s_string - 输入.is_success TYPEAS s_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - saleorder.*, - uuid() as order_line_code, - material.material_name, - material.material_spec, - unit.unit_name - FROM - PCS_sale_order saleorder - left join md_me_materialbase material on saleorder.material_id = material.material_id - left join md_pb_measureunit unit on saleorder.qty_unit_id = unit.measure_unit_id - WHERE - 1 = 1 - OPTION 输入.sale_code <> "" - (saleorder.sale_code like 输入.sale_code) - ENDOPTION - OPTION 输入.status <> "" - saleorder.status = 输入.status - ENDOPTION - OPTION 输入.is_success <> "" - saleorder.is_success = 输入.is_success - ENDOPTION - OPTION 输入.product_series <> "" - material.product_series in 输入.product_series - ENDOPTION - OPTION 输入.begin_time <> "" - saleorder.create_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - saleorder.create_time <= 输入.end_time - ENDOPTION - OPTION 输入.material <> "" - ( - material.material_code like 输入.material or - material.material_name like 输入.material or - material.material_spec like 输入.material - ) - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/pcs.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/procure_manage/备份pcs/wql/pcs.xls deleted file mode 100644 index 50e861b1b055b578bbc5a5e1149855c3a056c381..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292864 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
J>20TEo!{#>bu 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 query(DeviceQuery query, PageQuery page) { Page result = iDeviceService.page(page.build(PdmBiDevice.class), query.build()); @@ -52,7 +52,7 @@ public class PdmBiDeviceController { @PostMapping("/list") @Log("查询生产设备列表") - @ApiOperation("查询生产设备列表") + //("查询生产设备列表") @SaIgnore public ResponseEntity queryList (@RequestBody DeviceQuery query){ List> list = iDeviceService.listMaps(query.build().select("device_code", "device_name")); @@ -61,7 +61,7 @@ public class PdmBiDeviceController { @PostMapping @Log("新增生产设备") - @ApiOperation("新增生产设备") + //("新增生产设备") //@PreAuthorize("@el.check('device:add')") public ResponseEntity create (@RequestBody JSONObject form){ PdmBiDevice device = form.toJavaObject(PdmBiDevice.class); @@ -74,7 +74,7 @@ public class PdmBiDeviceController { @PutMapping @Log("修改生产设备") - @ApiOperation("修改生产设备") + //("修改生产设备") //@PreAuthorize("@el.check('device:edit')") public ResponseEntity update (@Validated @RequestBody JSONObject form){ PdmBiDevice device = form.toJavaObject(PdmBiDevice.class); @@ -86,7 +86,7 @@ public class PdmBiDeviceController { } @Log("删除生产设备") - @ApiOperation("删除生产设备") + //("删除生产设备") //@PreAuthorize("@el.check('device:del')") @DeleteMapping public ResponseEntity delete (@RequestBody String[]ids){ @@ -96,7 +96,7 @@ public class PdmBiDeviceController { @GetMapping("/getWorkprocedure") @Log("工序下拉") - @ApiOperation("工序下拉") + //("工序下拉") //@PreAuthorize("@el.check('device:list')") public ResponseEntity getWorkprocedure () { return new ResponseEntity<>(deviceService.getWorkprocedure(), HttpStatus.OK); @@ -104,7 +104,7 @@ public class PdmBiDeviceController { @GetMapping("/getDeviceList") @Log("设备下拉框") - @ApiOperation("设备下拉框") + //("设备下拉框") //@PreAuthorize("@el.check('device:list')") public ResponseEntity getDeviceList () { return new ResponseEntity<>(deviceService.getDeviceList(), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java index bf849976..630347dd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java @@ -45,7 +45,7 @@ public class SpecialDeviceController { private IPdmBiDeviceService iDeviceService; @GetMapping("/query") - @ApiOperation("查询生产设备") + //("查询生产设备") @Log("深坑物料") @SaIgnore public ResponseEntity query(DeviceQuery query,PageQuery page) { @@ -65,7 +65,7 @@ public class SpecialDeviceController { @PostMapping("/update") @Log("更新物料") - @ApiOperation("更新物料") + //("更新物料") @SaIgnore public ResponseEntity queryList (@RequestBody JSONObject query){ String device_code = query.getString("device_code"); @@ -80,7 +80,7 @@ public class SpecialDeviceController { } @PostMapping("/setEmp") @Log("设置空点位") - @ApiOperation("设置空点位") + //("设置空点位") @SaIgnore public ResponseEntity setEmp (@RequestBody String[]ids){ if (ids.length>0){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java index f0d2da8f..84d588a0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/processroute/ProcessrouteController.java @@ -34,14 +34,14 @@ public class ProcessrouteController { @GetMapping @Log("查询工艺路线") - @ApiOperation("查询工艺路线") + //("查询工艺路线") public ResponseEntity query(ProcessrouteQuery query, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(iProcessrouteService.page(page.build(),query.build())), HttpStatus.OK); } @PostMapping @Log("新增工艺路线") - @ApiOperation("新增工艺路线") + //("新增工艺路线") public ResponseEntity create(@RequestBody JSONObject json) { iProcessrouteService.create(json); return new ResponseEntity<>(HttpStatus.CREATED); @@ -49,14 +49,14 @@ public class ProcessrouteController { @PutMapping @Log("修改工艺路线") - @ApiOperation("修改工艺路线") + //("修改工艺路线") public ResponseEntity update(@RequestBody JSONObject whereJson) { iProcessrouteService.update(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除工艺路线") - @ApiOperation("删除工艺路线") + //("删除工艺路线") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { iProcessrouteService.deleteAll(ids); @@ -64,21 +64,21 @@ public class ProcessrouteController { } @Log("获取工序") - @ApiOperation("获取工序") + //("获取工序") @GetMapping("/getWorkList") public ResponseEntity getWorkList() { return new ResponseEntity<>(iProcessrouteService.getWorkList(), HttpStatus.OK); } @Log("获取明细") - @ApiOperation("获取明细") + //("获取明细") @GetMapping("/getDtl") public ResponseEntity getDtl(@RequestParam Map map) { return new ResponseEntity<>(iProcessrouteService.getDtl(map), HttpStatus.OK); } @Log("提交") - @ApiOperation("提交") + //("提交") @PutMapping("/submit") public ResponseEntity submit(@RequestBody JSONObject whereJson) { iProcessrouteService.submit(whereJson); @@ -86,7 +86,7 @@ public class ProcessrouteController { } @Log("取消提交") - @ApiOperation("取消提交") + //("取消提交") @PutMapping("/CancelSubmit") public ResponseEntity CancelSubmit(@RequestBody JSONObject whereJson) { iProcessrouteService.CancelSubmit(whereJson); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java index 1461ba8f..d4b77806 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java @@ -49,7 +49,7 @@ public class ProductprocessrouteController { @GetMapping @Log("查询产品工艺路线") - @ApiOperation("查询产品工艺路线") + //("查询产品工艺路线") public ResponseEntity query(@RequestParam Map whereJson, Pageable pageQuery){ Page page = PageHelper.startPage(pageQuery.getPageNumber() + 1, pageQuery.getPageSize()); List list = ipdmBiProductprocessrouteService.queryAll(whereJson); @@ -60,7 +60,7 @@ public class ProductprocessrouteController { @PostMapping @Log("新增产品工艺路线") - @ApiOperation("新增产品工艺路线") + //("新增产品工艺路线") public ResponseEntity create(@RequestBody Map whereJson){ ipdmBiProductprocessrouteService.create(whereJson); return new ResponseEntity<>(HttpStatus.CREATED); @@ -68,7 +68,7 @@ public class ProductprocessrouteController { @PutMapping @Log("修改产品工艺路线") - @ApiOperation("修改产品工艺路线") + //("修改产品工艺路线") //@PreAuthorize("@el.check('productprocessroute:edit')") public ResponseEntity update(@RequestBody Map whereJson){ ipdmBiProductprocessrouteService.update(whereJson); @@ -76,7 +76,7 @@ public class ProductprocessrouteController { } @Log("删除产品工艺路线") - @ApiOperation("删除产品工艺路线") + //("删除产品工艺路线") //@PreAuthorize("@el.check('productprocessroute:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -87,7 +87,7 @@ public class ProductprocessrouteController { @PostMapping("/getRoute") @Log("获取工艺路线") - @ApiOperation("获取工艺路线") + //("获取工艺路线") //@PreAuthorize("@el.check('materialtype:list')") public ResponseEntity getRoute(@RequestBody Map whereJson) { List list = pdmBiProcessrouteService.list(new QueryWrapper() @@ -97,14 +97,14 @@ public class ProductprocessrouteController { @PostMapping("/getRouteDtl") @Log("获取工艺路线明细") - @ApiOperation("获取工艺路线明细") + //("获取工艺路线明细") public ResponseEntity getRouteDtl(@RequestBody Map whereJson) { return new ResponseEntity<>(ipdmBiProductprocessrouteService.getRouteDtl(whereJson),HttpStatus.OK); } @PostMapping("/getProductRouteDtl") @Log("查询产品工艺路线明细") - @ApiOperation("查询产品工艺路线明细") + //("查询产品工艺路线明细") public ResponseEntity getProductRouteDtl(@RequestBody Map whereJson) { JSONObject jo = JSONObject.parseObject(JSON.toJSONString(whereJson)); List list = iPdmBiProductprocessroutedtlService.list(new QueryWrapper() @@ -113,7 +113,7 @@ public class ProductprocessrouteController { } @Log("提交") - @ApiOperation("提交") + //("提交") @PutMapping("/submit") public ResponseEntity submit(@RequestBody JSONObject whereJson) { ipdmBiProductprocessrouteService.submit(whereJson); @@ -121,7 +121,7 @@ public class ProductprocessrouteController { } @Log("取消提交") - @ApiOperation("取消提交") + //("取消提交") @PutMapping("/unSubmit") public ResponseEntity unSubmit(@RequestBody JSONObject whereJson) { ipdmBiProductprocessrouteService.unSubmit(whereJson); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java index 39e215d4..1886b100 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/teamcorrPerson/PdmBiTeamcorrpersonController.java @@ -45,7 +45,7 @@ public class PdmBiTeamcorrpersonController { @GetMapping @Log("查询人员设备维护") - @ApiOperation("查询人员设备维护") + //("查询人员设备维护") public ResponseEntity query(WorkTeamQuery query, PageQuery page){ Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); List list = iPdmBiTeamcorrpersonService.queryAll(query); @@ -56,7 +56,7 @@ public class PdmBiTeamcorrpersonController { @GetMapping("/queryUser") @Log("查询人员设备维护") - @ApiOperation("查询人员设备维护") + //("查询人员设备维护") public ResponseEntity queryUser(WorkTeamQuery query, PageQuery page){ Page result = PageHelper.startPage(page.getPage() + 1, page.getSize()); List list = iPdmBiTeamcorrpersonService.queryUser(query); @@ -68,7 +68,7 @@ public class PdmBiTeamcorrpersonController { @PostMapping @Log("新增班组对应人员") - @ApiOperation("新增班组对应人员") + //("新增班组对应人员") public ResponseEntity create(@RequestBody JSONObject entity){ Assert.notNull(entity,"请求参数不能为空"); @@ -89,7 +89,7 @@ public class PdmBiTeamcorrpersonController { @PutMapping @Log("修改班组对应人员") - @ApiOperation("修改班组对应人员") + //("修改班组对应人员") public ResponseEntity update(@RequestBody JSONObject entity){ PdmBiTeamcorrperson one = iPdmBiTeamcorrpersonService.getOne( @@ -107,7 +107,7 @@ public class PdmBiTeamcorrpersonController { } @Log("删除班组对应人员") - @ApiOperation("删除班组对应人员") + //("删除班组对应人员") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { if (ids != null && ids.length>0){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java index ab305e98..4f195aee 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java @@ -57,14 +57,14 @@ public class PdmProduceWorkorderController { @GetMapping @Log("查询工单管理") - @ApiOperation("查询工单管理") + //("查询工单管理") public ResponseEntity query(WorkorderQuery query, PageQuery page) { return new ResponseEntity<>(iPdmProduceWorkorderService.queryAll(query, page), HttpStatus.OK); } @PostMapping("/create") @Log("新增工单管理") - @ApiOperation("新增工单管理") + //("新增工单管理") public ResponseEntity submit(@Validated @RequestBody JSONObject dto) { iPdmProduceWorkorderService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -72,7 +72,7 @@ public class PdmProduceWorkorderController { @PutMapping @Log("修改工单管理") - @ApiOperation("修改工单管理") + //("修改工单管理") public ResponseEntity update(@Validated @RequestBody JSONObject dto) { iPdmProduceWorkorderService.updateForm(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -80,7 +80,7 @@ public class PdmProduceWorkorderController { @PostMapping("/submits") @Log("工单下发") - @ApiOperation("工单下发") + //("工单下发") public ResponseEntity submits(@RequestBody List param) { iPdmProduceWorkorderService.down(param); return new ResponseEntity<>(HttpStatus.OK); @@ -88,14 +88,14 @@ public class PdmProduceWorkorderController { @PostMapping("/unSubmits") @Log("工单取消下发") - @ApiOperation("工单取消下发") + //("工单取消下发") public ResponseEntity unSubmits(@RequestBody List param) { iPdmProduceWorkorderService.unDown(param); return new ResponseEntity<>(HttpStatus.OK); } @Log("删除工单管理") - @ApiOperation("删除工单管理") + //("删除工单管理") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { if (ids != null && ids.length > 0) { @@ -108,14 +108,14 @@ public class PdmProduceWorkorderController { @PostMapping("/getNotWorkDeviceByWorkproceduceId") @Log("根据工序查询没有工单的设备") - @ApiOperation("根据工序查询没有工单的设备") + //("根据工序查询没有工单的设备") public ResponseEntity getNotWorkDeviceByWorkproceduceId(@RequestBody JSONObject param) { return new ResponseEntity<>(TableDataInfo.build(deviceService.getNotWorkDeviceByWorkproceduceId(param)), HttpStatus.CREATED); } @PostMapping("/forceFinish") @Log("工单强制完成") - @ApiOperation("工单强制完成") + //("工单强制完成") public ResponseEntity forceFinish(@RequestBody JSONObject param) { iPdmProduceWorkorderService.finish(param); return new ResponseEntity<>(HttpStatus.OK); @@ -123,7 +123,7 @@ public class PdmProduceWorkorderController { @PostMapping("/excelImport") @Log("excel导入") - @ApiOperation("excel导入") + //("excel导入") public ResponseEntity excelImport(@RequestParam("file") MultipartFile file, HttpServletRequest request, HttpServletResponse response) { RedissonUtils.lock(() -> { iPdmProduceWorkorderService.excelImport(file, request, response); @@ -133,21 +133,21 @@ public class PdmProduceWorkorderController { @PostMapping("/getDtl") @Log("获取当前工单下的工单生产记录") - @ApiOperation("获取当前工单下的工单生产记录") + //("获取当前工单下的工单生产记录") public ResponseEntity getDtl(@RequestBody JSONObject param) { return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.getDtl(param)), HttpStatus.OK); } @PostMapping("/report") @Log("报工") - @ApiOperation("报工") + //("报工") public ResponseEntity report(@RequestBody JSONObject param) { return new ResponseEntity<>(iPdmProduceWorkorderService.report(param), HttpStatus.OK); } @PostMapping("/reportApprove") @Log("报工审核") - @ApiOperation("报工审核") + //("报工审核") public ResponseEntity reportApprove(@RequestBody JSONArray param) { iPdmProduceWorkorderService.reportApprove(param); return new ResponseEntity<>(HttpStatus.OK); @@ -156,7 +156,7 @@ public class PdmProduceWorkorderController { @PostMapping("/reportQuery") @Log("一体机报工数修改") - @ApiOperation("报工数修改") + //("报工数修改") @SaIgnore public ResponseEntity reportQuery(@RequestBody ReportQuery param) { if (!SecurityUtils.getCurrentUserId().equals("1")) { @@ -167,7 +167,7 @@ public class PdmProduceWorkorderController { @GetMapping("/reportQuery2") @Log("报工数修改") - @ApiOperation("报工数修改") + //("报工数修改") @SaIgnore public ResponseEntity reportQuery2(ReportQuery param, PageQuery pageQuery) { Page page = null; @@ -187,14 +187,14 @@ public class PdmProduceWorkorderController { @PostMapping("/reportQuery3") @Log("工单报工数") - @ApiOperation("工单报工数") + //("工单报工数") @SaIgnore public ResponseEntity reportQuery3(@RequestBody ReportQuery param) { return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)), HttpStatus.OK); } @Log("导出数据") - @ApiOperation("导出数据") + //("导出数据") @PostMapping(value = "/download") public void download(@RequestBody Map map, HttpServletResponse response) throws IOException { iPdmProduceWorkorderService.download(map, response); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index 25dee9b7..e7a880ef 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -47,7 +47,7 @@ public class ProduceshiftorderController{ @PostMapping("/getDevice") @Log("根据登录用户设备下拉") - @ApiOperation("根据登录用户设备下拉") + //("根据登录用户设备下拉") public ResponseEntity getDevice(@RequestBody JSONObject param) { //从设备拉去 return new ResponseEntity<>(produceshiftorderService.getDevice(param), HttpStatus.OK); @@ -55,7 +55,7 @@ public class ProduceshiftorderController{ @PostMapping("/getTable") @Log("获取工单生产记录") - @ApiOperation("获取工单生产记录") + //("获取工单生产记录") public ResponseEntity getTable(@RequestBody JSONObject param) { return new ResponseEntity<>(produceshiftorderService.getTable(param), HttpStatus.OK); @@ -63,7 +63,7 @@ public class ProduceshiftorderController{ @PostMapping("/getDeviceList") @Log("一体机-根据登录人信息获取设备列表") - @ApiOperation("一体机-根据登录人信息获取设备列表") + //("一体机-根据登录人信息获取设备列表") public ResponseEntity> getDeviceList(@RequestBody JSONObject form) { log.info("海亮一体机服务 [根据登录人信息获取设备列表] 接口被请求"); return new ResponseEntity<>(produceshiftorderService.getDeviceList(form.getString("search_bar")), HttpStatus.OK); @@ -71,7 +71,7 @@ public class ProduceshiftorderController{ @PostMapping("/getOrderList") @Log("一体机-工单管理列表") - @ApiOperation("一体机-工单管理列表") + //("一体机-工单管理列表") public ResponseEntity getOrderList(@RequestBody Map param, Pageable page) { log.info("海亮一体机服务 [工单管理列表] 接口被请求, 请求参数-{}", param); if(null == param) { @@ -86,7 +86,7 @@ public class ProduceshiftorderController{ @PostMapping("/getOrderList2") @Log("一体机-工单作业清单") - @ApiOperation("工单作业清单") + //("工单作业清单") public ResponseEntity getOrderList2(@RequestBody Map param, Pageable page) { log.info("海亮一体机服务 [工单管理列表] 接口被请求, 请求参数-{}", param); if(null == param) { @@ -104,7 +104,7 @@ public class ProduceshiftorderController{ @PostMapping("/openStart") @Log("看板开工") - @ApiOperation("看板开工") + //("看板开工") public ResponseEntity openStart(@RequestBody JSONObject param) { RedissonUtils.lock(()->{ iPdmProduceWorkorderService.openStart(param); @@ -114,13 +114,13 @@ public class ProduceshiftorderController{ @PostMapping("/saveReport") @Log("看板报工") - @ApiOperation("看板报工") + //("看板报工") public ResponseEntity saveReport(@RequestBody JSONObject param) { return new ResponseEntity<>(iPdmProduceWorkorderService.report(param), HttpStatus.OK); } @PostMapping("/unqualReport") @Log("工单不合格报工") - @ApiOperation("工单不合格报工") + //("工单不合格报工") public ResponseEntity unqualReport(@RequestBody JSONObject param) { iPdmProduceWorkorderService.unqualReport(param); return new ResponseEntity<>(HttpStatus.OK); @@ -129,7 +129,7 @@ public class ProduceshiftorderController{ @PostMapping("/finish") @Log("看板强制完成") - @ApiOperation("看板强制完成") + //("看板强制完成") public ResponseEntity finish(@RequestBody JSONObject param) { iPdmProduceWorkorderService.finish(param); return new ResponseEntity<>(HttpStatus.OK); @@ -137,7 +137,7 @@ public class ProduceshiftorderController{ @PostMapping("/getReportWork") @Log("获取当前报工记录") - @ApiOperation("获取当前报工记录") + //("获取当前报工记录") //@PreAuthorize("@el.check('produceshiftorder:list')") public ResponseEntity getReportWork(@RequestBody JSONObject param) { return new ResponseEntity<>(produceshiftorderService.getReportWork(param), HttpStatus.OK); @@ -145,7 +145,7 @@ public class ProduceshiftorderController{ @PostMapping("/getNotWorkDeviceByWorkproceduceId") @Log("根据工序查询没有工单的设备") - @ApiOperation("根据工序查询没有工单的设备") + //("根据工序查询没有工单的设备") //@PreAuthorize("@el.check('WorkProcedure:add')") public ResponseEntity getNotWorkDeviceByWorkproceduceId(@RequestBody JSONObject param) { return new ResponseEntity<>(produceshiftorderService.getNotWorkDeviceByWorkproceduceId(param), HttpStatus.CREATED); @@ -153,7 +153,7 @@ public class ProduceshiftorderController{ @PostMapping("/replaceDevice") @Log("更换工单设备") - @ApiOperation("更换工单设备") + //("更换工单设备") public ResponseEntity replaceDevice(@RequestBody JSONObject param) { produceshiftorderService.replaceDevice(param); return new ResponseEntity<>(HttpStatus.OK); @@ -161,7 +161,7 @@ public class ProduceshiftorderController{ @PostMapping("/deleteReport") @Log("deleteReport") - @ApiOperation("deleteReport") + //("deleteReport") public ResponseEntity deleteReport(@RequestBody JSONObject param) { iPdmProduceWorkorderService.removeById(param.getString("macoperate_id")); return new ResponseEntity<>(HttpStatus.OK); @@ -170,7 +170,7 @@ public class ProduceshiftorderController{ @PostMapping("/updateReport") @Log("报工数修改") - @ApiOperation("报工数修改") + //("报工数修改") public ResponseEntity updateReport(@RequestBody JSONObject param) { iPdmProduceWorkorderService.updateReport(param); return new ResponseEntity<>(HttpStatus.OK); @@ -179,7 +179,7 @@ public class ProduceshiftorderController{ @GetMapping("/getUser") @Log("查询操作人员") - @ApiOperation("查询操作人员") + //("查询操作人员") public ResponseEntity getUser() { return new ResponseEntity<>(produceshiftorderService.getUser(), HttpStatus.OK); } @@ -187,7 +187,7 @@ public class ProduceshiftorderController{ @GetMapping("/orderStatus") @Log("查询操作人员") - @ApiOperation("查询操作人员") + //("查询操作人员") public ResponseEntity getWorkOrderStatus() { return new ResponseEntity<>(WorkerOrderEnum.getWorkOrderStatus(), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java index c4a4b82a..6f962c33 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java @@ -42,14 +42,14 @@ public class PdmBiWorkprocedureController { @GetMapping @Log("查询工序") - @ApiOperation("查询工序") + //("查询工序") public ResponseEntity query(WorkprocedureQuery query, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(pdmBiWorkprocedureService.page(page.build(),query.build())), HttpStatus.OK); } @PostMapping @Log("新增工序") - @ApiOperation("新增工序") + //("新增工序") public ResponseEntity create(@Validated @RequestBody JSONObject dto) { pdmBiWorkprocedureService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -57,14 +57,14 @@ public class PdmBiWorkprocedureController { @PutMapping @Log("修改工序") - @ApiOperation("修改工序") + //("修改工序") public ResponseEntity update(@Validated @RequestBody JSONObject dto) { pdmBiWorkprocedureService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除工序") - @ApiOperation("删除工序") + //("删除工序") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { if (ids.length>0){ @@ -75,13 +75,13 @@ public class PdmBiWorkprocedureController { @GetMapping("/downSelect") @Log("查询工序下拉列表") - @ApiOperation("查询工序下拉列表") + //("查询工序下拉列表") public ResponseEntity downSelect() { return new ResponseEntity<>(pdmBiWorkprocedureService.downSelect(), HttpStatus.OK); } @GetMapping("/queryWorkprocedure") @Log("查询生产工序")//仓储/清洗 - @ApiOperation("查询生产工序") + //("查询生产工序") public ResponseEntity queryWorkprocedure() { List list = pdmBiWorkprocedureService.list(new QueryWrapper() .eq("is_used", true) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/PointListener.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/PointListener.java index c6d7b661..0ceb77fb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/PointListener.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/PointListener.java @@ -31,7 +31,7 @@ public class PointListener extends AbstraceListener { task.put("acs_task_type", event.getAcs_task_type()); task.put("task_status", TaskStatusEnum.CREATED.getCode()); task.put("point_code1", event.getPoint_code1()); - task.put("point_code2", event.getPoint_code2()); + task.put("point_code3", event.getPoint_code3()); task.put("vehicle_code", event.getVehicle_code()); task.put("product_area",event.getProduct_area()); task.put("task_group_id",event.getTask_group_id()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportDeliverOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportDeliverOrder.java index 20bac671..9f8de68d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportDeliverOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportDeliverOrder.java @@ -4,7 +4,7 @@ package org.nl.wms.product_manage.sch.manage; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.sap.service.WmsToSapService; +import org.nl.wms.ext_manage.sap.service.WmsToSapService; import org.springframework.stereotype.Component; @Slf4j diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportSaleOrder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportSaleOrder.java index 7cb17bab..c7d46e13 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportSaleOrder.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/manage/AutoImportSaleOrder.java @@ -4,7 +4,7 @@ package org.nl.wms.product_manage.sch.manage; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.wms.ext.sap.service.WmsToSapService; +import org.nl.wms.ext_manage.sap.service.WmsToSapService; import org.springframework.stereotype.Component; @Slf4j diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java index 5c3c1507..869b0a57 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/service/impl/TaskServiceImpl.java @@ -1,9 +1,7 @@ package org.nl.wms.product_manage.sch.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -11,16 +9,13 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.enums.AcsTaskEnum; -import org.nl.common.enums.StatusEnum; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.masterdata_manage.备份master.service.ClassstandardService; -import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; -import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; +import org.nl.wms.ext_manage.acs.service.AcsToWmsService; import org.nl.wms.product_manage.sch.service.TaskService; import org.nl.wms.product_manage.sch.service.dto.TaskDto; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java index 11418764..a754f19b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java @@ -19,7 +19,7 @@ import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.wms.ext.acs.service.impl.AgvInstService; +import org.nl.wms.ext_manage.acs.service.impl.AgvInstService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java index bebffa92..6bd8f196 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java @@ -20,7 +20,7 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.impl.AgvInstService; +import org.nl.wms.ext_manage.acs.service.impl.AgvInstService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; @@ -45,7 +45,6 @@ import java.util.List; import java.util.Map; import java.util.*; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 专机任务 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/TaskScheduleService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/TaskScheduleService.java index e93787a7..182e6eb7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/TaskScheduleService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/TaskScheduleService.java @@ -1,6 +1,5 @@ package org.nl.wms.product_manage.sch.tasks; -import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -9,28 +8,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.BaseCode; import org.nl.common.utils.IdUtil; -import org.nl.common.utils.MapOf; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.StringUtils; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.slf4j.MDC; -import org.springframework.http.HttpStatus; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; -import java.lang.reflect.Method; import java.util.*; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java index 9605f3c1..14ebd2bb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/WashMachineryTask.java @@ -15,9 +15,8 @@ import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; -import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.service.material.IMdMeMaterialbaseService; import org.nl.wms.masterdata_manage.service.material.dao.MdMeMaterialbase; import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapCallMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapCallMaterialTask.java index 1165e252..513e3695 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapCallMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapCallMaterialTask.java @@ -3,13 +3,11 @@ package org.nl.wms.product_manage.sch.tasks.packageWrap; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; @@ -20,10 +18,8 @@ import org.nl.common.utils.OptionRecord; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; -import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; @@ -38,7 +34,6 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; import java.util.stream.Collectors; /** diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapSendEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapSendEmptyTask.java index 41a4dab1..16ec92fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapSendEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/packageWrap/WrapSendEmptyTask.java @@ -18,7 +18,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterCallEmptyTask.java index 7f65d191..800bf6ff 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterCallEmptyTask.java @@ -9,7 +9,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; @@ -20,8 +19,7 @@ import org.nl.common.utils.OptionRecord; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; @@ -117,7 +115,7 @@ public class PlotterCallEmptyTask extends AbstractAcsTask { .and(wa->wa .eq("point_code1", param.getString("device_code")) .or() - .eq("point_code2", param.getString("device_code"))) + .eq("point_code3", param.getString("device_code"))) ); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterSendMaterialTask.java index 9c50851b..8b447a3d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/plotter/PlotterSendMaterialTask.java @@ -1,10 +1,8 @@ package org.nl.wms.product_manage.sch.tasks.plotter; -import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -20,12 +18,9 @@ import org.nl.common.utils.OptionRecord; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; -import org.nl.wms.product_manage.service.device.IPdmBiDeviceService; -import org.nl.wms.product_manage.service.device.dao.PdmBiDevice; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashCallEmptyTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashCallEmptyTask.java index b9f03745..d143768f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashCallEmptyTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashCallEmptyTask.java @@ -2,7 +2,6 @@ package org.nl.wms.product_manage.sch.tasks.wash; import cn.hutool.core.date.DateUtil; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -10,21 +9,33 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; +import org.nl.common.publish.BussEventMulticaster; +import org.nl.common.publish.event.PointEvent; +import org.nl.common.utils.IdUtil; import org.nl.common.utils.MapOf; +import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; +import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; +import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; +import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; import org.nl.wms.product_manage.service.workorder.dao.PdmProduceWorkorder; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; +import org.nl.wms.storage_manage.IOSEnum; +import org.nl.wms.storage_manage.pda.PDAEnum; +import org.nl.wms.storage_manage.pda.service.PdaStBcpInService; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,50 +53,66 @@ import java.util.stream.Collectors; @Slf4j @Service public class WashCallEmptyTask extends AbstractAcsTask { - @Autowired private IPdmProduceWorkorderService workorderService; @Autowired private ISchBaseTaskService taskService; @Autowired - private ISchBasePointService pointService; + private IStIvtStructattrService structattrService; // 仓位服务 + + @Autowired private WmsToAcsService wms; + + @Autowired + private PdaStBcpInService pdaStBcpInService; + @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject param, String status) { - SchBaseTask task = taskService.getById(param.getString("task_id")); - if (status.equals(AcsTaskEnum.STATUS_START.getCode())) { - taskService.update(new UpdateWrapper() - .set("task_status",StatusEnum.TASK_RUNNING.getCode()) - .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); - } + + String task_id = param.getString("task_id"); + + SchBaseTask taskDao = taskService.getById(task_id); + + // 更新任务状态为完成 if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { - // 完成 - taskService.update(new UpdateWrapper() - .set("task_status",StatusEnum.TASK_FINISH.getCode()) - .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); - pointService.update(new UpdateWrapper() - .set("lock_type",StatusEnum.LOCK_OFF.getCode()) - .in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); - } - if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) { - taskService.update(new UpdateWrapper() - .set("task_status",StatusEnum.TASK_CANNEL.getCode()) - .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); - pointService.update(new UpdateWrapper() - .set("lock_type",StatusEnum.LOCK_OFF.getCode()) - .in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); + + // 更新任务为完成 + taskDao.setTask_status(TaskStatusEnum.FINISHED.getCode()); + + // 解锁仓位 + structattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .set(StIvtStructattr::getIs_emptyvehicle,false) + .set(StIvtStructattr::getStoragevehicle_code,"") + .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1()) + ); + + } else if (status.equals(AcsTaskEnum.STATUS_START.getCode())) { + // 更新任务为执行中 + taskDao.setTask_status(TaskStatusEnum.EXECUTING.getCode()); + + } else if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) { + // 取消任务 + taskDao.setTask_status(TaskStatusEnum.CANCEL.getCode()); + + // 解锁仓位 + structattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .set(StIvtStructattr::getIs_emptyvehicle,false) + .set(StIvtStructattr::getStoragevehicle_code,"") + .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1()) + ); } + taskService.updateById(taskDao); } @Override @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject param) { - String end_point_code = param.getString("device_code"); PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper() .eq("workorder_code", param.getString("workorder_code")) .eq("is_delete", false) @@ -94,23 +121,45 @@ public class WashCallEmptyTask extends AbstractAcsTask { //?刻字满料请求：可以存在多个任务？ List list = taskService.list(new QueryWrapper() .lt("task_status", StatusEnum.TASK_FINISH.getCode()) - .and(wa->wa - .eq("point_code1", param.getString("device_code")) - .or() - .eq("point_code2", param.getString("device_code"))) - ); + .eq("point_code3", param.getString("device_code"))); if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); } - // 查找任务状态 - String taskdtl_id = IdUtil.getSnowflake(1, 1).nextId() + ""; +// 查找任务状态 + JSONObject task = packageTask(param.getString("device_code"), order.getMaterial_id(),order.getWorkorder_code()); + SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class); + taskService.save(schBaseTask); + // 找终点 + try { + RedissonUtils.lock(() -> { + pointConfirm(task); + JSONArray data = new JSONArray(); + data.add(task); + // 下发 + wms.issueTaskToAcs2(data); + }, "bcpcallemp", 2); + } catch (Exception ex) { + log.error("刻字请求异常,error:{}",ex); + schBaseTask.setRemark(ex.getMessage()); + schBaseTask.setUpdate_time(new Date()); + schBaseTask.setUpdate_name("acs"); + schBaseTask.setTask_status(StatusEnum.TASK_START_ERROR.getCode()); + taskService.save(schBaseTask); + } + pdaStBcpInService.callVehicle(); + return task.getString("task_id"); + + } + + @NotNull + private JSONObject packageTask(String end_point_code, String material_id,String fk) { JSONObject task = new JSONObject(); - task.put("task_id", taskdtl_id); - task.put("task_name", AcsTaskEnum.TASK_PLOTTER_EMPTY.getDesc()); - task.put("task_type", AcsTaskEnum.TASK_PLOTTER_EMPTY.getCode()); + task.put("task_id", IdUtil.getStringId()); + task.put("task_name", AcsTaskEnum.TASK_WASH_EMP.getDesc()); + task.put("task_type", AcsTaskEnum.TASK_WASH_EMP.getCode()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); - task.put("material_id", order.getMaterial_id()); + task.put("material_id", material_id); task.put("task_status", StatusEnum.TASK_CREATE.getCode()); task.put("point_code3", end_point_code); task.put("handle_class", this.getClass().getName()); @@ -124,77 +173,64 @@ public class WashCallEmptyTask extends AbstractAcsTask { task.put("update_time", DateUtil.now()); task.put("priority", "1"); task.put("agv_system_type", AcsTaskEnum.AGV_SYSTEM_XC.getCode()); - task.put("table_fk_id",order.getWorkorder_code()); - SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class); - taskService.save(schBaseTask); - // 找终点 - try { - pointConfirm(task); - JSONArray data = new JSONArray(); - data.add(task); - // 下发 - wms.issueTaskToAcs2(data); - } catch (Exception ex) { - log.error("刻字请求异常,error:{}",ex); - schBaseTask.setRemark(ex.getMessage()); - schBaseTask.setUpdate_time(new Date()); - schBaseTask.setUpdate_name("acs"); - schBaseTask.setTask_status(StatusEnum.TASK_START_ERROR.getCode()); - taskService.updateById(schBaseTask); - } - return taskdtl_id; + task.put("table_fk_id", fk); + return task; } + @Override + @Transactional public void cancel(String task_id) { - taskService.update(new UpdateWrapper() - .set("task_status",StatusEnum.TASK_CANNEL.getCode()) - .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task_id)); +// 取消任务 + SchBaseTask taskDao = taskService.getById(task_id); + taskDao.setTask_status(TaskStatusEnum.CANCEL.getCode()); + // 解锁仓位 + structattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .set(StIvtStructattr::getIs_emptyvehicle,false) + .set(StIvtStructattr::getStoragevehicle_code,"") + .eq(StIvtStructattr::getStruct_code, taskDao.getPoint_code1()) + ); + taskService.updateById(taskDao); + } /** * 空框请求 * 从半成品区中获取空位放入就行 - * @param taskObj: 任务对象 */ @Override - public void pointConfirm(JSONObject taskObj) { - //TODO:从半成品区中获取空位放入就行 - List> points = pointService.queryVehicle( - MapOf.of("is_used", "1", - "lock_type", StatusEnum.LOCK_OFF.getCode(), - "region_code", "A1_KZHC", - "material_null", "material_null")); - if (ObjectUtil.isNotEmpty(points)) { - Map map = points.get(0); - if (CollectionUtils.isEmpty(map)|| StringUtils.isEmpty(map.get("point_code"))){ - throw new BadRequestException("刻字缓存区没有可用货位."); - } - pointService.update(new UpdateWrapper() - .set("lock_type",StatusEnum.LOCK_ON.getCode()) - .eq("point_code",map.get("point_code"))); - // 设置点位 - taskObj.put("update_time", DateUtil.now()); - taskObj.put("point_code1",map.get("point_code")); - SchBaseTask schBaseTask = taskObj.toJavaObject(SchBaseTask.class); - schBaseTask.setTask_status(StatusEnum.TASK_START_END_P.getCode()); - schBaseTask.setUpdate_time(new Date()); - taskService.updateById(schBaseTask); - } else { - throw new BadRequestException("刻字缓存区没有可用货位."); - } + public void pointConfirm(JSONObject task) { + // 3.找一个空载具 + StIvtStructattr attrDao = structattrService.getOne( + new QueryWrapper().lambda() + .eq(StIvtStructattr::getIs_emptyvehicle, IOSEnum.IS_USED.code("是")) + .eq(StIvtStructattr::getSect_code, PDAEnum.SECT_CODE.code("半成品库区")) + .eq(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .eq(StIvtStructattr::getIs_used,true) + .and(qr -> qr.isNotNull(StIvtStructattr::getStoragevehicle_code) + .or() + .ne(StIvtStructattr::getStoragevehicle_code, "") + ),false + ); + + if (ObjectUtil.isEmpty(attrDao)) throw new BadRequestException("未找到空载具！"); + // 5.锁住仓位 + attrDao.setLock_type(IOSEnum.LOCK_TYPE.code("其他锁")); + structattrService.updateById(attrDao); + // 设置点位 + task.put("update_time", DateUtil.now()); + task.put("point_code1",attrDao.getStruct_code()); + SchBaseTask schBaseTask = task.toJavaObject(SchBaseTask.class); + schBaseTask.setTask_status(StatusEnum.TASK_START_END_P.getCode()); + schBaseTask.setTask_group_id(org.nl.common.utils.IdUtil.getStringId()); + schBaseTask.setUpdate_time(new Date()); + taskService.updateById(schBaseTask); } @Override public List schedulerTask(List tasks) { - ArrayList Merge = new ArrayList<>(); - if (!CollectionUtils.isEmpty(tasks)){ - for (SchBaseTask task : tasks) { - task.setTask_group_id(org.nl.common.utils.IdUtil.getStringId()); - Merge.add(task); - } - } - return Merge; + return tasks; } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialQZTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialQZTask.java index 3cd17b65..67e5ff9b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialQZTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialQZTask.java @@ -8,18 +8,18 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.enums.WorkerOrderEnum; import org.nl.common.utils.IdUtil; +import org.nl.common.utils.MapOf; +import org.nl.common.utils.OptionRecord; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; -import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; -import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; -import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.product_manage.service.workorder.IPdmProduceWorkorderService; @@ -28,18 +28,14 @@ import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; -import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; -import org.nl.wms.storage_manage.productmanage.util.RuleUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /* @@ -66,52 +62,74 @@ public class WashSendMaterialQZTask extends AbstractAcsTask { @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject param, String status) { - SchBaseTask task = taskService.getById(param.getString("task_id")); + SchBaseTask one = taskService.getById(param.getString("task_id")); + if (one.getTask_status().equals(StatusEnum.TASK_FINISH.getCode())||one.getTask_status().equals(StatusEnum.TASK_CANNEL.getCode())) { + throw new BadRequestException("任务已完成，不可取消!"); + } if (status.equals(AcsTaskEnum.STATUS_START.getCode())) { - taskService.update(new UpdateWrapper() + UpdateWrapper updateWrapper = new UpdateWrapper() .set("task_status", StatusEnum.TASK_RUNNING.getCode()) - .set("update_name","acs") - .set("update_time", DateUtil.now()).eq("task_id",task.getTask_id())); + .set("update_name", "acs") + .set("update_time", DateUtil.now()).eq("task_id", one.getTask_id()); + if (!("fall_finish"+one.getTask_id()).equals(one.getRemark())){ + updateWrapper.set("remark","fall_finish"+one.getTask_id()); + Map extParam = (Map)param.get("ext_param"); + String weight = extParam.get("weight"); + if (StringUtils.isNotEmpty(weight) && Integer.valueOf(weight)>0){ + updateWrapper.set("material_qty",weight); + } + } + taskService.update(updateWrapper); } if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { // 完成 taskService.update(new UpdateWrapper() .set("task_status",StatusEnum.TASK_FINISH.getCode()) + .set("point_status",StatusEnum.POINT_STATUS_FULL.getCode()) .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); + .set("update_time",DateUtil.now()).eq("task_id",one.getTask_id())); pointService.update(new UpdateWrapper() .set("lock_type",StatusEnum.LOCK_OFF.getCode()) - .in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); + .set("point_status",StatusEnum.POINT_STATUS_FULL.getCode()) + .set("material_id",one.getMaterial_id()) + .set("qty",one.getMaterial_qty()) + .eq("point_code",one.getPoint_code3())); } if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) { // 完成 taskService.update(new UpdateWrapper() .set("task_status",StatusEnum.TASK_CANNEL.getCode()) .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); + .set("update_time",DateUtil.now()).eq("task_id",one.getTask_id())); pointService.update(new UpdateWrapper() .set("lock_type",StatusEnum.LOCK_OFF.getCode()) - .in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); + .set("point_status",StatusEnum.POINT_STATUS_EMPTY.getCode()) + .eq("point_code",one.getPoint_code3())); } + OptionRecord.recordAsync(OptionRecord.OptionEnum.UPDATE, + status, + OptionRecord.Buss.POINT, + one.getPoint_code1(), MapOf.of("start",one.getPoint_code1(),"end",one.getPoint_code3(),"time",DateUtil.now(),"order",one.getTask_id())); + } @Override @Transactional(rollbackFor = Exception.class) public String createTask(JSONObject param) { String start_point_code = param.getString("device_code"); - PdmProduceWorkorder order = workorderService.getOne(new QueryWrapper() - .eq("workorder_code", param.getString("workorder_code")) - .eq("is_delete", false) - .lt("workorder_status", WorkerOrderEnum.COMPLETE.getCode())); - Assert.notNull(order, String.format("下发工单%s不存在未完成工单", param.getString("workorder_code"))); + PdmProduceWorkorder order = null; + if (StringUtils.isNotEmpty(param.getString("workorder_code"))){ + order = workorderService.getOne(new QueryWrapper() + .eq("workorder_code", param.getString("workorder_code")) + .eq("is_delete", false) + .lt("workorder_status", WorkerOrderEnum.COMPLETE.getCode())); + } //?刻字满料请求：可以存在多个任务？ List list = taskService.list(new QueryWrapper() .lt("task_status", StatusEnum.TASK_FINISH.getCode()) - .and(wa->wa - .eq("point_code1", param.getString("device_code")) - .or() - .eq("point_code2", param.getString("device_code"))) + .eq("point_code1", param.getString("device_code")) ); + if (!CollectionUtils.isEmpty(list)){ throw new BadRequestException(String.format("设备%s存在未完成任务"+list.stream().map(SchBaseTask::getTask_id).collect(Collectors.toList()).toString(), param.getString("device_code"))); } @@ -123,8 +141,8 @@ public class WashSendMaterialQZTask extends AbstractAcsTask { task.put("task_type", AcsTaskEnum.REQUEST_WASH_FULL_ERROR.getCode()); task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); task.put("acs_task_type", AcsTaskEnum.ACS_TASK_TYPE_NON_WEIGHING_TASK_OF_PS20.getCode()); - task.put("material_id", order.getMaterial_id()); - task.put("material_qty", param.getString("weight")); + task.put("material_id", order!=null?order.getMaterial_id():""); + task.put("material_qty", param.getBigDecimal("weight")); task.put("vehicle_code", param.getString("vehicle_code")); task.put("task_status", TaskStatusEnum.CREATED.getCode()); task.put("point_code1", start_point_code); @@ -169,17 +187,20 @@ public class WashSendMaterialQZTask extends AbstractAcsTask { /** * 满料请求 - * 从刻字机满料缓存区中获取空位放入就行 + *强制的话去异常位 */ @Override @Transactional(timeout=TransactionDefinition.ISOLATION_READ_UNCOMMITTED) public void pointConfirm(JSONObject task) { + // // 去刻字缓存区寻找空位 - List list = pointService.list(new QueryWrapper().isNull("vehicle_code") + List list = pointService.list(new QueryWrapper() .eq("is_used", "1") - .eq("region_code","A1_BCP_YC")//半成品 - .eq("lock_type", StatusEnum.LOCK_OFF.getCode())); - + .eq("region_code","A1_BCP_YC") + .eq("point_status", StatusEnum.POINT_STATUS_EMPTY.getCode()) + .eq("lock_type", StatusEnum.LOCK_OFF.getCode()) + .last("and (material_id is null or material_id = '')") + ); if (ObjectUtil.isNotEmpty(list)) { // 找到位置 // 点位上锁 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialTask.java index 52b0e210..13012843 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/wash/WashSendMaterialTask.java @@ -17,7 +17,7 @@ import org.nl.common.utils.RedissonUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtSectattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtSectattr; @@ -32,6 +32,7 @@ import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; import org.nl.wms.storage_manage.productmanage.util.RuleUtil; +import org.nl.wms.storage_manage.semimanage.service.iostorInv.IStIvtIostorinvBcpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -67,37 +68,14 @@ public class WashSendMaterialTask extends AbstractAcsTask { private WashSendMaterialQZTask sendMaterialQZTask; @Autowired private WmsToAcsService wms; - @Override + @Autowired + private IStIvtIostorinvBcpService stIvtIostorinvBcpService; // 仓位服务 + + @Override @Transactional(rollbackFor = Exception.class) public void updateTaskStatus(JSONObject param, String status) { - SchBaseTask task = taskService.getById(param.getString("task_id")); - if (status.equals(AcsTaskEnum.STATUS_START.getCode())) { - taskService.update(new UpdateWrapper() - .set("task_status", StatusEnum.TASK_RUNNING.getCode()) - .set("update_name","acs") - .set("update_time", DateUtil.now()).eq("task_id",task.getTask_id())); - } - if (status.equals(AcsTaskEnum.STATUS_FINISH.getCode())) { - // 完成 - taskService.update(new UpdateWrapper() - .set("task_status",StatusEnum.TASK_FINISH.getCode()) - .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); - pointService.update(new UpdateWrapper() - .set("lock_type",StatusEnum.LOCK_OFF.getCode()) - .in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); - } - if (status.equals(AcsTaskEnum.STATUS_CANNEL.getCode())) { - // 完成 - taskService.update(new UpdateWrapper() - .set("task_status",StatusEnum.TASK_CANNEL.getCode()) - .set("update_name","acs") - .set("update_time",DateUtil.now()).eq("task_id",task.getTask_id())); - pointService.update(new UpdateWrapper() - .set("lock_type",StatusEnum.LOCK_OFF.getCode()) - .in("point_code",task.getPoint_code1(),task.getPoint_code2(),task.getPoint_code3())); - } + stIvtIostorinvBcpService.taskOperate(param); } @Override @@ -150,11 +128,13 @@ public class WashSendMaterialTask extends AbstractAcsTask { taskService.save(schBaseTask); // 找终点 try { - pointConfirm(task); - JSONArray data = new JSONArray(); - data.add(task); - // 下发 - wms.issueTaskToAcs2(data); + RedissonUtils.lock(()->{ + pointConfirm(task); + JSONArray data = new JSONArray(); + data.add(task); + // 下发 + wms.issueTaskToAcs2(data); + },"banchengpin_ruku",2); } catch (Exception ex) { // 未找到 log.error("刻字满料请求异常,error:{}",ex); @@ -182,7 +162,7 @@ public class WashSendMaterialTask extends AbstractAcsTask { */ @Override public void pointConfirm(JSONObject task) { - RedissonUtils.lock(()->{ + // 去刻字缓存区寻找空位 //分配货位。下发任务，更新主单据状态。更新明细任务 StIvtSectattr sect = sectattrService.getOne(new QueryWrapper().eq("sect_name", "半成品库区")); @@ -202,7 +182,7 @@ public class WashSendMaterialTask extends AbstractAcsTask { schBaseTask.setTask_type(AcsTaskEnum.TASK_STRUCT_IN.getCode()); taskService.updateById(schBaseTask); structattrService.lockStruct(stIvtStructattr.getStruct_code(), "入库锁",schBaseTask.getTask_id()); - },"banchengpin_ruku",1); + } @Override diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java index 12ebee11..ce13be36 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java @@ -139,7 +139,7 @@ public class PdmBiProductprocessrouteServiceImpl extends ServiceImpl query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(bomService.queryAll(whereJson,page),HttpStatus.OK); @@ -39,7 +39,7 @@ public class BomController { @PostMapping @Log("新增BOM单管理") - @ApiOperation("新增BOM单管理") + //("新增BOM单管理") //@PreAuthorize("@el.check('bom:add')") public ResponseEntity create(@RequestBody JSONObject param){ bomService.create(param); @@ -48,7 +48,7 @@ public class BomController { @PutMapping @Log("修改BOM单管理") - @ApiOperation("修改BOM单管理") + //("修改BOM单管理") //@PreAuthorize("@el.check('bom:edit')") public ResponseEntity update(@RequestBody JSONObject param){ bomService.update(param); @@ -56,7 +56,7 @@ public class BomController { } @Log("删除BOM单管理") - @ApiOperation("删除BOM单管理") + //("删除BOM单管理") //@PreAuthorize("@el.check('bom:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -66,7 +66,7 @@ public class BomController { @PostMapping("/getProduceProcessRouteByMaterialId") @Log("根据物料标识获取产品工艺路线") - @ApiOperation("根据物料标识获取产品工艺路线") + //("根据物料标识获取产品工艺路线") //@PreAuthorize("@el.check('bom:add')") public ResponseEntity getProduceProcessRouteByMaterialId(@RequestBody JSONObject param){ return new ResponseEntity<>(bomService.getProduceProcessRouteByMaterialId(param),HttpStatus.CREATED); @@ -74,7 +74,7 @@ public class BomController { @PostMapping("/getworkprocedureListByProduceProcessRouteId") @Log("根据产品工艺路线id获取工序列表") - @ApiOperation("根据产品工艺路线id获取工序列表") + //("根据产品工艺路线id获取工序列表") //@PreAuthorize("@el.check('bom:add')") public ResponseEntity getworkprocedureListByProduceProcessRouteId(@RequestBody JSONObject param){ return new ResponseEntity<>(bomService.getworkprocedureListByProduceProcessRouteId(param),HttpStatus.CREATED); @@ -82,7 +82,7 @@ public class BomController { @PostMapping("/getDtl") @Log("根据bom单id获取明细") - @ApiOperation("根据bom单id获取明细") + //("根据bom单id获取明细") //@PreAuthorize("@el.check('bom:add')") public ResponseEntity getDtl(@RequestBody JSONObject param){ return new ResponseEntity<>(bomService.getDtl(param),HttpStatus.CREATED); @@ -90,7 +90,7 @@ public class BomController { @PostMapping("/submits") @Log("BOM单提交") - @ApiOperation("BOM单提交") + //("BOM单提交") //@PreAuthorize("@el.check('bom:add')") public ResponseEntity submits(@RequestBody JSONObject param){ bomService.submits(param); @@ -99,7 +99,7 @@ public class BomController { @PostMapping("/cancelSubmit") @Log("BOM单取消提交") - @ApiOperation("BOM单取消提交") + //("BOM单取消提交") //@PreAuthorize("@el.check('bom:add')") public ResponseEntity cancelSubmit(@RequestBody JSONObject param){ bomService.cancelSubmit(param); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java index 7d083a4c..9b8a2233 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceController.java @@ -30,7 +30,7 @@ public class DeviceController { @GetMapping @Log("查询生产设备") - @ApiOperation("查询生产设备") + //("查询生产设备") //@PreAuthorize("@el.check('device:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(deviceService.queryAll(whereJson,page),HttpStatus.OK); @@ -38,7 +38,7 @@ public class DeviceController { @PostMapping @Log("新增生产设备") - @ApiOperation("新增生产设备") + //("新增生产设备") //@PreAuthorize("@el.check('device:add')") public ResponseEntity create(@Validated @RequestBody DeviceDto dto){ deviceService.create(dto); @@ -47,7 +47,7 @@ public class DeviceController { @PutMapping @Log("修改生产设备") - @ApiOperation("修改生产设备") + //("修改生产设备") //@PreAuthorize("@el.check('device:edit')") public ResponseEntity update(@Validated @RequestBody DeviceDto dto){ deviceService.update(dto); @@ -55,7 +55,7 @@ public class DeviceController { } @Log("删除生产设备") - @ApiOperation("删除生产设备") + //("删除生产设备") //@PreAuthorize("@el.check('device:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -65,7 +65,7 @@ public class DeviceController { @GetMapping("/getWorkprocedure") @Log("工序下拉") - @ApiOperation("工序下拉") + //("工序下拉") //@PreAuthorize("@el.check('device:list')") public ResponseEntity getWorkprocedure(){ return new ResponseEntity<>(deviceService.getWorkprocedure(),HttpStatus.OK); @@ -73,7 +73,7 @@ public class DeviceController { @GetMapping("/getDeviceList") @Log("设备下拉框") - @ApiOperation("设备下拉框") + //("设备下拉框") //@PreAuthorize("@el.check('device:list')") public ResponseEntity getDeviceList(){ return new ResponseEntity<>(deviceService.getDeviceList(),HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java index 96e92caa..6505e211 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/DeviceitemController.java @@ -32,7 +32,7 @@ public class DeviceitemController { @GetMapping @Log("查询生产设备扩展项") - @ApiOperation("查询生产设备扩展项") + //("查询生产设备扩展项") //@PreAuthorize("@el.check('deviceitem:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(deviceitemService.queryAll(whereJson,page),HttpStatus.OK); @@ -40,7 +40,7 @@ public class DeviceitemController { @PostMapping @Log("新增生产设备扩展项") - @ApiOperation("新增生产设备扩展项") + //("新增生产设备扩展项") //@PreAuthorize("@el.check('deviceitem:add')") public ResponseEntity create(@Validated @RequestBody DeviceitemDto dto){ deviceitemService.create(dto); @@ -49,7 +49,7 @@ public class DeviceitemController { @PutMapping @Log("修改生产设备扩展项") - @ApiOperation("修改生产设备扩展项") + //("修改生产设备扩展项") //@PreAuthorize("@el.check('deviceitem:edit')") public ResponseEntity update(@Validated @RequestBody DeviceitemDto dto){ deviceitemService.update(dto); @@ -57,7 +57,7 @@ public class DeviceitemController { } @Log("删除生产设备扩展项") - @ApiOperation("删除生产设备扩展项") + //("删除生产设备扩展项") //@PreAuthorize("@el.check('deviceitem:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java index b8a0362e..2762d558 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/rest/FactoryCalendarController.java @@ -31,7 +31,7 @@ public class FactoryCalendarController { @GetMapping @Log("查询产品工艺路线") - @ApiOperation("查询产品工艺路线") + //("查询产品工艺路线") //@PreAuthorize("@el.check('productprocessroute:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(factoryCalendarService.queryAll(whereJson, page), HttpStatus.OK); @@ -39,7 +39,7 @@ public class FactoryCalendarController { @PostMapping @Log("新增工厂日历") - @ApiOperation("新增工厂日历") + //("新增工厂日历") //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity create(@RequestBody JSONObject whereJson) { factoryCalendarService.create(whereJson); @@ -48,7 +48,7 @@ public class FactoryCalendarController { @PutMapping @Log("修改工厂日历") - @ApiOperation("修改工厂日历") + //("修改工厂日历") //@PreAuthorize("@el.check('productprocessroute:edit')") public ResponseEntity update(@RequestBody JSONObject whereJson) { factoryCalendarService.update(whereJson); @@ -56,7 +56,7 @@ public class FactoryCalendarController { } @Log("删除工厂日历") - @ApiOperation("删除工厂日历") + //("删除工厂日历") //@PreAuthorize("@el.check('productprocessroute:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -66,7 +66,7 @@ public class FactoryCalendarController { @PostMapping("/getDtl") @Log("查询日期明细") - @ApiOperation("查询日期明细") + //("查询日期明细") //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity getDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(factoryCalendarService.getDtl(whereJson), HttpStatus.OK); @@ -74,7 +74,7 @@ public class FactoryCalendarController { @PostMapping("/updateActive") @Log("启用停用日历") - @ApiOperation("启用停用日历") + //("启用停用日历") //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity updateActive(@RequestBody JSONObject whereJson) { factoryCalendarService.updateActive(whereJson); @@ -83,7 +83,7 @@ public class FactoryCalendarController { @PostMapping("/queryDtl") @Log("查询日期明细") - @ApiOperation("查询日期明细") + //("查询日期明细") //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity queryDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(factoryCalendarService.queryDtl(whereJson), HttpStatus.OK); @@ -91,7 +91,7 @@ public class FactoryCalendarController { @PostMapping("/updateDtlStatus") @Log("修改工作日/休息日") - @ApiOperation("修改工作日/休息日") + //("修改工作日/休息日") //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity updateDtlStatus(@RequestBody JSONObject whereJson) { factoryCalendarService.updateDtlStatus(whereJson); @@ -100,7 +100,7 @@ public class FactoryCalendarController { @PostMapping("/updateDtlActive") @Log("查询工作日/休息日") - @ApiOperation("查询工作日/休息日") + //("查询工作日/休息日") //@PreAuthorize("@el.check('productprocessroute:add')") public ResponseEntity updateDtlActive(@RequestBody JSONObject whereJson) { factoryCalendarService.updateDtlActive(whereJson); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java index 10177807..6c7cc16c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionitempointController.java @@ -31,14 +31,14 @@ public class QlTestInspectionitempointController { @GetMapping @Log("查询检测项点") - @ApiOperation("查询检测项点") + //("查询检测项点") public ResponseEntity query(ItemPointQuery query, PageQuery page) { return new ResponseEntity<>(inspectionitempointService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("新增检测项点") - @ApiOperation("新增检测项点") + //("新增检测项点") public ResponseEntity create(@RequestBody JSONObject whereJson) { inspectionitempointService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -46,7 +46,7 @@ public class QlTestInspectionitempointController { @PostMapping("/update") @Log("修改检测项点") - @ApiOperation("修改检测项点") + //("修改检测项点") public ResponseEntity update(@RequestBody JSONObject whereJson) { inspectionitempointService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -54,7 +54,7 @@ public class QlTestInspectionitempointController { @PostMapping("delete") @Log("修改检测项点") - @ApiOperation("新增检测项点") + //("新增检测项点") public ResponseEntity delete(@RequestBody Long[] ids) { for (Long id : ids) { inspectionitempointService.removeById(id); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java index 66e8c5fe..d3cba7fb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschemedtlproductstandardController.java @@ -32,7 +32,7 @@ public class QlTestInspectionschemedtlproductstandardController { @PostMapping("/saveData") @Log("新增检测方案标准") - @ApiOperation("新增检测方案标准") + //("新增检测方案标准") public ResponseEntity create(@RequestBody JSONObject whereJson) { standardService.saveData(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -40,21 +40,21 @@ public class QlTestInspectionschemedtlproductstandardController { @GetMapping @Log("查询检测方案标准") - @ApiOperation("查询检测方案标准") + //("查询检测方案标准") public ResponseEntity query(StandardQuery query, PageQuery page) { return new ResponseEntity<>(standardService.query(query, page), HttpStatus.OK); } @PostMapping("/getDtl") @Log("查询检测方案标准明细") - @ApiOperation("查询检测方案标准明细") + //("查询检测方案标准明细") public ResponseEntity query(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(standardService.getDtl(whereJson), HttpStatus.OK); } @PostMapping("/delete") @Log("删除检测方案标准") - @ApiOperation("删除检测方案标准") + //("删除检测方案标准") public ResponseEntity delete(@RequestBody Long[] ids) { for (Long id : ids){ standardService.remove(new QueryWrapper() diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java index 1da6fbd9..d532c98c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/inspection/QlTestInspectionschememstController.java @@ -38,14 +38,14 @@ public class QlTestInspectionschememstController { @GetMapping @Log("查询检测方案") - @ApiOperation("查询检测方案") + //("查询检测方案") public ResponseEntity query(SchemeQuery query, PageQuery page) { return new ResponseEntity<>(inspectionschememstService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("新增检测方案") - @ApiOperation("新增检测方案") + //("新增检测方案") public ResponseEntity create(@RequestBody JSONObject whereJson) { inspectionschememstService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -53,7 +53,7 @@ public class QlTestInspectionschememstController { @PostMapping("/update") @Log("修改检测方案") - @ApiOperation("修改检测方案") + //("修改检测方案") public ResponseEntity update(@RequestBody JSONObject whereJson) { inspectionschememstService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -61,7 +61,7 @@ public class QlTestInspectionschememstController { @PostMapping("/delete") @Log("删除检测方案") - @ApiOperation("删除检测方案") + //("删除检测方案") public ResponseEntity delete(@RequestBody Long[] ids) { for (Long id : ids) { inspectionschememstService.removeById(id); @@ -72,14 +72,14 @@ public class QlTestInspectionschememstController { @PostMapping("/getDtl") @Log("获取方案明细") - @ApiOperation("获取方案明细") + //("获取方案明细") public ResponseEntity getDtl(@RequestBody QlTestInspectionschememst mst) { return new ResponseEntity<>(inspectionschemedtlService.getDtl(mst),HttpStatus.OK); } @PostMapping("/selectList") @Log("检测方案下拉框") - @ApiOperation("检测方案下拉框") + //("检测方案下拉框") public ResponseEntity selectList() { return new ResponseEntity<>(inspectionschememstService.list(new QueryWrapper().lambda().eq(QlTestInspectionschememst::getIs_used,true)),HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java index 09d86ec4..8a2a332f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/controller/report/QlTestInspectionsheetmstController.java @@ -38,7 +38,7 @@ public class QlTestInspectionsheetmstController { @PostMapping @Log("新增质检单") - @ApiOperation("新增质检单") + //("新增质检单") public ResponseEntity create(@RequestBody JSONObject whereJson) { inspectionsheetmstService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -46,7 +46,7 @@ public class QlTestInspectionsheetmstController { @PostMapping("/update") @Log("修改质检单") - @ApiOperation("修改质检单") + //("修改质检单") public ResponseEntity update(@RequestBody JSONObject whereJson) { inspectionsheetmstService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -54,7 +54,7 @@ public class QlTestInspectionsheetmstController { @PostMapping("/delete") @Log("删除质检单") - @ApiOperation("删除质检单") + //("删除质检单") public ResponseEntity delete(@RequestBody Long[] ids) { for (Long id : ids) { inspectionsheetmstService.removeById(id); @@ -65,21 +65,21 @@ public class QlTestInspectionsheetmstController { @GetMapping @Log("查询质检单") - @ApiOperation("查询质检单") + //("查询质检单") public ResponseEntity query(SheetQuery query, PageQuery page) { return new ResponseEntity<>(inspectionsheetmstService.pageQuery(query, page), HttpStatus.OK); } @PostMapping("/getResult") @Log("查询质检单明细") - @ApiOperation("查询质检单明细") + //("查询质检单明细") public ResponseEntity getResult(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(inspectionsheetmstService.getResult(whereJson), HttpStatus.OK); } @PostMapping("/saveResult") @Log("保存质检单明细") - @ApiOperation("保存质检单明细") + //("保存质检单明细") public ResponseEntity saveResult(@RequestBody JSONObject whereJson) { inspectionsheetmstService.saveResult(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -87,7 +87,7 @@ public class QlTestInspectionsheetmstController { @PostMapping("/confirm") @Log("确认质检单") - @ApiOperation("确认质检单") + //("确认质检单") public ResponseEntity confirm(@RequestBody QlTestInspectionsheetmst mst) { mst.setBill_status(TCEnum.BILL_STATUS.code("完成")); mst.setConfirm_optid(SecurityUtils.getCurrentUserId()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java index 89b28c6d..5ab5e811 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/cacheline/CachelinePositionController.java @@ -29,7 +29,7 @@ public class CachelinePositionController { @GetMapping @Log("查询缓存线位置") - @ApiOperation("查询缓存线位置") + //("查询缓存线位置") //@PreAuthorize("@el.check('cachelinePosition:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(cachelinePositionService.queryAll(whereJson,page),HttpStatus.OK); @@ -37,7 +37,7 @@ public class CachelinePositionController { @PostMapping @Log("新增缓存线位置") - @ApiOperation("新增缓存线位置") + //("新增缓存线位置") //@PreAuthorize("@el.check('cachelinePosition:add')") public ResponseEntity create(@Validated @RequestBody CachelinePositionDto dto){ cachelinePositionService.create(dto); @@ -46,7 +46,7 @@ public class CachelinePositionController { @PutMapping @Log("修改缓存线位置") - @ApiOperation("修改缓存线位置") + //("修改缓存线位置") //@PreAuthorize("@el.check('cachelinePosition:edit')") public ResponseEntity update(@Validated @RequestBody CachelinePositionDto dto){ cachelinePositionService.update(dto); @@ -54,7 +54,7 @@ public class CachelinePositionController { } @Log("删除缓存线位置") - @ApiOperation("删除缓存线位置") + //("删除缓存线位置") //@PreAuthorize("@el.check('cachelinePosition:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/point/SchBasePointController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/point/SchBasePointController.java index a29cf5de..95299090 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/point/SchBasePointController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/point/SchBasePointController.java @@ -41,14 +41,14 @@ public class SchBasePointController { @GetMapping @Log("查询点位") - @ApiOperation("查询点位") + //("查询点位") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(basePointService.queryAll(whereJson,page), HttpStatus.OK); } @PostMapping("/getPoint") @Log("查询点位下拉框") - @ApiOperation("查询点位下拉框") + //("查询点位下拉框") public ResponseEntity queryPoint(@RequestBody Map query) { List list = basePointService.list(new QueryWrapper() .eq("region_code", query.get("area_type")) @@ -59,21 +59,21 @@ public class SchBasePointController { @GetMapping("/selectPoint") @Log("查询点位管理") - @ApiOperation("查询点位管理") + //("查询点位管理") public ResponseEntity selectPoint(@RequestParam Map query, PageQuery page){ return new ResponseEntity<>(basePointService.selectPoint(query,page), HttpStatus.OK); } @PostMapping @Log("新增点位") - @ApiOperation("新增点位") + //("新增点位") public ResponseEntity create(@Validated @RequestBody JSONObject form) { basePointService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("删除点位") - @ApiOperation("删除点位") + //("删除点位") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { if (ids != null && ids.length>0){ @@ -84,7 +84,7 @@ public class SchBasePointController { @PutMapping @Log("修改点位") - @ApiOperation("修改点位") + //("修改点位") public ResponseEntity update(@RequestBody JSONObject dto) { basePointService.update(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -92,7 +92,7 @@ public class SchBasePointController { @PutMapping("/changeActive") @Log("修改点位启用状态") - @ApiOperation("修改点位启用状态") + //("修改点位启用状态") public ResponseEntity changeActive(@RequestBody JSONObject json) { basePointService.changeActive(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -100,14 +100,14 @@ public class SchBasePointController { @GetMapping("/getRegion") @Log("获取区域") - @ApiOperation("获取区域") + //("获取区域") public ResponseEntity getRegion(){ return new ResponseEntity<>(baseRegionService.list(),HttpStatus.OK); } @Log("启动与禁用") @PostMapping("/changeUsed") - @ApiOperation("启动与禁用") + //("启动与禁用") public ResponseEntity batchUpdateUsed(@RequestBody JSONObject form) { basePointService.batchUpdateOne(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -115,21 +115,21 @@ public class SchBasePointController { @Log("锁定与解锁") @PostMapping("/changeLock") - @ApiOperation("锁定与解锁") + //("锁定与解锁") public ResponseEntity batchUpdateLock(@RequestBody JSONObject form) { basePointService.batchUpdateOne(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @GetMapping("/queryVehicle") @Log("查询刻字点位") - @ApiOperation("查询点位") + //("查询点位") public ResponseEntity queryVehicle(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(basePointService.queryPointMaterial(whereJson,page), HttpStatus.OK); } @PostMapping("/setEmp") @Log("设置点位为空") - @ApiOperation("设置点位为空") + //("设置点位为空") public ResponseEntity setEmp(@RequestBody Long[] ids) { if (ids.length>0){ basePointService.update(new UpdateWrapper() diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java index a376bdda..a50f4e7e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/region/SchBaseRegionController.java @@ -41,21 +41,21 @@ public class SchBaseRegionController { @GetMapping @Log("查询区域管理") - @ApiOperation("查询区域管理") + //("查询区域管理") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(baseRegionService.queryAll(whereJson, page), HttpStatus.OK); } @GetMapping("/getPointQuery") @Log("获取可用点位") - @ApiOperation("获取可用点位") + //("获取可用点位") public ResponseEntity getPointQuery(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(baseRegionService.getPointQuery(whereJson,page), HttpStatus.OK); } @PostMapping @Log("新增区域管理") - @ApiOperation("新增区域管理") + //("新增区域管理") public ResponseEntity create(@Validated @RequestBody JSONObject dto) { baseRegionService.create(dto); return new ResponseEntity<>(HttpStatus.CREATED); @@ -63,14 +63,14 @@ public class SchBaseRegionController { @PutMapping @Log("修改区域管理") - @ApiOperation("修改区域管理") + //("修改区域管理") public ResponseEntity update(@Validated @RequestBody JSONObject form) { baseRegionService.update(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除区域管理") - @ApiOperation("删除区域管理") + //("删除区域管理") @DeleteMapping public ResponseEntity delete(@RequestBody String[] codes) { if (codes!=null && codes.length>0){ @@ -81,21 +81,21 @@ public class SchBaseRegionController { @PostMapping("/getPointStatusSelectByCode") @Log("获取点位状态下拉框") - @ApiOperation("获取点位状态下拉框") + //("获取点位状态下拉框") public ResponseEntity getPointStatusSelectByCode(@RequestBody String region_code) { return new ResponseEntity<>(baseRegionService.getPointStatusSelectByCode(region_code), HttpStatus.CREATED); } @PostMapping("/getPointTypeSelectByCode") @Log("获取点位类型下拉框") - @ApiOperation("获取点位类型下拉框") + //("获取点位类型下拉框") public ResponseEntity getPointTypeSelectByCode(@RequestBody String region_code) { return new ResponseEntity<>(baseRegionService.getPointTypeSelectByCode(region_code), HttpStatus.CREATED); } @PostMapping("/getRegionSelect") @Log("获取区域下拉框") - @ApiOperation("获取区域下拉框") + //("获取区域下拉框") public ResponseEntity getRegionSelect(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(baseRegionService.getRegionSelect(whereJson), HttpStatus.CREATED); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java index a0aa8f51..769793cb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/controller/task/TaskController.java @@ -48,7 +48,7 @@ public class TaskController { @GetMapping @Log("查询任务") - @ApiOperation("查询任务") + //("查询任务") //@PreAuthorize("@el.check('task:list')") public ResponseEntity query(@RequestParam Map query, PageQuery pageQuery) { Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); @@ -62,7 +62,7 @@ public class TaskController { @GetMapping("/undo") @Log("查询任务") - @ApiOperation("查询任务") + //("查询任务") public ResponseEntity undo() { int count = baseTaskService.count(new QueryWrapper().lt("task_status", StatusEnum.TASK_FINISH.getCode())); return new ResponseEntity<>(count, HttpStatus.OK); @@ -70,7 +70,7 @@ public class TaskController { @PostMapping @Log("新增任务") - @ApiOperation("新增任务") + //("新增任务") //@PreAuthorize("@el.check('task:add')") public ResponseEntity create(@Validated @RequestBody TaskDto dto) { taskService.create(dto); @@ -79,7 +79,7 @@ public class TaskController { @PutMapping @Log("修改任务") - @ApiOperation("修改任务") + //("修改任务") //@PreAuthorize("@el.check('task:edit')") public ResponseEntity update(@Validated @RequestBody TaskDto dto) { taskService.update(dto); @@ -87,7 +87,7 @@ public class TaskController { } @Log("删除任务") - @ApiOperation("删除任务") + //("删除任务") //@PreAuthorize("@el.check('task:del')") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -97,7 +97,7 @@ public class TaskController { @GetMapping("/taskStatus") @Log("获取任务状态列表") - @ApiOperation("获取任务状态列表") + //("获取任务状态列表") public ResponseEntity getTaskStatus() { return new ResponseEntity<>(dictService.list(new LambdaQueryWrapper() .eq(Dict::getCode, "task_status")), HttpStatus.OK); @@ -105,20 +105,20 @@ public class TaskController { @PostMapping("/taskType") @Log("获取任务类型列表") - @ApiOperation("获取任务类型列表") + //("获取任务类型列表") public ResponseEntity getTaskType() { return new ResponseEntity<>(taskService.getTaskTypes(), HttpStatus.OK); } @GetMapping("/acsTaskType") @Log("获取acs任务类型列表") - @ApiOperation("获取acs任务类型列表") + //("获取acs任务类型列表") public ResponseEntity getAcsTaskType() { return new ResponseEntity<>(taskService.getAcsTaskType(), HttpStatus.OK); } @GetMapping("/finishType") @Log("获取任务类型列表") - @ApiOperation("获取任务类型列表") + //("获取任务类型列表") public ResponseEntity getFinishType() { FinishTypeEnum[] values = FinishTypeEnum.values(); JSONArray arr = new JSONArray(); @@ -133,7 +133,7 @@ public class TaskController { @PutMapping("/operation") @Log("任务操作") - @ApiOperation("任务操作") + //("任务操作") //@PreAuthorize("@el.check('task:edit')") public ResponseEntity update(@RequestBody Map map) { baseTaskService.operation(map); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml index 84664f85..f1b26c7f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/dao/mapper/SchBasePointMapper.xml @@ -105,7 +105,7 @@ sch_base_task WHERE ( point_code1 = point.point_code OR point_code2 = point.point_code ) - AND '07' > task_status + AND '7' > task_status AND is_delete = '0' ) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java index 52152609..744f7cb7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/point/impl/SchBasePointServiceImpl.java @@ -36,6 +36,7 @@ import org.nl.wms.storage_manage.productmanage.service.check.dao.StIvtCheckdtlCp import org.nl.wms.storage_manage.productmanage.service.check.dao.StIvtCheckmstCp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.*; @@ -65,6 +66,11 @@ public class SchBasePointServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); page.setOrderBy("point_code asc"); List list = schBasePointMapper.queryAll(whereJson); + if (CollectionUtils.isEmpty(list)){ + TableDataInfo build = TableDataInfo.build(new ArrayList<>()); + build.setTotalElements(0); + return build; + } Set regionCodes = list.stream().map(a -> a.get("region_code")).collect(Collectors.toSet()); List regions = schBaseRegionService.list(new QueryWrapper().in("region_code", regionCodes)); Map regionMap = regions.stream().collect(HashMap::new, (k, v) -> k.put(v.getRegion_code(), v), HashMap::putAll); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java index 09c6c3a6..427be11c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java @@ -16,8 +16,8 @@ import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; +import org.nl.wms.ext_manage.acs.service.AcsToWmsService; +import org.nl.wms.ext_manage.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.product_manage.sch.manage.AbstractAcsTask; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; @@ -149,7 +149,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl query(IvtFlowQuery query, PageQuery page) { return new ResponseEntity<>(iStIvtStructivtflowService.queryAll(query,page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java index d435c1d2..016f2598 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/PDAEnum.java @@ -12,7 +12,7 @@ import java.util.Map; @Getter public enum PDAEnum { //点位区域 - REGION_CODE(MapOf.of("半成品入库区域", "A1_BCPRK01", "半成品出库区域", "A1_BCPCK01","成品入库区域", "A1_CPRK01","半成品盘点区域", "A1_BCP_PD01")), + REGION_CODE(MapOf.of("半成品入库区域", "A1_BCPRK01", "半成品出库区域", "A1_BCPCK01","成品入库区域", "A1_CPRK01","半成品盘点区域", "A1_BCP_PP")), //库区编码 SECT_CODE(MapOf.of("半成品库区", "KQ005")), //库区id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java index 2d653795..b7f64952 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpCheckController.java @@ -30,63 +30,63 @@ public class PdaStBcpCheckController { @PostMapping("/getBcpStor") @Log("查询半成品仓库下拉框") - @ApiOperation("查询半成品仓库下拉框") + //("查询半成品仓库下拉框") public ResponseEntity getBcpStor() { return new ResponseEntity<>(pdaStBcpCheckService.getBcpStor(), HttpStatus.OK); } @PostMapping("/getMaterialIvt") @Log("货位物料查询") - @ApiOperation("货位物料查询") + //("货位物料查询") public ResponseEntity getMaterialIvt(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.getMaterialIvt(whereJson), HttpStatus.OK); } @PostMapping("/create") @Log("生成盘点单") - @ApiOperation("生成盘点单") + //("生成盘点单") public ResponseEntity create(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.create(whereJson), HttpStatus.OK); } @PostMapping("/getDtlAll") @Log("半成品盘点查询") - @ApiOperation("半成品盘点查询") + //("半成品盘点查询") public ResponseEntity getDtlAll(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.getDtlAll(whereJson), HttpStatus.OK); } @PostMapping("/getPoint") @Log("查询盘点位下拉框") - @ApiOperation("查询盘点位下拉框") + //("查询盘点位下拉框") public ResponseEntity getPoint() { return new ResponseEntity<>(pdaStBcpCheckService.getPoint(), HttpStatus.OK); } @PostMapping("/sendTask") @Log("下发") - @ApiOperation("下发") + //("下发") public ResponseEntity sendTask(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.sendTask(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("盘点确认") - @ApiOperation("盘点确认") + //("盘点确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.confirm(whereJson), HttpStatus.OK); } @PostMapping("/confirmOffer") @Log("实盘为准") - @ApiOperation("实盘为准") + //("实盘为准") public ResponseEntity confirmOffer(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.confirmOffer(whereJson), HttpStatus.OK); } @PostMapping("/confirmFinance") @Log("财务为准") - @ApiOperation("财务为准") + //("财务为准") public ResponseEntity confirmFinance(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpCheckService.confirmFinance(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java index eaad000d..02f4407a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpInController.java @@ -32,56 +32,56 @@ public class PdaStBcpInController { @PostMapping("/getBcpStor") @Log("查询半成品仓库下拉框") - @ApiOperation("查询半成品仓库下拉框") + //("查询半成品仓库下拉框") public ResponseEntity getBcpStor() { return new ResponseEntity<>(pdaStBcpInService.getBcpStor(), HttpStatus.OK); } @PostMapping("/getBillType") @Log("查询单据类型下拉框") - @ApiOperation("查询单据类型下拉框") + //("查询单据类型下拉框") public ResponseEntity getBillType() { return new ResponseEntity<>(pdaStBcpInService.getBillType(), HttpStatus.OK); } @PostMapping("/getPoint") @Log("查询入库点下拉框") - @ApiOperation("查询入库点下拉框") + //("查询入库点下拉框") public ResponseEntity getPoint() { return new ResponseEntity<>(pdaStBcpInService.getPoint(), HttpStatus.OK); } @PostMapping("/getMaterial") @Log("查询物料") - @ApiOperation("查询物料") + //("查询物料") public ResponseEntity getMaterial(@RequestBody JSONObject whereJson, PageQuery pageQuery) { return new ResponseEntity<>(pdaStBcpInService.getMaterial(whereJson,pageQuery), HttpStatus.OK); } @PostMapping("/callVehicle") @Log("呼叫空载具") - @ApiOperation("呼叫空载具") + //("呼叫空载具") public ResponseEntity callVehicle() { return new ResponseEntity<>(pdaStBcpInService.callVehicle(), HttpStatus.OK); } @PostMapping("/createIn") @Log("确认入库") - @ApiOperation("确认入库") + //("确认入库") public ResponseEntity createIn(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpInService.createIn(whereJson), HttpStatus.OK); } @PostMapping("/getAll") @Log("半成品入库管理查询") - @ApiOperation("半成品入库管理查询") + //("半成品入库管理查询") public ResponseEntity getAll(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpInService.getAll(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpInService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java index 92a5b70c..cda45b53 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpOutController.java @@ -30,49 +30,49 @@ public class PdaStBcpOutController { @PostMapping("/getBcpStor") @Log("查询半成品仓库下拉框") - @ApiOperation("查询半成品仓库下拉框") + //("查询半成品仓库下拉框") public ResponseEntity getBcpStor() { return new ResponseEntity<>(pdaStBcpOutService.getBcpStor(), HttpStatus.OK); } @PostMapping("/getBillType") @Log("查询单据类型下拉框") - @ApiOperation("查询单据类型下拉框") + //("查询单据类型下拉框") public ResponseEntity getBillType() { return new ResponseEntity<>(pdaStBcpOutService.getBillType(), HttpStatus.OK); } @PostMapping("/getPoint") @Log("查询出库点下拉框") - @ApiOperation("查询出库点下拉框") + //("查询出库点下拉框") public ResponseEntity getPoint() { return new ResponseEntity<>(pdaStBcpOutService.getPoint(), HttpStatus.OK); } @PostMapping("/getMaterial") @Log("物料选择") - @ApiOperation("物料选择") + //("物料选择") public ResponseEntity getMaterial(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpOutService.getMaterial(whereJson), HttpStatus.OK); } @PostMapping("/createIn") @Log("确认出库") - @ApiOperation("确认出库") + //("确认出库") public ResponseEntity createIn(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpOutService.createIn(whereJson), HttpStatus.OK); } @PostMapping("/getAll") @Log("半成品出库管理查询") - @ApiOperation("半成品出库管理查询") + //("半成品出库管理查询") public ResponseEntity getAll(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpOutService.getAll(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpOutService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java index 469e7355..64fea142 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStBcpShutController.java @@ -30,28 +30,28 @@ public class PdaStBcpShutController { @PostMapping("/getBcpStor") @Log("查询半成品仓库下拉框") - @ApiOperation("查询半成品仓库下拉框") + //("查询半成品仓库下拉框") public ResponseEntity getBcpStor() { return new ResponseEntity<>(pdaStBcpShutService.getBcpStor(), HttpStatus.OK); } @PostMapping("/getBillType") @Log("单据类型下拉框") - @ApiOperation("单据类型下拉框") + //("单据类型下拉框") public ResponseEntity getBillType() { return new ResponseEntity<>(pdaStBcpShutService.getBillType(), HttpStatus.OK); } @PostMapping("/getdtl") @Log("半成品拼盘页面") - @ApiOperation("半成品拼盘页面") + //("半成品拼盘页面") public ResponseEntity getdtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpShutService.getdtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("拼盘完成") - @ApiOperation("拼盘完成") + //("拼盘完成") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStBcpShutService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java index 9db1b201..3399dcff 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStCpInController.java @@ -30,49 +30,49 @@ public class PdaStCpInController { @PostMapping("/getBcpStor") @Log("查询成品仓库下拉框") - @ApiOperation("查询成品仓库下拉框") + //("查询成品仓库下拉框") public ResponseEntity getBcpStor() { return new ResponseEntity<>(pdaStCpInService.getBcpStor(), HttpStatus.OK); } @PostMapping("/getBillType") @Log("查询单据类型下拉框") - @ApiOperation("查询单据类型下拉框") + //("查询单据类型下拉框") public ResponseEntity getBillType() { return new ResponseEntity<>(pdaStCpInService.getBillType(), HttpStatus.OK); } @PostMapping("/getPoint") @Log("查询入库点下拉框") - @ApiOperation("查询入库点下拉框") + //("查询入库点下拉框") public ResponseEntity getPoint() { return new ResponseEntity<>(pdaStCpInService.getPoint(), HttpStatus.OK); } @PostMapping("/getMaterial") @Log("查询单据物料") - @ApiOperation("查询单据物料") + //("查询单据物料") public ResponseEntity getMaterial(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStCpInService.getMaterial(whereJson), HttpStatus.OK); } @PostMapping("/confirmIn") @Log("确认入库") - @ApiOperation("确认入库") + //("确认入库") public ResponseEntity confirmIn(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStCpInService.confirmIn(whereJson), HttpStatus.OK); } @PostMapping("/getAll") @Log("成品入库查询") - @ApiOperation("成品入库查询") + //("成品入库查询") public ResponseEntity getAll(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStCpInService.getAll(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(pdaStCpInService.confirm(whereJson), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java index e0268238..5941db50 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStBcpInServiceImpl.java @@ -4,23 +4,20 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.druid.sql.visitor.functions.If; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.publish.event.PointEvent; import org.nl.common.utils.IdUtil; +import org.nl.common.utils.RedissonUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.master.service.classstandard.IMdPbClassstandardService; import org.nl.wms.masterdata_manage.service.master.IMdPbMeasureunitService; import org.nl.wms.masterdata_manage.service.master.dao.MdPbMeasureunit; @@ -30,7 +27,6 @@ import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattr import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; -import org.nl.wms.masterdata_manage.备份master.constant.MaterOptTypeEnum; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; @@ -47,14 +43,11 @@ import org.nl.wms.system_manage.service.dict.dao.Dict; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Collectors; /** *

@@ -162,70 +155,72 @@ public class PdaStBcpInServiceImpl implements PdaStBcpInService { @Override @Transactional public JSONObject callVehicle() { - // 1.查入库点位 - SchBasePoint pointDao = iSchBasePointService.getOne( - new QueryWrapper().lambda() - .eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("半成品入库区域")) - .eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是")), false - ); - - // 2.判断此入库点是否有正在执行的任务 - List taskList = iSchBaseTaskService.list( - new QueryWrapper().lambda() - .eq(SchBaseTask::getIs_delete, false) - .ne(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) - .and(qr -> qr.eq(SchBaseTask::getPoint_code1, pointDao.getPoint_code()) - .or() - .eq(SchBaseTask::getPoint_code2, pointDao.getPoint_code()) - ) - ); - - if (ObjectUtil.isNotEmpty(taskList)) throw new BadRequestException("有正在执行中的任务，请稍后在尝试！"); - - // 3.找一个空载具 - StIvtStructattr attrDao = structattrService.getOne( - new QueryWrapper().lambda() - .eq(StIvtStructattr::getIs_emptyvehicle,IOSEnum.IS_USED.code("是")) - .eq(StIvtStructattr::getSect_code, PDAEnum.SECT_CODE.code("半成品库区")) - .eq(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) - .eq(StIvtStructattr::getIs_used,true) - .and(qr -> qr.isNotNull(StIvtStructattr::getStoragevehicle_code) - .or() - .ne(StIvtStructattr::getStoragevehicle_code, "") - ),false - ); - - if (ObjectUtil.isEmpty(attrDao)) throw new BadRequestException("未找到空载具！"); - - // 4.创建任务 - PointEvent event = PointEvent.builder() - .type(AcsTaskEnum.TASK_STRUCT_BCP_EMPOUT.getCode()) - .acs_task_type("7") - .task_group_id(IdUtil.getStringId()) - .point_code1(attrDao.getStruct_code()) - .point_code2(pointDao.getPoint_code()) - .vehicle_code(attrDao.getStoragevehicle_code()) - .product_area("A1") // 暂时写死 - .build(); - BussEventMulticaster.Publish(event); - - // 5.锁住仓位 - attrDao.setLock_type(IOSEnum.LOCK_TYPE.code("其他锁")); - structattrService.updateById(attrDao); - - - // 6.下发任务 - String task_id = iSchBaseTaskService.getOne( - new QueryWrapper().lambda() - .eq(SchBaseTask::getTask_group_id, event.getTask_group_id()) - ).getTask_id(); - - sendTask(task_id); - - // 反馈 JSONObject result = new JSONObject(); - result.put("data", ""); - result.put("message", "下发成功"); + result.put("message", "下发失败"); + RedissonUtils.lock(() -> { + // 1.查入库点位 + SchBasePoint pointDao = iSchBasePointService.getOne( + new QueryWrapper().lambda() + .eq(SchBasePoint::getRegion_code, PDAEnum.REGION_CODE.code("半成品入库区域")) + .eq(SchBasePoint::getIs_used, IOSEnum.IS_USED.code("是")), false + ); + + // 2.判断此入库点是否有正在执行的任务 + List taskList = iSchBaseTaskService.list( + new QueryWrapper().lambda() + .eq(SchBaseTask::getIs_delete, false) + .ne(SchBaseTask::getTask_status, TaskStatusEnum.FINISHED.getCode()) + .and(qr -> qr.eq(SchBaseTask::getPoint_code1, pointDao.getPoint_code()) + .or() + .eq(SchBaseTask::getPoint_code2, pointDao.getPoint_code()) + ) + ); + + if (ObjectUtil.isNotEmpty(taskList)) throw new BadRequestException("有正在执行中的任务，请稍后在尝试！"); + + // 3.找一个空载具 + StIvtStructattr attrDao = structattrService.getOne( + new QueryWrapper().lambda() + .eq(StIvtStructattr::getIs_emptyvehicle,IOSEnum.IS_USED.code("是")) + .eq(StIvtStructattr::getSect_code, PDAEnum.SECT_CODE.code("半成品库区")) + .eq(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .eq(StIvtStructattr::getIs_used,true) + .and(qr -> qr.isNotNull(StIvtStructattr::getStoragevehicle_code) + .or() + .ne(StIvtStructattr::getStoragevehicle_code, "") + ),false + ); + + if (ObjectUtil.isEmpty(attrDao)) throw new BadRequestException("未找到空载具！"); + + // 4.创建任务 + PointEvent event = PointEvent.builder() + .type(AcsTaskEnum.TASK_STRUCT_BCP_EMPOUT.getCode()) + .acs_task_type("7") + .task_group_id(IdUtil.getStringId()) + .point_code1(attrDao.getStruct_code()) + .point_code3(pointDao.getPoint_code()) + .vehicle_code(attrDao.getStoragevehicle_code()) + .product_area("A1") // 暂时写死 + .build(); + BussEventMulticaster.Publish(event); + + // 5.锁住仓位 + attrDao.setLock_type(IOSEnum.LOCK_TYPE.code("其他锁")); + structattrService.updateById(attrDao); + + + // 6.下发任务 + String task_id = iSchBaseTaskService.getOne( + new QueryWrapper().lambda() + .eq(SchBaseTask::getTask_group_id, event.getTask_group_id()) + ).getTask_id(); + + sendTask(task_id); + + // 反馈 + result.put("message", "下发成功"); + }, "bcpcallemp", null); return result; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java index 63a6f50d..c3375bdd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStCpInServiceImpl.java @@ -9,7 +9,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.nl.wms.storage_manage.IOSEnum; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java index 6a9e4c6f..1ac36804 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/check/StIvtCheckmstCpController.java @@ -31,14 +31,14 @@ public class StIvtCheckmstCpController { @GetMapping @Log("查询盘点单主表") - @ApiOperation("查询盘点单主表") + //("查询盘点单主表") public ResponseEntity query(CheckQueryMst query, PageQuery page) { return new ResponseEntity<>(iStIvtCheckmstCpService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("创建盘点单") - @ApiOperation("创建盘点单") + //("创建盘点单") public ResponseEntity create(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -46,14 +46,14 @@ public class StIvtCheckmstCpController { @PostMapping("/getCheckDtl") @Log("查询盘点明细") - @ApiOperation("查询盘点明细") + //("查询盘点明细") public ResponseEntity getCheckDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(iStIvtCheckmstCpService.getCheckDtl(whereJson), HttpStatus.OK); } @PostMapping("/update") @Log("修改盘点单") - @ApiOperation("修改盘点单") + //("修改盘点单") public ResponseEntity update(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -61,7 +61,7 @@ public class StIvtCheckmstCpController { @PostMapping("/delete") @Log("删除盘点单") - @ApiOperation("删除盘点单") + //("删除盘点单") public ResponseEntity delete(@RequestBody Long[] ids){ iStIvtCheckmstCpService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -69,7 +69,7 @@ public class StIvtCheckmstCpController { @PostMapping("/saveCheck") @Log("盘点保存") - @ApiOperation("盘点保存") + //("盘点保存") public ResponseEntity saveCheck(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.saveCheck(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -77,7 +77,7 @@ public class StIvtCheckmstCpController { @PostMapping("/confirm") @Log("盘点强制确认") - @ApiOperation("盘点强制确认") + //("盘点强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -85,7 +85,7 @@ public class StIvtCheckmstCpController { @PostMapping("/process1") @Log("实盘为准，生成损溢单修改库存") - @ApiOperation("实盘为准，生成损溢单修改库存") + //("实盘为准，生成损溢单修改库存") public ResponseEntity process1(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.process1(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -93,7 +93,7 @@ public class StIvtCheckmstCpController { @PostMapping("/process0") @Log("账务为准") - @ApiOperation("账务为准") + //("账务为准") public ResponseEntity process0(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.process0(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -101,14 +101,14 @@ public class StIvtCheckmstCpController { @PostMapping("/getBucketrecord") @Log("获取箱") - @ApiOperation("获取箱") + //("获取箱") public ResponseEntity getBucketrecord(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(iStIvtCheckmstCpService.getBucketrecord(whereJson),HttpStatus.OK); } @PostMapping("/processBox") @Log("拆箱盘点保存") - @ApiOperation("拆箱盘点保存") + //("拆箱盘点保存") public ResponseEntity processBox(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.processBox(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -116,7 +116,7 @@ public class StIvtCheckmstCpController { @PostMapping("/sendTask") @Log("下发任务") - @ApiOperation("下发任务") + //("下发任务") public ResponseEntity sendTask(@RequestBody JSONObject whereJson) { iStIvtCheckmstCpService.sendTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java index 8bd01199..c3e3fae9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpInController.java @@ -31,14 +31,14 @@ public class IStivtlostorivnCpInController { @GetMapping @Log("查询入库单") - @ApiOperation("查询入库单") + //("查询入库单") public ResponseEntity query(IostorInvQuery query, PageQuery page){ return new ResponseEntity<>(iStIvtIostorinvCpService.pageQuery(query,page),HttpStatus.OK); } @PostMapping @Log("创建入库单") - @ApiOperation("创建入库单") + //("创建入库单") public ResponseEntity create(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -46,7 +46,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/update") @Log("修改入库单") - @ApiOperation("修改入库单") + //("修改入库单") public ResponseEntity update(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -54,7 +54,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ iStIvtIostorinvCpService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -62,28 +62,28 @@ public class IStivtlostorivnCpInController { @PostMapping("/getIosInvDtl") @Log("获取明细") - @ApiOperation("获取明细") + //("获取明细") public ResponseEntity getIosInvDtl(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(iStIvtIostorinvCpService.getIosInvDtl(whereJson),HttpStatus.OK); } @PostMapping("/getIosInvDis") @Log("获取分配明细") - @ApiOperation("获取明细") + //("获取明细") public ResponseEntity getIosInvDis(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(iStIvtIostorinvCpService.getIosInvDis(whereJson),HttpStatus.OK); } @PostMapping("/vehicleCheck") @Log("生成载具") - @ApiOperation("生成载具") + //("生成载具") public ResponseEntity vehicleCheck(){ return new ResponseEntity<>(iStIvtIostorinvCpService.vehicleCheck(),HttpStatus.OK); } @PostMapping("/confirmvehicle") @Log("组盘") - @ApiOperation("组盘") + //("组盘") public ResponseEntity confirmvehicle(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.confirmvehicle(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -91,7 +91,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/cancelConfirmvehicle") @Log("取消组盘") - @ApiOperation("取消组盘") + //("取消组盘") public ResponseEntity cancelConfirmvehicle(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.cancelConfirmvehicle(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -99,7 +99,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/divStruct") @Log("分配") - @ApiOperation("分配") + //("分配") public ResponseEntity divStruct(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.divStruct(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -107,7 +107,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/unDivStruct") @Log("取消分配") - @ApiOperation("取消分配") + //("取消分配") public ResponseEntity unDivStruct(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.unDivStruct(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -115,7 +115,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/setPoint") @Log("设置起点") - @ApiOperation("设置起点") + //("设置起点") public ResponseEntity setPoint(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.setPoint(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -123,7 +123,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -131,7 +131,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/delTask") @Log("删除任务") - @ApiOperation("删除任务") + //("删除任务") public ResponseEntity delTask(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.delTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -139,7 +139,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/sendTask") @Log("下发任务") - @ApiOperation("下发任务") + //("下发任务") public ResponseEntity sendTask(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.sendTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -147,7 +147,7 @@ public class IStivtlostorivnCpInController { @PostMapping("/confirmTask") @Log("标识完成任务") - @ApiOperation("标识完成任务") + //("标识完成任务") public ResponseEntity confirmTask(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpService.confirmTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java index cc7d2c62..ec008158 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java @@ -28,14 +28,14 @@ public class IStivtlostorivnCpOutController { @GetMapping @Log("查询出库单") - @ApiOperation("查询出库单") + //("查询出库单") public ResponseEntity query(IostorInvQuery query, PageQuery page){ return new ResponseEntity<>(iStIvtIostorinvCpOutService.pageQuery(query,page),HttpStatus.OK); } @PostMapping @Log("创建出库单") - @ApiOperation("创建出库单") + //("创建出库单") public ResponseEntity create(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -43,7 +43,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/update") @Log("修改出库单") - @ApiOperation("修改出库单") + //("修改出库单") public ResponseEntity update(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -51,7 +51,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/delete") @Log("删除出库单") - @ApiOperation("删除出库单") + //("删除出库单") public ResponseEntity delete(@RequestBody Long[] ids){ iStIvtIostorinvCpOutService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -59,21 +59,21 @@ public class IStivtlostorivnCpOutController { @PostMapping("/getIosInvDtl") @Log("获取明细") - @ApiOperation("获取明细") + //("获取明细") public ResponseEntity getIosInvDtl(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(iStIvtIostorinvCpOutService.getIosInvDtl(whereJson),HttpStatus.OK); } @PostMapping("/getIosInvDis") @Log("获取分配明细") - @ApiOperation("获取明细") + //("获取明细") public ResponseEntity getIosInvDis(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(iStIvtIostorinvCpOutService.getIosInvDis(whereJson),HttpStatus.OK); } @PostMapping("/allDivIvt") @Log("全部分配") - @ApiOperation("全部分配") + //("全部分配") public ResponseEntity allDivIvt(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.allDivIvt(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -81,7 +81,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/allCancel") @Log("全部取消") - @ApiOperation("全部取消") + //("全部取消") public ResponseEntity allCancel(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.allCancel(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -89,7 +89,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/setPoint") @Log("设置站点") - @ApiOperation("设置站点") + //("设置站点") public ResponseEntity setPoint(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.setPoint(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -97,7 +97,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -105,14 +105,14 @@ public class IStivtlostorivnCpOutController { @PostMapping("/getStructIvt") @Log("获取手工分配库存") - @ApiOperation("获取手工分配库存") + //("获取手工分配库存") public ResponseEntity getStructIvt(@RequestBody JSONObject whereJson){ return new ResponseEntity<>(iStIvtIostorinvCpOutService.getStructIvt(whereJson),HttpStatus.OK); } @PostMapping("/manualDiv") @Log("手工分配保存") - @ApiOperation("手工分配保存") + //("手工分配保存") public ResponseEntity manualDiv(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.manualDiv(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -120,7 +120,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/delTask") @Log("删除任务") - @ApiOperation("删除任务") + //("删除任务") public ResponseEntity delTask(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.delTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -128,7 +128,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/sendTask") @Log("下发任务") - @ApiOperation("下发任务") + //("下发任务") public ResponseEntity sendTask(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.sendTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -136,7 +136,7 @@ public class IStivtlostorivnCpOutController { @PostMapping("/confirmTask") @Log("标识完成任务") - @ApiOperation("标识完成任务") + //("标识完成任务") public ResponseEntity confirmTask(@RequestBody JSONObject whereJson){ iStIvtIostorinvCpOutService.confirmTask(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -144,7 +144,7 @@ public class IStivtlostorivnCpOutController { @GetMapping("/initAttr") @Log("初始化仓位") - @ApiOperation("初始化仓位") + //("初始化仓位") @SaIgnore public ResponseEntity initAttr(){ iStIvtIostorinvCpOutService.initAttr(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java index e1f4da8c..af22efa0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIfDeliveryorderCpController.java @@ -36,7 +36,7 @@ public class StIfDeliveryorderCpController { @GetMapping @Log("查询生产订单") - @ApiOperation("查询生产订单") + //("查询生产订单") public ResponseEntity query(DeliveQuery query, PageQuery page){ return new ResponseEntity<>(iStIfDeliveryorderCpService.pageQuery(query,page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java index 4a52e4a0..adf803d4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/moreOrLess/StIvtMoreorlessmstCpController.java @@ -29,14 +29,14 @@ public class StIvtMoreorlessmstCpController { @GetMapping @Log("查询损溢单") - @ApiOperation("查询损溢单") + //("查询损溢单") public ResponseEntity query(MoreOrlessQuery query, PageQuery page) { return new ResponseEntity<>(iStIvtMoreorlessmstCpService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("创建损溢单") - @ApiOperation("创建损溢单") + //("创建损溢单") public ResponseEntity create(@RequestBody JSONObject whereJson) { iStIvtMoreorlessmstCpService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -44,14 +44,14 @@ public class StIvtMoreorlessmstCpController { @PostMapping("/getMlDtl") @Log("查询损溢明细") - @ApiOperation("查询损溢明细") + //("查询损溢明细") public ResponseEntity getMlDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(iStIvtMoreorlessmstCpService.getMlDtl(whereJson), HttpStatus.OK); } @PostMapping("/update") @Log("修改损溢单") - @ApiOperation("修改损溢单") + //("修改损溢单") public ResponseEntity update(@RequestBody JSONObject whereJson) { iStIvtMoreorlessmstCpService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -59,7 +59,7 @@ public class StIvtMoreorlessmstCpController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ iStIvtMoreorlessmstCpService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -67,7 +67,7 @@ public class StIvtMoreorlessmstCpController { @PostMapping("/confirm") @Log("完成单据") - @ApiOperation("完成单据") + //("完成单据") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { iStIvtMoreorlessmstCpService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java index 90e71582..8126c38c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtCpController.java @@ -34,14 +34,14 @@ public class StIvtStructivtCpController { @GetMapping @Log("成品库存查询") - @ApiOperation("成品库存查询") + //("成品库存查询") public ResponseEntity query(CpIvtQuery query, PageQuery page) { return new ResponseEntity<>(iStIvtStructivtCpService.packageQuery(query,page), HttpStatus.OK); } @PostMapping("/getStructIvt") @Log("查询库存") - @ApiOperation("查询库存") + //("查询库存") public ResponseEntity getStructIvt(StructIvtYLQuery query) { return new ResponseEntity<>(iStIvtStructivtCpService.getStructIvtMore(query), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java index 57fdcb8b..99bfa3ce 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/structIvt/StIvtStructivtflowCpController.java @@ -30,7 +30,7 @@ public class StIvtStructivtflowCpController { @GetMapping @Log("查询库存变动记录") - @ApiOperation("查询库存变动记录") + //("查询库存变动记录") public ResponseEntity query(IvtFlowQuery query, PageQuery page) { return new ResponseEntity<>(iStIvtStructivtflowCpService.queryAll(query,page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java index efcc1859..dd08c7ec 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/check/impl/StIvtCheckmstCpServiceImpl.java @@ -40,24 +40,15 @@ import org.nl.wms.storage_manage.productmanage.service.check.dao.mapper.StIvtChe import org.nl.wms.storage_manage.productmanage.service.check.dao.mapper.StIvtCheckmstCpMapper; import org.nl.wms.storage_manage.productmanage.service.check.dto.CheckQueryMst; import org.nl.wms.storage_manage.productmanage.service.moreOrLess.IStIvtMoreorlessmstCpService; -import org.nl.wms.storage_manage.rawmanage.service.check.IStIvtCheckdtlYlService; -import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckdtlYl; -import org.nl.wms.storage_manage.rawmanage.service.check.dao.StIvtCheckmstYl; -import org.nl.wms.storage_manage.rawmanage.service.check.dto.CheckQuery; -import org.nl.wms.storage_manage.rawmanage.service.moveOrLess.IStIvtMoreorlessmstYlService; import org.nl.wms.storage_manage.semimanage.MLEnum; -import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckdtlBcp; -import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.function.Consumer; /** *

@@ -538,7 +529,7 @@ public class StIvtCheckmstCpServiceImpl extends ServiceImpl) disDao::setTask_id) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java index 699887e7..e0904e50 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpServiceImpl.java @@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -21,32 +20,28 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.AcsTaskEnum; import org.nl.common.publish.BussEventMulticaster; import org.nl.common.publish.event.PointEvent; -import org.nl.common.utils.AcsUtil; import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.MasterEnum; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbBucketrecordService; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleextService; import org.nl.wms.masterdata_manage.service.vehicle.IMdPbStoragevehicleinfoService; import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbBucketrecord; -import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleext; -import org.nl.wms.masterdata_manage.service.vehicle.dao.MdPbStoragevehicleinfo; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtStructattr; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.IMpsSaleOrderService; -import org.nl.wms.mps_manage.ordermanage.service.saleOrder.dao.MpsSaleOrder; +import org.nl.wms.mps_manage.saleorder.service.IMpsSaleOrderService; +import org.nl.wms.mps_manage.saleorder.service.dao.MpsSaleOrder; import org.nl.wms.product_manage.sch.manage.TaskStatusEnum; import org.nl.wms.scheduler_manage.service.point.ISchBasePointService; import org.nl.wms.scheduler_manage.service.point.dao.SchBasePoint; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; -import org.nl.wms.storage_manage.CHANGE_BILL_TYPE_ENUM; import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvCpService; import org.nl.wms.storage_manage.productmanage.service.iostorInv.IStIvtIostorinvdisCpService; @@ -62,7 +57,6 @@ import org.nl.wms.storage_manage.productmanage.service.structIvt.IStIvtStructivt import org.nl.wms.storage_manage.productmanage.util.ChangeIvtUtil; import org.nl.wms.storage_manage.productmanage.util.DivRuleCpService; import org.nl.wms.storage_manage.productmanage.util.RuleUtil; -import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -679,7 +673,7 @@ public class StIvtIostorinvCpServiceImpl extends ServiceImpl query(CheckQuery query, PageQuery page) { return new ResponseEntity<>(checkmstYlService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("创建盘点单") - @ApiOperation("创建盘点单") + //("创建盘点单") public ResponseEntity create(@RequestBody JSONObject whereJson) { checkmstYlService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -44,14 +44,14 @@ public class StIvtCheckmstYlController { @PostMapping("/getCheckDtl") @Log("查询盘点明细") - @ApiOperation("查询盘点明细") + //("查询盘点明细") public ResponseEntity getCheckDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(checkmstYlService.getCheckDtl(whereJson), HttpStatus.OK); } @PostMapping("/update") @Log("修改盘点单") - @ApiOperation("修改盘点单") + //("修改盘点单") public ResponseEntity update(@RequestBody JSONObject whereJson) { checkmstYlService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -59,7 +59,7 @@ public class StIvtCheckmstYlController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ checkmstYlService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -67,7 +67,7 @@ public class StIvtCheckmstYlController { @PostMapping("/saveCheck") @Log("盘点保存") - @ApiOperation("盘点保存") + //("盘点保存") public ResponseEntity saveCheck(@RequestBody JSONObject whereJson) { checkmstYlService.saveCheck(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -75,7 +75,7 @@ public class StIvtCheckmstYlController { @PostMapping("/confirm") @Log("移库单强制确认") - @ApiOperation("移库单强制确认") + //("移库单强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { checkmstYlService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -83,7 +83,7 @@ public class StIvtCheckmstYlController { @PostMapping("/process1") @Log("实盘为准，生成损溢单修改库存") - @ApiOperation("实盘为准，生成损溢单修改库存") + //("实盘为准，生成损溢单修改库存") public ResponseEntity process1(@RequestBody JSONObject whereJson) { checkmstYlService.process1(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -91,7 +91,7 @@ public class StIvtCheckmstYlController { @PostMapping("/process0") @Log("账务为准") - @ApiOperation("账务为准") + //("账务为准") public ResponseEntity process0(@RequestBody JSONObject whereJson) { checkmstYlService.process0(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java index b68f1d87..def479c7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlController.java @@ -35,14 +35,14 @@ public class StIvtIostorinvYlController { @GetMapping @Log("查询原料入库单") - @ApiOperation("查询原料入库单") + //("查询原料入库单") public ResponseEntity query(YlIostorInvQuery query, PageQuery page){ return new ResponseEntity<>(iostorinvYlService.pageQuery(query,page),HttpStatus.OK); } @PostMapping @Log("创建入库单") - @ApiOperation("创建入库单") + //("创建入库单") public ResponseEntity create(@RequestBody JSONObject whereJson) { iostorinvYlService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -50,7 +50,7 @@ public class StIvtIostorinvYlController { @PostMapping("/update") @Log("修改入库单") - @ApiOperation("修改入库单") + //("修改入库单") public ResponseEntity update(@RequestBody JSONObject whereJson) { iostorinvYlService.updateBill(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -58,7 +58,7 @@ public class StIvtIostorinvYlController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ iostorinvYlService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -66,14 +66,14 @@ public class StIvtIostorinvYlController { @PostMapping("/getIODtl") @Log("查询入库分配明细") - @ApiOperation("查询入库分配明细") + //("查询入库分配明细") public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(iostorinvYlService.getInvDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { iostorinvYlService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java index 606eb7ac..4a12217d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/iostorInv/StIvtIostorinvYlOutController.java @@ -29,14 +29,14 @@ public class StIvtIostorinvYlOutController { @GetMapping @Log("查询原料出库单") - @ApiOperation("查询原料出库单") + //("查询原料出库单") public ResponseEntity query(YlIostorInvQuery query, PageQuery page){ return new ResponseEntity<>(iostorinvOutYlService.pageQuery(query,page),HttpStatus.OK); } @PostMapping @Log("创建入库单") - @ApiOperation("创建入库单") + //("创建入库单") public ResponseEntity create(@RequestBody JSONObject whereJson) { iostorinvOutYlService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -44,7 +44,7 @@ public class StIvtIostorinvYlOutController { @PostMapping("/update") @Log("修改入库单") - @ApiOperation("修改入库单") + //("修改入库单") public ResponseEntity update(@RequestBody JSONObject whereJson) { iostorinvOutYlService.updateBill(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -52,7 +52,7 @@ public class StIvtIostorinvYlOutController { @DeleteMapping @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ iostorinvOutYlService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -60,14 +60,14 @@ public class StIvtIostorinvYlOutController { @PostMapping("/getIODtl") @Log("查询出库分配明细") - @ApiOperation("查询出库分配明细") + //("查询出库分配明细") public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(iostorinvOutYlService.getInvDtl(whereJson), HttpStatus.OK); } @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { iostorinvOutYlService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java index 4a7d07be..830ec18c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/moveOrLess/StIvtMoreorlessmstYlController.java @@ -29,14 +29,14 @@ public class StIvtMoreorlessmstYlController { @GetMapping @Log("查询损溢单") - @ApiOperation("查询损溢单") + //("查询损溢单") public ResponseEntity query(MoreOrlessQuery query, PageQuery page) { return new ResponseEntity<>(moreorlessmstYlService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("创建损溢单") - @ApiOperation("创建损溢单") + //("创建损溢单") public ResponseEntity create(@RequestBody JSONObject whereJson) { moreorlessmstYlService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -44,14 +44,14 @@ public class StIvtMoreorlessmstYlController { @PostMapping("/getMlDtl") @Log("查询损溢明细") - @ApiOperation("查询损溢明细") + //("查询损溢明细") public ResponseEntity getMlDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(moreorlessmstYlService.getMlDtl(whereJson), HttpStatus.OK); } @PostMapping("/update") @Log("修改损溢单") - @ApiOperation("修改损溢单") + //("修改损溢单") public ResponseEntity update(@RequestBody JSONObject whereJson) { moreorlessmstYlService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -59,7 +59,7 @@ public class StIvtMoreorlessmstYlController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ moreorlessmstYlService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -67,7 +67,7 @@ public class StIvtMoreorlessmstYlController { @PostMapping("/confirm") @Log("完成单据") - @ApiOperation("完成单据") + //("完成单据") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { moreorlessmstYlService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java index 846e2f1f..4451c7fd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtYlController.java @@ -31,35 +31,35 @@ public class StIvtStructivtYlController { @GetMapping("/getRawIvt") @Log("查询可用的原料库存") - @ApiOperation("查询可用的原料库存") + //("查询可用的原料库存") public ResponseEntity getRawIvt(StructIvtYLQuery query, PageQuery page) { return new ResponseEntity<>(structivtYlService.getRawIvt(query, page), HttpStatus.OK); } @GetMapping("/getProductIvt") @Log("查询可用的成品库存") - @ApiOperation("查询可用的成品库存") + //("查询可用的成品库存") public ResponseEntity getProductIvt(StructIvtYLQuery query, PageQuery page) { return new ResponseEntity<>(structivtYlService.getProductIvt(query,page), HttpStatus.OK); } @PostMapping("/getStructIvt") @Log("查询库存") - @ApiOperation("查询库存") + //("查询库存") public ResponseEntity getStructIvt(StructIvtYLQuery query) { return new ResponseEntity<>(structivtYlService.getStructIvt(query), HttpStatus.OK); } @PostMapping("/getSemiProductIvt") @Log("查询可用的半成品库存") - @ApiOperation("查询可用的半成品库存") + //("查询可用的半成品库存") public ResponseEntity getSemiProductIvt(StructIvtYLQuery query) { return new ResponseEntity<>(structivtYlService.getSemiProductIvt(query), HttpStatus.OK); } @GetMapping("/getAllRawIvt") @Log("查询原料库存") - @ApiOperation("查询原料库存") + //("查询原料库存") public ResponseEntity getAllRawIvt(StructIvtYLQuery query, PageQuery page) { return new ResponseEntity<>(structivtYlService.getAllRawIvt(query, page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java index b5c568dd..9d8f72ce 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/controller/structIvt/StIvtStructivtflowYlController.java @@ -30,7 +30,7 @@ public class StIvtStructivtflowYlController { @GetMapping @Log("查询库存变动记录") - @ApiOperation("查询库存变动记录") + //("查询库存变动记录") public ResponseEntity query(IvtFlowQuery query, PageQuery page) { return new ResponseEntity<>(iStIvtStructivtflowYlService.queryAll(query,page), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java index dd73dbbd..a07670e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/check/StIvtCheckmstBcpController.java @@ -29,14 +29,14 @@ public class StIvtCheckmstBcpController { @GetMapping @Log("查询原料入库单") - @ApiOperation("查询原料入库单") + //("查询原料入库单") public ResponseEntity query(CheckQuery query, PageQuery page) { return new ResponseEntity<>(checkmstBcpService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("创建盘点单") - @ApiOperation("创建盘点单") + //("创建盘点单") public ResponseEntity create(@RequestBody JSONObject whereJson) { checkmstBcpService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -44,14 +44,14 @@ public class StIvtCheckmstBcpController { @PostMapping("/getCheckDtl") @Log("查询盘点明细") - @ApiOperation("查询盘点明细") + //("查询盘点明细") public ResponseEntity getCheckDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(checkmstBcpService.getCheckDtl(whereJson), HttpStatus.OK); } @PostMapping("/update") @Log("修改盘点单") - @ApiOperation("修改盘点单") + //("修改盘点单") public ResponseEntity update(@RequestBody JSONObject whereJson) { checkmstBcpService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -59,7 +59,7 @@ public class StIvtCheckmstBcpController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ checkmstBcpService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -67,7 +67,7 @@ public class StIvtCheckmstBcpController { @PostMapping("/saveCheck") @Log("盘点保存") - @ApiOperation("盘点保存") + //("盘点保存") public ResponseEntity saveCheck(@RequestBody JSONObject whereJson) { checkmstBcpService.saveCheck(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -75,7 +75,7 @@ public class StIvtCheckmstBcpController { @PostMapping("/confirm") @Log("移库单强制确认") - @ApiOperation("移库单强制确认") + //("移库单强制确认") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { checkmstBcpService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -83,7 +83,7 @@ public class StIvtCheckmstBcpController { @PostMapping("/process1") @Log("实盘为准，生成损溢单修改库存") - @ApiOperation("实盘为准，生成损溢单修改库存") + //("实盘为准，生成损溢单修改库存") public ResponseEntity process1(@RequestBody JSONObject whereJson) { checkmstBcpService.process1(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -91,7 +91,7 @@ public class StIvtCheckmstBcpController { @PostMapping("/issueTask") @Log("下发任务") - @ApiOperation("下发任务") + //("下发任务") public ResponseEntity issueTask(@RequestBody JSONObject whereJson) { checkmstBcpService.issueTask(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -99,7 +99,7 @@ public class StIvtCheckmstBcpController { @PostMapping("/process0") @Log("账务为准") - @ApiOperation("账务为准") + //("账务为准") public ResponseEntity process0(@RequestBody JSONObject whereJson) { checkmstBcpService.process0(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java index 4f2e5995..0a9e39ab 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpController.java @@ -48,21 +48,21 @@ public class StIvtIostorinvBcpController { @GetMapping @Log("查询入库单据") - @ApiOperation("查询入库单据") + //("查询入库单据") public ResponseEntity query(BcpIostorInvQuery query, PageQuery page) { return new ResponseEntity<>(stIvtIostorinvBcpService.queryDtl(query,page), HttpStatus.OK); } @PostMapping("/create") @Log("新增入库单") - @ApiOperation("新增入库单") + //("新增入库单") public ResponseEntity create(@RequestBody JSONObject form) { stIvtIostorinvBcpService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("删除出入库单") - @ApiOperation("删除出入库单") + //("删除出入库单") @PostMapping("/delete") public ResponseEntity delete(@RequestBody Long[] ids) { if (ids.length>0){ @@ -87,7 +87,7 @@ public class StIvtIostorinvBcpController { @PostMapping("/update") @Log("修改入库单") - @ApiOperation("修改入库单") + //("修改入库单") public ResponseEntity update(@RequestBody JSONObject whereJson) { stIvtIostorinvBcpService.updateBill(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -96,7 +96,7 @@ public class StIvtIostorinvBcpController { @PostMapping("/commit") @Log("出入单提交") - @ApiOperation("出入单提交") + //("出入单提交") public ResponseEntity commit(@RequestBody Map whereJson) { //semiProductInService.commit(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -104,7 +104,7 @@ public class StIvtIostorinvBcpController { @PostMapping("/getIODtl") @Log("查询入库分配明细") - @ApiOperation("查询入库分配明细") + //("查询入库分配明细") public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(stIvtIostorinvBcpService.getIoDtl(whereJson.toJavaObject(BcpIostorInvQuery.class)), HttpStatus.OK); } @@ -112,7 +112,7 @@ public class StIvtIostorinvBcpController { @PostMapping("/confirm") @Log("完成单据") - @ApiOperation("完成单据") + //("完成单据") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { stIvtIostorinvBcpService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -120,7 +120,7 @@ public class StIvtIostorinvBcpController { @PostMapping("/confirmTask") @Log("下发任务") - @ApiOperation("下发任务") + //("下发任务") public ResponseEntity confirmTask(@RequestBody JSONObject whereJson) { stIvtIostorinvBcpService.confirmTask(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java index 2cf4ec16..f396d2bb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/iostorInv/StIvtIostorinvBcpOutController.java @@ -40,21 +40,21 @@ public class StIvtIostorinvBcpOutController { @GetMapping @Log("查询入库单据") - @ApiOperation("查询入库单据") + //("查询入库单据") public ResponseEntity query(BcpIostorInvQuery query, PageQuery page) { return new ResponseEntity<>(bcpOutService.queryDtl(query,page), HttpStatus.OK); } @PostMapping("/create") @Log("新增出库单") - @ApiOperation("新增出库单") + //("新增出库单") public ResponseEntity create(@RequestBody JSONObject form) { bcpOutService.create(form); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("删除出入库单") - @ApiOperation("删除出入库单") + //("删除出入库单") @PostMapping("/delete") public ResponseEntity delete(@RequestBody Long[] ids) { bcpOutService.delete(ids); @@ -64,7 +64,7 @@ public class StIvtIostorinvBcpOutController { @PostMapping("/update") @Log("修改出库单") - @ApiOperation("修改出库单") + //("修改出库单") public ResponseEntity update(@RequestBody JSONObject whereJson) { bcpOutService.updateBill(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -73,7 +73,7 @@ public class StIvtIostorinvBcpOutController { @PostMapping("/commit") @Log("出入单提交") - @ApiOperation("出入单提交") + //("出入单提交") public ResponseEntity commit(@RequestBody Map whereJson) { //semiProductInService.commit(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -81,7 +81,7 @@ public class StIvtIostorinvBcpOutController { @PostMapping("/getIODtl") @Log("查询入库分配明细") - @ApiOperation("查询入库分配明细") + //("查询入库分配明细") public ResponseEntity getIODtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bcpOutService.getIoDtl(whereJson.toJavaObject(BcpIostorInvQuery.class)), HttpStatus.OK); } @@ -89,7 +89,7 @@ public class StIvtIostorinvBcpOutController { @PostMapping("/confirm") @Log("完成单据") - @ApiOperation("完成单据") + //("完成单据") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { bcpOutService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -97,7 +97,7 @@ public class StIvtIostorinvBcpOutController { @PostMapping("/confirmTask") @Log("下发任务") - @ApiOperation("下发任务") + //("下发任务") public ResponseEntity confirmTask(@RequestBody JSONObject whereJson) { bcpOutService.confirmTask(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java index 1e7ebdbf..296a28d1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/moveOrLess/StIvtMoreorlessmstBcpController.java @@ -29,14 +29,14 @@ public class StIvtMoreorlessmstBcpController { @GetMapping @Log("查询损溢单") - @ApiOperation("查询损溢单") + //("查询损溢单") public ResponseEntity query(MoreOrlessQuery query, PageQuery page) { return new ResponseEntity<>(iStIvtMoreorlessmstBcpService.pageQuery(query, page), HttpStatus.OK); } @PostMapping @Log("创建损溢单") - @ApiOperation("创建损溢单") + //("创建损溢单") public ResponseEntity create(@RequestBody JSONObject whereJson) { iStIvtMoreorlessmstBcpService.create(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -44,14 +44,14 @@ public class StIvtMoreorlessmstBcpController { @PostMapping("/getMlDtl") @Log("查询损溢明细") - @ApiOperation("查询损溢明细") + //("查询损溢明细") public ResponseEntity getMlDtl(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(iStIvtMoreorlessmstBcpService.getMlDtl(whereJson), HttpStatus.OK); } @PostMapping("/update") @Log("修改损溢单") - @ApiOperation("修改损溢单") + //("修改损溢单") public ResponseEntity update(@RequestBody JSONObject whereJson) { iStIvtMoreorlessmstBcpService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -59,7 +59,7 @@ public class StIvtMoreorlessmstBcpController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ iStIvtMoreorlessmstBcpService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -67,7 +67,7 @@ public class StIvtMoreorlessmstBcpController { @PostMapping("/confirm") @Log("完成单据") - @ApiOperation("完成单据") + //("完成单据") public ResponseEntity confirm(@RequestBody JSONObject whereJson) { iStIvtMoreorlessmstBcpService.confirm(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java index 1ca37bbd..17023aaa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/shutFrame/StIvtShutframeinvBcpController.java @@ -32,7 +32,7 @@ public class StIvtShutframeinvBcpController { @PostMapping("/create") @Log("创建拼盘单") - @ApiOperation("创建拼盘单") + //("创建拼盘单") public ResponseEntity create(@RequestBody JSONObject jo) { shutframeinvBcpService.create(jo); return new ResponseEntity<>(HttpStatus.OK); @@ -40,7 +40,7 @@ public class StIvtShutframeinvBcpController { @PostMapping("/update") @Log("修改拼盘单") - @ApiOperation("修改拼盘单") + //("修改拼盘单") public ResponseEntity update(@RequestBody JSONObject whereJson) { shutframeinvBcpService.update(whereJson); return new ResponseEntity<>(HttpStatus.OK); @@ -48,7 +48,7 @@ public class StIvtShutframeinvBcpController { @PostMapping("/delete") @Log("删除入库单") - @ApiOperation("删除入库单") + //("删除入库单") public ResponseEntity delete(@RequestBody Long[] ids){ shutframeinvBcpService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); @@ -56,28 +56,28 @@ public class StIvtShutframeinvBcpController { @GetMapping @Log("查询拼盘单") - @ApiOperation("查询拼盘单") + //("查询拼盘单") public ResponseEntity query(ShutQuery query, PageQuery page) { return new ResponseEntity<>(shutframeinvBcpService.pageQuery(query, page), HttpStatus.OK); } @PostMapping("/getBillDtl") @Log("查询拼盘明细") - @ApiOperation("查询拼盘明细") + //("查询拼盘明细") public ResponseEntity getBillDtl(@RequestBody JSONObject jo) { return new ResponseEntity<>(shutframeinvBcpService.getBillDtl(jo), HttpStatus.OK); } @PostMapping("/getBillDtlView") @Log("查询拼盘详情") - @ApiOperation("查询拼盘详情") + //("查询拼盘详情") public ResponseEntity getBillDtlView(@RequestBody JSONObject jo) { return new ResponseEntity<>(shutframeinvBcpService.getBillDtlView(jo), HttpStatus.OK); } @PostMapping("/issueTask") @Log("任务下发") - @ApiOperation("任务下发") + //("任务下发") public ResponseEntity issueTask(@RequestBody JSONObject jo) { shutframeinvBcpService.issueTask(jo); return new ResponseEntity<>(HttpStatus.OK); @@ -85,7 +85,7 @@ public class StIvtShutframeinvBcpController { @PostMapping("/confirm") @Log("强制确认") - @ApiOperation("强制确认") + //("强制确认") public ResponseEntity confirm(@RequestBody JSONObject jo) { shutframeinvBcpService.confirm(jo); return new ResponseEntity<>(HttpStatus.OK); @@ -93,7 +93,7 @@ public class StIvtShutframeinvBcpController { @PostMapping("/confirmOne") @Log("一体机拼盘确认") - @ApiOperation("一体机拼盘确认") + //("一体机拼盘确认") @SaIgnore public ResponseEntity confirmOne(@RequestBody JSONObject jo) { shutframeinvBcpService.confirmOne(jo); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java index 7fff1368..4841f5a9 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/controller/structLvt/StIvtStructivtBcpController.java @@ -32,21 +32,21 @@ public class StIvtStructivtBcpController { @GetMapping @Log("半成品库存查询") - @ApiOperation("半成品库存查询") + //("半成品库存查询") public ResponseEntity query(StructIvtBcpQuery query, PageQuery page) { return new ResponseEntity<>(bcpService.packageQuery(query,page), HttpStatus.OK); } @GetMapping("/getBcpIvt") @Log("查询可用的半成品库存") - @ApiOperation("查询可用的半成品库存") + //("查询可用的半成品库存") public ResponseEntity getBcpIvt(StructIvtBcpQuery query, PageQuery page) { return new ResponseEntity<>(bcpService.getBcpIvt(query, page), HttpStatus.OK); } @PostMapping("/getBcpIvtInfo") @Log("查询可用的半成品库存") - @ApiOperation("查询可用的半成品库存") + //("查询可用的半成品库存") public ResponseEntity getBcpIvtInfo(@RequestBody JSONObject jo) { return new ResponseEntity<>(bcpService.getBcpIvtInfo(jo), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java index 244206b2..da3d4d40 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/check/impl/StIvtCheckmstBcpServiceImpl.java @@ -26,7 +26,7 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.WmsToAcsService; +import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtBsrealstorattrService; import org.nl.wms.masterdata_manage.storage.service.storage.IStIvtStructattrService; import org.nl.wms.masterdata_manage.storage.service.storage.dao.StIvtBsrealstorattr; @@ -38,7 +38,6 @@ import org.nl.wms.scheduler_manage.service.point.dao.mapper.SchBasePointMapper; import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService; import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask; import org.nl.wms.storage_manage.CHECKEnum; -import org.nl.wms.storage_manage.IOSEnum; import org.nl.wms.storage_manage.pda.PDAEnum; import org.nl.wms.storage_manage.semimanage.MLEnum; import org.nl.wms.storage_manage.semimanage.service.check.IStIvtCheckdtlBcpService; @@ -48,11 +47,11 @@ import org.nl.wms.storage_manage.semimanage.service.check.dao.StIvtCheckmstBcp; import org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckdtlBcpMapper; import org.nl.wms.storage_manage.semimanage.service.check.dao.mapper.StIvtCheckmstBcpMapper; import org.nl.wms.storage_manage.semimanage.service.check.dto.CheckQuery; -import org.nl.wms.storage_manage.semimanage.service.iostorInv.dao.StIvtIostorinvBcp; import org.nl.wms.storage_manage.semimanage.service.moveOrLess.IStIvtMoreorlessmstBcpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.util.HashMap; @@ -374,7 +373,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl(); map.put("region_code", PDAEnum.REGION_CODE.code("半成品盘点区域")); List maps = pointMapper.canUsePoint(map); - + if (CollectionUtils.isEmpty(maps)){ + throw new BadRequestException("没有可用盘点位"); + } StIvtCheckmstBcp mst = this.getById(dtl.getCheck_id()); StIvtStructattr struct = structattrService.getOne(new QueryWrapper().eq("struct_id", dtl.getStruct_id())); @@ -467,7 +468,7 @@ public class StIvtCheckmstBcpServiceImpl extends ServiceImpl) mst::setTask_id) @@ -362,7 +362,7 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl) mst::setTask_id) @@ -397,7 +397,7 @@ public class StIvtIostorinvBcpOutServiceImpl extends ServiceImpl().eq("struct_code", mst.getStruct_code())).getCanuse_qty()).change_qty(mst.getPlan_qty()) - .task_id(mst.getTask_id()) - .storagevehicle_code(mst.getStoragevehicle_code()) - .build() - );*/ return null; } @@ -291,7 +275,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl) mst::setTask_id) @@ -348,7 +332,7 @@ public class StIvtIostorinvBcpServiceImpl extends ServiceImpl().lambda().eq(StIvtIostorinvBcp::getTask_id, task_id) .set(StIvtIostorinvBcp::getWork_status, IOSEnum.WORK_STATUS.code("执行中"))); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/dao/StIvtShutframedtlBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/dao/StIvtShutframedtlBcp.java index 71740932..e89c0a52 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/dao/StIvtShutframedtlBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/dao/StIvtShutframedtlBcp.java @@ -37,7 +37,7 @@ public class StIvtShutframedtlBcp implements Serializable { /** * 明细序号 */ - private BigDecimal seqno; + private Integer seqno; /** * 转出库区标识 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java index 2175132a..24a88948 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanage/service/shutFrame/impl/StIvtShutframedtlBcpServiceImpl.java @@ -87,7 +87,7 @@ public class StIvtShutframedtlBcpServiceImpl extends ServiceImpl @@ -268,7 +263,7 @@ public class StIvtShutframeinvBcpServiceImpl extends ServiceImpl queryAll(CodeRuleQuery form, PageQuery pageable) { @@ -41,7 +41,7 @@ public class SysCodeRuleController { } @Log("新增编码") - @ApiOperation("新增编码") + //("新增编码") @PostMapping // @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody SysCodeRule codeRule) { @@ -50,7 +50,7 @@ public class SysCodeRuleController { } @Log("删除编码") - @ApiOperation("删除编码") + //("删除编码") @DeleteMapping // @SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -59,7 +59,7 @@ public class SysCodeRuleController { } @Log("修改编码") - @ApiOperation("修改编码") + //("修改编码") @PutMapping // @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRule codeRule) { @@ -67,7 +67,7 @@ public class SysCodeRuleController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出任务数据") + //("导出任务数据") @GetMapping(value = "/codeDemo") // @SaCheckPermission("genCode:list") public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java index c5aee8dc..ee8bc456 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/coderule/SysCodeRuleDetailController.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.*; public class SysCodeRuleDetailController { private final ISysCodeRuleDetailService codeDetailService; - @ApiOperation("查询编码明细") + //("查询编码明细") @GetMapping // @SaCheckPermission("genCode:list") public ResponseEntity queryAll(CodeRuleDetailQuery form, PageQuery pageable){ @@ -37,7 +37,7 @@ public class SysCodeRuleDetailController { } @Log("新增编码明细") - @ApiOperation("新增编码明细") + //("新增编码明细") @PostMapping // @SaCheckPermission("genCode:add") public ResponseEntity create(@RequestBody SysCodeRuleDetail codeRuleDetail){ @@ -46,7 +46,7 @@ public class SysCodeRuleDetailController { } @Log("删除编码明细") - @ApiOperation("删除编码明细") + //("删除编码明细") @DeleteMapping(value = "/{id}") // @SaCheckPermission("genCode:del") public ResponseEntity delete(@PathVariable String id){ @@ -55,7 +55,7 @@ public class SysCodeRuleDetailController { } @Log("修改编码明细") - @ApiOperation("修改编码明细") + //("修改编码明细") @PutMapping // @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRuleDetail json){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java index 3f974c92..56307996 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dept/DeptController.java @@ -51,14 +51,14 @@ public class DeptController { private final ISysDeptService deptService; - @ApiOperation("查询部门") + //("查询部门") @GetMapping public ResponseEntity query(DeptQuery query) throws Exception { List list = deptService.list(query.build()); return new ResponseEntity<>(PageUtil.toPage(list, list.size()),HttpStatus.OK); } - @ApiOperation("查询部门") + //("查询部门") @GetMapping("/vo") public ResponseEntity queryvo(DeptQuery query, PageQuery pageQuery) throws Exception { Page deptPage = deptService.queryVo(query, pageQuery); @@ -66,13 +66,13 @@ public class DeptController { } - @ApiOperation("查询所有部门树") + //("查询所有部门树") @GetMapping("/allTree") public ResponseEntity allTree(DeptQuery query) { return new ResponseEntity<>(deptService.buildTree(query),HttpStatus.OK); } - @ApiOperation("查询部门:根据ID获取同级与上级数据") + //("查询部门:根据ID获取同级与上级数据") @PostMapping("/superior") @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity getSuperior(@RequestBody List ids) { @@ -83,7 +83,7 @@ public class DeptController { } // @Log("新增部门") - @ApiOperation("新增部门") + //("新增部门") @PostMapping // @SaCheckPermission("dept:add") public ResponseEntity create(@Validated @RequestBody SysDept resources){ @@ -92,7 +92,7 @@ public class DeptController { } // @Log("修改部门") - @ApiOperation("修改部门") + //("修改部门") @PutMapping // @SaCheckPermission("dept:edit") public ResponseEntity update(@Validated @RequestBody SysDept dept){ @@ -104,7 +104,7 @@ public class DeptController { } // @Log("删除部门") - @ApiOperation("删除部门") + //("删除部门") @DeleteMapping // @SaCheckPermission("dept:del") public ResponseEntity delete(@RequestBody Set deptIds){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java index ca2667d5..d9798e2d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java @@ -39,14 +39,14 @@ public class SysDictController { private final ISysDictService dictService; @GetMapping - @ApiOperation("查询字典") + //("查询字典") public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable){ return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK); } @Log("新增字典") @PostMapping - @ApiOperation("新增字典") + //("新增字典") public ResponseEntity create(@RequestBody Dict dict){ dictService.create(dict); return new ResponseEntity<>(HttpStatus.CREATED); @@ -54,7 +54,7 @@ public class SysDictController { @PutMapping @Log("修改字典") - @ApiOperation("修改字典") + //("修改字典") //@SaCheckPermission("@el.check('dict:edit')") public ResponseEntity updateDict(@Validated @RequestBody Dict dto){ dictService.updateDict(dto); @@ -62,7 +62,7 @@ public class SysDictController { } @Log("删除字典") - @ApiOperation("删除字典") + //("删除字典") @DeleteMapping // @SaCheckPermission("dict:del") public ResponseEntity delete(@RequestBody Set ids){ @@ -71,13 +71,13 @@ public class SysDictController { } @GetMapping("/dictDetail") - @ApiOperation("查询字典详情") + //("查询字典详情") public ResponseEntity queryDetails(@RequestParam Map criteria, PageQuery pageable){ DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class); return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK); } - @ApiOperation("查询多个字典详情") + //("查询多个字典详情") @GetMapping(value = "/dictDetail/map") public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ String[] names = dictName.split("[,，]"); @@ -89,7 +89,7 @@ public class SysDictController { } @Log("新增字典详情") - @ApiOperation("新增字典详情") + //("新增字典详情") @PostMapping("/dictDetail") // @SaCheckPermission("dict:add") public ResponseEntity createDetail(@RequestBody Dict resources){ @@ -98,7 +98,7 @@ public class SysDictController { } @Log("修改字典详情") - @ApiOperation("修改字典详情") + //("修改字典详情") @PutMapping("/dictDetail") // @SaCheckPermission("dict:edit") public ResponseEntity updateDetail(@RequestBody Dict resources){ @@ -107,14 +107,14 @@ public class SysDictController { } @Log("删除字典详情") - @ApiOperation("删除字典详情") + //("删除字典详情") @DeleteMapping(value = "/dictDetail/{id}") public ResponseEntity deleteDetail(@PathVariable String id){ dictService.deleteDetail(id); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("查询字典详情") + //("查询字典详情") @PostMapping("/dictDetailByCode") @SaIgnore public ResponseEntity queryDetail(@RequestBody JSONObject code){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java index 14a5544e..70c5b2e1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeColumnConfigController.java @@ -33,7 +33,7 @@ public class CodeColumnConfigController { private final ICodeColumnConfigService generatorService; @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + //("查询数据库数据") @GetMapping(value = "/tables") public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, @RequestParam(defaultValue = "0")Integer page, diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java index 21642b8a..fa9d5879 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/generator/CodeGenConfigController.java @@ -28,13 +28,13 @@ import org.springframework.web.bind.annotation.*; public class CodeGenConfigController { private final ICodeGenConfigService genConfigService; - @ApiOperation("查询") + //("查询") @GetMapping(value = "/{tableName}") public ResponseEntity query(@PathVariable String tableName){ return new ResponseEntity<>(genConfigService.find(tableName), HttpStatus.OK); } - @ApiOperation("修改") + //("修改") @PutMapping public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig){ return new ResponseEntity<>(genConfigService.update(genConfig.getTableName(), genConfig),HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java index c214dfd4..8cc292e0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java @@ -42,20 +42,20 @@ public class SysMenuController { private final PlatformTransactionManager platformTransactionManager; @GetMapping(value = "/build") - @ApiOperation("根据用户获取菜单") + //("根据用户获取菜单") @Log("caidan") public ResponseEntity buildMenus(@Validated String systemType) { //校验系统表是否存在该系统类型 return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK); } - @ApiOperation("返回全部的菜单") + //("返回全部的菜单") @GetMapping(value = "/lazy") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam String pid) { return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK); } - @ApiOperation("获取菜单列表") + //("获取菜单列表") @PostMapping(value = "/getMenusByRole") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity getMenusByRole(@RequestBody JSONObject json) { @@ -65,7 +65,7 @@ public class SysMenuController { return new ResponseEntity<>(iSysMenuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK); } - @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") + //("根据菜单ID返回所有子节点ID，包含自身ID") @GetMapping(value = "/child") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam String id) { @@ -78,14 +78,14 @@ public class SysMenuController { } @GetMapping - @ApiOperation("查询菜单") + //("查询菜单") @SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { List list = iSysMenuService.query(query, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") + //("查询菜单:根据ID获取同级与上级数据") @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { @@ -99,7 +99,7 @@ public class SysMenuController { } @Log("新增菜单") - @ApiOperation("新增菜单") + //("新增菜单") @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { @@ -108,7 +108,7 @@ public class SysMenuController { } @Log("修改菜单") - @ApiOperation("修改菜单") + //("修改菜单") @PutMapping @SaCheckPermission("menu:edit") public ResponseEntity update( @RequestBody SysMenu form) { @@ -117,7 +117,7 @@ public class SysMenuController { } @Log("删除菜单") - @ApiOperation("删除菜单") + //("删除菜单") @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java index 25684471..76626148 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/monitor/MonitorController.java @@ -38,7 +38,7 @@ public class MonitorController { private final MonitorService serverService; @GetMapping - @ApiOperation("查询服务监控") + //("查询服务监控") // @SaCheckPermission("monitor:list") public ResponseEntity query() { return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java index 4ee77ef0..a2e48c98 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/notice/NoticeController.java @@ -29,7 +29,7 @@ public class NoticeController { @GetMapping @Log("查询消息通知") - @ApiOperation("查询消息通知") + //("查询消息通知") //@SaCheckPermission("@el.check('notice:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(noticeService.queryAll(whereJson,page),HttpStatus.OK); @@ -37,7 +37,7 @@ public class NoticeController { @PostMapping @Log("新增消息通知") - @ApiOperation("新增消息通知") + //("新增消息通知") //@SaCheckPermission("@el.check('notice:add')") public ResponseEntity create(@Validated @RequestBody NoticeDto dto){ noticeService.create(dto); @@ -46,7 +46,7 @@ public class NoticeController { @PutMapping @Log("修改消息通知") - @ApiOperation("修改消息通知") + //("修改消息通知") //@SaCheckPermission("@el.check('notice:edit')") public ResponseEntity update(@Validated @RequestBody NoticeDto dto){ noticeService.update(dto); @@ -54,7 +54,7 @@ public class NoticeController { } @Log("删除消息通知") - @ApiOperation("删除消息通知") + //("删除消息通知") //@SaCheckPermission("@el.check('notice:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Long[] ids) { @@ -96,7 +96,7 @@ public class NoticeController { @Log("批量已读") @PostMapping("/changeRead") - @ApiOperation("批量已读") + //("批量已读") public ResponseEntity changeRead(@RequestBody JSONObject jsonObject) { noticeService.changeRead(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java index d5995348..3b8eb8d8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/param/SysParamController.java @@ -38,7 +38,7 @@ class SysParamController { @GetMapping @Log(value = "查询系统参数", isAddLogTable = true, isInterfaceLog = true) - @ApiOperation("查询系统参数") + //("查询系统参数") //@SaCheckPermission("param:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK); @@ -46,7 +46,7 @@ class SysParamController { @PostMapping @Log("新增系统参数") - @ApiOperation("新增系统参数") + //("新增系统参数") //@SaCheckPermission("param:add") public ResponseEntity create(@Validated @RequestBody Param param) { paramService.create(param); @@ -55,7 +55,7 @@ class SysParamController { @PutMapping @Log("修改系统参数") - @ApiOperation("修改系统参数") + //("修改系统参数") //@SaCheckPermission("param:edit") public ResponseEntity update(@Validated @RequestBody Param param) { paramService.update(param); @@ -63,7 +63,7 @@ class SysParamController { } @Log("删除系统参数") - @ApiOperation("删除系统参数") + //("删除系统参数") //@SaCheckPermission("param:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -74,7 +74,7 @@ class SysParamController { @PostMapping("/getValueByCode") @Log("根据编码获取值") - @ApiOperation("根据编码获取值") + //("根据编码获取值") @SaIgnore public ResponseEntity getValueByCode(@RequestBody String code) { return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java index b703c944..4cbbd380 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/permission/SysDataPermissionController.java @@ -38,7 +38,7 @@ public class SysDataPermissionController { @GetMapping @Log("查询数据权限") - @ApiOperation("查询数据权限") + //("查询数据权限") //@SaCheckPermission("@el.check('dataPermission:list')") public ResponseEntity query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK); @@ -46,7 +46,7 @@ public class SysDataPermissionController { @PostMapping @Log("新增数据权限") - @ApiOperation("新增数据权限") + //("新增数据权限") //@SaCheckPermission("@el.check('dataPermission:add')") public ResponseEntity create(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.create(permission); @@ -55,7 +55,7 @@ public class SysDataPermissionController { @PutMapping @Log("修改数据权限") - @ApiOperation("修改数据权限") + //("修改数据权限") //@SaCheckPermission("@el.check('dataPermission:edit')") public ResponseEntity update(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.update(permission); @@ -63,7 +63,7 @@ public class SysDataPermissionController { } @Log("删除数据权限") - @ApiOperation("删除数据权限") + //("删除数据权限") //@SaCheckPermission("@el.check('dataPermission:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -73,21 +73,21 @@ public class SysDataPermissionController { @GetMapping("/scopeType") @Log("获取数据权限范围") - @ApiOperation("获取数据权限范围") + //("获取数据权限范围") public ResponseEntity getDataScopeType(){ return new ResponseEntity<>(dataPermissionService.getDataScopeType(),HttpStatus.OK); } @GetMapping("/dataPermissionOption") @Log("获取数据权限下拉框") - @ApiOperation("获取数据权限下拉框") + //("获取数据权限下拉框") public ResponseEntity getDataPermissionOption(){ return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK); } @PostMapping("/saveDataPermission") @Log("保存数据权限") - @ApiOperation("保存数据权限") + //("保存数据权限") public ResponseEntity saveDataPermission(@RequestBody JSONObject datas){ dataPermissionService.savePermission(datas); return new ResponseEntity<>(HttpStatus.CREATED); @@ -95,14 +95,14 @@ public class SysDataPermissionController { @PostMapping("/dataShow") @Log("查看数据权限") - @ApiOperation("查看数据权限") + //("查看数据权限") public ResponseEntity getDataShow(@RequestBody String id){ return new ResponseEntity<>(dataPermissionService.getDataShow(id),HttpStatus.OK); } @PostMapping("/dataDetail") @Log("查看数据明细") - @ApiOperation("查看数据明细") + //("查看数据明细") public ResponseEntity getDataDetail(@RequestBody JSONObject data){ return new ResponseEntity<>(dataPermissionService.getDataDetail(data),HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java index 030c0782..f93821bc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/quartz/SysQuartzJobController.java @@ -39,14 +39,14 @@ public class SysQuartzJobController { private final ISysQuartzJobService quartzJobService; - @ApiOperation("查询定时任务") + //("查询定时任务") @GetMapping @SaCheckPermission("timing:list") public ResponseEntity query(JobQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("查询任务执行日志") + //("查询任务执行日志") @GetMapping(value = "/logs") @SaCheckPermission("timing:list") public ResponseEntity queryJobLog(JobQuery criteria, PageQuery pageable) { @@ -54,7 +54,7 @@ public class SysQuartzJobController { } @Log("新增定时任务") - @ApiOperation("新增定时任务") + //("新增定时任务") @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { @@ -66,7 +66,7 @@ public class SysQuartzJobController { } @Log("修改定时任务") - @ApiOperation("修改定时任务") + //("修改定时任务") @PutMapping @SaCheckPermission("timing:edit") public ResponseEntity update(@Validated @RequestBody SysQuartzJob resources) { @@ -75,7 +75,7 @@ public class SysQuartzJobController { } @Log("更改定时任务状态") - @ApiOperation("更改定时任务状态") + //("更改定时任务状态") @PutMapping(value = "/{id}") @SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable String id) { @@ -84,7 +84,7 @@ public class SysQuartzJobController { } @Log("执行定时任务") - @ApiOperation("执行定时任务") + //("执行定时任务") @PutMapping(value = "/exec/{id}") @SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable String id) { @@ -93,7 +93,7 @@ public class SysQuartzJobController { } @Log("删除定时任务") - @ApiOperation("删除定时任务") + //("删除定时任务") @DeleteMapping @SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java index 5afac4f4..477df660 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/role/SysRoleController.java @@ -31,21 +31,21 @@ public class SysRoleController { private final ISysRoleService roleService; - @ApiOperation("分页查询角色") + //("分页查询角色") @GetMapping @SaCheckPermission("roles:list") public ResponseEntity pageQuery(@RequestParam Map param, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK); } - @ApiOperation("查询所有角色") + //("查询所有角色") @GetMapping("/all") public ResponseEntity queryAll() { return new ResponseEntity<>(roleService.list(), HttpStatus.OK); } @Log("新增角色") - @ApiOperation("新增角色") + //("新增角色") @PostMapping @SaCheckPermission("roles:add") public ResponseEntity create(@RequestBody JSONObject param) { @@ -54,7 +54,7 @@ public class SysRoleController { } @Log("修改角色") - @ApiOperation("修改角色") + //("修改角色") @PutMapping @SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { @@ -63,7 +63,7 @@ public class SysRoleController { } @Log("删除角色") - @ApiOperation("删除角色") + //("删除角色") @DeleteMapping @SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -72,7 +72,7 @@ public class SysRoleController { } @Log("修改角色菜单") - @ApiOperation("修改角色菜单") + //("修改角色菜单") @PutMapping(value = "/menu") @SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java index b7853f87..f37692ce 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/AuthorizationController.java @@ -63,7 +63,7 @@ public class AuthorizationController { @Resource private LoginProperties loginProperties; - @ApiOperation("登录授权") + //("登录授权") @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap) throws Exception { if (ObjectUtil.isEmpty(authMap)){ @@ -73,7 +73,7 @@ public class AuthorizationController { } - @ApiOperation("获取用户信息") + //("获取用户信息") @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -87,7 +87,7 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - @ApiOperation("获取指定用户信息") + //("获取指定用户信息") @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { if (loginId != null){ @@ -98,7 +98,7 @@ public class AuthorizationController { return ResponseEntity.noContent().build(); } - @ApiOperation("获取验证码") + //("获取验证码") @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -119,7 +119,7 @@ public class AuthorizationController { return ResponseEntity.ok(imgResult); } - @ApiOperation("退出登录") + //("退出登录") @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { if (ObjectUtil.isNotEmpty(StpUtil.getTokenValue())) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java index 0e929e0e..bcd46977 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/secutiry/HandLoginController.java @@ -38,19 +38,19 @@ public class HandLoginController { @PostMapping("/login") @Log("手持登陆验证") - @ApiOperation("手持登陆验证") + //("手持登陆验证") public ResponseEntity handlogin(@RequestBody Map whereJson) { return ResponseEntity.ok(handLoginService.handleLogin(whereJson)); } @PostMapping("/authority") @Log("手持登陆查询权限") - @ApiOperation("手持登陆查询权限") + //("手持登陆查询权限") public ResponseEntity queryAuthority(@RequestBody Map whereJson) { return new ResponseEntity<>(handLoginService.queryAuthority(whereJson), HttpStatus.OK); } - @ApiOperation("修改密码") + //("修改密码") @Log("手持修改密码") @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java index 734f3578..a6731154 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/OnlineController.java @@ -40,21 +40,21 @@ public class OnlineController { private final OnlineUserService onlineUserService; - @ApiOperation("查询在线用户") + //("查询在线用户") @GetMapping // @SaCheckPermission("@el.check()") public ResponseEntity query(String filter, Pageable pageable){ return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK); } - @ApiOperation("导出数据") + //("导出数据") @GetMapping(value = "/download") // @SaCheckPermission("@el.check()") public void download(HttpServletResponse response, String filter) throws IOException { onlineUserService.download(onlineUserService.getAll(filter), response); } - @ApiOperation("踢出用户") + //("踢出用户") @DeleteMapping // @SaCheckPermission("@el.check()") public ResponseEntity delete(@RequestBody Set keys) throws Exception { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java index fce80c14..fb5a35f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/user/UserController.java @@ -56,14 +56,14 @@ public class UserController { ISysUserService userService; - @ApiOperation("查询用户") + //("查询用户") @GetMapping public ResponseEntity query(UserQuery query, PageQuery page){ return new ResponseEntity(userService.getUserDetail(query, page),HttpStatus.OK); } @Log("新增用户") - @ApiOperation("新增用户") + //("新增用户") @PostMapping // @SaCheckPermission("user:add") public ResponseEntity create(@RequestBody Map user){ @@ -72,7 +72,7 @@ public class UserController { } @Log("修改用户") - @ApiOperation("修改用户") + //("修改用户") @PutMapping // @SaCheckPermission("user:edit") public ResponseEntity update( @RequestBody Map resources) throws Exception { @@ -81,7 +81,7 @@ public class UserController { } @Log("修改用户：个人中心") - @ApiOperation("修改用户：个人中心") + //("修改用户：个人中心") // @PutMapping(value = "center") public ResponseEntity center(@RequestBody SysUser resources){ if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ @@ -92,7 +92,7 @@ public class UserController { } @Log("删除用户") - @ApiOperation("删除用户") + //("删除用户") @DeleteMapping // @SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -100,21 +100,21 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改密码") + //("修改密码") @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { userService.updatePass(passVo); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改头像") + //("修改头像") @PostMapping(value = "/updateAvatar") public ResponseEntity updateAvatar(@RequestParam MultipartFile avatar){ return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK); } @Log("修改邮箱") - @ApiOperation("修改邮箱") + //("修改邮箱") @PostMapping(value = "/updateEmail/{code}") public ResponseEntity updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); diff --git a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 4d5422ea..7be08b17 100644 --- a/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/mes/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -24,7 +24,8 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false +# url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false username: ${DB_USER:root} # password: ${DB_PWD:123456} password: ${DB_PWD:942464Yy} diff --git a/mes/hd/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl b/mes/hd/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl index e98f5c32..8823899d 100644 --- a/mes/hd/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl +++ b/mes/hd/nladmin-system/src/main/resources/template/generator/admin/Controller.ftl @@ -30,7 +30,7 @@ public class ${className}Controller { @GetMapping @Log("查询${apiAlias}") - @ApiOperation("查询${apiAlias}") + //("查询${apiAlias}") //@PreAuthorize("@el.check('${changeClassName}:list')") public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ return new ResponseEntity<>(${changeClassName}Service.queryAll(whereJson,page),HttpStatus.OK); @@ -38,7 +38,7 @@ public class ${className}Controller { @PostMapping @Log("新增${apiAlias}") - @ApiOperation("新增${apiAlias}") + //("新增${apiAlias}") //@PreAuthorize("@el.check('${changeClassName}:add')") public ResponseEntity create(@Validated @RequestBody ${className}Dto dto){ ${changeClassName}Service.create(dto); @@ -47,7 +47,7 @@ public class ${className}Controller { @PutMapping @Log("修改${apiAlias}") - @ApiOperation("修改${apiAlias}") + //("修改${apiAlias}") //@PreAuthorize("@el.check('${changeClassName}:edit')") public ResponseEntity update(@Validated @RequestBody ${className}Dto dto){ ${changeClassName}Service.update(dto); @@ -55,7 +55,7 @@ public class ${className}Controller { } @Log("删除${apiAlias}") - @ApiOperation("删除${apiAlias}") + //("删除${apiAlias}") //@PreAuthorize("@el.check('${changeClassName}:del')") @DeleteMapping public ResponseEntity delete(@RequestBody ${pkColumnType}[] ids) {