user4 5 yıl önce
ebeveyn
işleme
ed7842585c

+ 3 - 2
src/main/java/com/jeeplus/modules/serialnum/service/SerialNumTplService.java

@@ -96,6 +96,7 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
 
 			SerialNumTpl numTpl = this.querySerialTpl(office, bizCode);
 			if (numTpl==null){
+//			    查询编号模板   {brspnm}DZ-{year}-{serialNum}
                 SerialNumTpl serialNumTpl = dao.queryByComAndBizCode("0", bizCode);
                 serialNumTpl.setCompany(company);
                 serialNumTpl.setSerialNum(0);
@@ -108,10 +109,10 @@ public class SerialNumTplService extends CrudService<SerialNumTplDao, SerialNumT
 			if (numTpl==null){
                 throw new Exception("生成编号失败,请先设置相关业务编号模板");
             }
-            if ("0".equals(office.getParent().getId()))office.setParent(null);
+            if ("0".equals(office.getParent().getId()))
+                office.setParent(null);
             String year = DateUtils.formatDate(new Date(), "yyyy");
 			if(!year.equals(numTpl.getYearBuilt())){
-				//新年,重置SerialNum
 				dao.resetSerialNum(numTpl.getId(),numTpl.getYearBuilt(),year);
 			}
             Map<String, String> map = new HashMap<>();

+ 1 - 0
src/main/java/com/jeeplus/modules/workofficechange/service/WorkOfficeChangeService.java

@@ -229,6 +229,7 @@ public class WorkOfficeChangeService extends CrudService<WorkOfficeChangeDao, Wo
 				createBy = UserUtils.getUser();
 				workOfficeChange.setCreateBy(createBy);
 			}
+//			业务标识20:  -> 默认部门调转编号模板:
 			workOfficeChange.setNumber(serialNumTplService.genSerialNum(createBy.getCompany(),"20"));
 		}
 		this.save(workOfficeChange);

+ 1 - 14
src/main/webapp/webpage/modules/leaveapply/leaveApplyForm.jsp

@@ -9,7 +9,6 @@
         var validateForm;
         var count1 = 0;
         $(document).ready(function() {
-        	$("#no").val(setNo());
             checkContentKeyUp('reason',128);
             if($("#applyTime").val()==null || $("#applyTime").val()==''){
                 $("#applyTime").val(getNowFormatDate());
@@ -53,19 +52,7 @@
 
         });
 
-        //设置请假编号
-        function setNo(){
-        	var date = new Date();
-        	var Y = date.getFullYear();
-        	var M = date.getMonth()+1;
-        	var D = date.getDate();
-			var rr = "";
-			for (var i = 0; i < 4; i++) {
-				var ran = Math.floor(Math.random() * 10);
-				rr = rr+ran;
-			}
-			return Y+""+M+""+D+""+rr;
-		}
+
 
         function doSubmit(obj){//回调函数,在编辑和保存动作时,供openDialog调用提交表单。
             var idArr = $("#leaveDetailList tr:visible");

+ 1 - 15
src/main/webapp/webpage/modules/workfield/workFieldForm.jsp

@@ -48,8 +48,6 @@
             return false;
         }
         $(document).ready(function() {
-        	$("#num").val(setNo());
-
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交,请稍等...');
@@ -153,19 +151,7 @@
             });
         });
 
-		//设置编号
-		function setNo(){
-			var date = new Date();
-			var Y = date.getFullYear();
-			var M = date.getMonth()+1;
-			var D = date.getDate();
-			var rr = "";
-			for (var i = 0; i < 4; i++) {
-				var ran = Math.floor(Math.random() * 10);
-				rr = rr+ran;
-			}
-			return Y+""+M+""+D+""+rr;
-		}
+
         function insertTitle(tValue){
             var list = "${workField.workAttachments}";
             var size = (list.split('url')).length-1;

+ 1 - 14
src/main/webapp/webpage/modules/workout/workOutForm.jsp

@@ -49,7 +49,6 @@
             return false;
         }
         $(document).ready(function() {
-        	$("#num").val(setNo());
 
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
@@ -153,19 +152,7 @@
                 }
             });
         });
-		//设置编号
-		function setNo(){
-			var date = new Date();
-			var Y = date.getFullYear();
-			var M = date.getMonth()+1;
-			var D = date.getDate();
-			var rr = "";
-			for (var i = 0; i < 4; i++) {
-				var ran = Math.floor(Math.random() * 10);
-				rr = rr+ran;
-			}
-			return Y+""+M+""+D+""+rr;
-		}
+
         function insertTitle(tValue){
             var list = "${workOut.workAttachments}";
             var size = (list.split('url')).length-1;

+ 1 - 15
src/main/webapp/webpage/modules/workovertime/workOvertimeForm.jsp

@@ -47,22 +47,8 @@
             }
             return false;
         }
-		//设置编号
-		function setNo(){
-			var date = new Date();
-			var Y = date.getFullYear();
-			var M = date.getMonth()+1;
-			var D = date.getDate();
-			var rr = "";
-			for (var i = 0; i < 4; i++) {
-				var ran = Math.floor(Math.random() * 10);
-				rr = rr+ran;
-			}
-			return Y+""+M+""+D+""+rr;
-		}
-        $(document).ready(function() {
-        	$("#num").val(setNo());
 
+        $(document).ready(function() {
             validateForm = $("#inputForm").validate({
                 submitHandler: function(form){
                     loading('正在提交,请稍等...');