Skip to content

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

完成需求开发并上线

parent 0ee6c9aa
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 47 deletions
WebRoot/WEB-INF/pages/fstzs/Fstzs_Yjh.jsp
View file @ d5bda891
......@@ -131,8 +131,9 @@
{field:'pjdm',title:'票据代码',width:100},
{field:'jksh',title:'缴款书号',width:100},
{field:'status',title:'非税缴款通知单状态',width:100,formatter: function (value, row, index){
if (value == 1) return "正常";
return "已作废";
if (value == 3) return "已缴费";
if (value == 2) return "已作废";
return "正常";
}}
]],
toolbar:[{
......
conf/jdbc.properties
View file @ d5bda891
......@@ -48,12 +48,12 @@ db.driverClassName=oracle.jdbc.driver.OracleDriver
#db.url = jdbc:oracle:thin:@10.1.163.147:1521/orcl
# 现场测试 start -------------------------------------
db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
db.username = zsb1016
db.password = 123456
#db.url = jdbc:oracle:thin:@192.168.30.140:1521:orcl
#db.username = zsb1
#db.url = jdbc:oracle:thin:@192.168.1.244:1521/orcl
#db.username = zsb1016
#db.password = 123456
db.url = jdbc:oracle:thin:@192.168.30.140:1521:orcl
db.username = zsb1
db.password = 123456
#db.username = zsb2107
#db.password = 123456
##db.username = zsb01
......
conf/system.properties
View file @ d5bda891
......@@ -143,10 +143,9 @@ fs-appkey:d85e08e7cb8e6b8ad45032198aa9
fs-kpdbm:001
fs-dwbm:708002
fs-qhbm:320100
fs-pjdm:32990120
fs-pjdm:32010120
fs-version:1.0.1
fs-billcode:9901
fs-sfxmbh:103015601
#非税开票
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>3201012301</EInvoiceSpecimenCode><SupervisorAreaCode>320101</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
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>3201012301</EInvoiceSpecimenCode><SupervisorAreaCode>320100</SupervisorAreaCode><TotalAmount>{{yjje}}</TotalAmount><IssueDate>{{kprq}}</IssueDate><IssueTime>{{kpsj}}</IssueTime><InvoicingParty><InvoicingPartyCode>708002</InvoicingPartyCode><InvoicingPartyName>{{zsdw}}</InvoicingPartyName><RecName>{{zsdw}}</RecName><RecAcct>{{recAcct}}</RecAcct><RecOpBk>{{recBank}}</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/account/accountBank/web/AccountBankAction.java
View file @ d5bda891
......@@ -431,7 +431,7 @@ public class AccountBankAction extends BaseAction
if(!"1".equals(flag)) {
FstzsXm fstzsXm = fstzsXmService.getBySlbh(paymentItemPending.getSlbh());
if(fstzsXm != null) {
if(fstzsXm.getStatus() == 1) {
if(fstzsXm.getStatus() == 0) {
fstzsXm.setStatus(1);
fstzsXm.setZdsc(1);
fstzsXm.setJbr(this.getLoginUser().getDisplayName());
......
src/com/jshx/fstzs/fsutil/FsRequest.java
View file @ d5bda891
......@@ -8,6 +8,7 @@ import com.jshx.core.utils.SysPropertiesUtil;
import com.jshx.fstzs.entity.Fstzs;
import com.jshx.fstzs.fsutil.bean.*;
import com.jshx.http.HttpclientUtil;
import com.jshx.kpsjgl.entity.Kpsjgl;
import com.neusoft.egov.utils.TextUtils;
import java.io.UnsupportedEncodingException;
......@@ -53,7 +54,7 @@ public class FsRequest {
*
* @param fstzs 非税缴费对象
*/
public static FsResult<KjjksResp> jihuo(Fstzs fstzs) {
public static FsResult<KjjksResp> jihuo(Fstzs fstzs, Kpsjgl kpsjgl) {
Map<String,Object> map = new HashMap<>();
map.put("serial_number", fstzs.getLsh());//流水号
map.put("place_code",getProp("fs-kpdbm"));//开票点编码
......@@ -70,14 +71,17 @@ public class FsRequest {
* 2单位指定
* 3子账号（不支持单位独立部署）
*/
map.put("acc_assign_type","1");
map.put("acc_assign_type","2");
map.put("rec_name",kpsjgl.getKrqc());
map.put("rec_no",kpsjgl.getSkrzh());
map.put("rec_bank",kpsjgl.getSkrkhh());
map.put("total_amt",fstzs.getYjje());//合计金额
map.put("author",fstzs.getJksJbr());//开票人
map.put("memo",fstzs.getFstzsXm().getBeizhu());//备注
Map<String,String> mapDatail = new HashMap<>();
mapDatail.put("item_code",getProp("fs-sfxmbh"));
mapDatail.put("std","150");//收费标准
mapDatail.put("item_code",kpsjgl.getXmbm());
mapDatail.put("std",kpsjgl.getSfbz());//收费标准
mapDatail.put("number",fstzs.getYjmj());//数量
mapDatail.put("amt",fstzs.getYjje());//金额
List<Map<String,String>> list = new ArrayList<>();
......@@ -157,7 +161,7 @@ public class FsRequest {
* @param jbr
* @return
*/
public static FsResult<String> kaipiao(Fstzs fstzs,String jbr) {
public static FsResult<String> kaipiao(Fstzs fstzs,String jbr,Kpsjgl kpsjgl) {
//1,stock.billno.get 获取电子票号
Map<String,Object> mapPh = new HashMap<>();
mapPh.put("place_code",getProp("fs-kpdbm"));//开票点编码
......@@ -200,7 +204,10 @@ public class FsRequest {
xml = xml.replaceAll("\\{\\{beizhu}}",fstzs.getFstzsXm().getBeizhu());
xml = xml.replaceAll("\\{\\{jkm}}",fstzs.getJkm());
xml = xml.replaceAll("\\{\\{yjmj}}",fstzs.getYjmj());
xml = xml.replaceAll("\\{\\{itemCode}}",getProp("fs-sfxmbh"));
xml = xml.replaceAll("\\{\\{itemCode}}",kpsjgl.getXmbm());
xml = xml.replaceAll("\\{\\{zsdw}}",kpsjgl.getZsdw());
xml = xml.replaceAll("\\{\\{recAcct}}",kpsjgl.getSkrzh());
xml = xml.replaceAll("\\{\\{recBank}}",kpsjgl.getSkrkhh());
try {
String xmlBase64 = Base64.getEncoder().encodeToString(xml.getBytes("utf-8"));
......
src/com/jshx/fstzs/fsutil/ParamsUtil.java
View file @ d5bda891
......@@ -46,9 +46,7 @@ public class ParamsUtil {
}
public static void main(String[] args) {
HashMap<String, Object> map = new HashMap<>();
map.put("key","value");
Map<String, String> hello = getParams("hello", map);
System.out.println(new Gson().toJson(hello));
String s = "2022-01-01";
System.out.printf(s.substring(0,7));
}
}
src/com/jshx/fstzs/web/FstzsAction.java
View file @ d5bda891
......@@ -285,7 +285,7 @@ public class FstzsAction extends BaseAction {
//金额转中文
fstzsXm.setYjjedx(NumberToCN.number2CNMontrayUnit(new BigDecimal(fstzsXm.getYjje())));
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
params.put("fsxmId",fstzsXm.getId());
params.put("status",new ArrayList<Integer>(){{
add(0);
}});
......@@ -332,6 +332,9 @@ public class FstzsAction extends BaseAction {
HashMap<String, Object> params = new HashMap<>();
params.put("fsxmId",dbXm.getId());
params.put("status",new ArrayList<Integer>(){{
add(0);
}});
fstzsList = fstzsService.findList(params);
String beizhuAppend = dbXm.getSlbh() + "，共" + fstzsList.size() + "张电子发票";
if(TextUtils.isEmpty(dbXm.getBeizhu())) {
......@@ -389,7 +392,7 @@ public class FstzsAction extends BaseAction {
//先查询是否有老的数据，有就删除先
//编辑时，先删除之前添加的内容
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzsXm.getSlbh());
params.put("fsxmId",fstzsXm.getId());
params.put("status",new ArrayList<Integer>(){{
add(0);
}});
......@@ -463,6 +466,9 @@ public class FstzsAction extends BaseAction {
FstzsXm xm = fstzsXmService.getById(id);
HashMap<String, Object> params = new HashMap<>();
params.put("fsxmId",xm.getId());
params.put("status",new ArrayList<Integer>(){{
add(0);//已激活
}});
// 需要调用财政系统操作，财政返回成功之后，才可以修改入库
List<Fstzs> list = fstzsService.findList(params);
list.stream().forEach(f-> {
......@@ -470,7 +476,7 @@ public class FstzsAction extends BaseAction {
f.setLsh(System.currentTimeMillis() + "");//生成流水号
f.setFstzsXm(xm);
f.setJksJbr(this.getLoginUser().getDisplayName());
FsResult<KjjksResp> resp = FsRequest.jihuo(f);
FsResult<KjjksResp> resp = FsRequest.jihuo(f,xm.getKpsjgl());
if(resp.success) {//成功
f.setStatus(1);
f.setJkm(resp.data.payCode);
......@@ -506,12 +512,13 @@ public class FstzsAction extends BaseAction {
String message = "OK";
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",fstzs.getSlbh());
FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
params.put("fsxmId",xm.getId());
params.put("status",new ArrayList<Integer>(){{
add(1);//已激活
}});
List<Fstzs> list = fstzsService.findList(params);
FstzsXm xm = fstzsXmService.getBySlbh(fstzs.getSlbh());
List<Fstzs> jkList = list.stream().filter(i -> i.getIsJk() == 1).collect(Collectors.toList());
if(jkList != null && jkList.size() > 0) {
result = false;
......@@ -563,7 +570,7 @@ public class FstzsAction extends BaseAction {
String jbr = this.getLoginUser().getDisplayName();
fstzs.setFstzsXm(xm);
FsResult<String> kaipiao = FsRequest.kaipiao(fstzs, jbr);
FsResult<String> kaipiao = FsRequest.kaipiao(fstzs, jbr,xm.getKpsjgl());
if(kaipiao.success) {
fstzs.setKpState(2);//非同步返回，需要异步查询
fstzs.setKpLsh(kaipiao.data);
......@@ -624,7 +631,7 @@ public class FstzsAction extends BaseAction {
xm.setMobile("");
xm.setBeizhu("");
HashMap<String, Object> params = new HashMap<>();
params.put("slbh",xm.getSlbh());
params.put("fsxmId",xm.getId());
params.put("status",new ArrayList<Integer>(){{
add(0);//初始状态
}});
......@@ -688,7 +695,7 @@ public class FstzsAction extends BaseAction {
if(xm == null) return;
if(xm.getIsJx() != null && xm.getIsJx() == 1) return;
Map<String, Object> paraMap = new HashMap();
paraMap.put("slbh",xm.getSlbh());
paraMap.put("fsxmId",xm.getId());
paraMap.put("status",new ArrayList<Integer>(){{
add(1);//已激活
add(3);//已缴款
......@@ -740,13 +747,12 @@ public class FstzsAction extends BaseAction {
paymentVoucherHis.setApplyStatus(Constant.VOUCHER_USE_STATUS_0);
paymentVoucherHis.setMessage("上报：成功");
String pjbz="";
pjbz="关联编号:"+paymentVoucherHis.getVoucherCode()+".";
paymentVoucherHis.setDestroyStatus(Constant.VOUCHER_DESTROY_STATUS_1);//TODO 默认已缴销
PaymentItemHis byXmbId = paymentItemHisService.getByXmbId(xm.getXmxxb().getId());
//四位全局校验码
for(Fstzs f : fstzsList) {
String pjbz="关联编号:"+f.getJkm()+".";
paymentVoucherHis.setAmount(f.getYjje());
//模拟票据领取发放功能
List<Indeticur> list = new ArrayList<Indeticur>();
......@@ -808,13 +814,12 @@ public class FstzsAction extends BaseAction {
pjjx.setJbr(paymentVoucherHis1.getOperator());
pjjx.setJkrqc(paymentVoucherHis1.getPayerName());
pjjx.setSalary(paymentVoucherHis1.getAmount());
pjjx.setState(paymentVoucherHis1.getApplyStatus());
pjjx.setRkdate(f.getJkTime());
pjjx.setRkdate(f.getJkTime().substring(0,7));
pjjx.setSlbh(paymentVoucherHis1.getOrderId());
pjjx.setDwdm(paymentVoucherHis1.getDwdm());
pjjx.setPayITEMid(paymentVoucherHis1.getRelateId());
pjjx.setZsdw(paymentVoucherHis1.getZsdw());
pjjx.setZsdw(indeticur.getZsdw());
pjjx.setZsfw(xm.getXmxxb().getZsfw());
......
src/com/jshx/jktzs/web/JktzsAction.java
View file @ d5bda891
......@@ -479,19 +479,23 @@ public class JktzsAction extends BaseAction
* 20221116
* 入paymentItemPending表同时，入FstzsXm表
*/
if(!"0.00".equals(jktzs.getJfje())) {
FstzsXm xm = new FstzsXm();
xm.setXmxxb(xmxxbService.getById(jktzs.getXmbzj()));
xm.setDelFlag(0);
xm.setStatus(0);
xm.setJsdwmc(jktzs.getDwmc());
xm.setGcxmmc(jktzs.getXmmc());
xm.setSlbh(jktzs.getSlbh());
xm.setYjje(jktzs.getJfje());
fstzsXmService.save(xm);
try {
if (Double.parseDouble(jktzs.getJfje()) != 0) {
FstzsXm xm = new FstzsXm();
xm.setXmxxb(xmxxbService.getById(jktzs.getXmbzj()));
xm.setDelFlag(0);
xm.setStatus(0);
xm.setJsdwmc(jktzs.getDwmc());
xm.setGcxmmc(jktzs.getXmmc());
xm.setSlbh(jktzs.getSlbh());
xm.setYjje(jktzs.getJfje());
fstzsXmService.save(xm);
}
} catch (Exception e) {
}
}else{
jktzsService.update(jktzs);
}
......
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