Version 12.1.12-ii

papyrussolution · Nov 26, 2024 · 1e404a4 · 1e404a4
1 parent 2f86620
commit 1e404a4
Show file tree

Hide file tree

Showing 38 changed files with 459 additions and 353 deletions.
diff --git a/Src/Include/Pp.h b/Src/Include/Pp.h
@@ -39446,7 +39446,13 @@ class PPViewBill : public PPView {
 	int    GetPacket(PPID billID, PPBillPacket * pPack) const; // <<PPALDD_BillInfoList::NextIteration
 	int    CheckIDForFilt(PPID id, const BillTbl::Rec *);
 	int    SetIterState(const void *, size_t sz);
-	const void * GetIterState() const;
+	void * GetIterState();
+	//
+	// Descr: Возвращает указатель на кэшированный экземпляр пакета документа по идентификатору billID.
+	//   Используется исключительно в рамках обработки потребностей структур DL600.
+	//
+	const  PPBillPacket * GetIterCachedBillPack(PPID billID);
+
 	static int TransmitByFilt(const BillFilt * pFilt, const ObjTransmitParam * pParam);
 	int    CellStyleFunc_(const void * pData, long col, int paintAction, BrowserWindow::CellStyle * pStyle, PPViewBrowser * pBrw);
 
@@ -39530,6 +39536,7 @@ class PPViewBill : public PPView {
 	PPBillPoolOpEx * P_BPOX;  // @# {(!Filt.PoolBillID && !Filt.PoolOpID) => P_BPOX==0}
 	PoolInsertionParam Pip;   //
 	PrcssrAlcReport * P_Arp;  //
+	PPBillPacket * P_Dl600BPackCache; // @v12.2.0
 	enum {
 		stNoTempTbl = 0x0001, // Экземпляр не будет создавать временную таблицу, даже если условия фильтрации этого требуют.
 		stCtrlX     = 0x0002,
@@ -57546,8 +57553,12 @@ class PPChZnPrcssr : private PPEmbeddedLogger {
 public:
 	struct Param {
 		Param();
+		enum {
+			fTestMode = 0x0001
+		};
 		PPID   GuaID;
 		PPID   LocID;
+		long   Flags; // @v12.2.0
 		DateRange Period;
 	};
 	struct QueryParam {

diff --git a/Src/Include/ued-id.h b/Src/Include/ued-id.h
@@ -1,9 +1,9 @@
-// UED-ID-TEMP.H
+// UED-ID.H
 // version: 36
 // sha256: 30e57f6807209c82ededb4610622268085372e2295a608dc2a01fc98fa6e8173
 //
-#ifndef __UED_ID_TEMP_H
-#define __UED_ID_TEMP_H
+#ifndef __UED_ID_H
+#define __UED_ID_H
 
 #define UED_META_META                                0x100000001ULL
 #define UED_META_PREDEFVALUE                         0x100000002ULL
@@ -3693,4 +3693,4 @@
 #define UED_META_INTEGER                             0x197000000ULL
 #define UED_META_DECIMAL                             0x198000000ULL
 
-#endif // __UED_ID_TEMP_H
+#endif // __UED_ID_H
diff --git a/Src/PPEquip/dls.cpp b/Src/PPEquip/dls.cpp
@@ -34,10 +34,7 @@ int DeviceLoadingStat::Fetch(PPID statID, DvcLoadingStatTbl::Rec * pRec)
 	return ok;
 }
 
-int DeviceLoadingStat::Search(PPID statID, DvcLoadingStatTbl::Rec * pRec)
-{
-	return SearchByID(this, 0, statID, pRec);
-}
+int DeviceLoadingStat::Search(PPID statID, DvcLoadingStatTbl::Rec * pRec) { return SearchByID(this, 0, statID, pRec); }
 
 int DeviceLoadingStat::GetPrev(PPID curStatID, PPID * pStatID, DvcLoadingStatTbl::Rec * pRec)
 {

diff --git a/Src/PPLib/Account.cpp b/Src/PPLib/Account.cpp
@@ -82,10 +82,7 @@ ArticleCore::ArticleCore() : ArticleTbl()
 {
 }
 
-int ArticleCore::Search(PPID id, void * b)
-{
-	return SearchByID(this, PPOBJ_ARTICLE, id, b);
-}
+int ArticleCore::Search(PPID id, void * b) { return SearchByID(this, PPOBJ_ARTICLE, id, b); }
 
 int ArticleCore::SearchName(PPID accSheetID, const char * pName, void * b)
 {
@@ -229,10 +226,7 @@ AcctRel::AcctRel() : AcctRelTbl()
 {
 }
 
-int AcctRel::Search(PPID id, AcctRelTbl::Rec * pRec)
-{
-	return SearchByID(this, PPOBJ_ACCTREL, id, pRec);
-}
+int AcctRel::Search(PPID id, AcctRelTbl::Rec * pRec) { return SearchByID(this, PPOBJ_ACCTREL, id, pRec); }
 
 int AcctRel::SearchAcctID(const AcctID * pAcctId, AcctRelTbl::Rec * pRec)
 {

diff --git a/Src/PPLib/BILL.CPP b/Src/PPLib/BILL.CPP
@@ -117,8 +117,7 @@ BillCore::BillCore() : BillTbl()
 {
 }
 
-int BillCore::Search(PPID id, BillTbl::Rec * pRec)
-	{ return SearchByID(this, PPOBJ_BILL, id, pRec); }
+int BillCore::Search(PPID id, BillTbl::Rec * pRec) { return SearchByID(this, PPOBJ_BILL, id, pRec); }
 
 int BillCore::PutItemMemo(PPID id, SString * pBuf, int use_ta) // @v11.1.12
 {

diff --git a/Src/PPLib/Billdlg.cpp b/Src/PPLib/Billdlg.cpp
@@ -3040,8 +3040,8 @@ int BillDialog::getDTS(int onCancel)
 		for(uint i = 0; P_Pack->EnumTItems(&i, &p_ti);)
 			SETFLAG(p_ti->Flags, PPTFR_COSTWSTAX, BIN(P_Pack->Rec.Flags & BILLF_RMVEXCISE));
 	}
-	/* @v12.1.12 
 	getCtrlData(CTL_BILL_DOC,  P_Pack->Rec.Code);
+	/* @v12.1.12 
 	getCtrlData(CTL_BILL_DATE, &P_Pack->Rec.Dt);
 	P_Pack->Rec.Dt = P_Pack->Rec.Dt.getactual(ZERODATE);
 	getCtrlData(CTL_BILL_DUEDATE, &P_Pack->Rec.DueDate);

diff --git a/Src/PPLib/CCHECK.CPP b/Src/PPLib/CCHECK.CPP
@@ -1889,7 +1889,7 @@ CCheckCore::~CCheckCore()
 	ZDELETE(P_ChkOpJrnl);
 }
 
-const PPEquipConfig & CCheckCore::GetEqCfg() const { return EqCfg; } // @v10.9.9
+const PPEquipConfig & CCheckCore::GetEqCfg() const { return EqCfg; }
 CheckOpJrnl * CCheckCore::GetOpJrnl() { return P_ChkOpJrnl; } // @v11.6.2
 
 int CCheckCore::HasExt()
@@ -1903,10 +1903,7 @@ int CCheckCore::HasExt()
 	return 0;
 }
 
-int CCheckCore::Search(PPID id, CCheckTbl::Rec * pRec)
-{
-	return SearchByID(this, PPOBJ_CCHECK, id, pRec);
-}
+int CCheckCore::Search(PPID id, CCheckTbl::Rec * pRec) { return SearchByID(this, PPOBJ_CCHECK, id, pRec); }
 
 int CCheckCore::Search(PPID cashID, LDATE dt, LTIME tm, CCheckTbl::Rec * pRec)
 {

diff --git a/Src/PPLib/Goods.cpp b/Src/PPLib/Goods.cpp
@@ -1284,10 +1284,7 @@ int GoodsCore::GetListByBrandList(const PPIDArray & rBrandList, PPIDArray & rGoo
 	return ok;
 }
 
-int GoodsCore::Search(PPID id, void * b)
-{
-	return SearchByID(this, PPOBJ_GOODS, id, b);
-}
+int GoodsCore::Search(PPID id, void * b) { return SearchByID(this, PPOBJ_GOODS, id, b); }
 
 int GoodsCore::GetExt(PPID id, GoodsExtTbl::Rec * pRec)
 {

diff --git a/Src/PPLib/LOCATION.CPP b/Src/PPLib/LOCATION.CPP
@@ -166,10 +166,7 @@ LocationCore::~LocationCore()
 	ZDELETE(P_Eac);
 }
 
-int LocationCore::Search(PPID id, LocationTbl::Rec * b)
-{
-	return SearchByID(this, PPOBJ_LOCATION, id, b);
-}
+int LocationCore::Search(PPID id, LocationTbl::Rec * b) { return SearchByID(this, PPOBJ_LOCATION, id, b); }
 
 int LocationCore::GetListByCode(PPID locTyp, const char * pCode, PPIDArray * pIdList)
 {
@@ -1027,10 +1024,7 @@ EAddrCore::EAddrCore() : EAddrTbl()
 {
 }
 
-int EAddrCore::Search(PPID id, EAddrTbl::Rec * pRec)
-{
-	return SearchByID(this, PPOBJ_EADDR, id, pRec);
-}
+int EAddrCore::Search(PPID id, EAddrTbl::Rec * pRec) { return SearchByID(this, PPOBJ_EADDR, id, pRec); }
 
 int EAddrCore::Put(PPID * pID, const PPEAddr * pAddr, const PPObjID * pObjId, int use_ta)
 {

diff --git a/Src/PPLib/OBJASSOC.CPP b/Src/PPLib/OBJASSOC.CPP
@@ -1,5 +1,5 @@
 // OBJASSOC.CPP
-// Copyright (c) A.Sobolev 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013, 2015, 2016, 2017, 2019
+// Copyright (c) A.Sobolev 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2013, 2015, 2016, 2017, 2019, 2024
 // @Kernel
 //
 #include <pp.h>
@@ -54,15 +54,8 @@ int ObjAssoc::Remove(PPID id, int use_ta)
 	return 0;
 }
 
-int ObjAssoc::Search(PPID id, ObjAssocTbl::Rec * pRec)
-{
-	return SearchByID(this, PPOBJ_OBJASSOC, id, pRec);
-}
-
-int ObjAssoc::SearchNum(PPID asscTyp, PPID prmr, long num, ObjAssocTbl::Rec * pRec)
-{
-	return _SearchNum(asscTyp, prmr, num, num ? spEq : spGe, pRec);
-}
+int ObjAssoc::Search(PPID id, ObjAssocTbl::Rec * pRec) { return SearchByID(this, PPOBJ_OBJASSOC, id, pRec); }
+int ObjAssoc::SearchNum(PPID asscTyp, PPID prmr, long num, ObjAssocTbl::Rec * pRec) { return _SearchNum(asscTyp, prmr, num, num ? spEq : spGe, pRec); }
 
 int ObjAssoc::_SearchNum(PPID asscTyp, PPID prmr, long num, int spMode, ObjAssocTbl::Rec * b)
 {

diff --git a/Src/PPLib/OBJQCERT.CPP b/Src/PPLib/OBJQCERT.CPP
@@ -17,10 +17,7 @@ PPObjQCert::~PPObjQCert()
 	TLP_CLOSE(P_Tbl);
 }
 
-int PPObjQCert::Search(PPID id, void * b)
-{
-	return SearchByID(P_Tbl, Obj, id, b);
-}
+int PPObjQCert::Search(PPID id, void * b) { return SearchByID(P_Tbl, Obj, id, b); }
 
 int PPObjQCert::SearchByCode(const char * pCode, PPID * pID, QualityCertTbl::Rec * pRec)
 {

diff --git a/Src/PPLib/Objstaff.cpp b/Src/PPLib/Objstaff.cpp
@@ -407,10 +407,7 @@ int PPObjStaffList::AssignPersonToStaff(PPID psnID, PPID staffID, LDATE dt, int
 	return PutPostPacket(&post_id, &pack, use_ta);
 }
 
-int PPObjStaffList::SearchPost(PPID postID, PersonPostTbl::Rec * pRec)
-{
-	return SearchByID(P_PostTbl, PPOBJ_PERSONPOST, postID, pRec);
-}
+int PPObjStaffList::SearchPost(PPID postID, PersonPostTbl::Rec * pRec) { return SearchByID(P_PostTbl, PPOBJ_PERSONPOST, postID, pRec); }
 
 int PPObjStaffList::GetPostPacket(PPID postID, PPPsnPostPacket * pPack)
 {

diff --git a/Src/PPLib/PACKAGE.CPP b/Src/PPLib/PACKAGE.CPP
@@ -247,10 +247,7 @@ PackageCore::PackageCore() : PackageTbl()
 {
 }
 
-int PackageCore::Search(PPID id, PackageTbl::Rec * pPckg)
-{
-	return SearchByID(this, PPOBJ_PACKAGE, id, pPckg);
-}
+int PackageCore::Search(PPID id, PackageTbl::Rec * pPckg) { return SearchByID(this, PPOBJ_PACKAGE, id, pPckg); }
 
 int PackageCore::SearchPrev(PPID prevID, PackageTbl::Rec * pPckg)
 {

diff --git a/Src/PPLib/Person.cpp b/Src/PPLib/Person.cpp
@@ -959,10 +959,7 @@ PersonCore::PersonCore() : PersonTbl()
 {
 }
 
-int PersonCore::Search(PPID id, PersonTbl::Rec * pRec)
-{
-	return SearchByID(this, PPOBJ_PERSON, id, pRec);
-}
+int PersonCore::Search(PPID id, PersonTbl::Rec * pRec) { return SearchByID(this, PPOBJ_PERSON, id, pRec); }
 
 SString & PersonCore::GetItemMemo(PPID id, SString & rBuf) // @v11.1.12
 {

diff --git a/Src/PPLib/Psnevent.cpp b/Src/PPLib/Psnevent.cpp
@@ -16,12 +16,10 @@ PersonEventCore::PersonEventCore() : PersonEventTbl()
 {
 }
 
-int PersonEventCore::Search(PPID id, PersonEventTbl::Rec * pRec)
-	{ return SearchByID(this, PPOBJ_PERSONEVENT, id, pRec); }
-int PersonEventCore::Add(PPID * pID, PersonEventTbl::Rec * pRec, int use_ta)
-	{ return (IncDateKey(this, 1, pRec->Dt, &pRec->OprNo) && AddObjRecByID(this, PPOBJ_PERSONEVENT, pID, pRec, use_ta)); }
-int PersonEventCore::Update(PPID id, PersonEventTbl::Rec * pRec, int use_ta)
-	{ return UpdateByID(this, PPOBJ_PERSONEVENT, id, pRec, use_ta); }
+int PersonEventCore::Search(PPID id, PersonEventTbl::Rec * pRec) { return SearchByID(this, PPOBJ_PERSONEVENT, id, pRec); }
+int PersonEventCore::Add(PPID * pID, PersonEventTbl::Rec * pRec, int use_ta) { return (IncDateKey(this, 1, pRec->Dt, &pRec->OprNo) && AddObjRecByID(this, PPOBJ_PERSONEVENT, pID, pRec, use_ta)); }
+int PersonEventCore::Update(PPID id, PersonEventTbl::Rec * pRec, int use_ta) { return UpdateByID(this, PPOBJ_PERSONEVENT, id, pRec, use_ta); }
+
 int PersonEventCore::Remove(PPID id, int use_ta)
 { 
 	int   ok = 1;