Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2025-02-11 6fb710f1b24021ca5e95a00706ced3ba581c1c8d

Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

 jrj/project/business/BasicCode/ExpressMaint.cpp

@@ -61,7 +61,7 @@
            dw_base.SetItemDisplayString(1, L"EnterName", m_username);
            dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
            dw_base.SetItemString(1, L"PBAStatus", L"Y");

            return 0;

        }
        return 0;

 jrj/project/business/BasicCode/ForwarderMaint.cpp

@@ -80,7 +80,7 @@
            dw_base.SetItemString(1, L"ForwarderType", L"1");
            dw_base.SetItemDisplayString(1, L"ForwarderType", L"预付货");
            //dw_base.SetItemString(1,L"PrimaryContactID",dwcon.GetItemString(1,L"ContactID"));    

            return 0;
        }
        else
        {

 jrj/project/business/BasicCode/ShipcompanyMaint.cpp

@@ -66,6 +66,7 @@
            dw_base.SetItemString(1, L"EnterName", m_userid);
            dw_base.SetItemDisplayString(1, L"EnterName", m_username);
            dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
            return 0;
        }
        else
        {

 jrj/project/business/BasicCode/TestingCompanyList.cpp

@@ -39,7 +39,6 @@
        {
            int DelRow = dw_list.GetRow();
            dw_list.DeleteRow(DelRow);

        }

        return 1;

 jrj/project/business/BasicCode/TestingCompanyMaint.cpp

@@ -49,11 +49,14 @@
        return publiccode::GetGuid();
    }
    int OnClear() {
        //alert(m_EntityID);
        if (m_EntityID == L"") {
            m_userid = publiccode::GetUser().id;
		
            m_userid = publiccode::GetUser().personid;
            m_username = publiccode::GetUser().name;
            dw_base = new xdwtable;
            dw_base.setNativePointer(GetControl(L"dw_base"));
            /*dw_base = new xdwtable;
            dw_base.setNativePointer(GetControl(L"dw_base"));*/
            dw_base = GetControl(L"dw_base");
            dw_base.SetItemString(1, L"PartyID", GetGuid());
            dw_base.SetItemString(1, L"PStatus", L"1");
            dw_base.SetItemDisplayString(1, L"PStatus", L"有效");
@@ -66,6 +69,8 @@
            dw_base.SetItemString(1, L"EnterName", m_userid);
            dw_base.SetItemDisplayString(1, L"EnterName", m_username);
            dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
			
            return 0;
        }
        else
        {
@@ -178,8 +183,8 @@
            if (aName == L"" )
            {
                aTemp = dwcon.GetItemString(i, L"Mobile") + dwcon.GetItemString(i, L"TEL") + dwcon.GetItemString(i, L"Fax") + dwcon.GetItemString(i, L"Email") + dwcon.GetItemString(i, L"PCRemark");
                trace(aTemp);
                if (aTemp != L"")
                //alert(aTemp);
                if (aTemp == L"")
                {
                    alert(L"联系人名称必填！");
                    return -1;