Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r12766 -r12769
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12766)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 12769)
@@ -43,7 +43,7 @@
 		Map<String, String> sqlWhereParamMap = gridManager
 				.getParamFromView(parameterMap);
 
-		String sql = "where po.type='" + GodownEntry.TYPE_IN + "'";
+		String sql = "where po.type='" + GodownEntry.TYPE_IN + "' and (po.sourceId is null or po.sourceId = 0)";
 		String code = sqlWhereParamMap.get("code");
 		String batchNumber = sqlWhereParamMap.get("batchNumber");
 		int codeIndex = code.lastIndexOf("[");
@@ -95,7 +95,7 @@
 	public String findGodownEntryTableList2(
 			Map<String, List<String>> parameterMap) {
 
-		String sql = "where po.type='" + GodownEntry.TYPE_OUT + "'";
+		String sql = "where po.type='" + GodownEntry.TYPE_OUT + "' and (po.sourceId is null or po.sourceId = 0)";
 		return gridManager.renderGrid(parameterMap,
 				GodownEntry.class.getSimpleName(), sql,
 				new String[] { "itemsList" });
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java
===================================================================
diff -u -r12766 -r12769
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java	(.../GodownEntryAction.java)	(revision 12766)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/GodownEntryAction.java	(.../GodownEntryAction.java)	(revision 12769)
@@ -145,7 +145,7 @@
 				// 保存入库单,里面的item一定都是新建标识号对象,并且需要更新批次属性。
 				entry = godownEntry;
 				buildGodownEntryParamsForSave(entry);
-				
+				entry.setSubType(GodownEntry.SUBTYPE_MANUE_OUT);
 				godownEntryManager.saveGodownOutEntry_TRANS_REQUIRED(entry, returnMsg);
 			}
 			saveResult = true;
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r12766 -r12769
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12766)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 12769)
@@ -1403,11 +1403,12 @@
 			Map<Long, DisposableGoodsBatch> idToDisposableGoodsBatchMap ,
 			Map<Long, DisposableGoodsBatchStock> idToBatchStockMap) {
 		// 保存入库单对象,后面需要绑定入库单和itemID
-		if(StringUtils.isBlank(entry.getSerialNumber())){// 有可能在其他地方设置了，比如同步入库单/导入入库单
+		/*if(StringUtils.isBlank(entry.getSerialNumber())){// 有可能在其他地方设置了，比如同步入库单/导入入库单
 			entry.setSerialNumber(serialNumManager
 					.getSerialNumberStr(SerialNum.TYPE_INSERT_GODOWN));
-		}
-		objectDao.save(entry);
+		}*/
+		this.save(entry);
+		//objectDao.save(entry);
 		List<GodownEntryItem> itemList = entry.getItemsList();
 		for (int i = 0; i < itemList.size(); ++i) {
 			GodownEntryItem godownEntryItem = itemList.get(i);