Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r20351 -r20358 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 20351) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 20358) @@ -238,5 +238,7 @@ //启用库存对比功能菜单 enableBatchStockCompare : true, //一次性物品盘点版本(版本2的盘点粒度细化到标识表这一级即最底导,原版本的盘点粒度只到批次这一级) - inventoryDisposableVersion : 2 + inventoryDisposableVersion : 2, + //是否覆盖发货计划的打印时间。默认为true,表示会覆盖 + overWriteInvoicePlanPrintTime:false } \ No newline at end of file Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r20342 -r20358 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20342) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20358) @@ -4640,7 +4640,18 @@ for(InvoicePlan invoicePlan : invoicePlans){ invoicePlanManagerTarget.computeAndSetPrintStatus(invoicePlan); if(setPrintTime){ - invoicePlan.setPrintTime(now); + boolean writePrintTime = false; + if(invoicePlan.getPrintTime() != null){ + boolean overWriteInvoicePlanPrintTime = CssdUtils.getSystemSetConfigByNameBool("overWriteInvoicePlanPrintTime", true); + if(overWriteInvoicePlanPrintTime){ + writePrintTime = true; + } + }else{ + writePrintTime = true; + } + if(writePrintTime){ + invoicePlan.setPrintTime(now); + } } objectDao.saveOrUpdate(invoicePlan); }