xuefeilong
/
hnlg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java
master
SookDong 2024-04-25 17:46:56 +08:00
parent f6469ec1e7 69acef6e09
commit 0616b7543b
10 changed files with 320 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/htjs/pt4/zzsxt/controller/api/ApiController.java
View File

@ -45,6 +45,34 @@ public class ApiController extends BaseController {
return jsonObj; return jsonObj;
} }
/**
* //TODO 异步推送发票回调
* @author: long
* @date 2024/3/15
*
*/
@PostMapping(value = "/asynCallback")
public Object asynCallback(@RequestBody String jsonStr){
StaticLog.info("发票推送回调参数:{}",jsonStr);
cn.hutool.json.JSONObject jsonObject1 = JSONUtil.parseObj(jsonStr);
cn.hutool.json.JSONArray ywdjbh1 = jsonObject1.getJSONArray("result");
if(!ywdjbh1.isEmpty()) {
for (Object o : ywdjbh1) {
cn.hutool.json.JSONObject resultObj = JSONUtil.parseObj(o);
String ywdjbh = resultObj.getStr("ywdjbh");
Map<String,Object> updateMap = new HashMap<>();
updateMap.put("djbh", ywdjbh);
updateMap.put("kpzt",resultObj.getStr("zt"));
iBoKpsqService.updataZZSGL_XX_KPSQ(updateMap);
}
}
cn.hutool.json.JSONObject jsonObject2 = JSONUtil.createObj();
jsonObject2.put("code","200");
jsonObject2.put("message","回调成功");
return jsonObject2;
}
/** /**
* //TODO 推送发票回调 * //TODO 推送发票回调
* @author: long * @author: long

2
src/main/java/net/htjs/pt4/zzsxt/dao/jxgl/jxfpgl/fphq/FphqMapper.java
View File

@ -58,4 +58,6 @@ public interface FphqMapper extends BaseDao {
*/ */
List<Map> selectZZSGL_JX_FPXX_BY_DMHM(Map userMap); List<Map> selectZZSGL_JX_FPXX_BY_DMHM(Map userMap);
Map select_JX_FPXX_BY_DMHM(Map userMap);
} }

26
src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/cgfp/BoCgfpServiceImpl.java
View File

@ -6,12 +6,13 @@ import com.alibaba.fastjson.JSONObject;
import net.htjs.pt4.core.ServiceException; import net.htjs.pt4.core.ServiceException;
import net.htjs.pt4.swgxpt.mapper.SwgxptMapper; import net.htjs.pt4.swgxpt.mapper.SwgxptMapper;
import net.htjs.pt4.swgxpt.vo.InvoiceSearchRes; import net.htjs.pt4.swgxpt.vo.InvoiceSearchRes;
import net.htjs.pt4.zzsxt.controller.jxgl.jxfpgl.fppz.JxpzController; import net.htjs.pt4.zzsxt.dao.jxgl.jxfpgl.fphq.FphqMapper;
import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.cgfp.CgfpMapper; import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.cgfp.CgfpMapper;
import net.htjs.pt4.zzsxt.entity.*; import net.htjs.pt4.zzsxt.entity.*;
import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.cgfp.IBoCgfpService; import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.cgfp.IBoCgfpService;
import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.kpsq.IBoKpsqService; import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.kpsq.IBoKpsqService;
import net.htjs.pt4.zzsxt.tools.HttpClientUtil; import net.htjs.pt4.zzsxt.tools.HttpClientUtil;
import net.htjs.util.Get16BM;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -27,6 +28,8 @@ public class BoCgfpServiceImpl implements IBoCgfpService {
@Resource @Resource
private CgfpMapper cgfpMapper; private CgfpMapper cgfpMapper;
@Resource
private FphqMapper fphqMapper;
@Autowired @Autowired
private IBoKpsqService iBoKpsqService; private IBoKpsqService iBoKpsqService;
@ -63,21 +66,22 @@ public class BoCgfpServiceImpl implements IBoCgfpService {
Map<String,Object> fpxxMap = new HashMap<>(); Map<String,Object> fpxxMap = new HashMap<>();
fpxxMap.put("fpdm",fpxx.get("fpdm")); fpxxMap.put("FPID", Get16BM.getUnquieID());
fpxxMap.put("fphm",fpxx.get("fphm")); fpxxMap.put("FPDM",fpxx.get("fpdm"));
fpxxMap.put("kprq",fpxx.get("kprq")); fpxxMap.put("FPHM",fpxx.get("fphm"));
fpxxMap.put("bhsje",fpxx.get("hjje")); fpxxMap.put("KPRQ",fpxx.get("kprq"));
fpxxMap.put("se",fpxx.get("hjse")); fpxxMap.put("JEBHS",fpxx.get("hjje"));
fpxxMap.put("fplxdm",fpxx.get("pjlx")); fpxxMap.put("SE",fpxx.get("hjse"));
fpxxMap.put("fylx",fpxx.get("fylx")); fpxxMap.put("JSHJ",fpxx.get("jshj"));
fpxxMap.put("FYLX",fpxx.get("fylx"));
Map map = cgfpMapper.selectInvoiceByFpdmhm(fpxxMap); Map map = fphqMapper.select_JX_FPXX_BY_DMHM(fpxxMap);
if (map == null){ if (map == null){
return this.insertZZSGL_XX_JXFP(fpxxMap); return fphqMapper.insertZZSGL_JX_FPXX_FPXZ(fpxxMap);
}else { }else {
fpxxMap.put("fpid",map.get("fpid")); fpxxMap.put("fpid",map.get("fpid"));
return this.updateZZSGL_XX_JXFP(fpxxMap); return fphqMapper.updateZZSGL_JX_FPXX_FPXZ(fpxxMap);
} }
} }

80
src/main/java/net/htjs/pt4/zzsxt/service/impl/xxgl/xmkpgl/kpsq/BoKpsqServiceImpl.java
View File

@ -21,6 +21,7 @@ import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.cgfp.CgfpMapper;
import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.fbfpgl.FbfpglMapper; import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.fbfpgl.FbfpglMapper;
import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.kpsq.KpsqMapper; import net.htjs.pt4.zzsxt.dao.xxgl.xmkpgl.kpsq.KpsqMapper;
import net.htjs.pt4.zzsxt.entity.XxKpsqDO; import net.htjs.pt4.zzsxt.entity.XxKpsqDO;
import net.htjs.pt4.zzsxt.service.htgl.spbmwh.IBoSpbmwhService;
import net.htjs.pt4.zzsxt.service.xtgl.qyxxgl.IBoQyxxglService; import net.htjs.pt4.zzsxt.service.xtgl.qyxxgl.IBoQyxxglService;
import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.kpsq.IBoKpsqService; import net.htjs.pt4.zzsxt.service.xxgl.xmkpgl.kpsq.IBoKpsqService;
import net.htjs.pt4.zzsxt.tools.CommonUtil; import net.htjs.pt4.zzsxt.tools.CommonUtil;
@ -76,6 +77,8 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
private FbfpglMapper fbfpglMapper; private FbfpglMapper fbfpglMapper;
@Resource @Resource
private PtDeptAuthorizeMapper ptDeptAuthorizeMapper; private PtDeptAuthorizeMapper ptDeptAuthorizeMapper;
@Resource
private IBoSpbmwhService iBoSpbmwhService;
@Override @Override
@ -192,7 +195,6 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
} }
result = kpsqMapper.insertZZSGL_XX_KPSQ(CommonUtil.replaceLDhOfMap(userMap)); result = kpsqMapper.insertZZSGL_XX_KPSQ(CommonUtil.replaceLDhOfMap(userMap));
Map<String,Object> map = new HashMap<>();
return result; return result;
}catch (Exception e){ }catch (Exception e){
@ -346,7 +348,31 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
jsonObject.put("async",MapUtil.getStr(userMap,"async")); jsonObject.put("async",MapUtil.getStr(userMap,"async"));
jsonObject.put("callBackUrl",MapUtil.getStr(userMap,"callBackUrl")); jsonObject.put("callBackUrl",MapUtil.getStr(userMap,"callBackUrl"));
cn.hutool.json.JSONObject fpkjObject = new cn.hutool.json.JSONObject(); cn.hutool.json.JSONObject fpkjObject = new cn.hutool.json.JSONObject();
fpkjObject.put("kpzddm",StrUtil.isNotBlank(MapUtil.getStr(userMap,"KPZDDM"))?MapUtil.getStr(userMap,"KPZDDM"):"20231129001");//是 开票终端代码 沟通后确认 fpkjObject.put("kpzddm","20231129001");//是 开票终端代码 沟通后确认
if(StrUtil.isNotBlank(MapUtil.getStr(userMap,"QYID"))){
Map<String,Object> map = new HashMap<>();
map.put("QYID",MapUtil.getStr(userMap,"QYID"));
List<Map> maps = null;
try {
maps = iBoQyxxglService.selectZZSGL_XT_QYXX(map);
} catch (SaveException e) {
throw new RuntimeException(e);
}
// Map<String, Object> maps = qywhMapper.selectOneZZSGL_GY_QYXX(map);
if(CollUtil.isNotEmpty(maps)){
Map map1 = maps.get(0);
fpkjObject.put("xfdh",MapUtil.getStr(map1,"LXDH")); //是 string 销方电话
fpkjObject.put("xfdz",MapUtil.getStr(map1,"JYDZ"));//是 string 销方地址
fpkjObject.put("xfmc",MapUtil.getStr(map1,"QYMC"));//是 string 销方名称
fpkjObject.put("xfsh",MapUtil.getStr(map1,"QYSH"));//是 string 销方税号
fpkjObject.put("xfyh",MapUtil.getStr(map1,"KHHMC"));//是 string 销方开户银行
fpkjObject.put("xfzh",MapUtil.getStr(map1,"YHZH"));//是 string 销方银行账号
fpkjObject.put("kpzddm",MapUtil.getStr(map1,"KPDDM"));//是 string 销方银行账号
}else{
throw new RuntimeException("请选择销方信息");
}
}
fpkjObject.put("kplx","0");//是 开票类型 0正数发票 1负数发票 fpkjObject.put("kplx","0");//是 开票类型 0正数发票 1负数发票
fpkjObject.put("fpsqlsh", MapUtil.getStr(userMap,"SQID")); //是 string 开票申请流水号 不可重复 fpkjObject.put("fpsqlsh", MapUtil.getStr(userMap,"SQID")); //是 string 开票申请流水号 不可重复
fpkjObject.put("cfclfs","1");//重复处理方式。重复处理方式 0：fpsqlsh重复时返回已开发票信息 1：返回报错。默认1 fpkjObject.put("cfclfs","1");//重复处理方式。重复处理方式 0：fpsqlsh重复时返回已开发票信息 1：返回报错。默认1
@ -359,7 +385,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
fpkjObject.put("bz","hnlg演示系统传入"); //否 string 备注 fpkjObject.put("bz","hnlg演示系统传入"); //否 string 备注
fpkjObject.put("hjje",new BigDecimal(MapUtil.getStr(userMap, "SQKPJE").replaceAll(",",""))); //是 number 合计金额(不含税) fpkjObject.put("hjje",new BigDecimal(MapUtil.getStr(userMap, "SQKPJE").replaceAll(",",""))); //是 number 合计金额(不含税)
fpkjObject.put("hjse",new BigDecimal(MapUtil.getStr(userMap,"SQKPSE").replaceAll(",",""))); //是 number 税额 fpkjObject.put("hjse",new BigDecimal(MapUtil.getStr(userMap,"SQKPSE").replaceAll(",",""))); //是 number 税额
fpkjObject.put("hzxxbbh",IdUtil.simpleUUID()); //否 string 红字信息表/红字申请单编号 // fpkjObject.put("hzxxbbh",IdUtil.simpleUUID()); //否 string 红字信息表/红字申请单编号
// fpkjObject.put("kce","01"); //否 number 扣除额 // fpkjObject.put("kce","01"); //否 number 扣除额
// fpkjObject.put("khdh","01"); //否 string 客户电话 // fpkjObject.put("khdh","01"); //否 string 客户电话
// fpkjObject.put("khdz","01"); //否 string 客户地址 // fpkjObject.put("khdz","01"); //否 string 客户地址
@ -376,17 +402,17 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
fpkjObject.put("qdbz", mxArray.size()>8?"1":"0"); //是 string 清单标志 0非清单 1清单 超过8行为清单票 fpkjObject.put("qdbz", mxArray.size()>8?"1":"0"); //是 string 清单标志 0非清单 1清单 超过8行为清单票
fpkjObject.put("sfzsgmfyhzh","N"); //否 string 是否展示购方银行账号到备注 Y/N fpkjObject.put("sfzsgmfyhzh","N"); //否 string 是否展示购方银行账号到备注 Y/N
fpkjObject.put("sfzsxsfyhzh","N");//否 string 是否展示销方银行账号到备注 Y/N fpkjObject.put("sfzsxsfyhzh","N");//否 string 是否展示销方银行账号到备注 Y/N
fpkjObject.put("tdyslxdm",MapUtil.getStr(userMap,"TDYW_DM")); //否 string 特定要素类型代码 03建筑服务04货物运输05不动产销售06不动产租赁09旅客运输 // fpkjObject.put("tdyslxdm",MapUtil.getStr(userMap,"TDYW_DM")); //否 string 特定要素类型代码 03建筑服务04货物运输05不动产销售06不动产租赁09旅客运输
fpkjObject.put("tspz",MapUtil.getStr(userMap,"TDYW_DM").equals("16")?"02":"00");//是 string 特殊票种 00正常发票01农产品销售02农产品收购06抵扣通行费07其他通行费08成品油销售12机动车 fpkjObject.put("tspz",MapUtil.getStr(userMap,"TDYW_DM").equals("16")?"02":"00");//是 string 特殊票种 00正常发票01农产品销售02农产品收购06抵扣通行费07其他通行费08成品油销售12机动车
Map<String ,Object> mapqq = new HashMap<>(); // Map<String ,Object> mapqq = new HashMap<>();
mapqq.put("QYID",MapUtil.getStr(userMap,"QYID")); // mapqq.put("QYID",MapUtil.getStr(userMap,"QYID"));
// Map<String,Object> map = qywhMapper.selectOneZZSGL_GY_QYXX(mapqq); // Map<String,Object> map = qywhMapper.selectOneZZSGL_GY_QYXX(mapqq);
fpkjObject.put("xfdh",MapUtil.getStr(userMap,"LXDH")); //是 string 销方电话 // fpkjObject.put("xfdh",MapUtil.getStr(userMap,"LXDH")); //是 string 销方电话
fpkjObject.put("xfdz",MapUtil.getStr(userMap,"DZDH"));//是 string 销方地址 // fpkjObject.put("xfdz",MapUtil.getStr(userMap,"DZDH"));//是 string 销方地址
fpkjObject.put("xfmc",MapUtil.getStr(userMap,"QYMC"));//是 string 销方名称 // fpkjObject.put("xfmc",MapUtil.getStr(userMap,"QYMC"));//是 string 销方名称
fpkjObject.put("xfsh",MapUtil.getStr(userMap,"QYSH"));//是 string 销方税号 // fpkjObject.put("xfsh",MapUtil.getStr(userMap,"QYSH"));//是 string 销方税号
fpkjObject.put("xfyh",MapUtil.getStr(userMap,"KHHMC"));//是 string 销方开户银行 // fpkjObject.put("xfyh",MapUtil.getStr(userMap,"KHHMC"));//是 string 销方开户银行
fpkjObject.put("xfzh",MapUtil.getStr(userMap,"YHZH"));//是 string 销方银行账号 // fpkjObject.put("xfzh",MapUtil.getStr(userMap,"YHZH"));//是 string 销方银行账号
fpkjObject.put("yfpdm",MapUtil.getStr(userMap,"YFPDM"));// 是 string 原发票代码 fpkjObject.put("yfpdm",MapUtil.getStr(userMap,"YFPDM"));// 是 string 原发票代码
fpkjObject.put("yfphm",MapUtil.getStr(userMap,"YFPHM"));// 是 string 原发票号码 fpkjObject.put("yfphm",MapUtil.getStr(userMap,"YFPHM"));// 是 string 原发票号码
BigDecimal total = mxArray.stream() BigDecimal total = mxArray.stream()
@ -423,14 +449,32 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
fpmxJsonObj.put("spdm",mxObj.getStr("SPBM"));//否 string 商品代码 fpmxJsonObj.put("spdm",mxObj.getStr("SPBM"));//否 string 商品代码
fpmxJsonObj.put("spsl",mxObj.getStr("SPSL").replaceAll(",",""));//是 number 商品数量 fpmxJsonObj.put("spsl",mxObj.getStr("SPSL").replaceAll(",",""));//是 number 商品数量
fpmxJsonObj.put("bhsdj",mxObj.getStr("SPDJ"));//否 string 不含税单价 fpmxJsonObj.put("bhsdj",mxObj.getStr("SPDJ"));//否 string 不含税单价
if (ObjectUtil.isNotEmpty(mxObj.get("SPSL"))&&mxObj.getBigDecimal("SPSL").compareTo(BigDecimal.ZERO) != 0) {
BigDecimal bhsdj = mxObj.getBigDecimal("JE", BigDecimal.ZERO).divide(mxObj.getBigDecimal("SPSL"), 13, BigDecimal.ROUND_HALF_UP);
fpmxJsonObj.put("bhsdj",bhsdj);//否 string 不含税单价
}
fpmxJsonObj.put("bhsje",StrUtil.isNotBlank(mxObj.getStr("JE"))?new BigDecimal(mxObj.getStr("JE").replaceAll(",","")):"0.00");//否 number 不含税金额 fpmxJsonObj.put("bhsje",StrUtil.isNotBlank(mxObj.getStr("JE"))?new BigDecimal(mxObj.getStr("JE").replaceAll(",","")):"0.00");//否 number 不含税金额
fpmxJsonObj.put("hsdj",mxObj.getStr("SPDJ"));//否 string 含税单价 fpmxJsonObj.put("hsdj",mxObj.getStr("SPDJ"));//否 string 含税单价
fpmxJsonObj.put("hsje",StrUtil.isNotBlank(mxObj.getStr("HSJE"))?new BigDecimal(mxObj.getStr("HSJE").replaceAll(",","")):"0.00");//否 number 含税金额 fpmxJsonObj.put("hsje",StrUtil.isNotBlank(mxObj.getStr("HSJE"))?new BigDecimal(mxObj.getStr("HSJE").replaceAll(",","")):"0.00");//否 number 含税金额
fpmxJsonObj.put("jldw",mxObj.getStr("JLDW"));//否 string 计量单位 fpmxJsonObj.put("jldw",mxObj.getStr("JLDW"));//否 string 计量单位
fpmxJsonObj.put("ggxh",mxObj.getStr("GGXH"));//否 string 规格型号 fpmxJsonObj.put("ggxh",mxObj.getStr("GGXH"));//否 string 规格型号
fpmxJsonObj.put("lslbs",StrUtil.isNotBlank(mxObj.getStr("HSBZ"))?mxObj.getStr("HSBZ"):"0");//是 string 零税率标识 0正常税率1是免税2是不征税3普通零税率 fpmxJsonObj.put("lslbs",StrUtil.isNotBlank(mxObj.getStr("HSBZ"))?mxObj.getStr("HSBZ"):"0");//是 string 零税率标识 0正常税率1是免税2是不征税3普通零税率
fpmxJsonObj.put("spbm","1010101010000000000");//是 string 税收编码 try {
// fpmxJsonObj.put("ssmc",mxObj.getStr("HSJE"));//否 string 税收分类名称 Map<String,Object> spMap = new HashMap<>(4);
spMap.put("ID", mxObj.getStr("SPID"));
List<Map> spbmList=iBoSpbmwhService.selectZZSGL_GY_SPBM(spMap);
if(CollUtil.isNotEmpty(spbmList)){
fpmxJsonObj.put("spbm",spbmList.get(0).get("SPBM"));//是 string 税收编码
fpmxJsonObj.put("ssmc",spbmList.get(0).get("JM"));//否 string 税收分类名称
}else{
fpmxJsonObj.put("spbm","1010101010000000000");//是 string 税收编码
fpmxJsonObj.put("ssmc","谷物");//否 string 税收分类名称
}
} catch (SaveException e) {
throw new RuntimeException(e);
}
fpmxJsonObj.put("tax",StrUtil.isNotBlank(mxObj.getStr("SL"))?new BigDecimal(mxObj.getStr("SL").replaceAll(",","")):"0.00");//是 number 税率 例：0.13 fpmxJsonObj.put("tax",StrUtil.isNotBlank(mxObj.getStr("SL"))?new BigDecimal(mxObj.getStr("SL").replaceAll(",","")):"0.00");//是 number 税率 例：0.13
fpmxJsonObj.put("taxje",StrUtil.isNotBlank(mxObj.getStr("SE"))?new BigDecimal(mxObj.getStr("SE").replaceAll(",","")):"0.00");//是 number 税额 fpmxJsonObj.put("taxje",StrUtil.isNotBlank(mxObj.getStr("SE"))?new BigDecimal(mxObj.getStr("SE").replaceAll(",","")):"0.00");//是 number 税额
fpmxJsonObj.put("yhzcbs",mxObj.getStr("0"));//是 string 优惠政策 0不使用1使用 fpmxJsonObj.put("yhzcbs",mxObj.getStr("0"));//是 string 优惠政策 0不使用1使用
@ -1365,7 +1409,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
jsonObject.put("async","1"); jsonObject.put("async","1");
HashMap<String, Object> cszzMap = MapUtil.newHashMap(1); HashMap<String, Object> cszzMap = MapUtil.newHashMap(1);
cszzMap.put("CSMC","HDDZ"); cszzMap.put("CSMC","YBKPHD");
Map map = kpsqMapper.selectZZSGL_XT_CSSZ(cszzMap); Map map = kpsqMapper.selectZZSGL_XT_CSSZ(cszzMap);
jsonObject.put("callBackUrl",MapUtil.getStr(map,"CSZ")); jsonObject.put("callBackUrl",MapUtil.getStr(map,"CSZ"));
cn.hutool.json.JSONArray array = JSONUtil.createArray(); cn.hutool.json.JSONArray array = JSONUtil.createArray();
@ -1456,12 +1500,12 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
if(CollUtil.isNotEmpty(maps)){ if(CollUtil.isNotEmpty(maps)){
Map map1 = maps.get(0); Map map1 = maps.get(0);
fpkjObject.put("xfdh",MapUtil.getStr(map1,"LXDH")); //是 string 销方电话 fpkjObject.put("xfdh",MapUtil.getStr(map1,"LXDH")); //是 string 销方电话
fpkjObject.put("xfdz",MapUtil.getStr(map1,"DZDH"));//是 string 销方地址 fpkjObject.put("xfdz",MapUtil.getStr(map1,"JYDZ"));//是 string 销方地址
fpkjObject.put("xfmc",MapUtil.getStr(map1,"QYMC"));//是 string 销方名称 fpkjObject.put("xfmc",MapUtil.getStr(map1,"QYMC"));//是 string 销方名称
fpkjObject.put("xfsh",MapUtil.getStr(map1,"QYSH"));//是 string 销方税号 fpkjObject.put("xfsh",MapUtil.getStr(map1,"QYSH"));//是 string 销方税号
fpkjObject.put("xfyh",MapUtil.getStr(map1,"KHHMC"));//是 string 销方开户银行 fpkjObject.put("xfyh",MapUtil.getStr(map1,"KHHMC"));//是 string 销方开户银行
fpkjObject.put("xfzh",MapUtil.getStr(map1,"YHZH"));//是 string 销方银行账号 fpkjObject.put("xfzh",MapUtil.getStr(map1,"YHZH"));//是 string 销方银行账号
fpkjObject.put("kpzddm",MapUtil.getStr(map1,"KPDDM"));//是 string 销方银行账号 fpkjObject.put("kpzddm",MapUtil.getStr(map1,"KPDDM"));//是 string 销方开票终端代码
} }
} }
@ -1509,7 +1553,7 @@ public class BoKpsqServiceImpl implements IBoKpsqService {
fpmxJsonObj.put("bhsdj",mxObj.getStr("SPDJ"));//否 string 不含税单价 fpmxJsonObj.put("bhsdj",mxObj.getStr("SPDJ"));//否 string 不含税单价
if (ObjectUtil.isNotEmpty(mxObj.get("SPSL"))&&mxObj.getBigDecimal("SPSL").compareTo(BigDecimal.ZERO) != 0) { if (ObjectUtil.isNotEmpty(mxObj.get("SPSL"))&&mxObj.getBigDecimal("SPSL").compareTo(BigDecimal.ZERO) != 0) {
BigDecimal bhsdj = mxObj.getBigDecimal("JE", BigDecimal.ZERO).divide(mxObj.getBigDecimal("SPSL"), 13, BigDecimal.ROUND_HALF_UP); BigDecimal bhsdj = mxObj.getBigDecimal("JE", BigDecimal.ZERO).divide(mxObj.getBigDecimal("SPSL"), 13, BigDecimal.ROUND_HALF_UP);
fpmxJsonObj.put("bhsdj",bhsdj);//否 string 不含税单价 fpmxJsonObj.put("bhsdj",bhsdj);//否 string 不含税单价
} }
fpmxJsonObj.put("bhsje",StrUtil.isNotBlank(mxObj.getStr("JE"))?new BigDecimal(mxObj.getStr("JE").replaceAll(",","")):"0.00");//否 number 不含税金额 fpmxJsonObj.put("bhsje",StrUtil.isNotBlank(mxObj.getStr("JE"))?new BigDecimal(mxObj.getStr("JE").replaceAll(",","")):"0.00");//否 number 不含税金额
fpmxJsonObj.put("hsdj",mxObj.getStr("SPDJ"));//否 string 含税单价 fpmxJsonObj.put("hsdj",mxObj.getStr("SPDJ"));//否 string 含税单价

26
src/main/resources/mapper/mysql/jxgl/FphqMapper.xml
View File

@ -105,6 +105,9 @@
<if test="RZRQ!=null and RZRQ!=''"> <if test="RZRQ!=null and RZRQ!=''">
,RZRQ ,RZRQ
</if> </if>
<if test="FYLX!=null and FYLX!=''">
,FYLX
</if>
) )
VALUES VALUES
( #{FPID}, #{FPDM}, #{FPHM}, #{FPZT}, #{KPRQ}, #{XFMC}, #{XFSH}, #{SL}, ( #{FPID}, #{FPDM}, #{FPHM}, #{FPZT}, #{KPRQ}, #{XFMC}, #{XFSH}, #{SL},
@ -112,6 +115,9 @@
<if test="RZRQ!=null and RZRQ!=''"> <if test="RZRQ!=null and RZRQ!=''">
,DATE_FORMAT(#{RZRQ}, '%Y-%m-%d') ,DATE_FORMAT(#{RZRQ}, '%Y-%m-%d')
</if> </if>
<if test="FYLX!=null and FYLX!=''">
,#{FYLX}
</if>
) )
</insert> </insert>
<!--/** <!--/**
@ -188,7 +194,25 @@
SELECT XX.FPID, XX.FPHM, XX.FPDM, GS.CZZT SELECT XX.FPID, XX.FPHM, XX.FPDM, GS.CZZT
FROM ZZSGL_JX_FPXX XX FROM ZZSGL_JX_FPXX XX
LEFT JOIN ZZSGL_JX_FPGS GS ON XX.FPID = GS.FPID LEFT JOIN ZZSGL_JX_FPGS GS ON XX.FPID = GS.FPID
WHERE XX.FPDM = #{FPDM} AND XX.FPHM = #{FPHM} WHERE XX.FPHM = #{FPHM}
<if test="FPDM != null and FPDM!=''">
AND XX.FPDM = #{FPDM}
</if>
</select>
<!--/**
*@Author: yangrong
*@Description： 发票下载-查询票是否重复
*@Date: 17:24 2018/5/22
*/-->
<select id="select_JX_FPXX_BY_DMHM" parameterType="map" resultType="hashMap">
<!--后期需要可以添加字段-->
SELECT *
FROM ZZSGL_JX_FPXX
WHERE FPHM = #{FPHM}
<if test="FPDM != null and FPDM!=''">
AND FPDM = #{FPDM}
</if>
</select> </select>
</mapper> </mapper>

4
src/main/resources/mapper/mysql/xxgl/KpsqMapper.xml
View File

@ -431,7 +431,7 @@
</choose> </choose>
#{SQZT}, #{XMKPBZ}, #{XMSQHBBZ}, #{SQZT}, #{XMKPBZ}, #{XMSQHBBZ},
#{QTKPSQLX}, #{LSSJ}, #{CZRY_DM}, NOW(), #{HBBZ}, #{BHBSQID}, #{KPZT}, #{SQKPHSJE}, #{QTKPSQLX}, #{LSSJ}, #{CZRY_DM}, NOW(), #{HBBZ}, #{BHBSQID}, #{KPZT}, #{SQKPHSJE},
#{GCJSD}, #{FPSX} ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm} #{GCJSD}, #{FPSX} ,#{BZ},#{USERID},#{khmc},#{khsh},#{qylxr},#{qylxdh},#{khhzh},#{isChangeTitle}, #{KPSX}, #{DJLX}, #{gsdm}, #{yhdm},#{sjly},#{sjlx},#{ssyt}
<if test="YSQID!=null and YSQID!=''"> <if test="YSQID!=null and YSQID!=''">
,#{YSQID} ,#{YSQID}
</if> </if>
@ -453,7 +453,7 @@
</if> </if>
<if test="YFPHM!=null and YFPHM!=''"> <if test="YFPHM!=null and YFPHM!=''">
,#{YFPHM} ,#{YFPHM}
</if> ,#{sjly},#{sjlx},#{ssyt},#{kz1} ,#{kz2} ,#{kz3} ,#{kz4} ,#{kz5} </if> ,#{kz1} ,#{kz2} ,#{kz3} ,#{kz4} ,#{kz5}
) )
</insert> </insert>
<!--Blue shaoming--> <!--Blue shaoming-->

7
src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_add.js
View File

@ -35,7 +35,10 @@ var kpsq_add =(function(){
tablePublic.onReset(curSeg,tableType); tablePublic.onReset(curSeg,tableType);
var optionStr = '<option value="">--请选择--</option>'; var optionStr = '<option value="">--请选择--</option>';
if (kpsx == "qdtbkp" || kpsx == "qdybkp"){ optionStr +=
' <option value="'+kpsq_util.onGetFplxValue("全电专用发票")+'">全电专用发票</option>\n' +
' <option value="'+kpsq_util.onGetFplxValue("全电普票发票")+'">全电普票发票</option>\n'
/*if (kpsx == "qdtbkp" || kpsx == "qdybkp"){
optionStr += optionStr +=
' <option value="'+kpsq_util.onGetFplxValue("全电专用发票")+'">全电专用发票</option>\n' + ' <option value="'+kpsq_util.onGetFplxValue("全电专用发票")+'">全电专用发票</option>\n' +
' <option value="'+kpsq_util.onGetFplxValue("全电普票发票")+'">全电普票发票</option>\n' ' <option value="'+kpsq_util.onGetFplxValue("全电普票发票")+'">全电普票发票</option>\n'
@ -44,7 +47,7 @@ var kpsq_add =(function(){
' <option value="'+kpsq_util.onGetFplxValue("增值税专用发票")+'">增值税专用发票</option>\n' + ' <option value="'+kpsq_util.onGetFplxValue("增值税专用发票")+'">增值税专用发票</option>\n' +
' <option value="'+kpsq_util.onGetFplxValue("增值税普通发票")+'">增值税普通发票</option>\n' + ' <option value="'+kpsq_util.onGetFplxValue("增值税普通发票")+'">增值税普通发票</option>\n' +
' <option value="'+kpsq_util.onGetFplxValue("增值税电子发票")+'">增值税电子发票</option>'; ' <option value="'+kpsq_util.onGetFplxValue("增值税电子发票")+'">增值税电子发票</option>';
} }*/
$('#FPLX_DM').html(optionStr); $('#FPLX_DM').html(optionStr);
layui.use(['form','element','jquery','layer'], function () { layui.use(['form','element','jquery','layer'], function () {

70
src/main/resources/static/zzsxt/xxgl/xmkpgl/kpsq/index_edit.js
View File

@ -13,7 +13,8 @@ var kpsq_edit =(function(){
var SQZJE_dis=0; var SQZJE_dis=0;
var inithjhsje = 0; var inithjhsje = 0;
var kpsx = top.window.iframeLayerData.kpsx; var kpsx = top.window.iframeLayerData.kpsx;
var djlx = top.window.iframeLayerData.djlx; var qyxxList;
// var djlx = top.window.iframeLayerData.djlx;
//私有方法 //私有方法
//初始化页面布局 //初始化页面布局
var initLayout = function(){ var initLayout = function(){
@ -21,6 +22,7 @@ var kpsq_edit =(function(){
$("[name=thzkje]").hide(); $("[name=thzkje]").hide();
} }
selectedKpsqObj=top.window.iframeLayerData.KPSQ_obj; selectedKpsqObj=top.window.iframeLayerData.KPSQ_obj;
console.log(selectedKpsqObj)
//初始化公用可操作表格组件 //初始化公用可操作表格组件
var tableType=[{ var tableType=[{
"table_id":"tbSave_kpmx",//动态表ID "table_id":"tbSave_kpmx",//动态表ID
@ -67,6 +69,10 @@ var kpsq_edit =(function(){
form.on('select(changeTitleSelect)', function(data){ form.on('select(changeTitleSelect)', function(data){
kpsq_edit.changeTitle(data); kpsq_edit.changeTitle(data);
}); });
//监听select下拉框
form.on('select(changeXfxxSelect)', function(data){
kpsq_edit.changXfxx(data);
});
//监听select下拉框 //监听select下拉框
form.on('select(htidSelect)', function(data){ form.on('select(htidSelect)', function(data){
@ -100,6 +106,7 @@ var kpsq_edit =(function(){
//curSeg.onComputeHj(); //curSeg.onComputeHj();
curSeg.onUploadFile(); curSeg.onUploadFile();
curSeg.onQueryKpry(); curSeg.onQueryKpry();
curSeg.onQueryXfxx();
}, },
//自动计算税额、价税合计 //自动计算税额、价税合计
onAutoComputeSE:function (obj) { onAutoComputeSE:function (obj) {
@ -267,6 +274,7 @@ var kpsq_edit =(function(){
if(data.length==1){//如果只有一个总包合同，默认选中 if(data.length==1){//如果只有一个总包合同，默认选中
ht += '<option value="'+ element.HTID +'" selected="selected">' + element.HTMC + '</option>'; ht += '<option value="'+ element.HTID +'" selected="selected">' + element.HTMC + '</option>';
//curSeg.onQueryZbhtMx(element.HTID); //curSeg.onQueryZbhtMx(element.HTID);
console.log(selectedKpsqObj)
}else{ }else{
if(selectedKpsqObj.HTID==element.HTID){ if(selectedKpsqObj.HTID==element.HTID){
ht += '<option value="'+ element.HTID +'" selected="selected">' + element.HTMC + '</option>'; ht += '<option value="'+ element.HTID +'" selected="selected">' + element.HTMC + '</option>';
@ -705,6 +713,66 @@ var kpsq_edit =(function(){
}); });
} }
}) })
},
// 查询销方信息
onQueryXfxx : function(){
var url = "/web/xtgl/qyxxgl/selectZZSGL_XT_QYXX.do";
baseTools.xhrAjax({
url: url,
params: {
noPage:true
},
callback: [function (jsonObj, xhrArgs) {
var data = jsonObj.data.list;
qyxxList = jsonObj.data.list;
var ht = '';
$.each(data,function(index,element){
if(data.length==1){//如果只有一个，默认选中
ht += '<option value="'+ element.QYID +'" selected="selected">' + element.QYMC + '</option>';
//curSeg.onQueryZbhtMx(element.HTID);
}else{
console.log(selectedKpsqObj)
// ht += '<option value="'+ element.QYID +'">' + element.QYMC + '</option>';
if(selectedKpsqObj.ZZJG_DM === element.QYID){
ht += '<option value="'+ element.QYID +'" selected="selected">' + element.QYMC + '</option>';
$('#QYMC').val(element.QYMC);
$('#QYID').val(element.QYID);
$('#QYSH').val(element.QYSH);
$('#LXDH').val(element.LXDH);
$('#DZDH').val(element.DZDH);
$('#KHHMC').val(element.KHHMC);
$('#YHZH').val(element.YHZH);
$('#KPZDDM').val(element.YHZH);
}else{
ht += '<option value="'+ element.QYID +'">' + element.QYMC + '</option>';
}
}
});
$('#QYID').append(ht);
layui.use('form', function () {
var form = layui.form;
form.render();
});
}]
});
},
changXfxx: function (data) {
console.log(data.value);
console.log(qyxxList);
$.each(qyxxList,function(index,element){
if(data.value==element.QYID){
$('#QYMC').val(element.QYMC);
$('#QYSH').val(element.QYSH);
$('#LXDH').val(element.LXDH);
$('#DZDH').val(element.DZDH);
$('#KHHMC').val(element.KHHMC);
$('#YHZH').val(element.YHZH);
$('#KPZDDM').val(element.YHZH);
}
})
} }
}; };
})(); })();

3
src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_add.html
View File

@ -69,7 +69,8 @@
placeholder="发票类型：请选择发票类型" placeholder="发票类型：请选择发票类型"
autocomplete="off" autocomplete="off"
> >
<option value="01">数电专票</option>
<option value="02">数电普票</option>
</select> </select>
</div> </div>
</div> </div>

107
src/main/resources/templates/zzsxt/xxgl/xmkpgl/kpsq/index_edit.html
View File

@ -195,6 +195,113 @@
/> />
</div> </div>
</div> </div>
<div class="m_jfkpxx" id = "xxDiv">
<div class="m_title">
销方信息
</div>
<div class="m_form layui-form f_cb">
<div class="layui-inline">
<label class="layui-form-label">销方名称：</label>
<div class="layui-input-block">
<select class="form-control" name="QYMC"
id="QYID"
lay-verify="required"
lay-filter="changeXfxxSelect"
placeholder="发票属性"
autocomplete="off"
>
</select>
<!--<input type="text" class="layui-input"
id="QYMC"
name="QYMC"
placeholder="输入企业名称"
autocomplete="off"
lay-verify=""
value=""
readonly="readonly"
/>-->
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">销方税号：</label>
<div class="layui-input-block">
<input type="text" class="layui-input"
id="QYSH"
name="QYSH"
placeholder="输入销方税号"
autocomplete="off"
lay-verify=""
value=""
/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">销方电话：</label>
<div class="layui-input-block">
<input type="text" class="layui-input"
id="LXDH"
name="LXDH"
placeholder="输入销方电话"
autocomplete="off"
lay-verify=""
value=""
/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">销方地址：</label>
<div class="layui-input-block">
<input type="text" class="layui-input"
id="DZDH"
name="DZDH"
placeholder="输入销方地址"
autocomplete="off"
lay-verify=""
value=""
/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">销方开户银行：</label>
<div class="layui-input-block">
<input type="text" class="layui-input"
id="KHHMC"
name="KHHMC"
placeholder="输入销方销方开户银行"
autocomplete="off"
lay-verify=""
value=""
/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">银行账号：</label>
<div class="layui-input-block">
<input type="text" class="layui-input"
id="YHZH"
name="YHZH"
placeholder="输入银行账号"
autocomplete="off"
value=""
/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">开票终端代码：</label>
<div class="layui-input-block">
<input type="text" class="layui-input"
id="KPZDDM"
name="KPZDDM"
placeholder="输入开票终端代码"
autocomplete="off"
value=""
/>
</div>
</div>
</div>
</div>
<div class="m_jfkpxx"> <div class="m_jfkpxx">
<div class="m_title"> <div class="m_title">
开票信息 开票信息