update

lifan

2025-09-11 9459286625f095613a7074c1cfd9cf95d88091f3

 jrj/project/business/Enquiry/Enquiry.maint.cpp

@@ -57,7 +57,7 @@
         return 1;
      }

      xstring GetEntityData(int pr)
      xstring GetEntityData(LPARAM  pr)
      {
         dw_base.AcceptText();
         dw_goods.AcceptText();
@@ -117,11 +117,7 @@
         dw_goods.AcceptText();
         if (dw_base.GetItemString(1, L"Remark") != L"保存")
         {
            if (dw_base.GetItemString(1, L"EnquiryNo") == L"")
            {
               xstring EnquiryNo = EnquiryView::MakeBillNo();
               dw_base.SetItemString(1, L"EnquiryNo", EnquiryNo);
            }
				

            if (dw_base.GetItemString(1, L"ValidDay") == L"")
            {
@@ -195,7 +191,7 @@
                  Packing = dw_goods.GetItemString(i,L"Packing");
                  if(Packings==L"")
                  Packings = Packing;
                  else if(Packings.find(Packing) < 0) Packings+=L",L"+Packing;
                  else if(Packings.find(Packing) < 0) Packings+=L","+Packing;
               }*/
               if (dw_goods.GetItemString(i, L"Packing") == L"")
               {
@@ -214,6 +210,13 @@
                  }
               }
            }

            if (dw_base.GetItemString(1, L"EnquiryNo") == L"")
            {
               xstring EnquiryNo = EnquiryView::MakeBillNo();
               dw_base.SetItemString(1, L"EnquiryNo", EnquiryNo);
            }

            trace(L"********" + Packings + L"*********");
         }

@@ -389,7 +392,7 @@
               Packing = dw_goods.GetItemString(i, L"Packing");
               if (Packings == L"")
                  Packings = Packing;
               else if (Packings.find(Packing) < 0) Packings += L",L" + Packing;
               else if (Packings.find(Packing) < 0) Packings += L"," + Packing;
            }
         }

@@ -441,11 +444,9 @@

               eleColumn = x.createElement(L"LineType");
               eleColumn.setAttribute(L"update.modify", L"1"); //delete
               eleColumn.text = L"1";
               eleColumn.settext(L"1");
               eleItem.appendChild(eleColumn);
               ele.appendChild(eleItem);
               eleColumn.release();
               eleItem.release();
               processed = true;
            }
            else if (itemModify == L"1")
@@ -461,17 +462,14 @@
                  eleColumn = x.createElement(L"RealEnquiryLineID");
                  eleColumn.setAttribute(L"update.modify", L"1");
                  guid = publiccode::GetGuid();
                  eleColumn.text = guid;
                  eleColumn.settext(guid);
                  eleItem.appendChild(eleColumn);
                  eleColumn.release();

                  eleColumn = x.createElement(L"LineType");
                  eleColumn.setAttribute(L"update.modify", L"1");
                  eleColumn.text = L"1"; //modify
                  eleColumn.settext(L"1"); //modify
                  eleItem.appendChild(eleColumn);
                  ele.appendChild(eleItem);
                  eleColumn.release();
                  eleItem.release();

                  //insert new row
                  eleItem = e.cloneNode(-1);
@@ -481,35 +479,30 @@

                  eleColumn = x.createElement(L"LineType");
                  eleColumn.setAttribute(L"update.modify", L"1");
                  eleColumn.text = L"0";  //normal
                  eleColumn.settext(L"0");  //normal
                  eleItem.appendChild(eleColumn);
                  eleColumn.release();

                  nodeColumn = e.selectSingleNode(L"ModifyDate");
                  if (!nodeColumn)
                     eleColumn = x.createElement(L"ModifyDate");
                  else
                     eleColumn = nodeColumn;
                  eleColumn.text = publiccode::GetCurrentDate();
                  eleColumn.settext(publiccode::GetCurrentDate());
                  eleItem.appendChild(eleColumn);
                  eleColumn.release();

                  ele.appendChild(eleItem);
                  eleItem.release();
               }
               else
               {
                  guid = e.getAttribute(L"guid");
                  child = e.cloneNode(-1);
                  child.selectSingleNode(L"RealEnquiryLineID").text = guid;
                  child.selectSingleNode(L"RelEnquiryLineID").text = guid;
                  child.selectSingleNode(L"RealEnquiryLineID").settext(guid);
                  child.selectSingleNode(L"RelEnquiryLineID").settext(guid);
                  ele.appendChild(child);
                  //trace(child.xml);
                  child.release();
               }
            }
            //}
            e.release();
         }
         
         xstring error = L"";
@@ -899,7 +892,7 @@

      int OnPriceEval()
      {
         OpenWindow(L"dev:xpage[eval.Enquiry3.vx]", cast(dw_goods as int));
         OpenWindow(L"dev:xpage[eval.Enquiry3.vx]", (LPARAM)&dw_goods);
         return 1;
      }

@@ -928,13 +921,13 @@
            if (i == 1)
               skunos = skuno;
            else
               skunos += L",L" + skuno;
               skunos += L"," + skuno;
         }

         xaserverarg arg_pic;
         
         arg_pic.AddArg(L"SKUNoList", skunos);
         arg_pic.AddArg(L"ParentWindow", GetHWND());
         arg_pic.SetParam(L"ParentWindow", GetHWND());
         arg_pic.AddArg(L"OpenFlag", L"1");
         OpenWindow(L"dev:xpage[SKU.PictureView.Product3.vx]",arg_pic);

@@ -948,7 +941,7 @@
         xml xp ;
         
         xaserverarg arg_pic;
         arg_pic.setNativePointer(arg_pic.CreateInstance());
			
         arg_pic.AddArg(L"SKUNo", skuno);

         xstring res = L"/sale/data/ProductLibrary3/pref/picture/imagelistSKUNo";
@@ -1056,7 +1049,7 @@
               if (skunos == L"")
                  skunos = dw_goods.GetItemString(i, L"SKUNo");
               else
                  skunos += L",L" + dw_goods.GetItemString(i, L"SKUNo");
                  skunos += L"," + dw_goods.GetItemString(i, L"SKUNo");
            }
         }
         xaserverarg arg ;
@@ -1087,8 +1080,8 @@
            if (str == L"")
            {
               xaserverarg arg1;
               arg1.setNativePointer(arg1.CreateInstance());
               arg1.AddArg(L"HWND", GetHWND().toString());
					
               arg1.SetParam(L"HWND", GetHWND());
               arg1.AddArg(L"CustomerID", dw_base.GetItemString(1, L"CustomerID"));
               OpenWindow(L"dev:xpage[Entity.Product.Select.vx]",arg1);
               int row = dw_goods.GetRow();
@@ -1137,13 +1130,14 @@
         }
         else if (comdid == L"xmProductDesc")
         {
            xaserverarg arg2;
            xaserverarg arg2=GetArg();
            
            int row2 = dw_goods.GetRow();
            if (row2 < 1) return 0;
            xstring str2 = dw_goods.GetItemString(row2, L"ProductDesc");
            arg2.AddArg(L"value", str2);
            OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg2);

            if (arg2.GetArgString(L"comdid") == L"xmOK")
            {
               str2 = arg2.GetArgString(L"value");
@@ -1169,7 +1163,7 @@
            dw_goods.SetItemDisplayString(nRow, L"KOPCode", L"CTNS");

            xaserverarg arg3;
            arg3.setNativePointer(arg3.CreateInstance());
				
            int row3 = dw_goods.GetRow();
            if (row3 < 1) return 0;
            dw_goods.SetItemString(nRow, L"SKUNo", dw_goods.GetItemString(row3, L"SKUNo"));
@@ -1183,7 +1177,7 @@
         }
         else if (comdid.find(L"ImportXml:", 0) == 0)
         {
            xstring strImport = comdid.mid(L"ImportXml:".length(), 9999);
            xstring strImport = comdid.mid(((xstring)L"ImportXml:").length(), 9999);
            
            ImportProductByText(strImport);
            return 1;
@@ -1195,7 +1189,7 @@
         return 0;
      }

      int OnImgDBClicked(TEvent* evt, int pr)
      int OnImgDBClicked(TEvent* evt, LPARAM  pr)
      {
         IMGNNMHDR& nmtv = *(IMGNNMHDR*)evt->notify.pnmh;
         xstring src = nmtv.path;