Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java =================================================================== diff -u -r20183 -r20242 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 20183) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 20242) @@ -713,7 +713,7 @@ "select dg.idFromHisSync sourceid,dgi.batchIdFromHisSync batchid,dg.externalCode externalCode,dg.name name,dg.specification specification,dgb.batchNumber batchNumber,dgi.amount cssdStock,null inventoryStock "+ "from DisposableGoodsIdentification dgi join DisposableGoods dg on dgi.disposableGoodsID=dg.id "+ "join DisposableGoodsBatch dgb on dgi.disposableGoodsBatchID=dgb.id "+ - "where dgi.amount > 0 and dg.idFromHisSync not in (select SourceID from JXINVENTORYSTOCK where Quantity > 0 and SourceID is not null) "+ + "where dgi.amount > 0 and dgi.batchIdFromHisSync not in (select BatchID from JXINVENTORYSTOCK where Quantity > 0 and SourceID is not null) "+ "union "+