From 7474e9db45540a01fa84d29ffa24e39f9d0e0e5b Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期三, 20 三月 2024 11:46:58 +0800
Subject: [PATCH] 修改主页面退出按钮以及其他
---
north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst | 134 +++++++++++++++++++++
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java | 3
north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue | 4
north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java | 16 +-
north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original | 0
north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue | 5
north-glass-erp/target/classes/mapper/sd/OrderMapper.xml | 2
north-glass-erp/northglass-erp/src/layout/MainErpView.vue | 9
north-glass-erp/src/main/resources/application.yml | 2
north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst | 6
north-glass-erp/northglass-erp/config.js | 4
north-glass-erp/pom.xml | 2
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 3
north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst | 134 +++++++++++++++++++++
north-glass-erp/northglass-erp/src/views/LoginView.vue | 2
north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst | 4
north-glass-erp/target/classes/application.yml | 2
17 files changed, 298 insertions(+), 34 deletions(-)
diff --git a/north-glass-erp/northglass-erp/config.js b/north-glass-erp/northglass-erp/config.js
index db0891c..7d511b4 100644
--- a/north-glass-erp/northglass-erp/config.js
+++ b/north-glass-erp/northglass-erp/config.js
@@ -1,4 +1,4 @@
export default {
- serverUrl:"localhost:8080"
+ serverUrl:"10.153.19.150:8086"
//serverUrl:"res.abeim.cn"
-}
\ No newline at end of file
+}
diff --git a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
index 7072d2d..e094acc 100644
--- a/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
+++ b/north-glass-erp/northglass-erp/src/layout/MainErpView.vue
@@ -89,13 +89,12 @@
<div style="height: 100%;width: 100%;display: flex">
<img src="../assets/northGlass.ico" alt="" style="max-width: 100%;max-height: 100%">
<h3 style="margin: 1rem ;font-weight: bold;width: 40vw;"> {{$t('main.titleFirst') + user + $t('main.titleLast')}}</h3>
- <span style="height: 70%;width: 78vw;margin-top: 1rem;" >
+ <span style="height: 70%;width: 78vw;margin-top: 1.5rem;" >
- <el-button class="sys-quit" @click="quit" type="info" round>
- <el-icon size="large"><SwitchButton size=""/></el-icon>
- </el-button>
+<!-- <el-button class="sys-quit" @click="quit" type="info" round>-->
+ <el-icon @click="quit" style="float: right;margin-right: 1rem" size="large" ><SwitchButton size=""/></el-icon>
+<!-- </el-button>-->
</span>
-
</div>
</el-header>
<el-container >
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index 2342d88..3a1698f 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -35,7 +35,7 @@
const validatePass = (rule: any, value: any, callback: any) => {
if (value === '') {
- callback(new Error( t('login.psErr') ))
+ callback(new Error( t('login.pwErr') ))
} else {
callback()
}
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
index 9f25879..b5a37a8 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue
@@ -439,6 +439,11 @@
status: 'primary',
'name': (res.data.order.orderReview>0?t('basicData.cancel'):t('basicData.restore'))}
gridOptions.toolbarConfig.buttons.push(button)
+ if(res.data.order.orderReview===-2){
+ gridOptions.toolbarConfig.buttons[2].disabled = true
+ gridOptions.toolbarConfig.buttons[3].disabled = true
+ gridOptions.toolbarConfig.buttons[4].disabled = true
+ }
}
if(res.data.order.productionOrder !==0 ){
gridOptions.toolbarConfig.buttons[2].disabled = true
diff --git a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
index 2b67b21..2400cb8 100644
--- a/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
+++ b/north-glass-erp/northglass-erp/src/views/sd/order/UpdateOrderCraft.vue
@@ -204,11 +204,13 @@
}
//鎸夐挳瀹℃牳杩囧悗鍙樹负鍙嶅
- if(res.data.order.orderReview === 2){
+ if(Math.abs(res.data.order.orderReview) === 2){
gridOptions.toolbarConfig.buttons[2].disabled = true
}
+
+
xGrid.value.reloadData(res.data.orderGlassDetails)
//xGrid.value.reloadData(res.data.orderDetails)
diff --git a/north-glass-erp/pom.xml b/north-glass-erp/pom.xml
index 3a0b1b3..5027113 100644
--- a/north-glass-erp/pom.xml
+++ b/north-glass-erp/pom.xml
@@ -118,8 +118,8 @@
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.24</version>
- <scope>import</scope>
</dependency>
+
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-commons</artifactId>
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
index 6362316..611202c 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -4,15 +4,12 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
-import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.PatchLogMapper;
import com.example.erp.mapper.pp.ReportingWorkMapper;
import com.example.erp.service.userInfo.SysErrorService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 36c8166..3e43562 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -4,9 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.example.erp.entity.pp.FlowCard;
-import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.entity.sd.OrderDetail;
+import com.example.erp.entity.sd.OrderGlassDetail;
import com.example.erp.mapper.pp.WorkOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/north-glass-erp/src/main/resources/application.yml b/north-glass-erp/src/main/resources/application.yml
index b9217b5..f5a9908 100644
--- a/north-glass-erp/src/main/resources/application.yml
+++ b/north-glass-erp/src/main/resources/application.yml
@@ -1,6 +1,6 @@
server:
- port: 8080
+ port: 8086
spring:
diff --git a/north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java b/north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java
index 17a8572..471c944 100644
--- a/north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java
+++ b/north-glass-erp/src/test/java/com/example/erp/service/pp/ReworkServiceTest.java
@@ -11,14 +11,14 @@
private ReworkService reworkService;
- @Test
- void queryReworkTest(){
- reworkService.queryRework(1,2,"2024-01-01","2024-01-25",null);
- }
+// @Test
+// void queryReworkTest(){
+// reworkService.queryRework(1,2,"2024-01-01","2024-01-25",null);
+// }
- @Test
- void queryReworkAddTest(){
- reworkService.queryRework(1,2,"2024-01-01","2024-01-25",null);
- }
+// @Test
+// void queryReworkAddTest(){
+// reworkService.queryRework(1,2,"2024-01-01","2024-01-25",null);
+// }
}
\ No newline at end of file
diff --git a/north-glass-erp/target/classes/application.yml b/north-glass-erp/target/classes/application.yml
index b9217b5..f5a9908 100644
--- a/north-glass-erp/target/classes/application.yml
+++ b/north-glass-erp/target/classes/application.yml
@@ -1,6 +1,6 @@
server:
- port: 8080
+ port: 8086
spring:
diff --git a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
index 277efd5..770d133 100644
--- a/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
+++ b/north-glass-erp/target/classes/mapper/sd/OrderMapper.xml
@@ -17,7 +17,7 @@
<update id="updateOrderParameter">
update `order` o
left join
- (select a.order_id,sum(a.perimeter) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
+ (select a.order_id,round(sum(a.perimeter),2) as aa,sum(a.quantity) as b,sum(a.compute_gross_area) as c
from sd.order_detail as a group by a.order_id) od
on o.order_id = od.order_id
set
diff --git a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
index d865a78..2f29063 100644
--- a/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
+++ b/north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original
Binary files differ
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 c2121ce..fd8bf9a 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
@@ -1,4 +1,132 @@
-com\example\erp\controller\OrderController.class
-com\example\erp\entity\Order.class
+com\example\erp\service\sd\DeliveryService.class
+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\sd\BasicGlassTypeServise.class
+com\example\erp\service\sd\ProductService.class
+com\example\erp\entity\mm\FinishedOperateLog.class
+com\example\erp\service\userInfo\UserService.class
+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\pp\ProductionSchedulingController.class
+com\example\erp\service\sd\OrderProcessDetailService.class
+com\example\erp\controller\pp\ReworkController.class
+com\example\erp\entity\pp\DamageDetails.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\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\mapper\sd\DeliveryDetailMapper.class
+com\example\erp\config\MybatisPlusConfig.class
+com\example\erp\entity\mm\BasicWarehouseType.class
+com\example\erp\config\InterceptorConfig.class
+com\example\erp\entity\mm\MaterialStore.class
+com\example\erp\controller\sd\ProductController.class
+com\example\erp\entity\sd\GlassType.class
+com\example\erp\mapper\sd\OrderMapper.class
+com\example\erp\service\mm\BasicWarehouseTypeService.class
+com\example\erp\mapper\OrderTestMapper.class
+com\example\erp\mapper\mm\MaterialStoreMapper.class
+com\example\erp\service\pp\ProductionSchedulingService.class
+com\example\erp\service\userInfo\SysMenuService.class
+com\example\erp\exception\GlobalExceptionHandle.class
+com\example\erp\entity\pp\SetupBom.class
+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\controller\pp\ReportingWorkController.class
+com\example\erp\mapper\pp\ReportingWorkDetailMapper.class
+com\example\erp\service\sd\BasicDateService.class
+com\example\erp\entity\OrderTest.class
+com\example\erp\service\pp\FlowCardService.class
+com\example\erp\mapper\pp\PatchLogMapper.class
+com\example\erp\service\userInfo\SysMenuItemService.class
+com\example\erp\entity\pp\ReportingWorkDetail.class
+com\example\erp\controller\sd\DeliveryController.class
+com\example\erp\service\impl\OrderServiceImpl.class
+com\example\erp\entity\sd\ProductDetail.class
+com\example\erp\mapper\pp\ReworkMapper.class
+com\example\erp\config\MyCorsConfig.class
+com\example\erp\controller\sd\BasicGlassTypeController.class
+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\sd\Order.class
+com\example\erp\entity\sd\BasicGlassType.class
+com\example\erp\entity\sd\OrderGlassDetail.class
+com\example\erp\entity\userInfo\SysError.class
+com\example\erp\entity\userInfo\User.class
+com\example\erp\mapper\pp\ProductionSchedulingMapper.class
+com\example\erp\controller\sd\BasicDataController.class
+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\sd\ReturnsDetail.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\userInfo\SysErrorService.class
com\example\erp\ErpApplication.class
-com\example\erp\Mapper\OrderMapper.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\entity\pp\ReportingWork.class
+com\example\erp\tools\netty\MyWebSocketHandler.class
+com\example\erp\service\mm\MaterialService.class
+com\example\erp\controller\sd\OrderController.class
+com\example\erp\entity\pp\BasicDataProduce.class
+com\example\erp\controller\pp\ReportWorkController.class
+com\example\erp\entity\pp\PatchLog.class
+com\example\erp\mapper\pp\WorkOrderMapper.class
+com\example\erp\controller\sd\CustomerController.class
+com\example\erp\entity\pp\ProductionScheduling.class
+com\example\erp\common\CacheUtil.class
+com\example\erp\entity\pp\OrderBom.class
+com\example\erp\mapper\sd\DeliveryMapper.class
+com\example\erp\controller\mm\BasicWarehouseTypeController.class
+com\example\erp\service\sd\OrderService.class
+com\example\erp\mapper\sd\CustomerMapper.class
+com\example\erp\tools\netty\MyChannelHandlerPool.class
+com\example\erp\controller\userInfo\UserController.class
+com\example\erp\mapper\userInfo\UserMapper.class
+com\example\erp\service\pp\BasicDateProduceService.class
+com\example\erp\tools\WebSocketServer.class
+com\example\erp\mapper\sd\ProductMapper.class
+com\example\erp\common\Result.class
+com\example\erp\service\sd\CustomerService.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\userInfo\SysMenuMapper.class
+com\example\erp\tools\TokenTools.class
+com\example\erp\mapper\sd\OrderDetailMapper.class
+com\example\erp\controller\userInfo\SysMenuItemController.class
+com\example\erp\mapper\sd\ProductDetailMapper.class
+com\example\erp\entity\pp\FlowCard.class
+com\example\erp\common\Constants.class
+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\entity\userInfo\SysMenuItem.class
+com\example\erp\mapper\pp\ReportingWorkMapper.class
+com\example\erp\entity\sd\BasicData.class
+com\example\erp\entity\sd\DeliveryDetail.class
+com\example\erp\mapper\sd\BasicGlassTypeMapper.class
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 5150be3..ac515c0 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
@@ -1,4 +1,130 @@
-D:\Documents\north-glass-erp\src\main\java\com\example\erp\controller\OrderController.java
-D:\Documents\north-glass-erp\src\main\java\com\example\erp\Mapper\OrderMapper.java
-D:\Documents\north-glass-erp\src\main\java\com\example\erp\entity\Order.java
-D:\Documents\north-glass-erp\src\main\java\com\example\erp\ErpApplication.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\PatchLog.java
+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\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
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\WorkprogressMonthlySettlement.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\DeviceMaintenance.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysMenu.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\OrderTestMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReworkController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\Rework.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\CustomerService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\MaterialStoreMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\BaseBom.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ProductionScheduling.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\UserController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\BasicGlassType.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\SetupBom.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderDetail.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\WebSocketServer.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\ProductController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\User.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\mm\FinishedGoodsInventoryService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\BasicDateService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicDataController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Delivery.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\Customer.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysMenuMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ReportingWork.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ProductionSchedulingMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\userInfo\SysMenuItemController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\ReportingWorkDetail.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ReportingWorkController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\FinishedGoodsInventory.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\BasicData.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderDetailMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\DeliveryMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\BasicGlassTypeController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\impl\OrderServiceImpl.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderProcessDetailMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\UserMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysMenuItemService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\userInfo\SysErrorService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ProductionSchedulingController.java
+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\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
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\DeliveryController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\WorkOrderController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\OrderGlassDetail.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReplenishService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\FlowCardService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReworkService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\OrderTest.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\pp\ReportWorkService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\BasicDateMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\OrderController.java
+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\WorkOrderService.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\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\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
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\userInfo\SysError.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\ServiceException.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\tools\netty\MyChannelHandlerPool.java
+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\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\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
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\IOrderService.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\OrderGlassDetailMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\ProcessCardController.java
+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\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
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\common\Constants.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReportingWorkMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\PatchLogMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\userInfo\SysErrorMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\DeliveryDetail.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\mm\BasicWarehouseTypeController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\DamageDetailsMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\mm\FinishedOperateLog.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\mm\FinishedGoodsInventoryMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\pp\DamageDetails.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\entity\sd\ReturnsDetail.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\ErpApplication.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\config\WebSocketConfig.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\pp\BasicDataProduceController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\BasicDateProduceMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\sd\ProductMapper.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\mapper\pp\ReworkMapper.java
+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\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
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\controller\sd\CustomerController.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\exception\GlobalExceptionHandle.java
+D:\Documents\ERP_override\north-glass-erp\src\main\java\com\example\erp\service\sd\OrderService.java
+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\sd\Product.java
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
index 02bf5e0..be867d2 100644
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
+++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -1 +1,5 @@
+com\example\erp\service\pp\ReworkServiceTest.class
com\example\erp\ErpApplicationTests.class
+com\example\erp\service\IOrderServiceTest.class
+com\example\erp\service\sd\BasicDateServiceTest.class
+com\example\erp\service\sd\OrderServiceTest.class
diff --git a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
index daf27b4..9845b69 100644
--- a/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
+++ b/north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -1 +1,5 @@
-D:\Documents\north-glass-erp\src\test\java\com\example\erp\ErpApplicationTests.java
+D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\pp\ReworkServiceTest.java
+D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\ErpApplicationTests.java
+D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\sd\OrderServiceTest.java
+D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\sd\BasicDateServiceTest.java
+D:\Documents\ERP_override\north-glass-erp\src\test\java\com\example\erp\service\IOrderServiceTest.java
--
Gitblit v1.8.0