From 727d32dbb3994c04ae3efbc4b6cfdad8053fcd8b Mon Sep 17 00:00:00 2001
From: lifan <2308045698@qq.com>
Date: 星期五, 13 十一月 2026 18:15:40 +0800
Subject: [PATCH] update
---
jrj/project/business/AP/maint.ap.cpp | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/jrj/project/business/AP/maint.ap.cpp b/jrj/project/business/AP/maint.ap.cpp
index ae45d3e..b28f268 100644
--- a/jrj/project/business/AP/maint.ap.cpp
+++ b/jrj/project/business/AP/maint.ap.cpp
@@ -55,12 +55,12 @@
{
xstring AdvanceID = dw_base.GetItemString(1, L"AdvanceID");
xstring ChargeOffState = L"Y";
- xstring ChargeOffDate = dw_base.GetItemString(1, L"APDate");
+ xstring ChargeOffDate = dw_base.GetItemString(1, L"PayedDate");
xstring PayedAmount = dw_base.GetItemString(1, L"PayedAmount");
xstring val = L"<data><PO><item guid='" + AdvanceID + L"' update.modify='1'>" +
- "<ChargeOffState update.modify='1'>" + ChargeOffState + L"</ChargeOffState>" +
- "<ChargeOffMoney update.modify='1'>" + PayedAmount + L"</ChargeOffMoney>" +
- "<ChargeOffDate update.modify='1'>" + ChargeOffDate + L"</ChargeOffDate></item></PO></data>";
+ L"<ChargeOffState update.modify='1'>" + ChargeOffState + L"</ChargeOffState>" +
+ L"<ChargeOffMoney update.modify='1'>" + PayedAmount + L"</ChargeOffMoney>" +
+ L"<ChargeOffDate update.modify='1'>" + ChargeOffDate + L"</ChargeOffDate></item></PO></data>";
xaserverarg arg;
arg.AddArg(L"content", val);
@@ -95,14 +95,23 @@
return 0;
}
}
-
-
+ if (APType1 == L"001")
+ {
+ if (dw_base.GetItemString(1, L"APSource") == L"" ) {
+ alert(L"付款原因为空!");
+ return 0;
+ }
+ if (dw_base.GetItemString(1, L"InvoiceNo") == L"") {
+ alert(L"请外运编号为空!");
+ return 0;
+ }
+ }
+ x.Reset();
dw_base.AcceptText();
dw_base.DwUpdateAllTo(x);
xaserverarg arg;
arg.AddArg(L"content", x.xml());
-
if (xurl::get(L"/sale/data/AP/update", arg.GetString(), x) != 1)
{
xstring error = x.text();
@@ -188,7 +197,10 @@
if (t.selectSingleNode(L"ShortName"))dw_base.SetItemDisplayString(1, L"APSupplierID", t.selectSingleNode(L"ShortName").text());
if (t.selectSingleNode(L"ShortName"))dw_base.SetItemDisplayString(1, L"SupplierID", t.selectSingleNode(L"ShortName").text());
if (t.selectSingleNode(L"SONo"))dw_base.SetItemString(1, L"SONO", t.selectSingleNode(L"SONo").text());
-
+ if (t.selectSingleNode(L"SOShortName"))dw_base.SetItemDisplayString(1, L"CustomerID", t.selectSingleNode(L"SOShortName").text());
+ if (t.selectSingleNode(L"CustomerID"))dw_base.SetItemString(1, L"CustomerID", t.selectSingleNode(L"CustomerID").text());
+ if (t.selectSingleNode(L"CustomerPONo"))dw_base.SetItemString(1, L"RelatedNo", t.selectSingleNode(L"CustomerPONo").text());
+
if (t.selectSingleNode(L"POAmount"))dw_base.SetItemString(1, L"POAmount", t.selectSingleNode(L"POAmount").text());
}
return 1;
@@ -254,6 +266,7 @@
SetArg();
APID = L"";
APType = L"";
+ xstring positionname = publiccode::GetUser().positionname;
if (GetWinParam())
{
xaserverarg arg=GetArg();
@@ -262,12 +275,21 @@
APType = arg.GetArgString(L"APType");
}
dw_base = GetControl(L"dw_base");
- dw_base.openUrl(L"/sale/view/AP/template/Base1");
+
+ if (APType == L"001")
+ {
+ dw_base.openUrl(L"/sale/view/AP/template/Base3");
+ }
+ else
+ {
+ dw_base.openUrl(L"/sale/view/AP/template/Base1");
+ }
+
dw_base.SetColHeaderHeight(0);
dw_base.SetRowSelectorWidth(0);
dw_base.SetHScrollState(false);
dw_base.SetVScrollState(false);
-
+
OnAttachEvent();
if (APID != L"")
@@ -278,7 +300,11 @@
{
xstring sdate = publiccode::GetCurrentDate();
dw_base.SetItemString(1, L"APDate", sdate);
- dw_base.SetItemString(1, L"PayedDate", sdate);
+ if (positionname.find(L"跟单") < 0)
+ {
+ dw_base.SetItemString(1, L"PayedDate", sdate);
+
+ }
dw_base.SetItemString(1, L"CreateDate", sdate);
xstring suserid = publiccode::GetUser().id;
xstring susername = publiccode::GetUser().name;
@@ -293,7 +319,7 @@
{
xstring col = dw_base.GetColumnName(m);
if (col == L"OrgName" || col == L"APNo")
- dw_base.SetColumnProp(col, L"cellprotect", L"1");
+ dw_base.SetColumnProp(col.c_str(), L"cellprotect", L"1");
}
return 1;
}
--
Gitblit v1.9.3