Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java =================================================================== diff -u -r13017 -r13019 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java (.../PDAAssembleSendGoodsInvoiceManagerTests.java) (revision 13017) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDAAssembleSendGoodsInvoiceManagerTests.java (.../PDAAssembleSendGoodsInvoiceManagerTests.java) (revision 13019) @@ -56,7 +56,7 @@ map.put(barcode , 1); } map.put("201410150001" , 500);//一次性物品发500个 - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"test10ml注射器", "小号"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"test10ml注射器", "小号"); assertNotNull(goods); String paramsStr = createSendOutParam(map); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java =================================================================== diff -u -r12812 -r13019 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java (.../DisposableGoodsStockAction.java) (revision 12812) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DisposableGoodsStockAction.java (.../DisposableGoodsStockAction.java) (revision 13019) @@ -503,7 +503,7 @@ public void prepare() { String id = StrutsParamUtils.getPraramValue("id", ""); if (DatabaseUtil.isPoIdValid(id)) { - disposableGoodsStock = disposableGoodsManager.getDiposableGoodsStockById(id); + disposableGoodsStock = disposableGoodsManager.getDisposableGoodsStockById(id); } else { disposableGoodsStock = new DisposableGoodsStock(); } Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r12920 -r13019 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 12920) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 13019) @@ -14,9 +14,6 @@ import java.util.Map; import java.util.Set; -import net.sf.json.JSONArray; -import net.sf.json.JSONObject; - import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.collections4.PredicateUtils; @@ -39,7 +36,7 @@ import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager; -import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig; @@ -348,8 +345,8 @@ item.getTousseName().length() - 1) .trim(); } - DisposableGoodsStock diposableGoods = diposableGoodsManager - .getDiposableGoodsOfTousseMaterialByName( + DisposableGoods diposableGoods = diposableGoodsManager + .getDisposableGoodsOfTousseMaterialByName( materialName, specification); if (diposableGoods != null) { vo.setExternalCode(diposableGoods.getExternalCode()); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java =================================================================== diff -u -r12982 -r13019 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 12982) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 13019) @@ -1305,7 +1305,7 @@ save(entry); //设置库存关系，但是调拨单本身不影响库存 for(GodownEntryItem item : entry.getItemsList()){ - item.setDiposableGoods(diposableGoodsManager.getDiposableGoodsStockById(item.getDisposableGoodsStockID() + "")); + item.setDiposableGoods(diposableGoodsManager.getDisposableGoodsStockById(item.getDisposableGoodsStockID() + "")); } //设置单的关系 inEntry.setSourceId(entry.getId()); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java =================================================================== diff -u -r13006 -r13019 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 13006) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/DiposableGoodsTableManager.java (.../DiposableGoodsTableManager.java) (revision 13019) @@ -248,7 +248,7 @@ */ public String getBatchsByDisposableGoodsStockIdAndWareHouse(String disposableGoodsStockId,String wareHouseId, boolean selectAll){ - DisposableGoodsStock goodsStock = this.diposableGoodsManager.getDiposableGoodsStockById(disposableGoodsStockId); + DisposableGoodsStock goodsStock = this.diposableGoodsManager.getDisposableGoodsStockById(disposableGoodsStockId); String batchs = "[]"; if(goodsStock != null && StringUtils.equals(goodsStock.getWarehouseID() + "", wareHouseId)){ return getBatchsByDisposableGoodsIDAndWareHouse(goodsStock.getDisposableGoodsID() + "",wareHouseId,selectAll); @@ -393,7 +393,7 @@ public String getDiposableGoodsInfoForGoodPurchase(String diposableGoodsId){ DisposableGoodsStock goods = diposableGoodsManager - .getDiposableGoodsStockById(diposableGoodsId); + .getDisposableGoodsStockById(diposableGoodsId); if(goods != null){ DisposableGoodsBatchStock lastBatchStock = getDiposableGoodLastBatchStock(goods); String manufacturer = ""; @@ -420,7 +420,7 @@ } public String getDiposableGoodsCertification(String diposableGoodsId) { DisposableGoodsStock goods = diposableGoodsManager - .getDiposableGoodsStockById(diposableGoodsId); + .getDisposableGoodsStockById(diposableGoodsId); if (goods != null) { String certification = goods.getCertification(); DisposableGoodsBatchStock lastBatchStock = getDiposableGoodLastBatchStock(goods); @@ -470,7 +470,7 @@ public String getDiposableGoodBatchProperty(String goodsId, String batchNumber) { DisposableGoodsStock goods = diposableGoodsManager - .getDiposableGoodsStockById(goodsId); + .getDisposableGoodsStockById(goodsId); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); if(goods != null){ for (DisposableGoodsBatchStock batchStock : goods.getGoodsBatchs()) { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java =================================================================== diff -u -r13017 -r13019 --- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 13017) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java (.../AbstractCSSDTest.java) (revision 13019) @@ -1991,7 +1991,7 @@ diposableGoods1.setGoodsBatchs(goodsBatchs1); diposableGoodsManager.saveOrUpdate(diposableGoods1); - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "10ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "10ML"); assertNotNull(goods); Set batchs = goods.getGoodsBatchs(); @@ -2056,9 +2056,9 @@ diposableGoods2.setGoodsBatchs(goodsBatchs2); diposableGoodsManager.saveOrUpdate(diposableGoods2); - assertNotNull(diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML")); - assertNotNull(diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "10ML")); - assertNotNull(diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8")); + assertNotNull(diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML")); + assertNotNull(diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "10ML")); + assertNotNull(diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8")); } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r13017 -r13019 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 13017) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 13019) @@ -253,7 +253,7 @@ goodsName.lastIndexOf("[")); } DisposableGoodsStock diposableGoods = diposableGoodsManager - .getDiposableGoodsByName(invoiceItem.getWareHouseId(),goodsName, specification); + .getDisposableGoodsStockByName(invoiceItem.getWareHouseId(),goodsName, specification); if (diposableGoods != null) { // TODO 这里没有减标识号的库存，是一个bug // diposableGoods.setAmount(diposableGoods.getAmount() Index: ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java =================================================================== diff -u -r13017 -r13019 --- ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java (.../DiposableGoodsManagerTests.java) (revision 13017) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerTests.java (.../DiposableGoodsManagerTests.java) (revision 13019) @@ -18,6 +18,7 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry; @@ -152,7 +153,7 @@ initCSSDData(); WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertNull(goods); DisposableGoodsStock diposableGoods = new DisposableGoodsStock(); diposableGoods.setName("注射器"); @@ -163,7 +164,7 @@ diposableGoods.setWbCode(GB2WB.getWBCode(diposableGoods.getName())); diposableGoodsManager.saveOrUpdate(diposableGoods); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertNotNull(goods); @@ -201,7 +202,7 @@ assertEquals(1.6, disposableGoodsBatchStock.getCost()); assertEquals(100, disposableGoodsBatchStock.getStorage().intValue()); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); batchs = goods.getGoodsBatchs(); assertNotNull(batchs); assertEquals(1, batchs.size()); @@ -235,7 +236,7 @@ // TODO Auto-generated catch block e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertEquals(1.71, goods.getReferencePrice()); assertEquals(300, goods.getAmount().intValue()); @@ -263,7 +264,7 @@ initCSSDData(); WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertNull(goods); DisposableGoodsStock diposableGoods = new DisposableGoodsStock(); diposableGoods.setName("注射器"); @@ -274,7 +275,7 @@ diposableGoods.setWbCode(GB2WB.getWBCode(diposableGoods.getName())); objectDao.saveOrUpdate(diposableGoods); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertNotNull(goods); @@ -310,7 +311,7 @@ assertNotNull(disposableGoodsBatchStock); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); batchs = goods.getGoodsBatchs(); assertNotNull(batchs); assertEquals(1, batchs.size()); @@ -345,7 +346,7 @@ // TODO Auto-generated catch block e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertEquals(1.6, goods.getReferencePrice()); assertEquals(300, goods.getAmount().intValue()); @@ -380,7 +381,7 @@ initCSSDData(); WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertNull(goods); DisposableGoodsStock diposableGoods = new DisposableGoodsStock(); diposableGoods.setName("注射器"); @@ -391,7 +392,7 @@ diposableGoods.setWbCode(GB2WB.getWBCode(diposableGoods.getName())); diposableGoodsManager.saveOrUpdate(diposableGoods); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertNotNull(goods); @@ -428,7 +429,7 @@ assertEquals(1.6, disposableGoodsBatchStock.getCost()); assertEquals(100, disposableGoodsBatchStock.getStorage().intValue()); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertEquals(1.6, goods.getReferencePrice()); assertEquals(100, goods.getAmount().intValue()); @@ -464,7 +465,7 @@ } catch (Exception e) { e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "1ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "1ML"); assertEquals(1.71, goods.getReferencePrice()); assertEquals(300, goods.getAmount().intValue()); @@ -505,7 +506,7 @@ initCSSDData(); WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(1000, goods.getAmount().intValue()); @@ -517,7 +518,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(1000, goods.getAmount().intValue()); } @@ -529,7 +530,7 @@ WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); // 5ML 注射器 发货 - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(1000, goods.getAmount().intValue()); @@ -540,7 +541,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(500, goods.getAmount().intValue()); @@ -551,7 +552,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(400, goods.getAmount().intValue()); @@ -563,7 +564,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(400, goods.getAmount().intValue()); @@ -580,7 +581,7 @@ DisposableGoodsStock goods = null; DisposableGoodsBatchStock stock = null; // 开始10ml注射器测试 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "10ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "10ML"); assertNotNull(goods); assertEquals(2000, goods.getAmount().intValue()); @@ -593,7 +594,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "10ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "10ML"); assertNotNull(goods); assertEquals(1500, goods.getAmount().intValue()); // 减少的应该是1.3的ident @@ -613,7 +614,7 @@ e.printStackTrace(); } // 结果 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "10ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "10ML"); assertNotNull(goods); assertEquals(1200, goods.getAmount().intValue()); // 减少的应该是1.4的ident @@ -633,11 +634,11 @@ e.printStackTrace(); } // 库存应该变为0 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "10ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "10ML"); assertNotNull(goods); assertEquals(0, goods.getAmount().intValue()); // 开始纱块测试 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(2000, goods.getAmount().intValue()); // 出库b-20140101批次的,但是价格不对，应该也能出 @@ -649,7 +650,7 @@ e.printStackTrace(); } // 应该剩余1500，b-20140101剩余1000 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(1500, goods.getAmount().intValue()); // 减少的应该是b-20140101批次 @@ -665,7 +666,7 @@ e.printStackTrace(); } // 应该剩余1500，b-20140202剩余200 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(1200, goods.getAmount().intValue()); // @@ -681,7 +682,7 @@ e.printStackTrace(); } // 应该剩余700，b-20140201剩余700,b-20140202剩余0 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(700, goods.getAmount().intValue()); @@ -703,7 +704,7 @@ WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); DisposableGoodsBatchStock stock = null; - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + DisposableGoodsStock goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(1000, goods.getAmount().intValue()); Map result = new HashMap(); @@ -733,7 +734,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); objectDao.getHibernateSession().refresh(goods); assertNotNull(goods); assertEquals(1000, goods.getAmount().intValue()); @@ -762,11 +763,11 @@ e.printStackTrace(); } // 出库数量等于库存，剩余库存应变为0 - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"注射器", "5ML"); assertNotNull(goods); assertEquals(0, goods.getAmount().intValue()); - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(2000, goods.getAmount().intValue()); @@ -794,7 +795,7 @@ e.printStackTrace(); } // 库存2000，出库1000后，库存应该变为1000. - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(1000, goods.getAmount().intValue()); @@ -806,7 +807,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(700, goods.getAmount().intValue()); @@ -834,7 +835,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(700, goods.getAmount().intValue()); @@ -862,7 +863,7 @@ e.printStackTrace(); } - goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"纱块", "6*8"); + goods = diposableGoodsManager.getDisposableGoodsStockByName(wareHouse1.getId(),"纱块", "6*8"); assertNotNull(goods); assertEquals(0, goods.getAmount().intValue()); @@ -913,15 +914,15 @@ initCSSDData(); WareHouse wareHouse1 = wareHouseManager.getDefaultWareHouseByUnitCode("testCSSD"); assertNotNull(wareHouse1); - DisposableGoodsStock goods = diposableGoodsManager.getDiposableGoodsByName(wareHouse1.getId(),"注射器", "5ML"); + DisposableGoods goods = diposableGoodsManager.getDisposableGoodsByName("注射器", "5ML"); assertNotNull(goods); final Long id = goods.getId(); System.out.print("1111111111"); Runnable thread1 = new Runnable() { public void run() { objectDao.getHibernateSession(); - DisposableGoodsStock g1 = diposableGoodsManager.getDiposableGoodsById_ForUpdate(id.toString()); + DisposableGoods g1 = diposableGoodsManager.getDisposableGoodsById_ForUpdate(id.toString()); assertNotNull(g1); // Thread.sleep(60*60*1000); System.out.print("thread1"); @@ -934,7 +935,7 @@ public void run() { //SessionFactoryUtils.getSession(sessionFactory, true); - DisposableGoodsStock g1 =diposableGoodsManager.getDiposableGoodsById_ForUpdate(id.toString()); + DisposableGoods g1 =diposableGoodsManager.getDisposableGoodsById_ForUpdate(id.toString()); assertNotNull(g1); // Thread.sleep(60*60*1000); System.out.print("thread2"); Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java =================================================================== diff -u -r13018 -r13019 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13018) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java (.../DiposableGoodsAction.java) (revision 13019) @@ -163,7 +163,7 @@ String id = StrutsParamUtils.getPraramValue("id", ""); DisposableGoodsStock disposableGoodsStock = null; if (StringUtils.isNotBlank(id) && !id.equals("0")) { - disposableGoodsStock = diposableGoodsManager.getDiposableGoodsStockById(id); + disposableGoodsStock = diposableGoodsManager.getDisposableGoodsStockById(id); } else { disposableGoodsStock = new DisposableGoodsStock(); } Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java =================================================================== diff -u -r13018 -r13019 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 13018) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManager.java (.../DiposableGoodsManager.java) (revision 13019) @@ -26,9 +26,9 @@ public DisposableGoods getDisposableGoodsById(String id); - public DisposableGoodsStock getDiposableGoodsStockById(String id); + public DisposableGoodsStock getDisposableGoodsStockById(String id); - public DisposableGoodsStock getDiposableGoodsByName(Long warehouseId,String name, + public DisposableGoodsStock getDisposableGoodsStockByName(Long warehouseId,String name, String specification); public DisposableGoods getDisposableGoodsByName(String name,String specification); @@ -38,14 +38,11 @@ public DisposableGoodsStock getDisposableGoodsStockByDisposableGoodsID(Long warehouseID,Long disposableGoodsID); public DisposableGoodsBatchStock getByWarehouseIDAndBarcode(Long warehouseID,String barcode); - public void deleteDiposableGoodsById(String id); - public boolean verifyDiposableGoods(String id, String name, String specification); public String getDiposableGoodsTypeTreeJson(); - //public JSONObject searchDiposableGoods(String simpleSpell, String allItems,String wareHouseId); /** * 获取一次性物品定义的列表 * @param simpleSpell 拼音或五笔码，或者是物品名称 @@ -61,8 +58,6 @@ public String importDiposableGoodsFromExcel(HttpServletRequest request); - public DisposableGoodsStock getDiposableGoodsOfTousseMaterialByName(String name, - String specification); public DisposableGoods getDisposableGoodsOfTousseMaterialByName(String name, String specification); @@ -83,7 +78,7 @@ public DisposableGoods getDisposableGoodsByInventorySerialNumber(String inventorySerialNumber); /////////////// - public DisposableGoodsStock getDiposableGoodsById_ForUpdate(String id); + public DisposableGoods getDisposableGoodsById_ForUpdate(String id); public List getDiposableGoodsBySql_ForUpdate(String sql); @@ -108,7 +103,6 @@ public List getDisposableGoodsBatchesByDisposableGoodsID(Long disposableGoodsID); -// public List getDiposableGoodsByIds_ForUpdate(asd); // 在新的事务中执行删除。 public void deleteDiposableGoodsById_TRANS_NEW(String id); // 获取批次的可以退库的价格数量 Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java =================================================================== diff -u -r13018 -r13019 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 13018) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java (.../DiposableGoodsManagerImpl.java) (revision 13019) @@ -21,6 +21,7 @@ import javax.servlet.http.HttpServletRequest; +import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.apache.commons.lang.StringUtils; @@ -45,7 +46,6 @@ import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; -import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryItem; import com.forgon.disinfectsystem.entity.assestmanagement.IdentificationOfDisposableGoods; import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance; @@ -508,25 +508,19 @@ return (DisposableGoods) objectDao.getByProperty( DisposableGoods.class.getSimpleName(), "id", Long.valueOf(id)); } - public DisposableGoodsStock getDiposableGoodsStockById(String id){ + public DisposableGoodsStock getDisposableGoodsStockById(String id){ return (DisposableGoodsStock) objectDao.getByProperty( DisposableGoodsStock.class.getSimpleName(), "id", Long.valueOf(id)); } - public void deleteDiposableGoodsById(String id) { - objectDao.delete(getDisposableGoodsById(id)); - } public boolean verifyDiposableGoods(String id, String name, String specification) { String sql = "where po.name = '" + name + "'"; if (StringUtils.isNotEmpty(id)) { sql += " and po.id != " + id; } - if (StringUtils.isNotBlank(specification)) { - sql += " and po.specification = '" + specification + "'"; - } else { - sql += " and po.specification is null"; - } + sql += String.format(" and %s", SqlUtils.getStringFieldPredicateWithBlankHandling("po.specification", specification)); + if (objectDao.getBySql(DisposableGoods.class.getSimpleName(), sql) != null) { return false; } else { @@ -535,29 +529,22 @@ } public String getDiposableGoodsTypeTreeJson() { - String json = null; + JSONArray jsonArray = new JSONArray(); List types = httpOptionManager .getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE); for (String type : types) { - - if (json == null) { - json = "{\"expanded\":false,\"href\":\"javascript:reloadGrid('" - + type - + "');\",\"hrefTarget\":\"_self\",\"isManager\":false,\"keyId\":\"\",\"leaf\":true,\"singleClickExpand\":true,\"text\":\"" - + type + "\"}"; - } else { - json += ",{\"expanded\":false,\"href\":\"javascript:reloadGrid('" - + type - + "');\",\"hrefTarget\":\"_self\",\"isManager\":false,\"keyId\":\"\",\"leaf\":true,\"singleClickExpand\":true,\"text\":\"" - + type + "\"}"; - } + JSONObject json = new JSONObject(); + json.put("expanded", false); + json.put("href", "javascript:reloadGrid('"+type+"');"); + json.put("hrefTarget", "_self"); + json.put("isManager", false); + json.put("keyId", ""); + json.put("leaf", true); + json.put("singleClickExpand", true); + json.put("text", type); + jsonArray.add(json); } - if (json != null) { - json = "[" + json + "]"; - } else { - json = "[]"; - } - return json; + return jsonArray.toString(); } /** @@ -1000,17 +987,17 @@ @Override - public DisposableGoodsStock getDiposableGoodsByName(Long warehouseId,String name, + public DisposableGoodsStock getDisposableGoodsStockByName(Long warehouseId,String name, String specification) { - String sql = String.format(" where po.warehouseID=%s ",warehouseId); - if (StringUtils.isNotBlank(name)) { - sql += "and po.name = '" + name + "'"; - sql += String.format(" and (%s) ", SqlUtils.getStringFieldPredicateWithBlankHandling("po.specification", specification)); - - return (DisposableGoodsStock) objectDao.getBySql( - DisposableGoodsStock.class.getSimpleName(), sql); + if (StringUtils.isBlank(name)) { + return null; } - return null; + String sql = String.format(" where po.warehouseID=%s ",warehouseId); + sql += "and po.name = '" + name + "'"; + sql += String.format(" and (%s) ", SqlUtils.getStringFieldPredicateWithBlankHandling("po.specification", specification)); + + return (DisposableGoodsStock) objectDao.getBySql( + DisposableGoodsStock.class.getSimpleName(), sql); } public DisposableGoods getDisposableGoodsByName(String name, @@ -1192,25 +1179,6 @@ } @Override - public DisposableGoodsStock getDiposableGoodsOfTousseMaterialByName(String name, - String specification) { - String sql = "where po.name='" + name - + "' and po.isPartOfTousseMaterial='能'"; - if (StringUtils.isNotBlank(specification)) { - sql += " and po.specification = '" + specification + "'"; - } else { - sql += " and po.specification is null"; - } - @SuppressWarnings("unchecked") - List list = objectDao.findBySql( - DisposableGoodsStock.class.getSimpleName(), sql); - if (list != null && list.size() > 0) { - return (DisposableGoodsStock) list.get(0); - } else { - return null; - } - } - @Override public DisposableGoods getDisposableGoodsOfTousseMaterialByName(String name, String specification) { String sql = "where po.name='" + name @@ -1481,10 +1449,9 @@ DisposableGoods.class.getSimpleName(), "inventorySerialNumber", inventorySerialNumber); } - public DisposableGoodsStock getDiposableGoodsById_ForUpdate(String id) { - // return (DiposableGoods) objectDao.getById_ForUpdate( - // DiposableGoods.class.getSimpleName(), Long.valueOf(id)); - return null; + public DisposableGoods getDisposableGoodsById_ForUpdate(String id) { + return (DisposableGoods) objectDao.getByID_ForUpdate( + DisposableGoods.class.getSimpleName(), Long.valueOf(id)); } public List getDiposableGoodsBySql_ForUpdate(String sql) {