";
+ if(v==0){
+ tableHtml=tableHtml+"| 未还 | ";
+ }
+ tableHtml=tableHtml+""+(v+1)+" | "
+ +""+remainReturn[v].tousseName+" | "
+ +" | "
+ +""+remainReturn[v].lendAmount+" | "
+ +" | "
+ +""+remainReturn[v].remainAmount+" | "
+ +" | "
+ +""+remainReturn[v].remainDays+" | "
+ +""+remainReturn[v].price+" | "
+ +""+remainReturn[v].totalPrice+" | "
+ +"
";
+ sum=sum+remainReturn[v].totalPrice;
+ }
+ }
+
+ //合计：金额
+ tableHtml=tableHtml+"贵港市人民医院（'+handleDepart+'）借物收费单
'
+ +'
部门：'+depart+'仓库：'
+ +''+wareHouse+'
'
+ +'
备注：
';
+
+
+ var footer='
打印时间:'+dateToStr(time)+''
+ +'科室确认人：'
+ +'制单人:'+applicant+'
';
+ +'
';
+
+ LODOP.SET_PRINT_STYLE("ItemType",1);
+ LODOP.ADD_PRINT_HTM('0.2cm','0.5cm',"23cm","3cm",head);
+
+ LODOP.SET_PRINT_STYLE("ItemType",1);
+ LODOP.ADD_PRINT_HTM('8.5cm','0.5cm',"23cm","2cm",footer);
+
+ LODOP.SET_PRINT_STYLE("ItemType", 2);
+ LODOP.SET_PRINT_STYLE("FontSize", 8);
+ LODOP.ADD_PRINT_TEXT('8.7cm','21cm',"RightMargin:0.5cm","BottomMargin:1cm", "第#页/共&页");
+
+ LODOP.SET_PRINT_STYLE("ItemType",4);
+ //判断收费模式
+ if(sstsConfig.isBorrowChargeByDayAndShow){
+ LODOP.ADD_PRINT_TABLE('2.5cm','0.5cm',"RightMargin:0.2cm","5cm",tableHtml);
+ }else{
+ LODOP.ADD_PRINT_TABLE('2.5cm','0.5cm',"RightMargin:0.2cm","5cm",tableHtml1);
+ }
+
+ if(printType == 0){//直接打印
+ LODOP.PRINT();
+ }else{//打印预览
+ LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1);
+ LODOP.PREVIEW();
+ }
+};
+
+
+//将字符串形式日期转化成Date形式
+function revertDate(dateStr){
+ //此处转换的字符串形式为2018-07-05 19:48
+ var array=dateStr.split(' ');
+ var dateArray=array[0].split('-');
+ var timeArray=array[1].split(':');
+ var year=parseInt(dateArray[0]);
+ var month=parseInt(dateArray[1])-1;
+ var day=parseInt(dateArray[2]);
+ var hour=parseInt(timeArray[0]);
+ var min=parseInt(timeArray[1]);
+ var sec=0;
+ if(timeArray.length>2){
+ sec=parseInt(timeArray[2]);
+ }
+ var date=new Date();
+ date.setFullYear(year);
+ date.setMonth(month);
+ date.setDate(day);
+ date.setHours(hour);
+ date.setMinutes(min);
+ date.setSeconds(sec);
+ return date;
+}
+
+function dateToStr(datetime){
+
+ var year = datetime.getFullYear();
+ var month = datetime.getMonth()+1;
+ var date = datetime.getDate();
+ var hour = datetime.getHours();
+ var minutes = datetime.getMinutes();
+ var second = datetime.getSeconds();
+
+ if(month<10){
+ month = "0" + month;
+ }
+ if(date<10){
+ date = "0" + date;
+ }
+ if(hour <10){
+ hour = "0" + hour;
+ }
+ if(minutes <10){
+ minutes = "0" + minutes;
+ }
+ if(second <10){
+ second = "0" + second ;
+ }
+
+ var time = year+"-"+month+"-"+date+" "+hour+":"+minutes+":"+second; //2009-06-12 17:18:05
+ return time;
+ }
+
+
+
+
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
===================================================================
diff -u -r23746 -r23873
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 23746)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 23873)
@@ -14,6 +14,7 @@
import com.forgon.directory.model.OrgUnit;
import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
@@ -450,4 +451,10 @@
* @return
*/
public String[] batchPrint(String batchId, JSONObject printScope, List
printSummaryList);
+ /**
+ * simon-add:根据申请单ID获取发货单
+ * @param applicationId
+ * @return
+ */
+ public List getInvoicesByApplicationId(String applicationId);
}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r23852 -r23873
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 23852)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 23873)
@@ -9,6 +9,7 @@
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -35,12 +36,14 @@
import org.apache.struts2.convention.annotation.Namespace;
import org.apache.struts2.convention.annotation.ParentPackage;
+import com.alibaba.fastjson.JSON;
import com.beust.jcommander.ParameterException;
import com.forgon.directory.acegi.tools.AcegiHelper;
import com.forgon.directory.model.CssdServiceDepts;
import com.forgon.directory.model.OrgUnit;
import com.forgon.directory.service.OrgUnitManager;
import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
import com.forgon.disinfectsystem.common.Constants;
import com.forgon.disinfectsystem.common.CssdUtils;
import com.forgon.disinfectsystem.departmentapplicationtemplate.service.DepartmentAppTemplateManager;
@@ -106,7 +109,7 @@
protected Logger logger = Logger.getLogger(this.getClass());
private RecyclingApplication recyclingApplication = new RecyclingApplication();
-
+
private RecyclingApplicationVo oldRecyclingApplication;
private String ids;
@@ -141,7 +144,16 @@
private ApplicationLogManager applicationLogManager;
private OrgUnitManager orgUnitManager;
+
+ private WareHouseManager wareHouseManager;
+// private InvoiceManager invoiceManager;
+
+
+ public void setWareHouseManager(WareHouseManager wareHouseManager) {
+ this.wareHouseManager = wareHouseManager;
+ }
+
public void setOrgUnitManager(OrgUnitManager orgUnitManager) {
this.orgUnitManager = orgUnitManager;
}
@@ -669,7 +681,7 @@
*/
public void loadTousseLeaseItems() {
try {
- LoadTousseLeaseItemsResultBuilder resultBuilder = new LoadTousseLeaseItemsResultBuilder(recyclingApplicationManager, objectDao);
+ LoadTousseLeaseItemsResultBuilder resultBuilder = new LoadTousseLeaseItemsResultBuilder(recyclingApplicationManager, objectDao,tousseDefinitionManager);
JSONArray result = resultBuilder.buildLoadTousseLeaseItems(recyclingApplication);
StrutsResponseUtils.output(result);
}
@@ -678,7 +690,46 @@
StrutsResponseUtils.output(false, e.getMessage());
}
}
+
+ /**
+ * simon-add:加载借物单收费信息
+ */
+ public void loadBrrowCharge(){
+ String borrowApplicationId = StrutsParamUtils.getPraramValue("applicationId", null);
+ //根据borrowApplicationId,得到recyclingApplication
+ RecyclingApplication recyclingApplication=recyclingApplicationManager.getRecyclingApplicationById(borrowApplicationId);
+ //根据申请单ID获取发货单
+ List invoiceList=recyclingApplicationManager.getInvoicesByApplicationId(borrowApplicationId);
+// List wareHouseList =wareHouseManager.getWareHouseListByUnitCode(recyclingApplication.getHandleDepartCoding());
+ String wareHouseName="";
+ Set wareHouseNameSet=new HashSet();
+ if(invoiceList.size()>0){
+ for(Invoice w:invoiceList){
+ wareHouseNameSet.add(w.getSourceWarehouseName());
+ }
+ }
+
+ for(String wn:wareHouseNameSet){
+ wareHouseName=wareHouseName+wn;
+ }
+
+ String str="{applicant:\'"+recyclingApplication.getApplicant()+"\',depart:\'"+recyclingApplication.getDepart()
+ +"\',handleDepart:\'"+recyclingApplication.getHandleDepart()+"\',wareHouse:\'"+wareHouseName.substring(0,wareHouseName.length())+"\'}";
+ try {
+ LoadTousseLeaseItemsResultBuilder resultBuilder = new LoadTousseLeaseItemsResultBuilder(recyclingApplicationManager, objectDao,tousseDefinitionManager);
+ JSONArray table = resultBuilder.buildLoadTousseLeaseItems(recyclingApplication);
+ String result="{table:"+table+",otherMsg:"+JSON.parse(str)+"}";
+ StrutsResponseUtils.output(JSON.parse(result));
+ }
+ catch (Exception e) {
+ logger.error(e, e);
+ StrutsResponseUtils.output(false, e.getMessage());
+ }
+
+ }
+
+
/**
* 加载科室申请的器械包模板
* 同时加载了已经申请的物品信息，根据传入的申请单的id。// terry kwan， 2015-03-01
@@ -1674,7 +1725,6 @@
proj.setProjCode("ccc");
proj.setProjName("333");
projList.add(proj);*/
-
out = response.getWriter();
// out.print("{\"data\":" + JSONArray.fromObject(projList) + "}");
out.print(JSONArray.fromObject(projList));
@@ -1866,5 +1916,5 @@
StrutsResponseUtils.output(result);
}
}
-
+
}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r23825 -r23873
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 23825)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 23873)
@@ -126,10 +126,10 @@
import com.forgon.treenode.model.THTreeNode;
import com.forgon.workflow.service.WorkFlowApprovalTaskManager;
import com.google.common.collect.Maps;
-
+
/**
* @author songwei 2012-3-23 下午16:59:34
- */
+ */
public class RecyclingApplicationManagerImpl extends BasePoManagerImpl implements
RecyclingApplicationManager {
private static final Logger logger = Logger
@@ -341,7 +341,8 @@
}
return null;
}
-
+
+
@Override
public InvoicePlan getRecyclingApplicationByIdForRecycle(String id) {
return (InvoicePlan) objectDao
@@ -813,7 +814,7 @@
tousseItem.setUrgentAmount(item.getUrgentAmount());
tousseIdAndMap.put(td.getId(),tousseItem);
}
- }
+ }
/**
* 如果是消毒物品,则生成消毒物品包定义
* @param application
@@ -6527,4 +6528,16 @@
//下面调用的方法已经按id升序排列
return tousseItemManager.getByHqlForUpdate(condition);
}
+ /**
+ *simon-add:根据申请单ID获取发货单
+ */
+ @Override
+ public List getInvoicesByApplicationId(String applicationId) {
+ String sql = " where po.invoicePlan.id =" + applicationId
+ + " order by po.id desc";
+ List list = objectDao.findBySql(Invoice.class.getSimpleName(),sql);
+ return list;
+ }
+
+
}