jg-waiwang-pro
胡川虎 4 months ago
parent 9aa7620aa6
commit fa449c8380

@ -3,6 +3,8 @@ package jnpf.service.impl;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import jnpf.entity.*; import jnpf.entity.*;
import jnpf.mapper.CwsettlementMapper; import jnpf.mapper.CwsettlementMapper;
import jnpf.model.yunguan.YunguanPurchaseSettlementModel;
import jnpf.model.yunguan.YunguanPurchaseSettlementProductModel;
import jnpf.model.yunguan.YunguanSaleSettlementModel; import jnpf.model.yunguan.YunguanSaleSettlementModel;
import jnpf.model.yunguan.YunguanSaleSettlementProductModel; import jnpf.model.yunguan.YunguanSaleSettlementProductModel;
import jnpf.permission.entity.OrganizeEntity; import jnpf.permission.entity.OrganizeEntity;
@ -77,6 +79,8 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
private CwaccountstorageService cwaccountstorageService; private CwaccountstorageService cwaccountstorageService;
@Resource @Resource
private CwsettlementMapper cwsettlementMapper; private CwsettlementMapper cwsettlementMapper;
@Resource
private ProductWarehouseService productWarehouseService;
@Override @Override
public List<CwsettlementEntity> getList(CwsettlementPagination cwsettlementPagination){ public List<CwsettlementEntity> getList(CwsettlementPagination cwsettlementPagination){
return getTypeList(cwsettlementPagination,cwsettlementPagination.getDataType()); return getTypeList(cwsettlementPagination,cwsettlementPagination.getDataType());
@ -988,23 +992,164 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
//推送结算单到运管 //推送结算单到运管
/*if(ObjectUtil.equals(entity.getType(), "2")){ /*if(ObjectUtil.equals(entity.getType(), "2")){
//销售 //销售
boolean headFlag = this.pushHeadYunguan(entity, cwsettlementForm); boolean headFlag = this.pushSaleHeadYunguan(entity, cwsettlementForm);
if(headFlag){ if(headFlag){
boolean lineFlag = this.pushLineYunguan(entity, cwsettlementForm); boolean lineFlag = this.pushSaleLineYunguan(entity, cwsettlementForm);
} }
}else{ }else{
//采购 //采购
boolean headFlag = this.pushPurchaseHeadYunguan(entity, cwsettlementForm);
if(headFlag){
boolean lineFlag = this.pushPurchaseLineYunguan(entity, cwsettlementForm);
}
}*/ }*/
} }
private boolean pushLineYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) { private boolean pushPurchaseLineYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
List<YunguanPurchaseSettlementProductModel> yunguanSaleSettlementProductModelList = new ArrayList<>();
for(int i=0;i<cwsettlementForm.getCwsettlementsummaryList().size();i++){ for(int i=0;i<cwsettlementForm.getCwsettlementsummaryList().size();i++){
CwsettlementsummaryModel cwsettlementsummaryModel = cwsettlementForm.getCwsettlementsummaryList().get(i);
YunguanPurchaseSettlementProductModel yunguanSaleSettlementProductModel = new YunguanPurchaseSettlementProductModel();
//查询公司代码
OrganizeEntity companyEntity = organizeService.getById(cwsettlementEntity.getCompanyId());
if(companyEntity != null){
yunguanSaleSettlementProductModel.setORG_CD(companyEntity.getEnCode());
yunguanSaleSettlementProductModel.setORG_NM(companyEntity.getFullName());
}
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementForm.getCwsettlementsummaryList().get(0).getProductId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementProductModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgName());
OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
if(departmentEntity != null){
yunguanSaleSettlementProductModel.setDEPARTMENT_CODE(departmentEntity.getEnCode());
yunguanSaleSettlementProductModel.setATTRIBUTE9(departmentEntity.getFullName());
}
yunguanSaleSettlementProductModel.setACCOUNT_NO(cwsettlementEntity.getCode());
yunguanSaleSettlementProductModel.setACCOUNT_LINE_NO(i);
yunguanSaleSettlementProductModel.setLINE_TYPE("INV");
//采购订单号
yunguanSaleSettlementProductModel.setORD_NO("");
//采购订单明细行
yunguanSaleSettlementProductModel.setORD_LN(i);
//采购入库单号
yunguanSaleSettlementProductModel.setRECEIPT_NO("");
yunguanSaleSettlementProductModel.setCONTRACT_NO(contractLEntity.getContractNumber());
yunguanSaleSettlementProductModel.setATTRIBUTE1(contractLEntity.getContractNo());
yunguanSaleSettlementProductModel.setITEM_CD(productWarehouseEntity.getCode());
yunguanSaleSettlementProductModel.setITEM_NM(productWarehouseEntity.getName());
yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
yunguanSaleSettlementProductModel.setQUANTITY_ACCOUNT(new BigDecimal(cwsettlementsummaryModel.getSettlementSum()));
//入库量
yunguanSaleSettlementProductModel.setQUANTITY_INVOICED(BigDecimal.ZERO);
yunguanSaleSettlementProductModel.setTAX_RATE_CODE("VAT_IN_"+cwsettlementsummaryModel.getRate());
yunguanSaleSettlementProductModel.setTAX_RATE(Integer.parseInt(cwsettlementsummaryModel.getRate()));
//仓库名称
yunguanSaleSettlementProductModel.setSUBINVENTORY("");
yunguanSaleSettlementProductModel.setATTRIBUTE15(cwsettlementsummaryModel.getSettlementSubtotal());
yunguanSaleSettlementProductModel.setAMOUNT(new BigDecimal(cwsettlementsummaryModel.getSettlementSubtotalNo()));
yunguanSaleSettlementProductModel.setDESCRIPTION(cwsettlementsummaryModel.getDescription());
yunguanSaleSettlementProductModel.setREAD_FLAG("N");
yunguanSaleSettlementProductModel.setESB_STATUS("N");
//错误信息
yunguanSaleSettlementProductModel.setERR_MESSAGE("");
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
}
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
return true;
}
}
return false;
}
private boolean pushPurchaseHeadYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
YunguanPurchaseSettlementModel yunguanSaleSettlementModel = new YunguanPurchaseSettlementModel();
yunguanSaleSettlementModel.setID(cwsettlementEntity.getId());
//查询公司代码
OrganizeEntity companyEntity = organizeService.getById(cwsettlementEntity.getCompanyId());
if(companyEntity != null){
yunguanSaleSettlementModel.setORG_CD(companyEntity.getEnCode());
yunguanSaleSettlementModel.setORG_NM(companyEntity.getFullName());
}
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementModel.setATTRIBUTE3(contractLEntity.getKucunOrgCode());
OrganizeEntity departmentEntity = organizeService.getById(cwsettlementEntity.getDepartmentId());
if(departmentEntity != null){
yunguanSaleSettlementModel.setDEPARTMENT_CODE(departmentEntity.getEnCode());
yunguanSaleSettlementModel.setATTRIBUTE9(departmentEntity.getFullName());
}
yunguanSaleSettlementModel.setACCOUNT_NO(cwsettlementEntity.getCode());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
yunguanSaleSettlementModel.setVENDOR_CD(subjectbasicEntity.getId());
yunguanSaleSettlementModel.setVENDOR_NAME(subjectbasicEntity.getName());
//供应商地点编码
yunguanSaleSettlementModel.setVENDOR_SITE_CODE("");
//供应商地点名称
yunguanSaleSettlementModel.setATTRIBUTE10("");
yunguanSaleSettlementModel.setATTRIBUTE2(contractLEntity.getContractNumber());
yunguanSaleSettlementModel.setATTRIBUTE4(contractLEntity.getContractNo());
yunguanSaleSettlementModel.setCREATE_EMP_ID(cwsettlementEntity.getCreatorUserId());
yunguanSaleSettlementModel.setCREATE_DTM(cwsettlementEntity.getCreatorTime());
yunguanSaleSettlementModel.setINVOICE_AMOUNT(cwsettlementEntity.getINVOICE_AMOUNT());
yunguanSaleSettlementModel.setINVOICE_CNT(cwsettlementEntity.getINVOICE_CNT());
yunguanSaleSettlementModel.setATTRIBUTE11(cwsettlementEntity.getATTRIBUTE11());
yunguanSaleSettlementModel.setINVOICE_DATE(cwsettlementEntity.getINVOICE_DATE());
yunguanSaleSettlementModel.setINVOICE_TYPE(cwsettlementEntity.getINVOICE_TYPE());
yunguanSaleSettlementModel.setINVOICE_NO(cwsettlementEntity.getINVOICE_NO());
yunguanSaleSettlementModel.setINVOICE_CURRENCY("CNY");
yunguanSaleSettlementModel.setTAX_RATE_CODE("VAT_IN_" + cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE(cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setTAX_RATE_CAL(cwsettlementForm.getCwsettlementsummaryList().get(0).getRate());
yunguanSaleSettlementModel.setEXCHANGE_RATE(1);
yunguanSaleSettlementModel.setEXCHANGE_DATE(null);
yunguanSaleSettlementModel.setGL_DATE(cwsettlementEntity.getGL_DATE());
BigDecimal ATTRIBUTE1 = new BigDecimal("0");
BigDecimal TAX = new BigDecimal("0");
for (CwsettlementsummaryModel cwsettlementsummaryModel : cwsettlementForm.getCwsettlementsummaryList()) {
ATTRIBUTE1 = ATTRIBUTE1.add(new BigDecimal(cwsettlementsummaryModel.getSettlementTotalNo()));
TAX = TAX.add(new BigDecimal(cwsettlementsummaryModel.getSettlementTotalNo()).subtract(new BigDecimal(cwsettlementsummaryModel.getSettlementTotal())));
}
yunguanSaleSettlementModel.setATTRIBUTE1(ATTRIBUTE1.toString());
yunguanSaleSettlementModel.setTAX(TAX);
yunguanSaleSettlementModel.setDESCRIPTION(cwsettlementEntity.getDESCRIPTION());
yunguanSaleSettlementModel.setANNEX_CNT(cwsettlementEntity.getANNEX_CNT());
yunguanSaleSettlementModel.setERP_FLAG("N");
yunguanSaleSettlementModel.setERP_USER(cwsettlementEntity.getCreatorUserId());
yunguanSaleSettlementModel.setERP_DTM(cwsettlementEntity.getCreatorTime());
yunguanSaleSettlementModel.setSUBMIT_USER(cwsettlementEntity.getCreatorUserId());
yunguanSaleSettlementModel.setSUBMIT_DTM(cwsettlementEntity.getCreatorTime());
yunguanSaleSettlementModel.setAPPROVE_USER(cwsettlementEntity.getCreatorUserId());
yunguanSaleSettlementModel.setAPPROVE_DTM(cwsettlementEntity.getCreatorTime());
yunguanSaleSettlementModel.setREAD_FLAG("N");
yunguanSaleSettlementModel.setREAD_TIME(null);
yunguanSaleSettlementModel.setERR_MESSAGE("");
yunguanSaleSettlementModel.setESB_STATUS("N");
yunguanSaleSettlementModel.setESB_DTM(null);
yunguanSaleSettlementModel.setESB_MESSAGE("");
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
return true;
}
}
return false;
}
private boolean pushSaleLineYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
List<YunguanSaleSettlementProductModel> yunguanSaleSettlementProductModelList = new ArrayList<>();
for(int i=0;i<cwsettlementForm.getCwsettlementsummaryList().size();i++){
CwsettlementsummaryModel cwsettlementsummaryModel = cwsettlementForm.getCwsettlementsummaryList().get(i);
YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = new YunguanSaleSettlementProductModel(); YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = new YunguanSaleSettlementProductModel();
//查询公司代码 //查询公司代码
OrganizeEntity companyEntity = organizeService.getById(cwsettlementEntity.getCompanyId()); OrganizeEntity companyEntity = organizeService.getById(cwsettlementEntity.getCompanyId());
if(companyEntity != null){ if(companyEntity != null){
yunguanSaleSettlementProductModel.setCOMP_CD(companyEntity.getEnCode()); yunguanSaleSettlementProductModel.setCOMP_CD(companyEntity.getEnCode());
} }
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getById(cwsettlementForm.getCwsettlementsummaryList().get(0).getProductId());
ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId()); ContractLEntity contractLEntity = contractLService.getById(cwsettlementForm.getCwsettlementcontractList().get(0).getContractId());
yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgCode()); yunguanSaleSettlementProductModel.setORG_ID(contractLEntity.getKucunOrgCode());
yunguanSaleSettlementProductModel.setORG_NM(contractLEntity.getKucunOrgName()); yunguanSaleSettlementProductModel.setORG_NM(contractLEntity.getKucunOrgName());
@ -1021,12 +1166,66 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setINVOICE_TYPE("T"); yunguanSaleSettlementProductModel.setINVOICE_TYPE("T");
} }
yunguanSaleSettlementProductModel.setATTRIBUTE4(String.valueOf(i)); yunguanSaleSettlementProductModel.setATTRIBUTE4(String.valueOf(i));
//销售订单,暂时没值
yunguanSaleSettlementProductModel.setORD_NO("");
//销售订单行,暂时没值
yunguanSaleSettlementProductModel.setLINE_NO("");
//出库单行,暂时没值
yunguanSaleSettlementProductModel.setDORD_NO("");
yunguanSaleSettlementProductModel.setCONTRACT_CD(contractLEntity.getContractNumber());
yunguanSaleSettlementProductModel.setKH_CONTR_NO(contractLEntity.getContractNo());
yunguanSaleSettlementProductModel.setCUST_ID(subjectbasicEntity.getId());
yunguanSaleSettlementProductModel.setCUST_NAME(subjectbasicEntity.getName());
yunguanSaleSettlementProductModel.setITEM_NO(productWarehouseEntity.getCode());
yunguanSaleSettlementProductModel.setITEM_NM(productWarehouseEntity.getName());
yunguanSaleSettlementProductModel.setMAT_SIZE(productWarehouseEntity.getSpec());
//销售数量
yunguanSaleSettlementProductModel.setORD_PRICE(cwsettlementsummaryModel.getSettlementPrice());
//销售单价
yunguanSaleSettlementProductModel.setORD_QUANTITY(cwsettlementsummaryModel.getSettlementSum());
yunguanSaleSettlementProductModel.setQUANTITY(cwsettlementsummaryModel.getSettlementSum());
//出库量
yunguanSaleSettlementProductModel.setSTO_OUT_WGT(cwsettlementsummaryModel.getSettlementSum());
yunguanSaleSettlementProductModel.setUNIT(cwsettlementsummaryModel.getSettlementUnit());
yunguanSaleSettlementProductModel.setINV_PRICE(cwsettlementsummaryModel.getSettlementPrice());
yunguanSaleSettlementProductModel.setINV_AMT(cwsettlementsummaryModel.getSettlementSubtotal());
yunguanSaleSettlementProductModel.setTAX_RATE("VAT_OUT_"+cwsettlementsummaryModel.getRate());
yunguanSaleSettlementProductModel.setCURRENCY_TY("CNY");
yunguanSaleSettlementProductModel.setINV_AMT_FOREG(cwsettlementsummaryModel.getSettlementPrice());
yunguanSaleSettlementProductModel.setINV_EXCHG_RAT("1");
yunguanSaleSettlementProductModel.setITEM_NM_INV(cwsettlementsummaryModel.getItemNmInv());
yunguanSaleSettlementProductModel.setATTRIBUTE5(cwsettlementsummaryModel.getRemark());
yunguanSaleSettlementProductModel.setBOOK_DATE(cwsettlementEntity.getBookDate());
yunguanSaleSettlementProductModel.setCUST_TY(cwsettlementEntity.getCustTy());
if(ObjectUtil.equals(cwsettlementEntity.getBusinessType(), "3")){
yunguanSaleSettlementProductModel.setINVOICE_TYPE("A");
yunguanSaleSettlementProductModel.setINV_FLAG(new BigDecimal("1"));
}else{
yunguanSaleSettlementProductModel.setINVOICE_TYPE("T");
yunguanSaleSettlementProductModel.setINV_FLAG(new BigDecimal("-1"));
}
yunguanSaleSettlementProductModel.setCREATE_EMP_ID(cwsettlementEntity.getCreatorUserId());
yunguanSaleSettlementProductModel.setCREATE_DTM(cwsettlementEntity.getCreatorTime());
yunguanSaleSettlementProductModel.setMODIFY_EMP_ID(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementProductModel.setMODIFY_DTM(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementProductModel.setCONSDR_USER(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementProductModel.setSLIT_FLAG("0");
yunguanSaleSettlementProductModel.setREAD_FLAG("N");
yunguanSaleSettlementProductModel.setESB_STATUS("N");
//错误信息
yunguanSaleSettlementProductModel.setERR_MESSAGE("");
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
}
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
return true;
}
} }
return false; return false;
} }
private boolean pushHeadYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) { private boolean pushSaleHeadYunguan(CwsettlementEntity cwsettlementEntity, CwsettlementForm cwsettlementForm) {
YunguanSaleSettlementModel yunguanSaleSettlementModel = new YunguanSaleSettlementModel(); YunguanSaleSettlementModel yunguanSaleSettlementModel = new YunguanSaleSettlementModel();
yunguanSaleSettlementModel.setID(cwsettlementEntity.getId()); yunguanSaleSettlementModel.setID(cwsettlementEntity.getId());
//查询公司代码 //查询公司代码
@ -1084,8 +1283,14 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setSLIT_FLAG("0"); yunguanSaleSettlementModel.setSLIT_FLAG("0");
yunguanSaleSettlementModel.setREAD_FLAG("N"); yunguanSaleSettlementModel.setREAD_FLAG("N");
yunguanSaleSettlementModel.setESB_STATUS("N"); yunguanSaleSettlementModel.setESB_STATUS("N");
yunguanSaleSettlementModel.setCREATE_EMP_ID(cwsettlementEntity.getCreatorUserId());
yunguanSaleSettlementModel.setCREATE_DTM(cwsettlementEntity.getCreatorTime());
yunguanSaleSettlementModel.setMODIFY_EMP_ID(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementModel.setMODIFY_DTM(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementModel.setCONSDR_USER(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementModel.setCONSDR_DATE(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementForm.getCwsettlementsummaryList().size()); yunguanSaleSettlementModel.setLINE_SUM(cwsettlementForm.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel)); JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){ if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) { if (purchaseCode.get("code").equals("200")) {
return true; return true;

@ -1,5 +1,6 @@
package jnpf.entity; package jnpf.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
@ -115,4 +116,37 @@ public class CwsettlementEntity {
@TableField(exist = false) @TableField(exist = false)
private String realNameA; private String realNameA;
@TableField("INVOICE_DATE")
private Date INVOICE_DATE;
@TableField("INVOICE_CNT")
private int INVOICE_CNT;
@TableField("INVOICE_NO")
private String INVOICE_NO;
@TableField("INVOICE_TYPE")
private String INVOICE_TYPE;
@JSONField(name = "ATTRIBUTE11")
private String ATTRIBUTE11;
@JSONField(name = "INVOICE_AMOUNT")
private BigDecimal INVOICE_AMOUNT;
@TableField("GL_DATE")
private Date GL_DATE;
@JSONField(name = "DESCRIPTION")
private String DESCRIPTION;
@TableField("ANNEX_CNT")
private int ANNEX_CNT;
@TableField("erp_mark")
private String erpMark;
@TableField("erp_massage")
private String erpMassage;
@TableField("erp_time")
private Date erpTime;
@TableField("yunguan_mark")
private String yunguanMark;
@TableField("yunguan_massage")
private String yunguanMassage;
@TableField("yunguan_time")
private Date yunguanTime;
} }

@ -80,4 +80,6 @@ public class CwsettlementsummaryEntity {
private String organizeJsonId; private String organizeJsonId;
@TableField("line_no") @TableField("line_no")
private String lineNo; private String lineNo;
@TableField("DESCRIPTION")
private String description;
} }

@ -1,5 +1,6 @@
package jnpf.model.cwsettlement; package jnpf.model.cwsettlement;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
import java.util.Date; import java.util.Date;
@ -60,4 +61,8 @@ public class CwsettlementsummaryModel {
/** 备注 **/ /** 备注 **/
@JSONField(name = "remark") @JSONField(name = "remark")
private String remark; private String remark;
@JSONField(name = "itemNmInv")
private String itemNmInv;
@JSONField(name = "DESCRIPTION")
private String description;
} }

@ -0,0 +1,103 @@
package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class YunguanPurchaseSettlementModel {
/** ID**/
@JSONField(name = "ID")
private String ID;
@JSONField(name = "ORG_CD")
private String ORG_CD;
@JSONField(name = "ORG_NM")
private String ORG_NM;
@JSONField(name = "ATTRIBUTE3")
private String ATTRIBUTE3;
@JSONField(name = "DEPARTMENT_CODE")
private String DEPARTMENT_CODE;
@JSONField(name = "ATTRIBUTE9")
private String ATTRIBUTE9;
@JSONField(name = "ACCOUNT_NO")
private String ACCOUNT_NO;
@JSONField(name = "VENDOR_CD")
private String VENDOR_CD;
@JSONField(name = "VENDOR_NAME")
private String VENDOR_NAME;
@JSONField(name = "VENDOR_SITE_CODE")
private String VENDOR_SITE_CODE;
@JSONField(name = "ATTRIBUTE10")
private String ATTRIBUTE10;
@JSONField(name = "ATTRIBUTE2")
private String ATTRIBUTE2;
@JSONField(name = "ATTRIBUTE4")
private String ATTRIBUTE4;
@JSONField(name = "CREATE_EMP_ID")
private String CREATE_EMP_ID;
@JSONField(name = "CREATE_DTM")
private Date CREATE_DTM;
@JSONField(name = "INVOICE_CURRENCY")
private String INVOICE_CURRENCY;
@JSONField(name = "TAX_RATE_CODE")
private String TAX_RATE_CODE;
@JSONField(name = "TAX_RATE")
private String TAX_RATE;
@JSONField(name = "TAX_RATE_CAL")
private String TAX_RATE_CAL;
@JSONField(name = "TAX")
private BigDecimal TAX;
@JSONField(name = "EXCHANGE_RATE")
private int EXCHANGE_RATE;
@JSONField(name = "EXCHANGE_DATE")
private Date EXCHANGE_DATE;
@JSONField(name = "GL_DATE")
private Date GL_DATE;
@JSONField(name = "ATTRIBUTE1")
private String ATTRIBUTE1;
@JSONField(name = "DESCRIPTION")
private String DESCRIPTION;
@JSONField(name = "ANNEX_CNT")
private int ANNEX_CNT;
@JSONField(name = "ERP_FLAG")
private String ERP_FLAG;
@JSONField(name = "ERP_USER")
private String ERP_USER;
@JSONField(name = "ERP_DTM")
private Date ERP_DTM;
@JSONField(name = "SUBMIT_USER")
private String SUBMIT_USER;
@JSONField(name = "SUBMIT_DTM")
private Date SUBMIT_DTM;
@JSONField(name = "APPROVE_USER")
private String APPROVE_USER;
@JSONField(name = "APPROVE_DTM")
private Date APPROVE_DTM;
@JSONField(name = "READ_FLAG")
private String READ_FLAG;
@JSONField(name = "READ_TIME")
private Date READ_TIME;
@JSONField(name = "ERR_MESSAGE")
private String ERR_MESSAGE;
@JSONField(name = "ESB_STATUS")
private String ESB_STATUS;
@JSONField(name = "ESB_DTM")
private Date ESB_DTM;
@JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE;
@JSONField(name = "INVOICE_DATE")
private Date INVOICE_DATE;
@JSONField(name = "INVOICE_CNT")
private int INVOICE_CNT;
@JSONField(name = "INVOICE_NO")
private String INVOICE_NO;
@JSONField(name = "INVOICE_TYPE")
private String INVOICE_TYPE;
@JSONField(name = "ATTRIBUTE11")
private String ATTRIBUTE11;
@JSONField(name = "INVOICE_AMOUNT")
private BigDecimal INVOICE_AMOUNT;
}

@ -0,0 +1,84 @@
package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
@Data
public class YunguanPurchaseSettlementProductModel {
/** ID **/
@JSONField(name = "ID")
private String ID;
@JSONField(name = "ORG_CD")
private String ORG_CD;
@JSONField(name = "ORG_NM")
private String ORG_NM;
@JSONField(name = "ATTRIBUTE3")
private String ATTRIBUTE3;
@JSONField(name = "ORG_ID")
private String ORG_ID;
@JSONField(name = "DEPARTMENT_CODE")
private String DEPARTMENT_CODE;
@JSONField(name = "ATTRIBUTE9")
private String ATTRIBUTE9;
@JSONField(name = "ACCOUNT_NO")
private String ACCOUNT_NO;
@JSONField(name = "ACCOUNT_LINE_NO")
private int ACCOUNT_LINE_NO;
@JSONField(name = "LINE_TYPE")
private String LINE_TYPE;
@JSONField(name = "ORD_NO")
private String ORD_NO;
@JSONField(name = "ORD_LN")
private int ORD_LN;
@JSONField(name = "RECEIPT_NO")
private String RECEIPT_NO;
@JSONField(name = "CONTRACT_NO")
private String CONTRACT_NO;
@JSONField(name = "ATTRIBUTE1")
private String ATTRIBUTE1;
@JSONField(name = "ITEM_CD")
private String ITEM_CD;
@JSONField(name = "ITEM_NM")
private String ITEM_NM;
@JSONField(name = "UNIT")
private String UNIT;
@JSONField(name = "QUANTITY_ACCOUNT")
private BigDecimal QUANTITY_ACCOUNT;
@JSONField(name = "QUANTITY_INVOICED")
private BigDecimal QUANTITY_INVOICED;
@JSONField(name = "TAX_RATE_CODE")
private String TAX_RATE_CODE;
@JSONField(name = "TAX_RATE")
private int TAX_RATE;
@JSONField(name = "SUBINVENTORY")
private String SUBINVENTORY;
@JSONField(name = "ATTRIBUTE15")
private String ATTRIBUTE15;
@JSONField(name = "AMOUNT")
private BigDecimal AMOUNT;
@JSONField(name = "DESCRIPTION")
private String DESCRIPTION;
/** 读取标记 **/
@JSONField(name = "READ_FLAG")
private String READ_FLAG;
/** 读取时间 **/
@JSONField(name = "READ_TIME")
private Date READ_TIME;
/** 错误信息 **/
@JSONField(name = "ERR_MESSAGE")
private String ERR_MESSAGE;
/** ESB是否传输 **/
@JSONField(name = "ESB_STATUS")
private String ESB_STATUS;
/** ESB传输时间 **/
@JSONField(name = "ESB_DTM")
private Date ESB_DTM;
/** ESB错误信息 **/
@JSONField(name = "ESB_MESSAGE")
private String ESB_MESSAGE;
@JSONField(name = "ERP_FLAG")
private String ERP_FLAG;
}

@ -3,6 +3,7 @@ package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@Data @Data
@ -105,13 +106,13 @@ public class YunguanSaleSettlementProductModel {
private String ATTRIBUTE5; private String ATTRIBUTE5;
/** 结算时间 **/ /** 结算时间 **/
@JSONField(name = "BOOK_DATE") @JSONField(name = "BOOK_DATE")
private String BOOK_DATE; private Date BOOK_DATE;
/** 事务处理类型 **/ /** 事务处理类型 **/
@JSONField(name = "CUST_TY") @JSONField(name = "CUST_TY")
private String CUST_TY; private String CUST_TY;
/** 结算标识 **/ /** 结算标识 **/
@JSONField(name = "INV_FLAG") @JSONField(name = "INV_FLAG")
private String INV_FLAG; private BigDecimal INV_FLAG;
/** 制单人编码**/ /** 制单人编码**/
@JSONField(name = "CREATE_EMP_ID") @JSONField(name = "CREATE_EMP_ID")
private String CREATE_EMP_ID; private String CREATE_EMP_ID;

@ -227,8 +227,8 @@
</template> </template>
<el-button size="mini" type="text" <el-button size="mini" type="text"
@click="downLoadPDF(scope.row.code)">开票文件下载</el-button> @click="downLoadPDF(scope.row.code)">开票文件下载</el-button>
<!-- <el-button size="mini" type="text" <el-button size="mini" type="text"
@click="printPDF(scope.row.code)">打印</el-button> --> @click="printPDF(scope.row.code)">打印</el-button>
<!-- <template v-if="scope.row.yunguanMark !== '200'"> <!-- <template v-if="scope.row.yunguanMark !== '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button> <el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
</template> --> </template> -->

Loading…
Cancel
Save