Skip to content

N
njzsb
Commit e55fa92a authored by 徐州's avatar 徐州
Browse files
Options

修改部分问题，替换非税通知书底图

parent 162a0276
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 27 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Add.jsp
View file @ e55fa92a
......@@ -98,7 +98,7 @@
</td>
</tr>
<tr>
<th width="15">缴款人账号111</th>
<th width="15">缴款人账号</th>
<td width="35%">
<input id="zhanghao" onblur="check()" name="fstzsXm.zhanghao" style="width:90%" value="${fstzsXm.zhanghao}"/>
</td>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Print.jsp
View file @ e55fa92a
......@@ -130,33 +130,33 @@
</form>
<div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
<img class='screen-only' src="${ctx}/images/img/cw.jpg" style="position:absolute;width:100%;height:100%"/>
<img class='screen-only' src="${ctx}/images/img/fstzs.png" style="position:absolute;width:100%;height:100%"/>
<div id='f1' draggable='true'
class='f1'>${fstzsXm.jsdwmc}
class='f1'>${fstzs.jsdwmc}
</div>
<div id='f2' draggable='true'
class='f2'>${fstzsXm.zhanghao}
class='f2'>${fstzs.zhanghao}
</div>
<div id='f3' draggable='true'
class='f3'>${fstzsXm.khh}
class='f3'>${fstzs.khh}
</div>
<div id='f4' draggable='true'
class='f4'>${fstzsXm.yjje}
class='f4'>${fstzs.yjje}
</div>
<div id='f5' draggable='true'
class='f5'>${fstzsXm.yjjedx}
class='f5'>${fstzs.yjjedx}
</div>
<div id='f6' draggable='true'
class='f6'>${fstzsXm.beizhu}
class='f6'>${fstzs.beizhu}
</div>
<div id='f7' draggable='true'
class='f7'>${fstzsXm.slbh}
class='f7'>${fstzs.slbh}
</div>
<div id='f8' draggable='true'
class='f8'>${fstzsXm.paymentItemPending.csmj}
class='f8'>${fstzs.paymentItemPending.csmj}
</div>
<div id='f9' draggable='true'
class='f9'>${fstzsXm.yjje}
class='f9'>${fstzs.yjje}
</div>
</div>
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp
View file @ e55fa92a
......@@ -43,6 +43,12 @@
}
function dayin(id){
var dt=new Date();
createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + id,900,700);
}
function reloadDate(){
$('#pagination').datagrid('clearSelections');
search_fstzs();
......@@ -103,11 +109,12 @@
"jssj":$("#jssj").val()
},
columns:[[
{field:'op',title:'操作',width:80,align:'center',formatter:function(value,rec){
{field:'op',title:'操作',width:140,align:'center',formatter:function(value,rec){
var result = "";
if(rec.status == 1) {//未缴款的可作废
result += "<a class='btn_01_mini' onclick=zuofei('"+rec.slbh+"','"+rec.length+"','"+rec.jkm+"') >作废<b></b></a>";
}
result += "<a class='btn_01_mini' onclick=dayin('"+rec.id+"') >打印<b></b></a>";
return result;
}},
{field:'jkm',title:'缴款码',width:200},
......
WebRoot/WEB-INF/pages/fstzs/Fstzs_Ysc.jsp
View file @ e55fa92a
......@@ -18,11 +18,6 @@
}
function dayin(id){
var dt=new Date();
createSimpleWindow("win_fstzs","打印非税通知书","${ctx}/jsp/fstzs/winPrintFstzs.action?id=" + id,900,700);
}
function jihuo(id){
$.messager.confirm("提示", "确认要激活该项目？", function(result) {
......@@ -108,10 +103,8 @@
}
if(rec.status == 2) {//复核通过
result += "<a class='btn_01_mini' onclick=jihuo('"+rec.id+"') >激活<b></b></a>";
result += "<a class='btn_01_mini' onclick=dayin('"+rec.id+"') >打印<b></b></a>";
} else if(rec.status == 6) {
result += "<a class='btn_01_mini' onclick=jihuo('"+rec.id+"') >重新激活<b></b></a>";
result += "<a class='btn_01_mini' onclick=dayin('"+rec.id+"') >打印<b></b></a>";
} else {
result += "<a class='btn_01_mini' style='opacity: 0.5' >激活<b></b></a>";
}
......
conf/system.properties
View file @ e55fa92a
......@@ -150,4 +150,4 @@ fs-sfxmbh:10304240101
#fs-sfxmbh:103015601
#非税开票
EInvoiceContent:<Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>{{EInvoiceID}}</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>\u6c5f\u82cf\u7701\u975e\u7a0e\u6536\u5165\u7edf\u4e00\u7968\u636e\uff08\u7535\u5b50\uff09</EInvoiceName><EInvoiceCode>{{EInvoiceCode}}</EInvoiceCode><EInvoiceNumber>{{EInvoiceNumber}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012010</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</InvoicingPartyName><RecName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>\u5357\u4eac\u519c\u884c\u9f13\u697c\u652f\u884c</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>{{itemCode}}</ItemCode><ItemName>\u57ce\u5e02\u57fa\u7840\u8bbe\u65bd\u914d\u5957\u8d39-\u57ce\u533a</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>\u5143</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData>
\ No newline at end of file
EInvoiceContent:<EInvoice><Header><EInvoiceTag>CZ-EI-32</EInvoiceTag><EInvoiceID>{{EInvoiceID}}</EInvoiceID><Version>1.1.0</Version></Header><EInvoiceData><Main><EInvoiceName>\u6c5f\u82cf\u7701\u975e\u7a0e\u6536\u5165\u7edf\u4e00\u7968\u636e\uff08\u7535\u5b50\uff09</EInvoiceName><EInvoiceCode>{{EInvoiceCode}}</EInvoiceCode><EInvoiceNumber>{{EInvoiceNumber}}</EInvoiceNumber><RandomNumber>{{random}}</RandomNumber><EInvoiceSpecimenCode>3201012010</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</InvoicingPartyName><RecName>\u5357\u4eac\u5e02\u57ce\u5e02\u5efa\u8bbe\u8d39\u7528\u5f81\u6536\u670d\u52a1\u4e2d\u5fc3</RecName><RecAcct>10105901040000062</RecAcct><RecOpBk>\u5357\u4eac\u519c\u884c\u9f13\u697c\u652f\u884c</RecOpBk></InvoicingParty><PayerParty><PayerPartyType>2</PayerPartyType><PayerPartyCode/><PayerPartyName>{{jkr}}</PayerPartyName><PayerAcct/><PayerOpBk/></PayerParty><PayMode/><BizCode>{{lsh}}</BizCode><CurrencyType/><ExchangeRate/><Remark>{{beizhu}}</Remark><HandlingPerson>{{jbr}}</HandlingPerson><Checker/><SupervisorRemark/><InvoicingPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></InvoicingPartySeal><SupervisorPartySeal><SealId>f2ae8a477d7247148adf2e5cd48630e6</SealId><SealName/><SealHash/></SupervisorPartySeal><MainExt><RelatedInvoiceCode/><RelatedInvoiceNumber/><PayCode>{{jkm}}</PayCode><BusinessNumber/><BusinessDate/><Gender/><Age/><Address/><School/><Faculty/><Major/><Classes/><StudentID/><MedicalType/><MedicalDate/><CaseNumber/><PatientNumber/><HospitalizationNumber/><DepartmentName/><InHospitalDate/><OutHospitalDate/><PrepayAmount/><RechargeAmount/><RefundAmount/><OrgType/><MedicalInsuranceType/><MedicalInsuranceID/><FundPayAmount/><OtherPayAmount/><AccountPayAmount/><OwnPayAmount/><SelfpaymentAmount/><SelfpaymentCost/><Custom1/><Custom2/><Custom3/><Custom4/><Custom5/><Custom6/><Custom7/><Custom8/><Custom9/><Custom10/><Custom11/><Custom12/></MainExt></Main><Details><Item><ItemCode>{{itemCode}}</ItemCode><ItemName>\u57ce\u5e02\u57fa\u7840\u8bbe\u65bd\u914d\u5957\u8d39-\u57ce\u533a</ItemName><ItemQuantity>{{yjmj}}</ItemQuantity><ItemUnit>\u5143</ItemUnit><ItemStd>150.00</ItemStd><ItemAmount>{{yjje}}</ItemAmount><ItemRemark/><ItemExt><ItemDetailName/></ItemExt></Item></Details></EInvoiceData></EInvoice>
\ No newline at end of file
src/com/jshx/fstzs/conf/struts-fstzs.xml
View file @ e55fa92a
......@@ -33,7 +33,7 @@
</action>
<!--打印非税通知书窗口-->
<action name="winPrintFstzs" class="com.jshx.fstzs.web.FstzsAction" method="winAddFstzs">
<action name="winPrintFstzs" class="com.jshx.fstzs.web.FstzsAction" method="winFstzs">
<result name="view">/WEB-INF/pages/fstzs/Fstzs_Print.jsp</result>
</action>
......
src/com/jshx/fstzs/entity/Fstzs.java
View file @ e55fa92a
......@@ -50,6 +50,10 @@ public class Fstzs extends BaseModel {
* 财政返回的缴款吗
*/
private String jkm;
/**
* 财政返回的缴款Url
*/
private String jkUrl;
/**
* 缴款缴款人
......@@ -377,4 +381,12 @@ public class Fstzs extends BaseModel {
public void setPjUrl(String pjUrl) {
this.pjUrl = pjUrl;
}
public String getJkUrl() {
return jkUrl;
}
public void setJkUrl(String jkUrl) {
this.jkUrl = jkUrl;
}
}
src/com/jshx/fstzs/fsutil/FsRequest.java
View file @ e55fa92a
......@@ -84,7 +84,7 @@ public class FsRequest {
map.put("item_details",list);
try {
String request = request("paybook.e.issue.do", map);
String request = request("paybook.e.issue.js.do", map);
if(TextUtils.isEmpty(request)) {
return FsResult.fail("网络异常,请重试！");
}
......@@ -192,7 +192,8 @@ public class FsRequest {
xml = xml.replaceAll("\\{\\{yjje}}",fstzs.getYjje());
xml = xml.replaceAll("\\{\\{kprq}}",new SimpleDateFormat("yyyyMMdd").format(new Date()));
xml = xml.replaceAll("\\{\\{kpsj}}",new SimpleDateFormat("HH:mm:ss").format(new Date()));
xml = xml.replaceAll("\\{\\{jkr}}",jbr);
xml = xml.replaceAll("\\{\\{jkr}}",fstzs.getJkr());
xml = xml.replaceAll("\\{\\{jbr}}",fstzs.getJksJbr());
xml = xml.replaceAll("\\{\\{lsh}}",fstzs.getLsh());
xml = xml.replaceAll("\\{\\{beizhu}}",fstzs.getFstzsXm().getBeizhu());
xml = xml.replaceAll("\\{\\{jkm}}",fstzs.getJkm());
......@@ -216,13 +217,14 @@ public class FsRequest {
if(resp.errorMessage != null) {
return FsResult.fail(resp.errorMessage.errorMsg);
}
if(resp.message != null && "0000".equals(resp.message.succCode)) {
if(resp.message != null) {
KpResp kpResp = kaipiaoCx(kpLsh);
kpResp.lsh = kpLsh;
return new FsResult<>(kpResp);
}
return FsResult.fail("操作错误！" + new Gson().toJson(resp));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return FsResult.fail("操作异常" + e.getMessage());
......
src/com/jshx/fstzs/fsutil/bean/KjjksResp.java
View file @ e55fa92a
......@@ -26,4 +26,9 @@ public class KjjksResp {
@SerializedName("create_time")
public String createTime;
/**
* 接口返回的缴款吗url
*/
public String url;
}
src/com/jshx/fstzs/web/FstzsAction.java
View file @ e55fa92a
......@@ -226,10 +226,30 @@ public class FstzsAction extends BaseAction {
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
fstzsList = fstzsService.findList(params);
if(fstzsList.size() == 0) {
Fstzs f = new Fstzs();
f.setJkr(fstzsXm.getJsdwmc());
f.setYjje(fstzsXm.getYjje());
f.setYjmj(fstzsXm.getPaymentItemPending().getCsmj());
fstzsList.add(f);
}
if(TextUtils.isEmpty(fstzsXm.getMobile())) {
Xmxxb bySlbh = xmxxbService.getBySlbh(fstzsXm.getSlbh());
if(bySlbh != null) {
fstzsXm.setMobile(bySlbh.getPhone());
}
}
} catch (Exception e) {}
return VIEW;
}
public String winFstzs() {
fstzs = fstzsService.getById(id);
fstzsXm = fstzsXmService.getBySlbh(fstzs.getSlbh());
return VIEW;
}
/**
* 生成非税通知书操作
* @return
......@@ -247,11 +267,11 @@ public class FstzsAction extends BaseAction {
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",dbXm.getSlbh());
fstzsList = fstzsService.findList(params);
String beizhuAppend = "(" + dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票)";
String beizhuAppend = dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票";
if(TextUtils.isEmpty(dbXm.getBeizhu())) {
dbXm.setBeizhu(beizhuAppend);
} else if(!dbXm.getBeizhu().contains(beizhuAppend)) {
dbXm.setBeizhu(dbXm.getBeizhu() + beizhuAppend);
dbXm.setBeizhu(dbXm.getBeizhu() + "，" + beizhuAppend);
}
fstzsXmService.update(dbXm);
return RELOAD;
......@@ -384,6 +404,7 @@ public class FstzsAction extends BaseAction {
if(resp.success) {//成功
f.setStatus(1);
f.setJkm(resp.data.payCode);
f.setJkUrl(resp.data.url);
f.setJhTime(System.currentTimeMillis() + "");
f.setBzrq(resp.data.createTime);
} else {//失败
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment