diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html
index 903f49a3..1542c07b 100644
--- a/erp_web/pages/manage/serialNumber.html
+++ b/erp_web/pages/manage/serialNumber.html
@@ -260,22 +260,6 @@
});
showSerialNumberDetails(1, initPageSize);
}
- //初始化键盘enter事件
- $(document).keydown(function (event) {
- //兼容 IE和firefox 事件
- var e = window.event || event;
- var k = e.keyCode || e.which || e.charCode;
- //兼容 IE,firefox 兼容
- var obj = e.srcElement ? e.srcElement : e.target;
- //绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件 ---遗留问题 enter键效验 对话框会关闭问题
- if (k == "13" && (obj.id == "CategoryLevel" || obj.id == "Name")) {
- $("#saveMaterial").click();
- }
- //搜索按钮添加快捷键
- if (k == "13" && (obj.id == "searchCategoryId" || (obj.id == "searchName"))) {
- $("#searchBtn").click();
- }
- });
//分页信息处理
function ininPager() {
try {
@@ -290,9 +274,21 @@
pageNumber: pageNum,
pageSize: pageSize
});
- showMaterialDetails(pageNum, pageSize);
- }
- });
+ showSerialNumberDetails(pageNum, pageSize);
+ },
+ onBeforeRefresh:function(pageNum, pageSize){
+ opts.pageSize = pageSize;
+ var pageNumberTemp=parseInt($($("input.pagination-num").get(0)).val());
+
+ opts.pageNumber = pageNumberTemp;
+ pager.pagination('refresh',
+ {
+ pageNumber: pageNumberTemp,
+ pageSize: pageSize
+ });
+ },
+ }
+ );
}
catch (e) {
$.messager.alert('异常处理提示', "分页信息异常 : " + e.name + ": " + e.message, 'error');
diff --git a/pom.xml b/pom.xml
index 7f1e9547..0516e47e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,11 +60,6 @@
spring-boot-starter-test
test
-
- log4j
- log4j
- 1.2.17
-
com.google.code.gson
@@ -107,6 +102,25 @@
lombok
1.16.12
+
+
+ ch.qos.logback
+ logback-classic
+ 1.2.3
+ compile
+
+
+ org.apache.logging.log4j
+ log4j-to-slf4j
+ 2.10.0
+ compile
+
+
+ org.slf4j
+ jul-to-slf4j
+ 1.7.25
+ compile
+
diff --git a/sql/jsh_erp.sql b/sql/jsh_erp.sql
index 3c0aaa1f..841fad89 100644
--- a/sql/jsh_erp.sql
+++ b/sql/jsh_erp.sql
@@ -5338,15 +5338,16 @@ ALTER TABLE jsh_materialcategory DROP FOREIGN KEY FK3EE7F725237A77D8;
-- ----------------------------
-- 修改根目录父节点id为-1
-- ----------------------------
-update jsh_materialcategory set ParentId='-1' where id='1'
+update jsh_materialcategory set ParentId='-1' where id='1';
-- ----------------------------
-- 删除礼品卡管理、礼品充值、礼品销售、礼品卡统计的功能数据
-- ----------------------------
-delete from jsh_functions where id in (213,214,215,216)
+delete from jsh_functions where id in (213,214,215,216);
-- ----------------------------
-- 新增采购订单、销售订单的功能数据
+--主键自增长，直接指定主键插入数据的方式可能会和本地数据冲突
-- ----------------------------
-insert into `jsh_functions` values ('242', '050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', '');
-insert into `jsh_functions` values ('243', '060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', '');
\ No newline at end of file
+insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('050202', '采购订单', '0502', '../materials/purchase_orders_list.html', b'0', '0335',b'1', '电脑版', '');
+insert into `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, `Enabled`, `Type`, `PushBtn`) VALUES ('060301', '销售订单', '0603', '../materials/sale_orders_list.html', b'0', '0392', b'1', '电脑版', '');
\ No newline at end of file
diff --git a/sql/华夏ERP数据库设计汇总.xlsx b/sql/华夏ERP数据库设计汇总.xlsx
index 8a9e3ebf..2ccf40ea 100644
Binary files a/sql/华夏ERP数据库设计汇总.xlsx and b/sql/华夏ERP数据库设计汇总.xlsx differ
diff --git a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
index 4fa2f601..55b4f55f 100644
--- a/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
+++ b/src/main/java/com/jsh/erp/service/materialCategory/MaterialCategoryService.java
@@ -111,6 +111,7 @@ public class MaterialCategoryService {
* @Param: mc
* @return void
*/
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int addMaterialCategory(MaterialCategory mc) throws Exception {
if(mc==null){
return 0;
@@ -135,7 +136,7 @@ public class MaterialCategoryService {
mc.setUpdater(userInfo==null?null:userInfo.getId());
return materialCategoryMapperEx.addMaterialCategory(mc);
}
-
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchDeleteMaterialCategoryByIds(String ids) throws Exception {
//更新时间
Date updateDate =new Date();
@@ -149,7 +150,7 @@ public class MaterialCategoryService {
}
return materialCategoryMapperEx.batchDeleteMaterialCategoryByIds(updateDate,updater,strArray);
}
-
+ @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int editMaterialCategory(MaterialCategory mc) {
//检查商品类型编号是否已存在
checkMaterialCategorySerialNo(mc);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f3b627ad..5e36727f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -9,6 +9,10 @@ mybatis.mapper-locations=classpath:./mapper_xml/*.xml
#开启sql打印
logging.level.com.jsh.erp.datasource.mappers=DEBUG
+#日志
+logging.config=classpath:logback-spring.xml
+logging.level.com.didispace=DEBUG
+
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 00000000..716fe85a
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,197 @@
+
+
+
+
+
+
+
+
+
+ logback
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ debug
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+ UTF-8
+
+
+
+
+
+
+
+
+
+ ${log.path}/log_debug.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/debug/log-debug-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ debug
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/log_info.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+
+ ${log.path}/info/log-info-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ info
+ ACCEPT
+ DENY
+
+
+
+
+
+
+ ${log.path}/log_warn.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/warn/log-warn-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ warn
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+ ${log.path}/log_error.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
+ UTF-8
+
+
+
+ ${log.path}/error/log-error-%d{yyyy-MM-dd}.%i.log
+
+ 100MB
+
+
+ 15
+
+
+
+ ERROR
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file