Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java =================================================================== diff -u -r15314 -r15403 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java (.../Invoice.java) (revision 15314) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/Invoice.java (.../Invoice.java) (revision 15403) @@ -125,10 +125,7 @@ */ private String hospitalNumber; - public static final String ROUTINE_YES = "是"; - public static final String ROUTINE_NO = "否"; - private String isRoutine = ROUTINE_YES; //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了） - + public String getHospitalNumber() { return hospitalNumber; } @@ -433,15 +430,7 @@ this.sourceWarehouseName = sourceWarehouseName; } - - public String getIsRoutine() { - return isRoutine; - } - public void setIsRoutine(String isRoutine) { - this.isRoutine = isRoutine; - } - /** * 更新发货单的打印状态,遍历InvoiceItem,如果Item都是已打印,则打印状态为是,如果都没有打印,则为否,否则为部分打印 */ Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java =================================================================== diff -u -r15314 -r15403 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java (.../InvoiceTableManager.java) (revision 15314) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoiceTableManager.java (.../InvoiceTableManager.java) (revision 15403) @@ -411,41 +411,4 @@ return json; } - public String isRoutine(String tousseBarcodes) { - - List> list = invoiceManager.getForeignTousseForBarcodes(tousseBarcodes); - - String noBiologicalMonitoringForeignTousses = ""; - if (list.size() > 0) { - for (Map map : list) { - String biologicalMonitoringEndDate = map.get("biologicalMonitoringEndDate"); - - if (biologicalMonitoringEndDate == null) { //没有进行生物监测或者忘记登录了 - noBiologicalMonitoringForeignTousses += map.get("tousseName") + ";"; - } else { //登记了生物监测，则判断是否为常规发货 - try { - long biologicalMonitoringEndDateTime =new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDate).getTime(); - long nowTime = System.currentTimeMillis(); - if (biologicalMonitoringEndDateTime > nowTime) { //生物监测没结束就发货 - return "no"; - } - } catch (ParseException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } - if ("".equals(noBiologicalMonitoringForeignTousses)) { - return "yes"; - } else { - noBiologicalMonitoringForeignTousses = noBiologicalMonitoringForeignTousses.substring(0, noBiologicalMonitoringForeignTousses.length() - 1); - } - } else { //此发货单没有外来器械 - return "yes"; - } - - return noBiologicalMonitoringForeignTousses; - - } - } Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java =================================================================== diff -u -r15314 -r15403 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java (.../InvoiceManager.java) (revision 15314) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java (.../InvoiceManager.java) (revision 15403) @@ -180,4 +180,11 @@ * @return */ public List> getForeignTousseForBarcodes(String tousseBarcodes); + + /** + * 验证是否器械包常规发货 + * @param tousseBarcodes：器械包条码集合的字符串，用分号分隔 + * @return + */ + public JSONObject isRoutine(String tousseBarcodes); } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r15402 -r15403 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15402) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 15403) @@ -11699,7 +11699,7 @@ + "ur.patientName patientName," + "ur.hospitalNum hospitalNum," + "ur.operator operator," - + "i.isRoutine isRoutine," + + "t.isRoutine isRoutine," + "i.sender sender " + "from " Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/SubmitInvoiceItem.java =================================================================== diff -u -r12331 -r15403 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/SubmitInvoiceItem.java (.../SubmitInvoiceItem.java) (revision 12331) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/SubmitInvoiceItem.java (.../SubmitInvoiceItem.java) (revision 15403) @@ -11,6 +11,7 @@ private String barcode; private int amount; private String tousseType; + private String isRoutine; public String getBarcode() { return barcode; @@ -35,5 +36,13 @@ public void setTousseType(String tousseType) { this.tousseType = tousseType; } + + public String getIsRoutine() { + return isRoutine; + } + + public void setIsRoutine(String isRoutine) { + this.isRoutine = isRoutine; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java =================================================================== diff -u -r15314 -r15403 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java (.../SterilizerManagerImpl.java) (revision 15314) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/service/SterilizerManagerImpl.java (.../SterilizerManagerImpl.java) (revision 15403) @@ -15,6 +15,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.ConsumptiveConfig; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.DetectionItem; import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; @@ -112,14 +113,14 @@ } return false; } - + @Override public void updateIsRoutineAttribute(Long sterilizationRecordId, Date biologicalMonitoringEndDate) { String sql = - "select t.tousseName,i.id,i.sendTime " + "select t.id tousseId,t.tousseName tousseName,i.sendTime sendTime " + "from TousseInstance t,SterilizationRecord sr,Invoice i " + "where t.sterilizationRecord_id=sr.id " + "and t.invoice_id=i.id " @@ -130,19 +131,19 @@ try { while(result.next()){ - String tousseName = result.getString(1); - String invoiceId = result.getString(2); - String sendTime = result.getString(3); + String tousseId = result.getString("tousseId"); + String tousseName = result.getString("tousseName"); + String sendTime = result.getString("sendTime"); try { long sendTimeStamp = new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(sendTime).getTime(); long biologicalMonitoringEndDateStamp = biologicalMonitoringEndDate.getTime(); - String isRoutine = Invoice.ROUTINE_YES; + String isRoutine = TousseInstance.ROUTINE_YES; if (biologicalMonitoringEndDateStamp > sendTimeStamp) { //非常规发货 - isRoutine = Invoice.ROUTINE_NO; + isRoutine = TousseInstance.ROUTINE_NO; } - String sql2 = "update invoice set isRoutine='" + isRoutine + "' where id=" + invoiceId; + String sql2 = "update TousseInstance set isRoutine='" + isRoutine + "' where id=" + tousseId; objectDao.executeUpdate(sql2); } catch (ParseException e) { // TODO Auto-generated catch block Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r15355 -r15403 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15355) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 15403) @@ -3,6 +3,7 @@ import java.math.BigDecimal; import java.sql.ResultSet; import java.sql.SQLException; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; @@ -1119,6 +1120,12 @@ String tousseType = JSONUtil.optString(jsonInvoiceItem, "tousseType", ""); item.setTousseType(tousseType); item.setAmount(amount); + String isRoutine = jsonInvoiceItem.optString("isRoutine"); + if (StringUtils.isBlank(isRoutine)) { + throw new RuntimeException("缺失参数isRoutine"); + } + item.setIsRoutine(isRoutine); + submitInvoiceItems.add(item); // 类型相关的处理 @@ -1408,7 +1415,7 @@ // 发货处理 private void invoice( - InvoicePlan invoicePlan,SubmitInvoiceContext submitInvoiceContext) { + InvoicePlan invoicePlan,SubmitInvoiceContext submitInvoiceContext,List submitInvoiceItems) { submitInvoiceContext.getTousseInstancesToUpdate().clear(); Map> updateStockInfo = submitInvoiceContext.getUpdateStockInfo(); List invoiceList = submitInvoiceContext.getInvoiceList(); @@ -1467,6 +1474,7 @@ // updateGoodsStock(invoice,tousseInstancesToUpdate); updateStockInfo.put(invoice, new HashSet(tousseInstancesToUpdate)); saveInvoice(invoice); + updateTousseInstanceStatus(tousseInstancesToUpdate,submitInvoiceItems); //修改器械包是否常规发货的方法（cjr） // 设置发货单和器械包实例的关联以及修改器械包状态等属性 updateTousseInstanceStatus(invoice,tousseInstancesToUpdate); @@ -1496,6 +1504,24 @@ } } } + private void updateTousseInstanceStatus( + Set tousseInstancesToUpdate, + List submitInvoiceItems) { + + for (TousseInstance tousseInstance : tousseInstancesToUpdate) { + String barcode = tousseInstance.getBarcode(); + + for (SubmitInvoiceItem submitInvoiceItem : submitInvoiceItems) { + String barcodeTemp = submitInvoiceItem.getBarcode(); + if (barcodeTemp != null && barcodeTemp.equals(barcode)) { + tousseInstance.setIsRoutine(submitInvoiceItem.getIsRoutine()); + } + } + } + + + } + /** * 设置发货单所属的仓库 * @param tousseInstance @@ -1662,7 +1688,7 @@ if(isSendOutCompletely(submitInvoiceContext)){ break; } - invoice( invoicePlan, submitInvoiceContext); + invoice( invoicePlan, submitInvoiceContext, submitInvoiceItems); } // 开始发货非紧急物品 submitInvoiceContext.setSendOnlyUrgentGoods(false); @@ -1674,7 +1700,7 @@ if(isSendOutCompletely(submitInvoiceContext)){ break; } - invoice( invoicePlan, submitInvoiceContext); + invoice( invoicePlan, submitInvoiceContext, submitInvoiceItems); } List invoiceList = submitInvoiceContext.getInvoiceList(); Map> updateStockInfo = submitInvoiceContext.getUpdateStockInfo();// 用于更新库存的信息 @@ -2282,10 +2308,8 @@ JSONObject params = submitInvoiceContext.getParams(); String personInCharge = JSONUtil.optString(params, "personInCharge", ""); String personInChargeCode = JSONUtil.optString(params, "personInChargeCode", ""); - String isRoutine = JSONUtil.optString(params, "isRoutine", ""); - if (isRoutine.equals("no")) { //非常规发货（这里的非常规指的是：正在做"生物监测"时就把这个器械包发货了）cjr - invoice.setIsRoutine(Invoice.ROUTINE_NO); - } + + invoice.setApplicant(invoicePlan.getApplicant()); invoice.setApplicationTime(invoicePlan.getApplicationTime()); invoice.setRecyclingTime(invoicePlan.getRecyclingTime()); @@ -5919,7 +5943,7 @@ sqlFilter += ")"; String sql = - "SELECT t.tousseName,bd.barcode,sr.biologicalMonitoringEndDate " + "SELECT t.tousseName tousseName,bd.barcode barcode,sr.biologicalMonitoringEndDate biologicalMonitoringEndDate " + "FROM TousseInstance t,barcodeDevice bd,TousseDefinition td,SterilizationRecord sr " + "WHERE t.id=bd.id " + "AND t.tousseDefinition_id=td.id " @@ -5932,9 +5956,9 @@ try { while(result.next()){ - String tousseName = result.getString(1); - String barcode = result.getString(2); - String biologicalMonitoringEndDate = result.getString(3); + String tousseName = result.getString("tousseName"); + String barcode = result.getString("barcode"); + String biologicalMonitoringEndDate = result.getString("biologicalMonitoringEndDate"); Map map = new HashMap(); map.put("tousseName", tousseName); @@ -5953,5 +5977,54 @@ } + /** + * 验证是否器械包常规发货 + * @param tousseBarcodes：器械包条码集合的字符串，用分号分隔 + * @return + */ + @Override + public JSONObject isRoutine(String tousseBarcodes) { + + List> list = getForeignTousseForBarcodes(tousseBarcodes); + + String noBiologicalMonitoringForeignTousses = ""; + String unconventionalForeignTousses = ""; + + if (list.size() > 0) { + for (Map map : list) { + String biologicalMonitoringEndDate = map.get("biologicalMonitoringEndDate"); + + if (biologicalMonitoringEndDate == null) { //没有进行生物监测或者忘记登录了 + noBiologicalMonitoringForeignTousses += map.get("barcode") + ";"; + } else { //登记了生物监测，则判断是否为常规发货 + try { + long biologicalMonitoringEndDateTime =new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(biologicalMonitoringEndDate).getTime(); + long nowTime = System.currentTimeMillis(); + if (biologicalMonitoringEndDateTime > nowTime) { //生物监测没结束就发货 + unconventionalForeignTousses += map.get("barcode") + ";"; + } + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } + } + + + noBiologicalMonitoringForeignTousses = noBiologicalMonitoringForeignTousses.equals("") ? "" : + noBiologicalMonitoringForeignTousses.substring(0, noBiologicalMonitoringForeignTousses.length() - 1); + unconventionalForeignTousses = unconventionalForeignTousses.equals("") ? "" : + unconventionalForeignTousses.substring(0, unconventionalForeignTousses.length() - 1); + + + + JSONObject jsonObj = new JSONObject(); + jsonObj.put("noBiologicalMonitoringForeignTousses", noBiologicalMonitoringForeignTousses); + jsonObj.put("unconventionalForeignTousses", unconventionalForeignTousses); + return jsonObj; + + } + } \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java =================================================================== diff -u -r14933 -r15403 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java (.../InvoiceGoodsVo.java) (revision 14933) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoiceGoodsVo.java (.../InvoiceGoodsVo.java) (revision 15403) @@ -3,6 +3,7 @@ */ package com.forgon.disinfectsystem.entity.invoicemanager; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.tools.Constants; /** @@ -54,6 +55,10 @@ private String typeInfoOnScanned; public static final boolean VALIDATE_PASS_TRUE = true; public static final boolean VALIDATE_PASS_FALSE = false; + + private String isRoutine =TousseInstance.ROUTINE_YES; //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了） + private Boolean noBiologicalMonitoring = true; //没有做生物监测，默认是没做（目前只针对外来器械吧） + public Long getId() { return id; @@ -230,5 +235,21 @@ public void setTypeInfoOnScanned(String typeInfoOnScanned) { this.typeInfoOnScanned = typeInfoOnScanned; } + + public String getIsRoutine() { + return isRoutine; + } + + public void setIsRoutine(String isRoutine) { + this.isRoutine = isRoutine; + } + + public Boolean getNoBiologicalMonitoring() { + return noBiologicalMonitoring; + } + + public void setNoBiologicalMonitoring(Boolean noBiologicalMonitoring) { + this.noBiologicalMonitoring = noBiologicalMonitoring; + } } Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r15314 -r15403 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 15314) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 15403) @@ -346,7 +346,8 @@ frequency : goods.frequency, isTracable : goods.isTracable, tousseDefinitionId : goods.tousseDefinitionId, - externalCode : goods.externalCode + externalCode : goods.externalCode, + isRoutine : goods.isRoutine }); sendOutGoodsStore.add(record); speakBasket.addGoods('',record.data.showTousseName,record.data.count); @@ -516,6 +517,18 @@ continue; } + if (goods.noBiologicalMonitoring && (goods.tousseType == '外来器械包' || goods.tousseType == '外来器械拆分小包')) { //此外来器械包没做生物监测（cjr） + if (!confirm(goodsName + '没做生物监测，确定要发货吗？')){ + continue; + } + } + + if (goods.isRoutine == '否'){ //此外来器械包正在做生物监测（cjr） + if (!confirm(goodsName + '正在做生物监测的器械包，需要紧急发货吗？')){ + continue; + } + } + addGoods(goods,speakBasket); } @@ -801,10 +814,6 @@ id : 'id' },{ xtype : 'hidden', - name : 'isRoutine', - id : 'isRoutine' - },{ - xtype : 'hidden', name : 'sendOutGoodsStoreData', id : 'sendOutGoodsStoreData' },{ @@ -1297,38 +1306,6 @@ return false; } - var tousseBarcodes = ''; - for ( var i = 0; i < sendOutGoodsStore.getCount(); i++) { - var record = sendOutGoodsStore.getAt(i); - tousseBarcodes += record.data.barcode + ';'; - } - tousseBarcodes = tousseBarcodes.substring(0, tousseBarcodes.lastIndexOf(';')); - - DWREngine.setAsync(false); //把dwr请求设置成同步 - var flag = false; - InvoiceTableManager.isRoutine(tousseBarcodes, function(result) { - if (result == 'no') { //不是常规发货 - if (confirm('发货的器械包中含有正在做生物监测的器械包，需要紧急发货吗？')){ - top.Ext.getCmp('isRoutine').setValue('no'); - } else { - flag = true; - } - } else if (result == 'yes') { //是常规发货，而且所有要发的外来器械包都登记了生物监测 - top.Ext.getCmp('isRoutine').setValue('yes'); - } else { //是常规发货，但是有的外来器械包没登录生物监测 - if (confirm('发货的器械包中含有没做生物监测的外来器械包，确定要发货吗？')){ - top.Ext.getCmp('isRoutine').setValue('yes'); - } else { - flag = true; - } - } - }); //发货之前验证，此发货单是否有紧急发货的器械包 - DWREngine.setAsync(true); //把dwr请求设置成异步 - - if (flag) { - return false; - } - getTousseGridData(); form.form.submit( { //url : WWWROOT + '/disinfectSystem/invoiceAction!saveDepartInvoice.do', Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r15391 -r15403 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15391) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 15403) @@ -1336,7 +1336,7 @@ } } - private static JsonElement convertResult(final JsonObject src){ + private JsonElement convertResult(final JsonObject src){ Gson gson = new GsonBuilder().serializeNulls().create(); Type gsonType = new TypeToken>() { }.getType(); @@ -1397,8 +1397,9 @@ final JsonObject data = src.get("data").getAsJsonObject(); InvoiceGoodsVo vo = new InvoiceGoodsVo(); + String barcode = data.get("barcode").getAsString(); vo.setIsTracable("否"); - vo.setBarcode(data.get("barcode").getAsString()); + vo.setBarcode(barcode); vo.setName(data.get("tousseName").getAsString()); vo.setShowTousseName(data.get("showTousseName").getAsString()); vo.setStorage("1"); @@ -1417,9 +1418,10 @@ // vo.setSterilizerName(sterilizerName); // vo.setFrequency(frequency); // vo.setTousseDefinitionId(tousseDefinitionId); - vo.setShowResult(tips); + updateVO(barcode, vo); + result.add("data", gson.toJsonTree(Collections.singleton(vo), gsonType)); return result; @@ -1432,8 +1434,9 @@ vos.add(vo); final JsonObject data = datas.get(i).getAsJsonObject(); + String barcode = data.get("barcode").getAsString(); vo.setIsTracable("否"); - vo.setBarcode(data.get("barcode").getAsString()); + vo.setBarcode(barcode); vo.setName(data.get("tousseName").getAsString()); vo.setShowTousseName(data.get("showTousseName").getAsString()); vo.setStorage("1"); @@ -1447,6 +1450,7 @@ // vo.setSterilizerName(sterilizerName); // vo.setFrequency(frequency); // vo.setTousseDefinitionId(tousseDefinitionId); + updateVO(barcode, vo); } if(CollectionUtils.isNotEmpty(vos)){ @@ -1470,6 +1474,25 @@ } /** + * 修改vo对象的NoBiologicalMonitoring和IsRoutine属性的值 + * @param barcode + * @param vo + */ + private void updateVO(String barcode, InvoiceGoodsVo vo) { + + JSONObject jsonObj = invoiceManager.isRoutine(barcode); //判断是否常规发货（cjr） + String noBiologicalMonitoringForeignTousse = jsonObj.optString("noBiologicalMonitoringForeignTousses"); + String unconventionalForeignTousse = jsonObj.optString("unconventionalForeignTousses"); + if (StringTools.isBlank(noBiologicalMonitoringForeignTousse)) { //此外来器械包做了生物监测 + vo.setNoBiologicalMonitoring(false); + } + if (!StringTools.isBlank(unconventionalForeignTousse)) { //此外来器械包做了生物监测，但是没结束就要发货了 + vo.setIsRoutine(TousseInstance.ROUTINE_NO); + } + + } + + /** * 保存发货单（合并发货单保存） */ public void saveDepartInvoice() { @@ -1522,7 +1545,7 @@ String personInChargeCode = StrutsParamUtils.getPraramValue("personInChargeCode", ""); String sourceWarehouseId = StrutsParamUtils.getPraramValue("sourceWarehouseId", ""); String sourceWarehouseName = StrutsParamUtils.getPraramValue("sourceWarehouseName", ""); - String isRoutine = StrutsParamUtils.getPraramValue("isRoutine", ""); + params.put("mode", "depart"); params.put("departCode", orgUnitCoding); params.put("assistantSender", sender); @@ -1531,7 +1554,6 @@ params.put("personInChargeCode", personInChargeCode); params.put("sourceWarehouseId", sourceWarehouseId); params.put("sourceWarehouseName", sourceWarehouseName); - params.put("isRoutine", isRoutine); JSONArray sendOutGoodsItems = JSONArray.fromObject(sendOutGoodsStoreData); // List voList = getInvoiceGoodsVo(sendOutGoodsStoreData); params.put("invoiceItems", sendOutGoodsItems); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java =================================================================== diff -u -r15299 -r15403 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 15299) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java (.../TousseInstance.java) (revision 15403) @@ -246,6 +246,12 @@ */ private String sterilizerPosition; + + public static final String ROUTINE_YES = "是"; + public static final String ROUTINE_NO = "否"; + private String isRoutine = ROUTINE_YES; //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了） + + public static final String[] filterProperties = { "handler", "hibernateLazyInitializer", "fieldHandler", "materialInstances", "sterilizationRecords", "isUploadImage", "isUploadVideo", "images", @@ -1043,4 +1049,12 @@ this.washOperatorCode = washOperatorCode; } + public String getIsRoutine() { + return isRoutine; + } + + public void setIsRoutine(String isRoutine) { + this.isRoutine = isRoutine; + } + } \ No newline at end of file