Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java =================================================================== diff -u -r21235 -r21488 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java (.../InventoryRecordManager.java) (revision 21235) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManager.java (.../InventoryRecordManager.java) (revision 21488) @@ -5,7 +5,9 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; + import net.sf.json.JSONArray; + import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryItem; import com.forgon.disinfectsystem.entity.stocktakemanager.InventoryRecord; import com.forgon.tools.hibernate.BasePoManager; Index: ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java =================================================================== diff -u -r21292 -r21488 --- ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 21292) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/inventoryrecord/service/InventoryRecordManagerImpl.java (.../InventoryRecordManagerImpl.java) (revision 21488) @@ -12,11 +12,9 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; import javax.servlet.http.HttpServletRequest; @@ -36,7 +34,6 @@ import com.forgon.Constants; import com.forgon.directory.acegi.tools.AcegiHelper; -import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; @@ -79,9 +76,6 @@ import com.forgon.log.service.LogManager; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; -import com.forgon.systemsetting.model.HttpOption; -import com.forgon.tools.GB2Alpha; -import com.forgon.tools.GB2WB; import com.forgon.tools.MathTools; import com.forgon.tools.Path; import com.forgon.tools.date.DateTools; @@ -277,7 +271,9 @@ throw new RuntimeException(ConstantDefinition.WRITEBACK_RESULTMESSAGE_PREFIX + jsonReturn.optString("message")); } }else{ - writeBackInventoryHelper.writeBackForGodownEntryStockTakeOut(Collections.singletonList(entry.getId())); + if(writeBackInventoryHelper != null){ + writeBackInventoryHelper.writeBackForGodownEntryStockTakeOut(Collections.singletonList(entry.getId())); + } } } // 盘盈入库单 @@ -306,10 +302,13 @@ throw new RuntimeException(ConstantDefinition.WRITEBACK_RESULTMESSAGE_PREFIX + jsonReturn.optString("message")); } }else{ - writeBackInventoryHelper.writeBackForGodownEntryStockTakeIn(Collections.singletonList(entry.getId())); + if(writeBackInventoryHelper != null){ + writeBackInventoryHelper.writeBackForGodownEntryStockTakeIn(Collections.singletonList(entry.getId())); + } } } } catch (Exception e) { + e.printStackTrace(); throw new RuntimeException(e.getMessage()); } }