From eb8fbf0c3736ef329f1844d7eb135a254740268b Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期一, 08 四月 2024 11:11:26 +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/inputFiles.lst | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index ac515c0..8d12ab0 100644 --- a/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -2,7 +2,7 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\BasicDateProduceService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MybatisPlusConfig.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductDetailMapper.java -D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialController.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\GlassType.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\interceptor\JwtInterceptor.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\WorkOrderMapper.java @@ -49,6 +49,7 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedOperateLogMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\FlowCardMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\TokenTools.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialInventoryController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportWorkController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialStore.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenuItem.java @@ -65,12 +66,16 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Result.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Returns.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysMenuService.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\WorkOrderService.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialStoreService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\dto\UserDTO.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportingWorkService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ProductDetail.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouseDetail.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\BasicWarehouseTypeService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderProcessDetailService.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialInventoryMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyWebSocketHandler.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\FlowCard.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkDetailMapper.java @@ -80,11 +85,14 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\InterceptorConfig.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BasicDataProduce.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicGlassTypeServise.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutbound.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialInventoryService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\MyCorsConfig.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\SwaggerConfig.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Device.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\ProductService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\OrderBom.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\MaterialStoreController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Order.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ProductionSchedulingService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\WebSocketServerPool.java @@ -94,6 +102,7 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryDetailMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysMenuItemMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\CacheUtil.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\FinishedGoodsInventoryController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\UserService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicGlassTypeMapper.java @@ -117,6 +126,8 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\SysMenuController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\CustomerMapper.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\NettyServer.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialInventory.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\ReturningWarehouse.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderProcessDetail.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\BasicWarehouseType.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReplenishController.java @@ -126,5 +137,5 @@ D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\DeliveryService.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\OrderTestController.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\BasicWarehouseTypeMapper.java -D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\MaterialService.java +D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\MaterialOutboundDetail.java D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Product.java -- Gitblit v1.8.0