Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java =================================================================== diff -u -r16604 -r16677 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java (.../PackingTableManagerTests.java) (revision 16604) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java (.../PackingTableManagerTests.java) (revision 16677) @@ -88,7 +88,7 @@ } // 并发调用该方法，验证死锁是否会发生 - @Test +// @Test public void testFindPackingRecordTableListConcurrent() throws Exception { initDataInSeperateThread(); @@ -182,7 +182,7 @@ } } - @Test +// @Test public void testPackingTousseConcurrent() throws Exception{ initDataInSeperateThread(); Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java =================================================================== diff -u -r13424 -r16677 --- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java (.../InvoiceManagerForComboFormTests.java) (revision 13424) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForComboFormTests.java (.../InvoiceManagerForComboFormTests.java) (revision 16677) @@ -24,6 +24,8 @@ import test.forgon.disinfectsystem.AbstractCSSDTest; import com.forgon.directory.model.BarcodeDevice; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods; +import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatch; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsIdentification; import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock; @@ -39,6 +41,7 @@ import com.forgon.disinfectsystem.invoicemanager.vo.ScanGoodsVo; import com.forgon.disinfectsystem.webservice.service.ServiceManager; import com.forgon.tools.MathTools; +import com.forgon.tools.json.JSONUtil; /** * 通用申请单发货 * @author WangYi @@ -58,9 +61,134 @@ private RecyclingApplication application;//定义为全局变量,然后取其id private void createComboApplication(){ + + DisposableGoods disposableGoods = diposableGoodsManager.getDisposableGoodsByName("test注射器", "小号"); application = new RecyclingApplication(); + objectDao.saveOrUpdate(application); + // 器械包 + TousseDefinition tousseDefinition1 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); + for (String barcode : tousseInstanceArray) { + TousseInstance tousseInstance1 = new TousseInstance(); + tousseInstance1.setTousseDefinition(tousseDefinition1); + tousseInstance1.setTousseName("Test开胸包"); + tousseInstance1.setBarcode(barcode); + tousseInstance1.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); + tousseInstance1.setStatus(TousseInstance.STATUS_STERILED); + tousseInstance1.setPrice(3.14); + tousseInstance1.setFluctuationPrice(3.14); + tousseInstance1.setSterilingType("P1"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseInstance1.setStatisticsAmount(1); + Date date = null; + try { + date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2030-10-20 13:00:00"); + } catch (ParseException e) { + e.printStackTrace(); + } + tousseInstance1.setValidUntil(date); + tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_OR); + tousseInstanceManager.saveOrUpdate(tousseInstance1); + tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName()); + } + + //// 消毒物品 + //消毒物品(固定条码器械包关联用) + TousseDefinition disinfectionTousse = new TousseDefinition(); + disinfectionTousse.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); + + disinfectionTousse.setName("止血带"); + disinfectionTousse.setPrice(2.5); + disinfectionTousse.setTousseAmount(1); + disinfectionTousse.setSpelling("zxd"); + disinfectionTousse.setIsTraceable("否"); + disinfectionTousse.setIsCleanedEntirely("否"); + disinfectionTousse.setWorkLoadStatisticalMethod("按包"); + disinfectionTousse.setIsRecycling("是"); + + objectDao.save(disinfectionTousse); + disinfectionTousse.setAncestorID(disinfectionTousse.getId()); + objectDao.saveOrUpdate(disinfectionTousse); + //创建固定条码的器械包 + for (String barcode : disinfectArray) { + TousseInstance tousseInstance1 = new TousseInstance(); + tousseInstance1.setTousseDefinition(disinfectionTousse); + tousseInstance1.setTousseName("止血带"); + tousseInstance1.setBarcode(barcode); + tousseInstance1.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); + tousseInstance1.setStatus(TousseInstance.STATUS_DISINFECTED); + tousseInstance1.setPrice(2.5); + tousseInstance1.setFluctuationPrice(2.5); + tousseInstance1.setSterilingType("P1"); + tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseInstance1.setStatisticsAmount(10); + tousseInstance1.setTousseFixedBarcode(true); + tousseInstance1.setUnTraceableTousse(true); + + Date date = null; + try { + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.DATE, 180); + date = cal.getTime(); + } catch (Exception e) { + e.printStackTrace(); + } + tousseInstance1.setValidUntil(date); + tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstanceManager.saveOrUpdate(tousseInstance1); + tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName()); + } + + + TousseDefinition disinfectionTousseNew = new TousseDefinition(); + disinfectionTousseNew.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); + disinfectionTousseNew.setAncestorID(disinfectionTousse.getId()); + disinfectionTousseNew.setName("止血带"); + disinfectionTousseNew.setInvoicePlanID(application.getId()); + disinfectionTousseNew.setPrice(2.5); + disinfectionTousseNew.setTousseAmount(1); + disinfectionTousseNew.setSpelling("zxd"); + disinfectionTousseNew.setIsTraceable("否"); + disinfectionTousseNew.setIsCleanedEntirely("否"); + disinfectionTousseNew.setWorkLoadStatisticalMethod("按包"); + disinfectionTousseNew.setIsRecycling("是"); + disinfectionTousseNew.setMaterialsMD5("testMD5"); +// tousseDefinitionManager.saveOrUpdate(disinfectionTousseNew); + objectDao.saveOrUpdate(disinfectionTousseNew); + + //创建一个待发货器械包实例记录及相应器械包定义 + TousseInstance tousseInstanceNew = new TousseInstance(); + tousseInstanceNew.setTousseDefinition(disinfectionTousseNew); + tousseInstanceNew.setTousseName("止血带"); + tousseInstanceNew.setInvoicePlanID(application.getId()); + tousseInstanceNew.setBarcode("010000218");//随便写,反正不使用此条码 + tousseInstanceNew.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); + tousseInstanceNew.setStatus(TousseInstance.STATUS_DISINFECTED); + tousseInstanceNew.setPrice(2.5); + tousseInstanceNew.setFluctuationPrice(2.5); + tousseInstanceNew.setSterilingType("P1"); + tousseInstanceNew.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstanceNew.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); + tousseInstanceNew.setStatisticsAmount(10); + tousseInstanceNew.setTousseFixedBarcode(false); + tousseInstanceNew.setUnTraceableTousse(true); + + Date date = null; + try { + Calendar cal = Calendar.getInstance(); + cal.add(Calendar.DATE, 180); + date = cal.getTime(); + } catch (Exception e) { + e.printStackTrace(); + } + tousseInstanceNew.setValidUntil(date); + tousseInstanceManager.setToDefaultWareHouse(tousseInstanceNew, Constants.ORG_UNIT_CODE_DISINFECT); + tousseInstanceManager.saveOrUpdate(tousseInstanceNew); + //// 消毒物品 TousseItem ti1 = new TousseItem(); ti1.setTousseName("Test开胸包"); + ti1.setTousseDefinitionId(tousseDefinition1.getId()); ti1.setAmount(5); ti1.setRecyclingAmount(null); ti1.setSendOutAmount(0); @@ -79,7 +207,8 @@ TousseItem ti3 = new TousseItem(); ti3.setTousseType(TousseItem.TYPE_DIPOSABLE_GOODS); - ti3.setTousseName("test注射器[小号]"); + ti3.setTousseName(disposableGoods.getShowName()); + ti3.setDisposableGoodsId(disposableGoods.getId()); ti3.setAmount(1000); ti3.setDiposable("是"); ti3.setRecyclingAmount(0); @@ -101,12 +230,16 @@ application.setSerialNumber("89012000001"); application.setDepartCoding("3266"); application.setSettleAccountsDepartCoding("3266"); + application.setHandleDepart(Constants.ORG_UNIT_NAME_CSSD); + application.setHandleDepartCoding(Constants.ORG_UNIT_CODE_CSSD); + objectDao.saveOrUpdate(application); TousseItem ti4 = new TousseItem(); ti4.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); ti4.setTousseName("止血带"); ti4.setInvoicePlanID(application.getId()); + ti4.setTousseDefinitionId(disinfectionTousseNew.getId()); ti4.setAmount(1); ti4.setDiposable("否"); ti4.setRecyclingAmount(null); @@ -119,36 +252,77 @@ } + /** * 创建一次性物品 */ private void createDiposableGoods2(){ + WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD); + assertNotNull(wareHouse_CSSD); + DisposableGoods disposableGoods = new DisposableGoods(); + disposableGoods.setName("test注射器"); + disposableGoods.setSpecification("小号"); + disposableGoods.setReferencePrice(1.2); + disposableGoods.setMinApplyAmount(100); + objectDao.saveOrUpdate(disposableGoods); //一次性物品 - DisposableGoodsStock diposableGoods = new DisposableGoodsStock(); - diposableGoods.setName("test注射器"); - diposableGoods.setSpecification("小号"); + DisposableGoodsStock disposableGoodsStock = new DisposableGoodsStock(); + disposableGoodsStock.setName("test注射器"); + disposableGoodsStock.setSpecification("小号"); //diposableGoods.setAmount(1100L); - diposableGoods.setReferencePrice(1.2); - diposableGoods.setMinApplyAmount(100); + disposableGoodsStock.setReferencePrice(1.2); + disposableGoodsStock.setMinApplyAmount(100); + disposableGoodsStock.setDisposableGoodsID(disposableGoods.getId()); + disposableGoodsStock.setWarehouseID(wareHouse_CSSD.getId()); + disposableGoodsStock.setWarehouseName(wareHouse_CSSD.getName()); //批次 Set batchList = new HashSet(); + // 批次定义 + DisposableGoodsBatch disposableGoodsBatch = new DisposableGoodsBatch(); + disposableGoodsBatch.setDiposableGoods(disposableGoods); + disposableGoodsBatch.setBatchNumber("1402180001"); + disposableGoodsBatch.setBarcode(disposableGoodsArray[0]); + disposableGoodsBatch.setCost(1.2); + Date date = null; + try { + date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2030-09-20 00:00:00"); + } catch (ParseException e) { + e.printStackTrace(); + } + disposableGoodsBatch.setExpDate(date); + objectDao.saveOrUpdate(disposableGoodsBatch); + ///// DisposableGoodsBatchStock batch = new DisposableGoodsBatchStock(); - batch.setDiposableGoods(diposableGoods); + batch.setDiposableGoods(disposableGoodsStock); + batch.setDisposableGoodsBatchId(disposableGoodsBatch.getId()); + batch.setDisposableGoodsId(disposableGoods.getId()); + batch.setDisposableGoodsStockId(disposableGoodsStock.getId()); + batch.setWarehouseID(wareHouse_CSSD.getId()); + batch.setWarehouseName(wareHouse_CSSD.getName()); batch.setBatchNumber("1402180001"); // batch.setType(BarcodeDevice.BARCODE_TYPE_DIPOSABLEGOODS); batch.setBarcode(disposableGoodsArray[0]); batch.setStorage(700L); batch.setCost(1.2); - Date date = null; - try { - date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2015-09-20 00:00:00"); - } catch (ParseException e) { - e.printStackTrace(); - } + batch.setExpDate(date); batchList.add(batch); + + // 批次定义 + DisposableGoodsBatch disposableGoodsBatch2 = new DisposableGoodsBatch(); + disposableGoodsBatch2.setDiposableGoods(disposableGoods); + disposableGoodsBatch2.setBatchNumber("1402180002"); + disposableGoodsBatch2.setBarcode(disposableGoodsArray[1]); + disposableGoodsBatch2.setCost(1.5); + disposableGoodsBatch2.setExpDate(date); + objectDao.saveOrUpdate(disposableGoodsBatch2); DisposableGoodsBatchStock batch2 = new DisposableGoodsBatchStock(); - batch2.setDiposableGoods(diposableGoods); + batch2.setDiposableGoods(disposableGoodsStock); + batch2.setDisposableGoodsBatchId(disposableGoodsBatch2.getId()); + batch2.setDisposableGoodsId(disposableGoods.getId()); + batch2.setDisposableGoodsStockId(disposableGoodsStock.getId()); + batch2.setWarehouseID(wareHouse_CSSD.getId()); + batch2.setWarehouseName(wareHouse_CSSD.getName()); batch2.setBatchNumber("1402180002"); // batch2.setType(BarcodeDevice.BARCODE_TYPE_DIPOSABLEGOODS); batch2.setBarcode(disposableGoodsArray[1]); @@ -162,13 +336,23 @@ DisposableGoodsIdentification identification = new DisposableGoodsIdentification(); identification.setAmount(200L); identification.setBatchStock(batch2); + identification.setDisposableGoodsBatchID(disposableGoodsBatch2.getId()); + identification.setDisposableGoodsID(disposableGoods.getId()); + identification.setDisposableGoodsStockID(disposableGoodsStock.getId()); + identification.setWarehouseID(wareHouse_CSSD.getId()); + identification.setWarehouseName(wareHouse_CSSD.getName()); identification.setIdentification("00001"); identification.setPrice(1.5); identification.setEntryDate(date); list.add(identification); DisposableGoodsIdentification identification22 = new DisposableGoodsIdentification(); identification22.setAmount(200L); identification22.setBatchStock(batch2); + identification22.setDisposableGoodsBatchID(disposableGoodsBatch2.getId()); + identification22.setDisposableGoodsID(disposableGoods.getId()); + identification22.setDisposableGoodsStockID(disposableGoodsStock.getId()); + identification22.setWarehouseID(wareHouse_CSSD.getId()); + identification22.setWarehouseName(wareHouse_CSSD.getName()); identification22.setIdentification("00002"); identification22.setPrice(1.6); identification22.setEntryDate(date); @@ -179,155 +363,65 @@ DisposableGoodsIdentification identification2 = new DisposableGoodsIdentification(); identification2.setAmount(700L); identification2.setBatchStock(batch); + identification2.setDisposableGoodsBatchID(disposableGoodsBatch.getId()); + identification2.setDisposableGoodsID(disposableGoods.getId()); + identification2.setDisposableGoodsStockID(disposableGoodsStock.getId()); + identification2.setWarehouseID(wareHouse_CSSD.getId()); + identification2.setWarehouseName(wareHouse_CSSD.getName()); identification2.setIdentification("00002"); identification2.setPrice(1.2); identification2.setEntryDate(date); list2.add(identification2); batch.setIdentifications(list2); - diposableGoods.setGoodsBatchs(batchList); - diposableGoods.recalculateAmount(); - objectDao.saveOrUpdate(diposableGoods); + disposableGoodsStock.setGoodsBatchs(batchList); + disposableGoodsStock.recalculateAmount(); + objectDao.saveOrUpdate(disposableGoodsStock); } - public void createInvoiceGoods(){ - TousseDefinition tousseDefinition1 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包"); - for (String barcode : tousseInstanceArray) { - TousseInstance tousseInstance1 = new TousseInstance(); - tousseInstance1.setTousseDefinition(tousseDefinition1); - tousseInstance1.setTousseName("Test开胸包"); - tousseInstance1.setBarcode(barcode); - tousseInstance1.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); - tousseInstance1.setStatus(TousseInstance.STATUS_STERILED); - tousseInstance1.setPrice(3.14); - tousseInstance1.setFluctuationPrice(3.14); - tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); - tousseInstance1.setStatisticsAmount(1); - Date date = null; - try { - date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2015-10-20 13:00:00"); - } catch (ParseException e) { - e.printStackTrace(); - } - tousseInstance1.setValidUntil(date); - tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_OR); - tousseInstanceManager.saveOrUpdate(tousseInstance1); - tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName()); - } - //消毒物品(固定条码器械包关联用) - TousseDefinition disinfectionTousse = new TousseDefinition(); - disinfectionTousse.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - disinfectionTousse.setName("止血带"); - disinfectionTousse.setPrice(2.5); - disinfectionTousse.setTousseAmount(1); - disinfectionTousse.setSpelling("zxd"); - disinfectionTousse.setIsTraceable("否"); - disinfectionTousse.setIsCleanedEntirely("否"); - disinfectionTousse.setWorkLoadStatisticalMethod("按包"); - disinfectionTousse.setIsRecycling("是"); - - objectDao.save(disinfectionTousse); - //创建固定条码的器械包 - for (String barcode : disinfectArray) { - TousseInstance tousseInstance1 = new TousseInstance(); - tousseInstance1.setTousseDefinition(disinfectionTousse); - tousseInstance1.setTousseName("止血带"); - tousseInstance1.setBarcode(barcode); - tousseInstance1.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); - tousseInstance1.setStatus(TousseInstance.STATUS_DISINFECTED); - tousseInstance1.setPrice(2.5); - tousseInstance1.setFluctuationPrice(2.5); - tousseInstance1.setSterilingType("P1"); - tousseInstance1.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstance1.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); - tousseInstance1.setStatisticsAmount(10); - tousseInstance1.setTousseFixedBarcode(true); - tousseInstance1.setUnTraceableTousse(true); - - Date date = null; - try { - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DATE, 180); - //date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2015-12-20 13:00:00"); - date = cal.getTime(); - } catch (Exception e) { - e.printStackTrace(); - } - tousseInstance1.setValidUntil(date); - tousseInstanceManager.setToDefaultWareHouse(tousseInstance1, Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstanceManager.saveOrUpdate(tousseInstance1); - tousseStockManager.increaseStockByTousseName(tousseInstance1.getTousseName()); - } - - - TousseDefinition disinfectionTousseNew = new TousseDefinition(); - disinfectionTousseNew.setTousseType(TousseDefinition.PACKAGE_TYPE_DISINFECTION); - disinfectionTousseNew.setName("止血带"); - disinfectionTousseNew.setInvoicePlanID(application.getId()); - disinfectionTousseNew.setPrice(2.5); - disinfectionTousseNew.setTousseAmount(1); - disinfectionTousseNew.setSpelling("zxd"); - disinfectionTousseNew.setIsTraceable("否"); - disinfectionTousseNew.setIsCleanedEntirely("否"); - disinfectionTousseNew.setWorkLoadStatisticalMethod("按包"); - disinfectionTousseNew.setIsRecycling("是"); - objectDao.save(disinfectionTousseNew); - - //创建一个待发货器械包实例记录及相应器械包定义 - TousseInstance tousseInstanceNew = new TousseInstance(); - tousseInstanceNew.setTousseDefinition(disinfectionTousseNew); - tousseInstanceNew.setTousseName("止血带"); - tousseInstanceNew.setInvoicePlanID(application.getId()); - tousseInstanceNew.setBarcode("010000218");//随便写,反正不使用此条码 - tousseInstanceNew.setType(BarcodeDevice.BARCODE_TYPE_PACKAGE); - tousseInstanceNew.setStatus(TousseInstance.STATUS_DISINFECTED); - tousseInstanceNew.setPrice(2.5); - tousseInstanceNew.setFluctuationPrice(2.5); - tousseInstanceNew.setSterilingType("P1"); - tousseInstanceNew.setOrgUnitCoding(Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstanceNew.setOrgUnitName(Constants.ORG_UNIT_NAME_DISINFECT); - tousseInstanceNew.setStatisticsAmount(10); - tousseInstanceNew.setTousseFixedBarcode(true); - tousseInstanceNew.setUnTraceableTousse(true); - - Date date = null; - try { - Calendar cal = Calendar.getInstance(); - cal.add(Calendar.DATE, 180); - //date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2015-12-20 13:00:00"); - date = cal.getTime(); - } catch (Exception e) { - e.printStackTrace(); - } - tousseInstanceNew.setValidUntil(date); - tousseInstanceManager.setToDefaultWareHouse(tousseInstanceNew, Constants.ORG_UNIT_CODE_DISINFECT); - tousseInstanceManager.saveOrUpdate(tousseInstanceNew); - } + public void createInvoiceGoods(){} - private List getInvoiceGoods(){ - List list = new ArrayList(); + private List getInvoiceGoods(){ + WareHouse wareHouse_CSSD = wareHouseManager.getDefaultWareHouseByUnitCode(Constants.ORG_UNIT_CODE_CSSD); + List list = new ArrayList(); for (String barcode : tousseInstanceArray) { - ScanGoodsVo vo = new ScanGoodsVo(); - vo.setBarcode(barcode); - vo.setSendAmount(1); + JSONObject vo = new JSONObject(); + vo.put("barcode", barcode); + vo.put("sendAmount", 1); + vo.put("isRoutine", TousseInstance.ROUTINE_YES); list.add(vo); } for (String barcode : disposableGoodsArray) { - ScanGoodsVo vo = new ScanGoodsVo(); - vo.setBarcode(barcode); + JSONObject vo = new JSONObject(); + vo.put("barcode", barcode); + vo.put("tousseType", DisposableGoods.TYPE_NAME); + + JSONObject typeInfoOnScanned = new JSONObject(); + + DisposableGoodsBatchStock disposableGoodsBatchStock = diposableGoodsManager.getByWarehouseIDAndBarcode(wareHouse_CSSD.getId(), barcode); + /// + typeInfoOnScanned.put("disposableGoodsId", disposableGoodsBatchStock.getDisposableGoodsId()); + typeInfoOnScanned.put("disposableGoodsStockId", disposableGoodsBatchStock.getDisposableGoodsStockId()); + typeInfoOnScanned.put("disposableGoodsBatchId", disposableGoodsBatchStock.getDisposableGoodsBatchId()); + typeInfoOnScanned.put("disposableGoodsBatchStockId", disposableGoodsBatchStock.getId()); +// if(StringUtils.equals(tousseType,DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS)){ +// typeInfoOnScanned.put("expensiveDisposablegoodsId", null); +// } + /// if("20150300001".equals(barcode)){ - vo.setSendAmount(700); + vo.put("sendAmount", 700); }else{ - vo.setSendAmount(300); + vo.put("sendAmount", 300); } + vo.put("isRoutine", TousseInstance.ROUTINE_YES); + vo.put("typeInfoOnScanned", typeInfoOnScanned); list.add(vo); } for (String barcode : disinfectArray) { - ScanGoodsVo vo = new ScanGoodsVo(); - vo.setBarcode(barcode); - vo.setSendAmount(1); + JSONObject vo = new JSONObject(); + vo.put("barcode", barcode); + vo.put("sendAmount", 1); + vo.put("isRoutine", TousseInstance.ROUTINE_YES); list.add(vo); } return list; Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/ScanGoodsVo.java =================================================================== diff -u -r12331 -r16677 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/ScanGoodsVo.java (.../ScanGoodsVo.java) (revision 12331) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/vo/ScanGoodsVo.java (.../ScanGoodsVo.java) (revision 16677) @@ -13,6 +13,8 @@ private Integer sendAmount; + private String isRoutine; + public String getBarcode() { return barcode; } @@ -28,5 +30,13 @@ public void setSendAmount(Integer sendAmount) { this.sendAmount = sendAmount; } + + public String getIsRoutine() { + return isRoutine; + } + + public void setIsRoutine(String isRoutine) { + this.isRoutine = isRoutine; + } } Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java =================================================================== diff -u -r16316 -r16677 --- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java (.../InvoicePlanManagerTests.java) (revision 16316) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/InvoicePlanManagerTests.java (.../InvoicePlanManagerTests.java) (revision 16677) @@ -167,11 +167,13 @@ ScanGoodsVo vo = new ScanGoodsVo(); vo.setBarcode(tousseInstance1.getBarcode()); vo.setSendAmount(1); + vo.setIsRoutine(TousseInstance.ROUTINE_YES); voList.add(vo); vo = new ScanGoodsVo(); vo.setBarcode(tousseInstance2.getBarcode()); vo.setSendAmount(1); + vo.setIsRoutine(TousseInstance.ROUTINE_YES); voList.add(vo); params.put("invoiceItems", voList);