Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r21241 -r21295 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 21241) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 21295) @@ -1191,6 +1191,7 @@ /** * 解析发货项参数. * @param jsonArrayInvoiceItems 发货项的JSONArray + * 格式示例:[{barcode:'',tousseType:'',sendAmount:1,isRoutine:''},{barcode:'',tousseType:'',sendAmount:1,isRoutine:''}] * @param submitInvoiceContext 发货的上下文 */ private List parseParameters(JSONArray jsonArrayInvoiceItems, SubmitInvoiceContext submitInvoiceContext) { @@ -2230,7 +2231,7 @@ refreshReviewedBasketStatus(submitInvoiceItems); checkIfForeignTousseAppInvoiceComplete(submitInvoiceContext); // 回写物资系统 - writebackForZSLY(invoiceList); + writebackCommon(invoiceList); // throw new RuntimeException("发货速度测试!"); return submitInvoiceContext; @@ -2340,9 +2341,10 @@ } /** - * @param invoiceList + * 通用的发货回写方法 + * @param invoiceList 发货单集合 */ - private void writebackForZSLY(List invoiceList) { + private void writebackCommon(List invoiceList) { if(writeBackInventoryHelper != null){ Set invoiceIds = new HashSet(); for (Invoice invoice : invoiceList) { @@ -2439,6 +2441,10 @@ /** * 自定义发货. * @param params 前台传过来的参数 + * 格式示例{assistantSender:"",sender:"",sourceWarehouseId:"",sourceWarehouseName:"", + * allowPartlyInvoiceForeignTousse:false,invoiceItems:[{barcode:'',tousseType:'',sendAmount:1,isRoutine:''},{barcode:'',tousseType:'',sendAmount:1,isRoutine:''}], + * mode:'',departCode:'',depart:'' + * } * @return */ private SubmitInvoiceContext submitInvoiceForCustom(JSONObject params) { @@ -2494,7 +2500,7 @@ refreshReviewedBasketStatus(submitInvoiceItems); checkIfForeignTousseAppInvoiceComplete(submitInvoiceContext); // 回写物资系统 - writebackForZSLY(invoiceList); + writebackCommon(invoiceList); //回写接口调用 writebackForWriteBackInventoryDao(Collections.singletonList(invoice) , disposableGoodsStorageAdjustVoTotalList); @@ -2506,7 +2512,11 @@ /** * 验证前台传过来的参数并且设置发货的上下文. - * @param params 前台传过来的参数 + * @param params 前台传过来的参数, + * 格式示例{assistantSender:"",sender:"",sourceWarehouseId:"",sourceWarehouseName:"", + * allowPartlyInvoiceForeignTousse:false,invoiceItems:[{barcode:'',tousseType:'',sendAmount:1,isRoutine:''},{barcode:'',tousseType:'',sendAmount:1,isRoutine:''}], + * mode:'',departCode:'',depart:'' + * } * @param submitInvoiceContext 发货的上下文 */ private void setAndValidateParams(JSONObject params,SubmitInvoiceContext submitInvoiceContext){ @@ -2667,7 +2677,7 @@ refreshReviewedBasketStatus(submitInvoiceItems); checkIfForeignTousseAppInvoiceComplete(submitInvoiceContext); - writebackForZSLY(invoiceList); + writebackCommon(invoiceList); if (CssdUtils.getSystemSetConfigByNameBool("enableTousseVoluntarilyUrgent", false)) { recalculateUrgentTousse(AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(), submitInvoiceContext); Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java =================================================================== diff -u -r21241 -r21295 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java (.../InvoiceManager.java) (revision 21241) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java (.../InvoiceManager.java) (revision 21295) @@ -91,6 +91,11 @@ /** * 做了并发控制的发货 TODO ,还需要优化处理的流程. * @param params 前台传过来的参数 + * 格式示例{ + * invoicePlanType:'',assistantSender:"",sender:"",sourceWarehouseId:"",sourceWarehouseName:"", + * allowPartlyInvoiceForeignTousse:false,invoiceItems:[{barcode:'',tousseType:'',sendAmount:1,isRoutine:''},{barcode:'',tousseType:'',sendAmount:1,isRoutine:''}], + * mode:'',departCode:'',depart:'' + * } */ public SubmitInvoiceContext submitInvoice(JSONObject params); public List submitInvoice(JSONArray params);