|
|
@@ -40,7 +40,7 @@ public class InvoiceAddImpl extends BaseServlet implements IHttpServletAdaptor {
|
|
|
vbillcode = json.getString("vbillcode");
|
|
|
checkJson(json);//非空判断
|
|
|
InvocationInfoProxy.getInstance().setGroupId(SqlexecuteQuery("pk_group", "org_group", "code", "00"));
|
|
|
- InvocationInfoProxy.getInstance().setUserId(SqlexecuteQuery("cuserid", "sm_user", "user_code", json.getString("billmaker")));
|
|
|
+ InvocationInfoProxy.getInstance().setUserId(SqlexecuteQuery("cuserid", "sm_user", "cuserid", json.getString("billmaker")));
|
|
|
PrintWriter out = resp.getWriter();
|
|
|
InvoiceVO[] aggvos = new InvoiceVO[1];
|
|
|
InvoiceVO aggvo = new InvoiceVO();
|
|
|
@@ -51,11 +51,11 @@ public class InvoiceAddImpl extends BaseServlet implements IHttpServletAdaptor {
|
|
|
InvoiceItemVO[] childrenVO = new InvoiceItemVO[json.getJSONArray("childrenVO").size()];
|
|
|
//封装表头VO
|
|
|
parentVO.setPk_group(SqlexecuteQuery("pk_group", "org_group", "code", "00"));//所属集团
|
|
|
- parentVO.setPk_org(json.getString("pk_org"));//财务组织
|
|
|
- parentVO.setPk_org_v(SqlexecuteQuery2("pk_vid", "org_stockorg_v", "pk_stockorg", json.getString("pk_org")));//财务组织最新版本
|
|
|
- parentVO.setCreator(SqlexecuteQuery("cuserid", "sm_user", "user_code", json.getString("billmaker")));//创建人
|
|
|
+ parentVO.setPk_org(SqlexecuteQuery2("pk_financeorg", "org_financeorg", "code", json.getString("pk_org")));//财务组织
|
|
|
+ parentVO.setPk_org_v(SqlexecuteQuery2("pk_vid", "org_financeorg_v", "code", json.getString("pk_org")));//财务组织最新版本
|
|
|
+ parentVO.setCreator(SqlexecuteQuery("cuserid", "sm_user", "cuserid", json.getString("billmaker")));//创建人
|
|
|
parentVO.setCreationtime(new UFDateTime(json.getString("dbilldate")));//创建时间
|
|
|
- parentVO.setBillmaker(SqlexecuteQuery("cuserid", "sm_user", "user_code", json.getString("billmaker")));//制单人
|
|
|
+ parentVO.setBillmaker(SqlexecuteQuery("cuserid", "sm_user", "cuserid", json.getString("billmaker")));//制单人
|
|
|
parentVO.setDmakedate(new UFDate(json.getString("dbilldate")));//制单日期
|
|
|
parentVO.setVtrantypecode(json.getString("vtrantypecode"));//发票类型编码
|
|
|
parentVO.setCtrantypeid(SqlexecuteQuery("pk_billtypeid", "bd_billtype", "pk_billtypecode", json.getString("ctrantypeid")));//发票类型
|
|
|
@@ -64,7 +64,7 @@ public class InvoiceAddImpl extends BaseServlet implements IHttpServletAdaptor {
|
|
|
parentVO.setDbilldate(new UFDate(json.getString("dbilldate")));//发票日期
|
|
|
parentVO.setPk_supplier(SqlexecuteQuery("pk_supplier", "bd_supplier", "code", json.getString("pk_supplier")));//供应商
|
|
|
parentVO.setPk_bankaccbas(SqlexecuteQuery("pk_bankaccsub", "bd_bankaccsub", "accnum", json.getString("pk_bankaccbas")));//银行账户
|
|
|
- parentVO.setPk_bizpsn(SqlexecuteQuery("pk_psndoc", "bd_psndoc", "code", json.getString("pk_bizpsn")));//采购员
|
|
|
+ parentVO.setPk_bizpsn(SqlexecuteQuery("pk_psndoc", "bd_psndoc", "pk_psndoc", json.getString("pk_bizpsn")));//采购员
|
|
|
parentVO.setPk_dept_v(SqlexecuteQuery("pk_vid", "org_dept_v", "code", json.getString("pk_dept_v")));//采购部门
|
|
|
parentVO.setPk_busitype(SqlexecuteQuery("pk_busitype", "bd_busitype", "busicode", json.getString("pk_busitype")));//业务流程
|
|
|
parentVO.setPk_stockorg_v(SqlexecuteQuery("pk_vid", "org_stockorg_v", "code", json.getString("pk_stockorg_v")));//库存组织
|
|
|
@@ -92,11 +92,11 @@ public class InvoiceAddImpl extends BaseServlet implements IHttpServletAdaptor {
|
|
|
JSONObject bodyObject = JSONObject.fromObject(Object);
|
|
|
InvoiceItemVO invoiceItemVO = new InvoiceItemVO();
|
|
|
invoiceItemVO.setPk_group(SqlexecuteQuery("pk_group", "org_group", "code", "00"));//所属集团
|
|
|
- invoiceItemVO.setPk_org(json.getString("pk_org"));//财务组织
|
|
|
- invoiceItemVO.setPk_org_v(SqlexecuteQuery2("pk_vid", "org_stockorg_v", "pk_stockorg", json.getString("pk_org")));//财务组织
|
|
|
+ invoiceItemVO.setPk_org(SqlexecuteQuery2("pk_financeorg", "org_financeorg", "code", json.getString("pk_org")));//财务组织
|
|
|
+ invoiceItemVO.setPk_org_v(SqlexecuteQuery2("pk_vid", "org_financeorg_v", "code", json.getString("pk_org")));//财务组织
|
|
|
invoiceItemVO.setDbilldate(new UFDate(json.getString("dbilldate")));//发票日期
|
|
|
invoiceItemVO.setCrowno(bodyObject.getString("crowno"));//行号
|
|
|
- invoiceItemVO.setVbdef13(bodyObject.getString("vbdef13"));//发票参照
|
|
|
+// invoiceItemVO.setVbdef13(bodyObject.getString("vbdef13"));//发票参照
|
|
|
invoiceItemVO.setVbdef11(bodyObject.getString("vbdef11"));//发票查看
|
|
|
invoiceItemVO.setVbdef12(vbillcode);//必填 发票号
|
|
|
invoiceItemVO.setPk_material(SqlexecuteQuery("pk_material", "bd_material", "code", bodyObject.getString("pk_material")));//物料编码
|
|
|
@@ -104,6 +104,7 @@ public class InvoiceAddImpl extends BaseServlet implements IHttpServletAdaptor {
|
|
|
invoiceItemVO.setCtaxcodeid(SqlexecuteQuery("pk_taxcode", "bd_taxcode", "code", bodyObject.getString("ctaxcodeid")));//税码
|
|
|
invoiceItemVO.setNtaxrate(new UFDouble(bodyObject.getString("ntaxrate")));//税率
|
|
|
invoiceItemVO.setNastorigprice(new UFDouble(bodyObject.getString("nastorigprice")));//无税单价
|
|
|
+ invoiceItemVO.setNmny(new UFDouble(bodyObject.getString("nmny")));//本币无税金额
|
|
|
invoiceItemVO.setNorigmny(new UFDouble(bodyObject.getString("norigmny")));//无税金额
|
|
|
invoiceItemVO.setNtax(new UFDouble(bodyObject.getString("ntax")));//税额
|
|
|
invoiceItemVO.setNastorigtaxprice(new UFDouble(bodyObject.getString("nastorigtaxprice")));//含税单价
|
|
|
@@ -151,7 +152,7 @@ public class InvoiceAddImpl extends BaseServlet implements IHttpServletAdaptor {
|
|
|
String vbillcode = "vbillcode";//单据号
|
|
|
String pk_org = "pk_org";//组织编码
|
|
|
String billmaker = "billmaker";//创建人
|
|
|
- String vdef18 = "vdef18";//vdef11是否一致
|
|
|
+ String vdef18 = "vdef18";//vdef18是否一致
|
|
|
|
|
|
String body = "childrenVO";//表体
|
|
|
|
