fzzy-igdss-core/src/main/java/com/fzzy/igds/bill/InoutBill.java
@@ -11,11 +11,16 @@ * 默认入库过磅单 */ public static String IN_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>入库过磅单</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'宋体';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:50%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div id=\"print_main\"class='div-tit'><span class='sp1'>完成时间：<a>completeTime</a></span><span class='sp1'>单号：serId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>发货单位</td><td colspan='3'width='37.5%'>customerName</td><td width='12.5%'>收货单位</td><td colspan='3'`width`='37.5%'>deptName</td></tr><tr><td width='12.5%'>承运人</td><td width='12.5%'>driverName</td><td width='12.5%'>粮食品种</td><td width='12.5%'>foodVariety</td><td width='12.5%'>装卸仓库</td><td width='12.5%'>depotName</td><td width='12.5%'>粮食产地</td><td width='12.5%'>foodLocation</td></tr><tr><td>承运车牌</td><td>plateNum</td><td>毛重(KG)</td><td>fullWeight</td><td>皮重(KG)</td><td>emptyWeight</td><td>净重(KG)</td><td>netWeight</td></tr><tr><td>质检扣重(KG)</td><td>deCheck</td><td>质检增重(KG)</td><td>addCheck</td><td>值仓扣重(KG)</td><td>deHandle</td><td>其他扣重(KG)</td><td>deOther</td></tr><tr><td>质检结果</td><td colspan='3'>checkStatus</td><td>入库重量(KG)</td><td>recordWeight</td><td>结算重量(KG)</td><td>settleWeight</td></tr><tr><td>备注</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>司磅员：</span><span class='sp2'>监磅员：</span><span class='sp2'>保管员：handleUser</span><span class='sp2'>承运人：driverName</span></div></br><div style=\"padding-top: 10px\"><span></span></div></body></html>"; //新疆定制入库过磅单 public static String IN_WEIGHT_DEFAULT_NEW = "<!doctypehtml><html lang=zh-cn><meta content=\"text/html;charset=UTF-8\"http-equiv=Content-Type><title>入库过磅单</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'宋体';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}.no-border td{border:none}.border_right{border-right:1px solid}</style><h1 class=tit>billTitle</h1><table cellpadding=0 cellspacing=0><tr class=no-border><td colspan=2>磅单号：serId<td colspan=2>单位：KG<td colspan=2>打印日期：printTime<tr><td>车牌号<td>plateNum<td>货物名称<td>foodVariety<td>所属仓库<td class=border_right>depotName<tr><td>毛重时间<td>fullTime<td>毛重<td>fullWeight<td>单价(元/KG)<td class=border_right>price<tr><td>皮重时间<td>emptyTime<td>皮重<td>emptyWeight<td>结算金额<td class=border_right>settleMoney<tr><td>扣重（杂）<td><td>净重<td>netWeight<td>客户名称<td class=border_right>customerName<tr><td>水分<td><td>备注<td class=border_right colspan=3>remark<tr><td>制表人<td>createUser<td>司机签名<td><td>司机电话<td class=border_right>userContact</table><div style=padding-top:10px><span></span></div>"; /** * 默认出库过磅单 */ public static String OUT_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>出库称重单</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'宋体';padding-top:15px}.div-tit{padding-top:10px}.sp1{width:50%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>完成时间：completeTime</span><span class='sp1'>出库单号：serId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>发货单位</td><td colspan='3'width='37.5%'>deptName</td><td width='12.5%'>收货单位</td><td colspan='3'width='37.5%'>customerName</td></tr><tr><td width='12.5%'>承运人</td><td width='12.5%'>driverName</td><td width='12.5%'>粮食品种</td><td width='12.5%'>foodVariety</td><td width='12.5%'>出库仓库</td><td width='12.5%'>depotName</td><td width='12.5%'>粮食产地</td><td width='12.5%'>foodLocation</td></tr><tr><td>承运车牌</td><td>plateNum</td><td>毛重(KG)</td><td>fullWeight</td><td>皮重(KG)</td><td>emptyWeight</td><td>净重(KG)</td><td>netWeight</td></tr><tr><td>其他扣重(KG)</td><td>deOther</td><td>值仓扣重(KG)</td><td>deHandle</td><td>出库重量(KG)</td><td>recordWeight</td><td>结算重量(KG)</td><td>settleWeight</td></tr><tr><td>备注</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>司磅员：</span><span class='sp2'>监磅员：</span><span class='sp2'>保管员：handleUser</span><span class='sp2'>承运人：driverName</span></div><br></body><div style=\"padding-top: 10px\"><span></span></div></html>"; //新疆定制出库过磅单 public static String OUT_WEIGHT_DEFAULT_NEW = "<!doctypehtml><html lang=zh-cn><meta content=\"text/html;charset=UTF-8\"http-equiv=Content-Type><title>入库过磅单</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'宋体';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}.no-border td{border:none}.border_right{border-right:1px solid}</style><h1 class=tit>billTitle</h1><table cellpadding=0 cellspacing=0><tr class=no-border><td colspan=2>磅单号：serId<td colspan=2>单位：KG<td colspan=2>打印日期：printTime<tr><td>车牌号<td>plateNum<td>货物名称<td>foodVariety<td>所属仓库<td class=border_right>depotName<tr><td>毛重时间<td>fullTime<td>毛重<td>fullWeight<td>单价(元/KG)<td class=border_right>price<tr><td>皮重时间<td>emptyTime<td>皮重<td>emptyWeight<td>结算金额<td class=border_right>settleMoney<tr><td>扣重（杂）<td><td>净重<td>netWeight<td>客户名称<td class=border_right>customerName<tr><td>水分<td><td>备注<td class=border_right colspan=3>remark<tr><td>制表人<td>createUser<td>司机签名<td><td>司机电话<td class=border_right>userContact</table><div style=padding-top:10px><span></span></div>"; /** * 默认结算单 */ fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutPrintBill.java
@@ -25,9 +25,9 @@ private String registerTime = ""; //完成时间 private String completeTime = ""; //完成时间 //毛重称重时间 private String fullTime = ""; //完成时间 //皮重称重时间 private String emptyTime = ""; //流水单号 private String serId = ""; @@ -99,6 +99,8 @@ private String remark = ""; //保管员 private String handleUser = ""; //制表人 private String createUser = ""; } fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -687,10 +687,10 @@ public String inWeightBill(InoutRecord data) { // 获取表单数据 InoutPrintBill bill = this.createBillData(data, "-入库单"); InoutPrintBill bill = this.createBillData(data, "入库单"); // 调整模版数据并返回 String htmlStr = InoutBill.IN_WEIGHT_DEFAULT; String htmlStr = InoutBill.IN_WEIGHT_DEFAULT_NEW; htmlStr = htmlStr.replace("billTitle", bill.getBillTitle()); @@ -748,7 +748,7 @@ htmlStr = htmlStr.replace("handleEnd", ""); htmlStr = htmlStr.replace("noticeId", bill.getNoticeId() == null ? "" : bill.getNoticeId()); htmlStr = htmlStr.replace("phone", data.getUserContact() == null ? "" : data.getUserContact() + ""); htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm")); htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); htmlStr = htmlStr.replaceAll("weightUser", bill.getWeightUser() == null ? "" : bill.getWeightUser()); @@ -756,7 +756,7 @@ bill.getHandleUser() == null ? "" : bill.getHandleUser()); htmlStr = htmlStr.replaceAll("keeperName", bill.getKeeperUser() == null ? "" : bill.getKeeperUser()); htmlStr = htmlStr.replaceAll("createUser",ContextUtil.getLoginUserName()); return htmlStr; } @@ -769,10 +769,10 @@ */ public String outWeightBill(InoutRecord data) { // 获取表单数据 InoutPrintBill bill = this.createBillData(data, "-出库单"); InoutPrintBill bill = this.createBillData(data, "出库单"); //默认模版 String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT; String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT_NEW; htmlStr = htmlStr.replace("billTitle", bill.getBillTitle()); @@ -821,11 +821,13 @@ htmlStr = htmlStr.replace("handleEnd", ""); htmlStr = htmlStr.replace("noticeId", bill.getNoticeId() == null ? "" : bill.getNoticeId()); htmlStr = htmlStr.replace("phone", data.getUserContact() == null ? "" : data.getUserContact() + ""); htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm")); htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")); htmlStr = htmlStr.replaceAll("weightUser", getValue(bill.getWeightUser())); htmlStr = htmlStr.replace("handleUser", getValue(bill.getHandleUser())); htmlStr = htmlStr.replaceAll("keeperName", getValue(bill.getKeeperUser())); htmlStr = htmlStr.replaceAll("createUser",ContextUtil.getLoginUserName()); return htmlStr; } @@ -861,13 +863,13 @@ data.setRegisterTime(new Date()); } bill.setRegisterTime(DateFormatUtils.format(data.getRegisterTime(), "yyyy-MM-dd HH:mm")); "yyyy-MM-dd HH:mm:ss")); if (null == data.getCompleteTime()) { data.setCompleteTime(new Date()); } bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd HH:mm")); "yyyy-MM-dd HH:mm:ss")); bill.setEmptyTime(DateFormatUtils.format(data.getEmptyWeightTime(), "yyyy-MM-dd HH:mm:ss")); @@ -921,7 +923,7 @@ data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2)); } } bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + ""); bill.setSettleMoney(data.getSettleMoney() == null ? "" : String.format("%.2f", data.getSettleMoney())); bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks()); if (Constant.TYPE_IN.equals(data.getType())) { fzzy-igdss-web/src/main/resources/templates/print/pay.html
@@ -1,72 +1,99 @@ <!DOCTYPE html> <html lang='zh-cn'> <!doctypehtml> <html lang=zh-cn> <meta content="text/html;charset=UTF-8" http-equiv=Content-Type> <title>入库过磅单</title> <style>body { text-align: center; padding: 10px } <head> <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'> <title>结算单</title> <style> body {text-align: center;padding: 10px;font-family: '宋体';} .tit {font-size: 24px;flex-grow: 1;text-align: center;} .div-tit {padding-top: 6px;} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px;border-collapse: collapse;} table td {border-left: 1px solid;border-top: 1px solid;height: 32px;} .sp1 {width: 33%;float: left;padding-bottom: 5px;} .sp2 {width: 25%;float: left;text-align: center;} .sp3 {width: 16.6%;float: left;text-align: center;} .txt-left {text-align: left;} .txt-center {text-align: center;} .txt-right {text-align: right;} </style> </head> .tit { margin: 10px; font-size: 24px; font-family: '宋体'; padding-top: 15px } <body> <h1 class='tit'><u>[billTitle]</u></h1> <div class='div-tit'><span class='sp1 txt-left'>库区名称：[deptId]</span><span class='sp1 txt-center'>单据号:[id]</span><span class='sp1 txt-right'>打印时间：[payTime]</span></div> <table cellspacing='0' cellpadding='0'> .div-tit { padding-top: 10px } table { width: 100%; border-bottom: 1px solid; font-size: 14px } table td { border-left: 1px solid; border-top: 1px solid; height: 38px } .sp1 { width: 33%; float: left; padding-bottom: 10px } .sp2 { width: 25%; float: left; text-align: center } .no-border td { border: none } .border_right { border-right: 1px solid }</style> <h1 class=tit>billTitle</h1> <table cellpadding=0 cellspacing=0> <tr class=no-border> <td colspan=2>磅单号：serId <td colspan=2>单位：KG <td colspan=2>打印日期：printTime <tr> <td>客户名称</td> <td colspan='7'>[customerName]</td> </tr> <td>车牌号 <td>plateNum <td>货物名称 <td>foodVariety <td>所属仓库 <td class=border_right>depotName <tr> <td width='12.5%'>承运人</td> <td width='37.5%' colspan='3'>[userName]</td> <td width='12.5%'>联系电话</td> <td width='37.5%' colspan='3'>[userContact]</td> </tr> <td>毛重时间 <td>fullTime <td>毛重 <td>fullWeight <td>单价(元/KG) <td class=border_right>price <tr> <td>身份证号码</td> <td colspan='3'>[userId]</td> <td>车牌号</td> <td colspan='3'>[plateNum]</td> </tr> <td>皮重时间 <td>emptyTime <td>皮重 <td>emptyWeight <td>结算金额 <td class=border_right>settleMoney <tr> <td>仓库</td> <td colspan='3'>[depotId]</td> <td>粮食名称</td> <td colspan='3'>[foodVariety]</td> </tr> <td>扣重（杂） <td> <td>净重 <td>netWeight <td>客户名称 <td class=border_right>customerName <tr> <td>备注</td> <td colspan="7">[remark]</td> </tr> <td>水分 <td> <td>备注 <td class=border_right colspan=3>remark <tr> <td colspan="8">计量信息</td> </tr> <tr> <td>毛重</td> <td colspan='2'>[fullWeight]公斤</td> <td>皮重</td> <td colspan='2'>[emptyWeight]公斤</td> <td>扣重</td> <td colspan='2'>[deOther]公斤</td> </tr> <tr> <td colspan="8">结算信息</td> </tr> <tr> <td>单价</td> <td colspan='2'>[payPrice]元/公斤</td> <td>结算重量</td> <td colspan='2'>[settleWeight]公斤</td> <td>结算金额</td> <td colspan='2'>[payMoney]元</td> </tr> <tr> <td>大写金额</td> <td colspan="7">[payMoneyName]</td> </tr> <td>制表人 <td>createUser <td>司机签名 <td> <td>司机电话 <td class=border_right>userContact </table> <div class='div-tit'><span class='sp2 txt-left '>结算员：_______</span><span class='sp2 txt-left '>保管员：_______</span><span class='sp2 txt-left '>审核人：_______</span><span class='sp2 txt-left '>承运人：_______</span></div> </body> </html> <div style=padding-top:10px><span></span></div>
