diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js index a2e1491c..ba5f7819 100644 --- a/erp_web/js/pages/materials/in_out.js +++ b/erp_web/js/pages/materials/in_out.js @@ -582,7 +582,7 @@ } }, { title: organNameTitle, field: 'organName',width:120, hidden:isShowOrganNameColumn}, - { title: '单据编号',field: 'number',width:145}, + { title: '单据编号',field: 'number',width:125}, { title: '商品信息',field: 'materialsList',width:180,formatter:function(value){ if(value) { return value.replace(",",","); @@ -1544,8 +1544,7 @@ if(res && res.code === 200){ var obj = res.data; var defaultNumber = obj.DefaultNumber; - var thisDateTwo = getNowFormatDateTwo(); //当前日期 - var newNumber = amountNum + thisDateTwo + defaultNumber + var newNumber = amountNum + defaultNumber $("#Number").val(newNumber).attr("data-defaultNumber",newNumber); } }, diff --git a/src/main/java/com/jsh/erp/constants/BusinessConstants.java b/src/main/java/com/jsh/erp/constants/BusinessConstants.java index 8ed7a377..5b1c3ea3 100644 --- a/src/main/java/com/jsh/erp/constants/BusinessConstants.java +++ b/src/main/java/com/jsh/erp/constants/BusinessConstants.java @@ -65,7 +65,7 @@ public class BusinessConstants { * sequence名称 * */ //sequence返回字符串的最小长度 - public static final Long SEQ_TO_STRING_MIN_LENGTH = 1000000L; + public static final Long SEQ_TO_STRING_MIN_LENGTH = 100000000L; //sequence长度小于基准长度时前追加基础值 public static final String SEQ_TO_STRING_LESS_INSERT = "0"; //单据编号