Index: build.gradle =================================================================== diff -u -r35615 -r35650 --- build.gradle (.../build.gradle) (revision 35615) +++ build.gradle (.../build.gradle) (revision 35650) @@ -588,8 +588,6 @@ //cache数据库驱动包(因为在maven远程仓库中找不到该版本对应的库文件,所以通过本地方式管理:jar所在目录位置:localrepo\com.intersys\cache-jdbc\2016.2\cache-jdbc-2016.2.jar) compile group: 'com.intersys', name: 'cache-jdbc', version: '2016.2' - //compile 'org.java-websocket:Java-WebSocket:1.5.1' - //ffmpeg视频编码解码 compile group: 'ws.schild', name: 'jave-all-deps', version:'2.7.1' compile group: 'ws.schild', name: 'jave-core', version:'2.7.1' @@ -601,6 +599,8 @@ compile group: 'com.github.s7connector', name: 's7connector', version: '2.1' compile group: 'si.trina', name: 'moka7-live', version: '0.0.13' + //webSocket另一种组件 + compile group: 'org.java-websocket', name: 'Java-WebSocket', version: '1.5.3' } // 文件夹的名字必须用斜线结果,否则创建该文件夹不成功 @@ -838,6 +838,7 @@ compile (project(":ssts-recyclingapplication")) compile (project(":ssts-idcard")) compile (project(":ssts-receiverecord")) + compile (project(":ssts-invoice")) } } @@ -1274,7 +1275,6 @@ compile group: 'org.antlr', name: 'antlr-runtime', version: '3.5.2' compile group: 'de.regnis.q.sequence', name: 'sequence-library', version: '1.0.4' - //读取项目个性化lib包的定义文件 def libsJsonFile = file('projectCustomLibs.json') def projectCustomLibList = new groovy.json.JsonSlurper().parseText(libsJsonFile.getText('UTF-8')) Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r35649 -r35650 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35649) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 35650) @@ -116,7 +116,7 @@ import com.forgon.disinfectsystem.entity.urgent.UrgentLevel; import com.forgon.disinfectsystem.expirationdateinfo.service.ExpirationDateInfoManager; import com.forgon.disinfectsystem.idcardinstance.service.IDCardInstanceManager; -//import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager; +import com.forgon.disinfectsystem.invoicemanager.service.InvoiceManager; import com.forgon.disinfectsystem.receiverecord.service.ReceiveRecordManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationTransition.service.SterilizationTransitionItemManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationDetailsDataVo; @@ -225,7 +225,7 @@ */ private HttpServletRequest request; -// private InvoiceManager invoiceOptimizeManager; + private InvoiceManager invoiceOptimizeManager; public void setReceiveRecordManager( ReceiveRecordManager receiveRecordManager) { @@ -354,9 +354,9 @@ this.request = request; } - /*public void setInvoiceOptimizeManager(InvoiceManager invoiceOptimizeManager) { + public void setInvoiceOptimizeManager(InvoiceManager invoiceOptimizeManager) { this.invoiceOptimizeManager = invoiceOptimizeManager; - }*/ + } /** * 更新旧的灭菌记录 有时器械包在灭菌后不合格需要重新灭菌,并非该炉灭菌失败,而是某几个器械包需要重新灭菌 * 这时需要将这些器械包重新扫入灭菌记录中,并用新的灭菌记录覆盖旧的灭菌记录 @@ -3739,7 +3739,8 @@ obj.put("sendAmount", 1); invoiceItemArray.add(obj); } - return execAutoInvoiceByPostingInvoiceActionRequest(deptName, deptCode, defaultWareHouse, invoiceItemArray); +// return execAutoInvoiceByPostingInvoiceActionRequest(deptName, deptCode, defaultWareHouse, invoiceItemArray); + execAutoInvoiceByInvokingInvoiceManagerMethod(deptName, deptCode, defaultWareHouse, invoiceItemArray); } return JSONUtil.buildJsonObject(true); } @@ -3793,7 +3794,7 @@ * @param defaultWareHouse * @param invoiceItemArray */ - /*private void execAutoInvoiceByInvokingInvoiceManagerMethod(String deptName, + private void execAutoInvoiceByInvokingInvoiceManagerMethod(String deptName, String deptCode,WareHouse defaultWareHouse,JSONArray invoiceItemArray){ //调用发货的bean的方式 JSONObject invoiceParams = new JSONObject(); @@ -3807,7 +3808,7 @@ //发货的备注(用户可以输入的内容) invoiceParams.put("invoiceItems", invoiceItemArray); invoiceOptimizeManager.submitInvoice(invoiceParams); - }*/ + } @Override public void saveRecordPicture(Long sterilizationRecordId,