From 492f1870ad3f79064f5d1a00cef4ad985cd0f8cf Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期二, 23 四月 2024 10:31:50 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index fd8bf9a..e972b6f 100644 --- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -2,6 +2,7 @@ com\example\erp\mapper\pp\BasicDateProduceMapper.class com\example\erp\entity\sd\Returns.class com\example\erp\entity\sd\Product.class +com\example\erp\service\pp\ReportService.class com\example\erp\service\sd\BasicGlassTypeServise.class com\example\erp\service\sd\ProductService.class com\example\erp\entity\mm\FinishedOperateLog.class @@ -9,19 +10,24 @@ com\example\erp\service\pp\ReplenishService.class com\example\erp\entity\sd\OrderDetail.class com\example\erp\config\MyCorsConfig$1.class +com\example\erp\controller\sd\BasicOtherMoneyController.class com\example\erp\controller\pp\ProductionSchedulingController.class com\example\erp\service\sd\OrderProcessDetailService.class +com\example\erp\entity\mm\MaterialOutboundDetail.class com\example\erp\controller\pp\ReworkController.class com\example\erp\entity\pp\DamageDetails.class +com\example\erp\entity\pp\OptimizeUse.class com\example\erp\mapper\mm\BasicWarehouseTypeMapper.class com\example\erp\mapper\mm\FinishedGoodsInventoryMapper.class com\example\erp\service\IOrderService.class com\example\erp\service\pp\ReportingWorkService.class +com\example\erp\tools\DownExcel.class com\example\erp\mapper\sd\BasicDateMapper.class com\example\erp\controller\pp\ReplenishController.class com\example\erp\mapper\sd\OrderGlassDetailMapper.class com\example\erp\entity\pp\WorkprogressMonthlySettlement.class com\example\erp\entity\mm\FinishedGoodsInventory.class +com\example\erp\entity\sd\BasicOtherMoney.class com\example\erp\mapper\sd\DeliveryDetailMapper.class com\example\erp\config\MybatisPlusConfig.class com\example\erp\entity\mm\BasicWarehouseType.class @@ -30,7 +36,9 @@ com\example\erp\controller\sd\ProductController.class com\example\erp\entity\sd\GlassType.class com\example\erp\mapper\sd\OrderMapper.class +com\example\erp\controller\pp\ReportController.class com\example\erp\service\mm\BasicWarehouseTypeService.class +com\example\erp\entity\sd\OrderOtherMoney.class com\example\erp\mapper\OrderTestMapper.class com\example\erp\mapper\mm\MaterialStoreMapper.class com\example\erp\service\pp\ProductionSchedulingService.class @@ -40,12 +48,12 @@ com\example\erp\entity\sd\Customer.class com\example\erp\entity\userInfo\SysMenu.class com\example\erp\entity\sd\Delivery.class -com\example\erp\controller\mm\MaterialController.class com\example\erp\controller\pp\BasicDataProduceController.class com\example\erp\config\WebSocketConfig.class com\example\erp\controller\dto\UserDTO.class com\example\erp\service\pp\WorkOrderService.class com\example\erp\mapper\mm\FinishedOperateLogMapper.class +com\example\erp\mapper\pp\DeviceMaintenanceMapper.class com\example\erp\controller\pp\ReportingWorkController.class com\example\erp\mapper\pp\ReportingWorkDetailMapper.class com\example\erp\service\sd\BasicDateService.class @@ -55,6 +63,7 @@ com\example\erp\service\userInfo\SysMenuItemService.class com\example\erp\entity\pp\ReportingWorkDetail.class com\example\erp\controller\sd\DeliveryController.class +com\example\erp\entity\mm\ReturningWarehouseDetail.class com\example\erp\service\impl\OrderServiceImpl.class com\example\erp\entity\sd\ProductDetail.class com\example\erp\mapper\pp\ReworkMapper.class @@ -63,6 +72,7 @@ com\example\erp\mapper\pp\FlowCardMapper.class com\example\erp\mapper\userInfo\SysMenuItemMapper.class com\example\erp\controller\userInfo\SysMenuController.class +com\example\erp\entity\mm\ReturningWarehouse.class com\example\erp\entity\sd\Order.class com\example\erp\entity\sd\BasicGlassType.class com\example\erp\entity\sd\OrderGlassDetail.class @@ -73,23 +83,29 @@ com\example\erp\entity\pp\BaseBom.class com\example\erp\mapper\userInfo\SysErrorMapper.class com\example\erp\service\mm\FinishedGoodsInventoryService.class +com\example\erp\entity\mm\MaterialInventory.class com\example\erp\entity\sd\ReturnsDetail.class +com\example\erp\controller\pp\DeviceMaintenanceController.class com\example\erp\entity\sd\OrderProcessDetail.class com\example\erp\config\SwaggerConfig.class com\example\erp\controller\pp\ProcessCardController.class com\example\erp\service\pp\ReportWorkService.class com\example\erp\controller\mm\FinishedGoodsInventoryController.class com\example\erp\service\pp\ReworkService.class +com\example\erp\service\pp\DeviceMaintenanceService.class com\example\erp\service\userInfo\SysErrorService.class com\example\erp\ErpApplication.class com\example\erp\tools\netty\NettyServer.class com\example\erp\exception\ServiceException.class com\example\erp\common\interceptor\JwtInterceptor.class com\example\erp\entity\pp\Rework.class +com\example\erp\service\mm\MaterialStoreService.class com\example\erp\entity\pp\ReportingWork.class com\example\erp\tools\netty\MyWebSocketHandler.class -com\example\erp\service\mm\MaterialService.class +com\example\erp\entity\mm\MaterialOutbound.class +com\example\erp\mapper\sd\OrderOtherMoneyMapper.class com\example\erp\controller\sd\OrderController.class +com\example\erp\mapper\pp\ReportMapper.class com\example\erp\entity\pp\BasicDataProduce.class com\example\erp\controller\pp\ReportWorkController.class com\example\erp\entity\pp\PatchLog.class @@ -97,6 +113,7 @@ com\example\erp\controller\sd\CustomerController.class com\example\erp\entity\pp\ProductionScheduling.class com\example\erp\common\CacheUtil.class +com\example\erp\service\sd\BasicOtherMoneyService.class com\example\erp\entity\pp\OrderBom.class com\example\erp\mapper\sd\DeliveryMapper.class com\example\erp\controller\mm\BasicWarehouseTypeController.class @@ -110,14 +127,18 @@ com\example\erp\mapper\sd\ProductMapper.class com\example\erp\common\Result.class com\example\erp\service\sd\CustomerService.class +com\example\erp\controller\mm\MaterialInventoryController.class com\example\erp\mapper\pp\DamageDetailsMapper.class com\example\erp\mapper\sd\OrderProcessDetailMapper.class com\example\erp\entity\pp\Device.class com\example\erp\tools\WebSocketServerPool.class com\example\erp\controller\OrderTestController.class +com\example\erp\mapper\sd\BasicOtherMoneyMapper.class com\example\erp\mapper\userInfo\SysMenuMapper.class com\example\erp\tools\TokenTools.class +com\example\erp\controller\mm\MaterialStoreController.class com\example\erp\mapper\sd\OrderDetailMapper.class +com\example\erp\service\mm\MaterialInventoryService.class com\example\erp\controller\userInfo\SysMenuItemController.class com\example\erp\mapper\sd\ProductDetailMapper.class com\example\erp\entity\pp\FlowCard.class @@ -125,6 +146,7 @@ com\example\erp\controller\pp\WorkOrderController.class com\example\erp\entity\pp\DeviceMaintenance.class com\example\erp\tools\netty\NettyServer$1.class +com\example\erp\mapper\mm\MaterialInventoryMapper.class com\example\erp\entity\userInfo\SysMenuItem.class com\example\erp\mapper\pp\ReportingWorkMapper.class com\example\erp\entity\sd\BasicData.class -- Gitblit v1.8.0