Index: forgon-core/src/main/java/com/forgon/oa/initdata/bean/SerialNums.java
===================================================================
diff -u -r23730 -r24148
--- forgon-core/src/main/java/com/forgon/oa/initdata/bean/SerialNums.java (.../SerialNums.java) (revision 23730)
+++ forgon-core/src/main/java/com/forgon/oa/initdata/bean/SerialNums.java (.../SerialNums.java) (revision 24148)
@@ -35,6 +35,7 @@
|| SerialNum.TYPE_INVOICE.equals(type)
|| SerialNum.TYPE_RECYCLINGAPPLICATION.equals(type)
|| SerialNum.TYPE_EXPENSIVEGOODS_BILL.equals(type)
+ || SerialNum.TYPE_SCHEDULE_DEFINITION.equals(type)
|| SerialNum.TYPE_PACKING_TASK.equals(type)) {
// 验证流水号定是否以“字母或数字开头，@结尾”
if(Pattern.matches("^[\\d\\w][\\d\\w]*@*$", serialNumBean.getDefaultSerialNum())){
Index: forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java
===================================================================
diff -u -r23730 -r24148
--- forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java (.../SerialNum.java) (revision 23730)
+++ forgon-core/src/main/java/com/forgon/serialnumber/model/SerialNum.java (.../SerialNum.java) (revision 24148)
@@ -55,6 +55,7 @@
public static final String TYPE_CLEAN = "清洗消毒";
public static final String TYPE_BARCODE = "条码";
public static final String TYPE_EXPENSIVEGOODS_BILL = "高值耗材发票";
+ public static final String TYPE_SCHEDULE_DEFINITION = "班次定义";
/**
* 采购计划单
*/
Index: ssts-web/src/main/resources/systemset/dataxml_iniData.xml
===================================================================
diff -u -r23734 -r24148
--- ssts-web/src/main/resources/systemset/dataxml_iniData.xml (.../dataxml_iniData.xml) (revision 23734)
+++ ssts-web/src/main/resources/systemset/dataxml_iniData.xml (.../dataxml_iniData.xml) (revision 24148)
@@ -37,6 +37,7 @@
+
Index: forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java
===================================================================
diff -u -r23730 -r24148
--- forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java (.../SerialNumManagerImpl.java) (revision 23730)
+++ forgon-core/src/main/java/com/forgon/serialnumber/service/SerialNumManagerImpl.java (.../SerialNumManagerImpl.java) (revision 24148)
@@ -31,6 +31,7 @@
private static SerialNumVo cleanSerialNum = null;
private static SerialNumVo packingTaskSerialNum = null;
private static SerialNumVo expensiveGoodsBillSerialNum = null;
+ private static SerialNumVo scheduleDefinitionNum = null;
private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
@@ -73,6 +74,8 @@
return packingTaskSerialNum;
}else if(SerialNum.TYPE_EXPENSIVEGOODS_BILL.equals(type)){
return expensiveGoodsBillSerialNum;
+ }else if(SerialNum.TYPE_SCHEDULE_DEFINITION.equals(type)){
+ return scheduleDefinitionNum;
}else{
return null;
}
@@ -93,6 +96,8 @@
packingTaskSerialNum = vo;
}else if(SerialNum.TYPE_EXPENSIVEGOODS_BILL.equals(type)){
expensiveGoodsBillSerialNum = vo;
+ }else if(SerialNum.TYPE_SCHEDULE_DEFINITION.equals(type)){
+ scheduleDefinitionNum = vo;
}
}
@@ -267,6 +272,7 @@
godownSerialNum = null;
invoiceSerialNum = null;
cleanSerialNum = null;
+ expensiveGoodsBillSerialNum = null;
}
}