consum-base/doc/¸üÐÂÕýʽ»·¾³ÐèÒªÌí¼Ó.sql
@@ -0,0 +1,14 @@ -- å建åå¨è¿ç¨å¼å§----------- DELIMITER // CREATE PROCEDURE `InsertL_WH_GOODS` (IN p_WAREHOUSE_FLOW_ID BIGINT,IN p_WAREHOUSE_ID BIGINT,IN p_WH_GOODS_RECORD_ID BIGINT,IN p_RECORD_TYPE SMALLINT,IN p_WAREHOUSE_NAME VARCHAR (100),IN p_COST_TYPE SMALLINT,IN p_BASE_GOODS_TEMPLATE_ID BIGINT,IN p_GOODS_TEMPLATE_NAME VARCHAR (200),IN p_BASE_GOODS_MODELS_ID BIGINT,IN p_BASE_GOODS_MODELS_NAME VARCHAR (200),IN p_SUPPLIER VARCHAR (200),IN p_BUY_TYPE SMALLINT,IN p_UNIT VARCHAR (10),IN p_PRICE BIGINT,IN p_PROCURE_DATE BIGINT,IN p_STATES INT,IN p_DEAL_TIME BIGINT,IN p_times INT) BEGIN DECLARE i INT DEFAULT 1; DECLARE v_WH_GOODS_ID BIGINT; DECLARE CONTINUE HANDLER FOR SQLEXCEPTION BEGIN-- An error occurred, rollback the transaction ROLLBACK; END;-- Start the transaction START TRANSACTION; WHILE i<=p_times DO INSERT INTO L_WH_GOODS (WAREHOUSE_ID,WAREHOUSE_NAME,COST_TYPE,BASE_GOODS_TEMPLATE_ID,GOODS_TEMPLATE_NAME,BASE_GOODS_MODELS_ID,BASE_GOODS_MODELS_NAME,SUPPLIER,BUY_TYPE,UNIT,PRICE,PROCURE_DATE,STATES) VALUES (p_WAREHOUSE_ID,p_WAREHOUSE_NAME,p_COST_TYPE,p_BASE_GOODS_TEMPLATE_ID,p_GOODS_TEMPLATE_NAME,p_BASE_GOODS_MODELS_ID,p_BASE_GOODS_MODELS_NAME,p_SUPPLIER,p_BUY_TYPE,p_UNIT,p_PRICE,p_PROCURE_DATE,p_STATES); SET v_WH_GOODS_ID=LAST_INSERT_ID();-- æå ¥åè·åID并åå ¥L_WH_GOODS_RECORD_DETAILS表 INSERT INTO L_WH_GOODS_RECORD_DETAILS (WH_GOODS_RECORD_ID,WH_GOODS_ID,THIS_TYPE) VALUES (p_WH_GOODS_RECORD_ID,v_WH_GOODS_ID,p_RECORD_TYPE);-- æå ¥å°L_GOODS_WH_RECORD表 INSERT INTO L_GOODS_WH_RECORD (WAREHOUSE_FLOW_ID,WH_GOODS_ID,WAREHOUSE_ID,DEAL_TIME) VALUES (p_WAREHOUSE_FLOW_ID,v_WH_GOODS_ID,p_WAREHOUSE_ID,p_DEAL_TIME); SET i=i+1; END WHILE;-- If no errors, commit the transaction COMMIT; END -- å建åå¨è¿ç¨ç»æ ----------- consum-base/doc/ÏîÄ¿×ÊÁÏ/ºÓÄÏÓÊÕþµÍÖµÒ׺ÄÆ·V20231023.pdm
@@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698127600" Name="Physical Data Model 1" Objects="473" Symbols="54" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.7.4.6866"?> <?PowerDesigner AppLocale="UTF16" ID="{88086B01-C9E1-11D4-9552-0090277716A9}" Label="" LastModificationDate="1698127600" Name="Physical Data Model 1" Objects="475" Symbols="54" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.7.4.6866"?> <!-- do not edit this file --> <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object"> @@ -1150,7 +1150,7 @@ [ModelOptions\Default Opts\JIDX] PhysOpts=</a:ModelOptionsText> <a:GlobalObjectID/> <a:RepositoryFilename>F:\code\low-consum-manage\consum-base\doc\项ç®èµæ\æ²³åé®æ¿ä½å¼æèåV20231023.pdm</a:RepositoryFilename> <a:RepositoryFilename>D:\MyProjects\jmy\ä½å¼æèå\low-consum-manage\consum-base\doc\项ç®èµæ\æ²³åé®æ¿ä½å¼æèåV20231023.pdm</a:RepositoryFilename> <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,75={C6E0B27F-F765-4DDD-87DA-84EB4CD5A1BC},AutoFixMaterializedViewDone,4=true </a:ExtendedAttributesText> @@ -6304,8 +6304,9 @@ <a:Code>AGENCY_ID</a:Code> <a:CreationDate>1696836553</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1696836560</a:ModificationDate> <a:Modifier>asus</a:Modifier> <a:ModificationDate>1698215094</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>æºæç¼å·</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> @@ -6315,8 +6316,9 @@ <a:Code>AGENCY_NAME</a:Code> <a:CreationDate>1696836553</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1696836560</a:ModificationDate> <a:Modifier>asus</a:Modifier> <a:ModificationDate>1698215094</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>æºæå称</a:Comment> <a:DataType>varchar(100)</a:DataType> <a:Length>100</a:Length> <a:GlobalObjectID/> @@ -6327,9 +6329,9 @@ <a:Code>INCOME_ID</a:Code> <a:CreationDate>1696478356</a:CreationDate> <a:Creator>Administrator</a:Creator> <a:ModificationDate>1698134145</a:ModificationDate> <a:ModificationDate>1698215053</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>éè´äººç¼å·</a:Comment> <a:Comment>å ¥åºäººç¼å·</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> @@ -6339,9 +6341,9 @@ <a:Code>INCOME_NAME</a:Code> <a:CreationDate>1696478356</a:CreationDate> <a:Creator>Administrator</a:Creator> <a:ModificationDate>1698134145</a:ModificationDate> <a:ModificationDate>1698215053</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>éè´äººå§å</a:Comment> <a:Comment>å ¥åºäººå§å</a:Comment> <a:DataType>varchar(32)</a:DataType> <a:Length>32</a:Length> <a:GlobalObjectID/> @@ -6352,9 +6354,9 @@ <a:Code>INCOME_TIME</a:Code> <a:CreationDate>1696478356</a:CreationDate> <a:Creator>Administrator</a:Creator> <a:ModificationDate>1696478429</a:ModificationDate> <a:Modifier>Administrator</a:Modifier> <a:Comment>éè´æ¶é´</a:Comment> <a:ModificationDate>1698215053</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>å ¥åºæ¶é´</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> @@ -6364,8 +6366,9 @@ <a:Code>BEIZ</a:Code> <a:CreationDate>1696482197</a:CreationDate> <a:Creator>Administrator</a:Creator> <a:ModificationDate>1696482214</a:ModificationDate> <a:Modifier>Administrator</a:Modifier> <a:ModificationDate>1698215094</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>å¤æ³¨</a:Comment> <a:DataType>varchar(2000)</a:DataType> <a:Length>2000</a:Length> <a:GlobalObjectID/> @@ -7357,7 +7360,7 @@ <a:Code>L_WH_PROCURE_MODEL</a:Code> <a:CreationDate>1696835850</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1698131255</a:ModificationDate> <a:ModificationDate>1698199283</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>éè´ãè°æ¨ãåºåºççç©ååå·</a:Comment> <a:GlobalObjectID/> @@ -7424,44 +7427,18 @@ <a:GlobalObjectID/> </o:Column> <o:Column Id="o303"> <a:ObjectID>A4720418-D705-4296-92B5-4655A47BCC8A</a:ObjectID> <a:Name>è§æ ¼åå·å称</a:Name> <a:Code>BASE_GOODS_MODELS_NAME</a:Code> <a:CreationDate>1696835850</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1696835850</a:ModificationDate> <a:Modifier>asus</a:Modifier> <a:Comment>è§æ ¼åå·å称</a:Comment> <a:DataType>varchar(200)</a:DataType> <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o304"> <a:ObjectID>B86B853D-D872-4F4A-B481-80D01484FCEA</a:ObjectID> <a:Name>计éåä½</a:Name> <a:Code>UNIT</a:Code> <a:CreationDate>1696835850</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1696835850</a:ModificationDate> <a:Modifier>asus</a:Modifier> <a:Comment>计éåä½å¦æ件ãæ¤ãè¾ç</a:Comment> <a:DataType>varchar(10)</a:DataType> <a:Length>10</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o305"> <a:ObjectID>3111744D-6F33-4FDF-95CA-C6907FA22606</a:ObjectID> <a:Name>åä»·(éè´éè¦ï¼è°æ¨ä¸éè¦)</a:Name> <a:Code>PRICE</a:Code> <a:CreationDate>1696835850</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1698033105</a:ModificationDate> <a:ModificationDate>1698200192</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>éè´åä»·ï¼éè´éè¦ï¼è°æ¨ä¸éè¦ï¼</a:Comment> <a:DataType>double</a:DataType> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o306"> <o:Column Id="o304"> <a:ObjectID>8727D918-4358-46B5-A93C-70E1A6EC9627</a:ObjectID> <a:Name>æä½æ°é</a:Name> <a:Code>COUNTS</a:Code> @@ -7473,7 +7450,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o307"> <o:Column Id="o305"> <a:ObjectID>503BED7B-D32A-4E26-A043-4F3963BF8C14</a:ObjectID> <a:Name>åºåæ°é</a:Name> <a:Code>WOREHOUSE_COUNT</a:Code> @@ -7485,7 +7462,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o308"> <o:Column Id="o306"> <a:ObjectID>49E69E8A-8009-4226-A02E-28DA768D66E4</a:ObjectID> <a:Name>ä¾åºå</a:Name> <a:Code>SUPPLIER</a:Code> @@ -7500,7 +7477,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o309"> <o:Key Id="o307"> <a:ObjectID>3AE696B5-4397-496F-AAEE-8DD54A1F22AA</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -7515,7 +7492,7 @@ </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o309"/> <o:Key Ref="o307"/> </c:PrimaryKey> </o:Table> <o:Table Id="o205"> @@ -7530,7 +7507,7 @@ <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o310"> <o:Column Id="o308"> <a:ObjectID>F6B4D663-AC20-4915-BF46-B1A6E362D6C7</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -7542,7 +7519,7 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o311"> <o:Column Id="o309"> <a:ObjectID>AEAC61FC-E4D8-49C5-A8AA-F8A6330361C0</a:ObjectID> <a:Name>è¿åºåºæµæ°´æ»è¡¨ID</a:Name> <a:Code>L_WAREHOUSE_FLOW_ID</a:Code> @@ -7554,7 +7531,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o312"> <o:Column Id="o310"> <a:ObjectID>34EA8044-D51A-45DF-ADA0-658BABA5705C</a:ObjectID> <a:Name>æ¥åºåç¼ç </a:Name> <a:Code>BUSINESS_FORM_CODE</a:Code> @@ -7567,7 +7544,7 @@ <a:Length>32</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o313"> <o:Column Id="o311"> <a:ObjectID>6153EAE2-33D3-41CA-8CB3-CF4232F74332</a:ObjectID> <a:Name>ä»åºç¼å·</a:Name> <a:Code>WAREHOUSE_ID</a:Code> @@ -7579,7 +7556,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o314"> <o:Column Id="o312"> <a:ObjectID>4AD84C6D-F8AB-4A1E-87E6-58297DFB9998</a:ObjectID> <a:Name>ä»åºå称</a:Name> <a:Code>WAREHOUSE_NAME</a:Code> @@ -7592,7 +7569,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o315"> <o:Column Id="o313"> <a:ObjectID>1DB31041-4C7A-4A87-8D3F-216948806278</a:ObjectID> <a:Name>ç±»å0æºæ1é¨é¨</a:Name> <a:Code>SCRAPPED_TYPE</a:Code> @@ -7604,7 +7581,7 @@ <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o316"> <o:Column Id="o314"> <a:ObjectID>E737D7FA-AECF-4D48-93D0-C65A4A705E2D</a:ObjectID> <a:Name>æºæ/é¨é¨ç¼å·</a:Name> <a:Code>AGENCY_ID</a:Code> @@ -7616,7 +7593,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o317"> <o:Column Id="o315"> <a:ObjectID>BA2B5846-9039-4C5F-9F7C-1B687073242B</a:ObjectID> <a:Name>æºæ/é¨é¨å称</a:Name> <a:Code>AGENCY_NAME</a:Code> @@ -7629,7 +7606,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o318"> <o:Column Id="o316"> <a:ObjectID>D7BD6817-BC5F-46BD-AE4A-2023386897C7</a:ObjectID> <a:Name>æä½äººç¼å·</a:Name> <a:Code>OPERATOR_ID</a:Code> @@ -7641,7 +7618,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o319"> <o:Column Id="o317"> <a:ObjectID>EEC89E28-59D4-4141-805A-8728D04AFF53</a:ObjectID> <a:Name>æä½äººå§å</a:Name> <a:Code>OPERATOR_NAME</a:Code> @@ -7654,7 +7631,7 @@ <a:Length>32</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o320"> <o:Column Id="o318"> <a:ObjectID>BA40B97D-5528-49D3-876C-0FE41945DB7B</a:ObjectID> <a:Name>æä½æ¶é´</a:Name> <a:Code>DEAL_TIME</a:Code> @@ -7666,7 +7643,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o321"> <o:Column Id="o319"> <a:ObjectID>3E1BB416-3AB8-4FB2-B4AC-3784B142D4C8</a:ObjectID> <a:Name>æä½äººé¨é¨å称</a:Name> <a:Code>DEPARTMENT_ID</a:Code> @@ -7679,7 +7656,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o322"> <o:Column Id="o320"> <a:ObjectID>730C1618-A2A9-4AC2-832B-67F35E8FF392</a:ObjectID> <a:Name>æä½äººé¨é¨ç¼å·</a:Name> <a:Code>DEPARTMENT_NAME</a:Code> @@ -7691,7 +7668,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o323"> <o:Column Id="o321"> <a:ObjectID>DFC62409-C3C2-4418-B82C-1CBE91637EA7</a:ObjectID> <a:Name>é件</a:Name> <a:Code>UPLOAD_FILES</a:Code> @@ -7706,7 +7683,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o324"> <o:Key Id="o322"> <a:ObjectID>88AC6223-71F8-4B4E-9803-88A399642E91</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -7716,12 +7693,12 @@ <a:Modifier>asus</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o310"/> <o:Column Ref="o308"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o324"/> <o:Key Ref="o322"/> </c:PrimaryKey> </o:Table> <o:Table Id="o172"> @@ -7730,13 +7707,13 @@ <a:Code>L_WH_GOODS_RECORD</a:Code> <a:CreationDate>1696994977</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1698138503</a:ModificationDate> <a:ModificationDate>1698204342</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>åè§æ ¼ç©åçè¿åºåº</a:Comment> <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o325"> <o:Column Id="o323"> <a:ObjectID>0FE14808-926C-4999-B38A-B78E0A8F8189</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -7748,31 +7725,31 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o326"> <a:ObjectID>82A135A6-B57F-444A-95F0-563299A21B35</a:ObjectID> <a:Name>è¿åºåºæµæ°´æ»è¡¨ID</a:Name> <a:Code>L_WAREHOUSE_FLOW_ID</a:Code> <a:CreationDate>1698117176</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698118010</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>è¿åºåºæµæ°´æ»è¡¨ID</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o327"> <a:ObjectID>62185A02-009A-4201-9D18-8F91E037BBD2</a:ObjectID> <o:Column Id="o324"> <a:ObjectID>1966965A-BB34-41E0-88C3-0DD4881EA550</a:ObjectID> <a:Name>ä»åºç¼å·</a:Name> <a:Code>WAREHOUSE_FLOW_ID</a:Code> <a:CreationDate>1696994977</a:CreationDate> <a:Creator>asus</a:Creator> <a:ModificationDate>1698026136</a:ModificationDate> <a:Code>WAREHOUSE_ID</a:Code> <a:CreationDate>1698204253</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698204342</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>ä»åºç¼å·</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o328"> <o:Column Id="o325"> <a:ObjectID>82A135A6-B57F-444A-95F0-563299A21B35</a:ObjectID> <a:Name>è¿åºåºæµæ°´æ»è¡¨ID</a:Name> <a:Code>WAREHOUSE_FLOW_ID</a:Code> <a:CreationDate>1698117176</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698204342</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>è¿åºåºæµæ°´æ»è¡¨ID</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o326"> <a:ObjectID>CD29D3BC-6F92-442B-9904-084ED5B3DF18</a:ObjectID> <a:Name>æåæ°é</a:Name> <a:Code>INITIAL_COUNT</a:Code> @@ -7784,7 +7761,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o329"> <o:Column Id="o327"> <a:ObjectID>7F0B2E99-7BC5-44E5-BA7E-6FADC89E9DA2</a:ObjectID> <a:Name>æ¬æ¬¡è°æ´ç±»å</a:Name> <a:Code>THIS_TYPE</a:Code> @@ -7796,7 +7773,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o330"> <o:Column Id="o328"> <a:ObjectID>072D4DBA-04E3-4C71-B720-D3C1CFB1FF90</a:ObjectID> <a:Name>æ¬æ¬¡è¿åºæ°é</a:Name> <a:Code>THIS_COUNT</a:Code> @@ -7808,7 +7785,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o331"> <o:Column Id="o329"> <a:ObjectID>6ABA5814-B472-483A-84FE-026F8E80C50C</a:ObjectID> <a:Name>ææ«æ°é</a:Name> <a:Code>END_COUNT</a:Code> @@ -7820,7 +7797,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o332"> <o:Column Id="o330"> <a:ObjectID>D3587088-FD22-4900-A662-5A41A805E976</a:ObjectID> <a:Name>ç©å模çç¼å·</a:Name> <a:Code>BASE_GOODS_TEMPLATE_ID</a:Code> @@ -7832,7 +7809,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o333"> <o:Column Id="o331"> <a:ObjectID>D9951853-2C85-45DA-99D7-8D1DAA69B150</a:ObjectID> <a:Name>ç©å模çå称</a:Name> <a:Code>GOODS_TEMPLATE_NAME</a:Code> @@ -7845,7 +7822,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o334"> <o:Column Id="o332"> <a:ObjectID>6E870326-522E-4F11-B5BF-6FF1910D5579</a:ObjectID> <a:Name>è§æ ¼åå·ç¼å·</a:Name> <a:Code>BASE_GOODS_MODELS_ID</a:Code> @@ -7857,7 +7834,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o335"> <o:Column Id="o333"> <a:ObjectID>20D7AF06-2B7F-46CA-A801-1176187F95EA</a:ObjectID> <a:Name>è§æ ¼åå·å称</a:Name> <a:Code>BASE_GOODS_MODELS_NAME</a:Code> @@ -7870,9 +7847,21 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o334"> <a:ObjectID>F9BE096C-5811-48F0-8E4A-491F16F4729F</a:ObjectID> <a:Name>æä½æ¶é´</a:Name> <a:Code>DEAL_TIME</a:Code> <a:CreationDate>1698204313</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698204342</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>æä½æ¶é´</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> </c:Columns> <c:Keys> <o:Key Id="o336"> <o:Key Id="o335"> <a:ObjectID>17804BFA-8E23-4982-A982-26025B0D78DE</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -7882,12 +7871,12 @@ <a:Modifier>asus</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o325"/> <o:Column Ref="o323"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o336"/> <o:Key Ref="o335"/> </c:PrimaryKey> </o:Table> <o:Table Id="o206"> @@ -7901,7 +7890,7 @@ <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o337"> <o:Column Id="o336"> <a:ObjectID>B468A6EF-DA54-467C-9151-1AC9F88E9A6B</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -7913,7 +7902,7 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o338"> <o:Column Id="o337"> <a:ObjectID>166365BC-0358-4912-AAA0-2A3B2E56777E</a:ObjectID> <a:Name>æ°é</a:Name> <a:Code>COUNTS</a:Code> @@ -7925,7 +7914,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o339"> <o:Column Id="o338"> <a:ObjectID>F320C2A2-C2D7-43F8-B7E9-95E2E703A921</a:ObjectID> <a:Name>æ¥åºåå CODE</a:Name> <a:Code>SCRAPPED_CODE</a:Code> @@ -7938,7 +7927,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o340"> <o:Column Id="o339"> <a:ObjectID>9206D23C-2025-4ED7-BCD2-95B921C05A7B</a:ObjectID> <a:Name>æ¥åºåå NAME</a:Name> <a:Code>SCRAPPED_NAME</a:Code> @@ -7951,7 +7940,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o341"> <o:Column Id="o340"> <a:ObjectID>3D188B73-629D-49CD-8F5B-D03AF325E971</a:ObjectID> <a:Name>å¤æ³¨</a:Name> <a:Code>BEIZ</a:Code> @@ -7964,7 +7953,7 @@ <a:Length>2000</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o342"> <o:Column Id="o341"> <a:ObjectID>A341D6D6-AD7D-4711-8DAD-1C0F53CF6818</a:ObjectID> <a:Name>æ¥åºåç¼å·</a:Name> <a:Code>DEP_FORM_SCRAPPED_ID</a:Code> @@ -7976,7 +7965,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o343"> <o:Column Id="o342"> <a:ObjectID>0C5A7398-46CF-4DAE-9094-E24D26168CA2</a:ObjectID> <a:Name>ç©å模çç¼å·</a:Name> <a:Code>BASE_GOODS_TEMPLATE_ID</a:Code> @@ -7988,7 +7977,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o344"> <o:Column Id="o343"> <a:ObjectID>EFC2C5F4-4DF5-4A1B-A932-088C6FDDDEEB</a:ObjectID> <a:Name>ç©å模çå称</a:Name> <a:Code>GOODS_TEMPLATE_NAME</a:Code> @@ -8001,7 +7990,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o345"> <o:Column Id="o344"> <a:ObjectID>3B5C7C42-8317-4210-8C6E-463B0A9CC425</a:ObjectID> <a:Name>计éåä½</a:Name> <a:Code>UNIT</a:Code> @@ -8014,7 +8003,7 @@ <a:Length>10</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o346"> <o:Column Id="o345"> <a:ObjectID>3A80F4B6-3DE2-4598-BA3C-0676FB3F68F5</a:ObjectID> <a:Name>è§æ ¼åå·ç¼å·</a:Name> <a:Code>BASE_GOODS_MODELS_ID</a:Code> @@ -8026,7 +8015,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o347"> <o:Column Id="o346"> <a:ObjectID>C9B5208B-8F0A-4FD5-9917-EC1BF9E6E3A2</a:ObjectID> <a:Name>è§æ ¼åå·å称</a:Name> <a:Code>BASE_GOODS_MODELS_NAME</a:Code> @@ -8039,7 +8028,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o348"> <o:Column Id="o347"> <a:ObjectID>B572E100-7B85-4936-A3A1-AB60F0B87786</a:ObjectID> <a:Name>åºåç©å详æ IDs,ç©åè§æ ¼åå· æè idï¼å¿ é¡»éæ©å ¶ä¸</a:Name> <a:Code>åºåç©å详æ IDs,ç©åè§æ ¼åå· æè idï¼å¿ é¡»éæ©å ¶ä¸</a:Code> @@ -8052,7 +8041,7 @@ <a:Length>2000</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o349"> <o:Column Id="o348"> <a:ObjectID>F0C7EEBE-22E1-4C83-B564-446160874CA8</a:ObjectID> <a:Name>顺åº</a:Name> <a:Code>SORT</a:Code> @@ -8066,7 +8055,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o350"> <o:Key Id="o349"> <a:ObjectID>34554B12-AAA9-427A-98E9-C28AE724E801</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8076,12 +8065,12 @@ <a:Modifier>asus</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o337"/> <o:Column Ref="o336"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o350"/> <o:Key Ref="o349"/> </c:PrimaryKey> </o:Table> <o:Table Id="o197"> @@ -8095,7 +8084,7 @@ <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o351"> <o:Column Id="o350"> <a:ObjectID>47EE8040-11B8-4025-BEC2-E18A70C23E7C</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -8107,7 +8096,7 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o352"> <o:Column Id="o351"> <a:ObjectID>20E569D8-AF86-4C3B-93D3-4AC63077F90A</a:ObjectID> <a:Name>çç¹åç¼å·</a:Name> <a:Code>WH_FORM_INVENTORY_ID</a:Code> @@ -8119,7 +8108,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o353"> <o:Column Id="o352"> <a:ObjectID>77913576-6C01-4768-B21F-A058EDC22214</a:ObjectID> <a:Name>ç©å模çç¼å·</a:Name> <a:Code>BASE_GOODS_TEMPLATE_ID</a:Code> @@ -8131,7 +8120,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o354"> <o:Column Id="o353"> <a:ObjectID>B105ABE7-C914-4230-97D1-C6411E6AC70C</a:ObjectID> <a:Name>ç©å模çå称</a:Name> <a:Code>GOODS_TEMPLATE_NAME</a:Code> @@ -8144,7 +8133,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o355"> <o:Column Id="o354"> <a:ObjectID>D5A68808-F7D5-42DD-B21D-76C2EF47E819</a:ObjectID> <a:Name>计éåä½</a:Name> <a:Code>UNIT</a:Code> @@ -8157,7 +8146,7 @@ <a:Length>10</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o356"> <o:Column Id="o355"> <a:ObjectID>022BFB4F-5C23-4C5F-A700-D1A3827F1017</a:ObjectID> <a:Name>è§æ ¼åå·ç¼å·</a:Name> <a:Code>BASE_GOODS_MODELS_ID</a:Code> @@ -8169,7 +8158,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o357"> <o:Column Id="o356"> <a:ObjectID>F2BD2B68-4CBB-4CBC-B46F-5939A7A4B568</a:ObjectID> <a:Name>è§æ ¼åå·å称</a:Name> <a:Code>BASE_GOODS_MODELS_NAME</a:Code> @@ -8182,7 +8171,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o358"> <o:Column Id="o357"> <a:ObjectID>47EB25F5-968D-4309-999A-DCCEFF95F279</a:ObjectID> <a:Name>éè´åä»·</a:Name> <a:Code>PRICE</a:Code> @@ -8194,7 +8183,7 @@ <a:DataType>double</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o359"> <o:Column Id="o358"> <a:ObjectID>3DB5F4EF-2C8C-47D8-BE15-84CE37626F69</a:ObjectID> <a:Name>æåæ°é</a:Name> <a:Code>INIT_COUNTS</a:Code> @@ -8206,7 +8195,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o360"> <o:Column Id="o359"> <a:ObjectID>9667048E-EC9F-4CE1-B78E-0810CC0FAD3D</a:ObjectID> <a:Name>çç¹æ°é</a:Name> <a:Code>INVENTORY_COUNTS</a:Code> @@ -8218,7 +8207,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o361"> <o:Column Id="o360"> <a:ObjectID>FC1691D3-4264-4D1B-98DD-B5BF933956CB</a:ObjectID> <a:Name>å·®å¼æ°é</a:Name> <a:Code>ERROR_COUNTS</a:Code> @@ -8230,7 +8219,7 @@ <a:DataType>int</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o362"> <o:Column Id="o361"> <a:ObjectID>AAA6B85A-D53E-4716-B8C6-3D1EEBF259C4</a:ObjectID> <a:Name>çç¹ç»æ</a:Name> <a:Code>INVENTORY_RESULT</a:Code> @@ -8244,7 +8233,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o363"> <o:Key Id="o362"> <a:ObjectID>BD301CB1-232D-4D34-A26B-0A8D951B5C27</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8254,12 +8243,12 @@ <a:Modifier>39886</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o351"/> <o:Column Ref="o350"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o363"/> <o:Key Ref="o362"/> </c:PrimaryKey> </o:Table> <o:Table Id="o164"> @@ -8275,7 +8264,7 @@ <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o364"> <o:Column Id="o363"> <a:ObjectID>FB0CD68A-F40C-4A33-A0EA-227105147883</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -8288,7 +8277,7 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o365"> <o:Column Id="o364"> <a:ObjectID>9C8B80E9-70B0-401F-987D-4497324D41A7</a:ObjectID> <a:Name>æå±ä»åºä»åºç¼å·</a:Name> <a:Code>WAREHOUSE_ID</a:Code> @@ -8300,7 +8289,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o366"> <o:Column Id="o365"> <a:ObjectID>AF42D1A7-F0AD-4FBF-9B5B-6475C0F99EEB</a:ObjectID> <a:Name>ä»åºå称</a:Name> <a:Code>WAREHOUSE_NAME</a:Code> @@ -8313,7 +8302,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o367"> <o:Column Id="o366"> <a:ObjectID>31B11685-5373-4571-8872-8C9111AEF0C7</a:ObjectID> <a:Name>ä»·å¼ç±»å</a:Name> <a:Code>COST_TYPE</a:Code> @@ -8325,7 +8314,7 @@ <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o368"> <o:Column Id="o367"> <a:ObjectID>8F50FC5D-47E6-4600-A744-35C0F87557E4</a:ObjectID> <a:Name>ç©å模çç¼å·</a:Name> <a:Code>BASE_GOODS_TEMPLATE_ID</a:Code> @@ -8337,7 +8326,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o369"> <o:Column Id="o368"> <a:ObjectID>3EE7D003-9ABE-47C6-987F-3E65AE6E7ED0</a:ObjectID> <a:Name>ç©å模çå称</a:Name> <a:Code>GOODS_TEMPLATE_NAME</a:Code> @@ -8350,7 +8339,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o370"> <o:Column Id="o369"> <a:ObjectID>5E4854DF-745A-4B3E-BBE9-845940927E74</a:ObjectID> <a:Name>è§æ ¼åå·ç¼å·</a:Name> <a:Code>BASE_GOODS_MODELS_ID</a:Code> @@ -8362,7 +8351,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o371"> <o:Column Id="o370"> <a:ObjectID>5F39D30A-E162-430D-B17B-A23CA5DD36A8</a:ObjectID> <a:Name>è§æ ¼åå·å称</a:Name> <a:Code>BASE_GOODS_MODELS_NAME</a:Code> @@ -8375,7 +8364,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o372"> <o:Column Id="o371"> <a:ObjectID>C6557AAF-4976-4454-9CBC-E486877DAB23</a:ObjectID> <a:Name>ä¾åºå</a:Name> <a:Code>SUPPLIER</a:Code> @@ -8388,7 +8377,7 @@ <a:Length>200</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o373"> <o:Column Id="o372"> <a:ObjectID>512AA92C-2CEF-462F-ACDB-DB25569A5BF2</a:ObjectID> <a:Name>éè´æ¹å¼</a:Name> <a:Code>BUY_TYPE</a:Code> @@ -8400,7 +8389,7 @@ <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o374"> <o:Column Id="o373"> <a:ObjectID>2094ACE4-DAAA-4C89-B9F2-3256BE75B525</a:ObjectID> <a:Name>计éåä½</a:Name> <a:Code>UNIT</a:Code> @@ -8413,19 +8402,19 @@ <a:Length>10</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o375"> <o:Column Id="o374"> <a:ObjectID>0ACD1E18-E191-4DC7-8C8B-F11DD20328CE</a:ObjectID> <a:Name>éè´åä»·</a:Name> <a:Code>PRICE</a:Code> <a:CreationDate>1697870035</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1697870147</a:ModificationDate> <a:ModificationDate>1698200205</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>éè´åä»·</a:Comment> <a:DataType>double</a:DataType> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o376"> <o:Column Id="o375"> <a:ObjectID>1205FE5B-0F6B-4D3A-8E6D-27A4E8580F2C</a:ObjectID> <a:Name>éè´æ¶é´</a:Name> <a:Code>PROCURE_DATE</a:Code> @@ -8437,7 +8426,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o377"> <o:Column Id="o376"> <a:ObjectID>FFD7AD7F-2649-4248-AEF1-98C45140F37A</a:ObjectID> <a:Name>ç¶æ</a:Name> <a:Code>STATES</a:Code> @@ -8451,7 +8440,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o378"> <o:Key Id="o377"> <a:ObjectID>2E6E2565-85F9-434C-BE7A-07258CB379BF</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8461,12 +8450,12 @@ <a:Modifier>cy</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o364"/> <o:Column Ref="o363"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o378"/> <o:Key Ref="o377"/> </c:PrimaryKey> </o:Table> <o:Table Id="o163"> @@ -8481,7 +8470,7 @@ <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o379"> <o:Column Id="o378"> <a:ObjectID>C3C2B29C-4ADD-43DF-9888-FF977249759D</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -8493,7 +8482,7 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o380"> <o:Column Id="o379"> <a:ObjectID>008F9C93-1FAE-41A1-AF4D-D1FF880C2B48</a:ObjectID> <a:Name>åºåç©å详æ 表Id</a:Name> <a:Code>GOODS_USER_PHONE</a:Code> @@ -8505,7 +8494,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o381"> <o:Column Id="o380"> <a:ObjectID>13D7806D-73F2-47FE-BBE6-03662029214B</a:ObjectID> <a:Name>ç±»å0åå使ç¨1 è¿åº</a:Name> <a:Code>RECORD_TYPE</a:Code> @@ -8517,7 +8506,7 @@ <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o382"> <o:Column Id="o381"> <a:ObjectID>C56F4D87-180F-4C3F-9101-407C1250D6D3</a:ObjectID> <a:Name>ä¸æ¬¡ä½¿ç¨è®°å½ID</a:Name> <a:Code>LAST_RECORD_ID</a:Code> @@ -8529,7 +8518,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o383"> <o:Column Id="o382"> <a:ObjectID>2669CCF5-FB7C-4D7E-9D76-8953F5A7D97A</a:ObjectID> <a:Name>å½å使ç¨äººåçµè¯(0æ¶ææ)</a:Name> <a:Code>NOW_USER_PHONE</a:Code> @@ -8541,7 +8530,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o384"> <o:Column Id="o383"> <a:ObjectID>225A1A97-D4D5-42D8-BAE6-F3D73ADD1E6F</a:ObjectID> <a:Name>å½å使ç¨äººåå称(0æ¶ææ)</a:Name> <a:Code>NOW_USER_NAME</a:Code> @@ -8554,7 +8543,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o385"> <o:Column Id="o384"> <a:ObjectID>85D6EA22-FE1E-4AA8-9CEC-4E0E2557F2D2</a:ObjectID> <a:Name>æä½äººç¼å·</a:Name> <a:Code>OPERATOR_ID</a:Code> @@ -8566,7 +8555,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o386"> <o:Column Id="o385"> <a:ObjectID>E5625391-B555-4BEE-97E4-4C6415B0E5A3</a:ObjectID> <a:Name>æä½äººå§å</a:Name> <a:Code>OPERATOR_NAME</a:Code> @@ -8579,7 +8568,7 @@ <a:Length>32</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o387"> <o:Column Id="o386"> <a:ObjectID>0C97B594-7D65-452C-B495-C79DF4BD7471</a:ObjectID> <a:Name>æä½æ¶é´</a:Name> <a:Code>DEAL_TIME</a:Code> @@ -8593,7 +8582,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o388"> <o:Key Id="o387"> <a:ObjectID>F2E883B7-2A0C-49F1-ABC9-945F3EFB3D87</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8603,12 +8592,12 @@ <a:Modifier>cy</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o379"/> <o:Column Ref="o378"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o388"/> <o:Key Ref="o387"/> </c:PrimaryKey> </o:Table> <o:Table Id="o165"> @@ -8617,49 +8606,51 @@ <a:Code>L_GOODS_WH_RECORD</a:Code> <a:CreationDate>1697870731</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698124281</a:ModificationDate> <a:ModificationDate>1698212922</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>è®°å½ä»åºé´æµè½¬è®°å½</a:Comment> <a:PhysicalOptions>auto_increment = 1</a:PhysicalOptions> <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o389"> <o:Column Id="o388"> <a:ObjectID>522B6DE3-B187-4218-961C-56FB916CB66E</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> <a:CreationDate>1697870731</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1697870731</a:ModificationDate> <a:ModificationDate>1698212593</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:DataType>bigint</a:DataType> <a:Identity>1</a:Identity> <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o390"> <o:Column Id="o389"> <a:ObjectID>095CCBF2-BAE5-4BAE-80D6-779A46FCD5AE</a:ObjectID> <a:Name>è¿åºåºæµæ°´æ»è¡¨ID</a:Name> <a:Code>L_WAREHOUSE_FLOW_ID</a:Code> <a:Code>WAREHOUSE_FLOW_ID</a:Code> <a:CreationDate>1698123916</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698123945</a:ModificationDate> <a:ModificationDate>1698212922</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>è¿åºåºæµæ°´æ»è¡¨ID</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o391"> <o:Column Id="o390"> <a:ObjectID>BE1F0A1A-AC79-4C85-BCBE-0008FF34901D</a:ObjectID> <a:Name>åºåç©å详æ 表Id</a:Name> <a:Code>L_WH_GOODS_ID</a:Code> <a:Code>WH_GOODS_ID</a:Code> <a:CreationDate>1698119498</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698119674</a:ModificationDate> <a:ModificationDate>1698212922</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>ç©åid</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o392"> <o:Column Id="o391"> <a:ObjectID>7A6C0071-4E86-428B-91F2-8E9BE6AE26C0</a:ObjectID> <a:Name>å½åä¿ç®¡ä»åºid</a:Name> <a:Code>WAREHOUSE_ID</a:Code> @@ -8671,19 +8662,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o393"> <a:ObjectID>C05759CE-817B-400A-B638-C43CEB984F49</a:ObjectID> <a:Name>ä¸æ¬¡æµè½¬è®°å½id</a:Name> <a:Code>PARENT_ID</a:Code> <a:CreationDate>1697870731</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698123897</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>ä¸æ¬¡æµè½¬è®°å½id</a:Comment> <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o394"> <o:Column Id="o392"> <a:ObjectID>B34545B4-03E2-4548-ABC0-A1333214AE86</a:ObjectID> <a:Name>æä½æ¶é´</a:Name> <a:Code>DEAL_TIME</a:Code> @@ -8697,7 +8676,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o395"> <o:Key Id="o393"> <a:ObjectID>2BAC8AE6-1892-4043-AC90-A0D2BBC9F570</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8707,12 +8686,12 @@ <a:Modifier>cy</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o389"/> <o:Column Ref="o388"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o395"/> <o:Key Ref="o393"/> </c:PrimaryKey> </o:Table> <o:Table Id="o174"> @@ -8721,49 +8700,51 @@ <a:Code>L_WH_GOODS_RECORD_DETAILS</a:Code> <a:CreationDate>1697872131</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698132938</a:ModificationDate> <a:ModificationDate>1698204611</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>è¿åºåºæµæ°´æç»</a:Comment> <a:PhysicalOptions>auto_increment = 1</a:PhysicalOptions> <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o396"> <o:Column Id="o394"> <a:ObjectID>9D048633-8FBA-46FE-A467-42743F0BDE29</a:ObjectID> <a:Name>id</a:Name> <a:Code>id</a:Code> <a:CreationDate>1698115157</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698132938</a:ModificationDate> <a:ModificationDate>1698204574</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:DataType>bigint</a:DataType> <a:Identity>1</a:Identity> <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o397"> <o:Column Id="o395"> <a:ObjectID>97BEFBD7-1FFF-4A97-BD0A-478BF1A94060</a:ObjectID> <a:Name>è¿åºåºæµæ°´id</a:Name> <a:Code>L_WH_GOODS_RECORD_ID</a:Code> <a:Code>WH_GOODS_RECORD_ID</a:Code> <a:CreationDate>1697872133</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698118158</a:ModificationDate> <a:ModificationDate>1698204378</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>è¿åºåºæµæ°´id</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o398"> <o:Column Id="o396"> <a:ObjectID>7732FC0F-15B8-46E1-8A7C-4326799845D5</a:ObjectID> <a:Name>ç©åid</a:Name> <a:Code>L_WH_GOODS_ID</a:Code> <a:Code>WH_GOODS_ID</a:Code> <a:CreationDate>1697872133</a:CreationDate> <a:Creator>cy</a:Creator> <a:ModificationDate>1698118241</a:ModificationDate> <a:ModificationDate>1698204378</a:ModificationDate> <a:Modifier>cy</a:Modifier> <a:Comment>ç©åid</a:Comment> <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o399"> <o:Column Id="o397"> <a:ObjectID>0776EE2A-1DD6-400C-ACF4-AD3FAAD1A90A</a:ObjectID> <a:Name>æ¬æ¬¡è°æ´ç±»å</a:Name> <a:Code>THIS_TYPE</a:Code> @@ -8777,7 +8758,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o400"> <o:Key Id="o398"> <a:ObjectID>1278B13E-9B79-4C2D-B5EF-39789F6BFA04</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8787,12 +8768,12 @@ <a:Modifier>cy</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o396"/> <o:Column Ref="o394"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o400"/> <o:Key Ref="o398"/> </c:PrimaryKey> </o:Table> <o:Table Id="o173"> @@ -8807,7 +8788,7 @@ <a:GlobalObjectID/> <a:TotalSavingCurrency/> <c:Columns> <o:Column Id="o401"> <o:Column Id="o399"> <a:ObjectID>E8E0CC8A-8F75-442F-B2CF-7E0D008D66DC</a:ObjectID> <a:Name>ID</a:Name> <a:Code>ID</a:Code> @@ -8820,7 +8801,7 @@ <a:Column.Mandatory>1</a:Column.Mandatory> <a:GlobalObjectID/> </o:Column> <o:Column Id="o402"> <o:Column Id="o400"> <a:ObjectID>18D09933-0F77-435B-AD27-0808D0323F8C</a:ObjectID> <a:Name>ä»åºç¼å·</a:Name> <a:Code>WAREHOUSE_ID</a:Code> @@ -8832,7 +8813,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o403"> <o:Column Id="o401"> <a:ObjectID>28C8FEA6-9877-469D-8061-FAA607DADCA7</a:ObjectID> <a:Name>ä»åºå称</a:Name> <a:Code>WAREHOUSE_NAME</a:Code> @@ -8845,7 +8826,7 @@ <a:Length>100</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o404"> <o:Column Id="o402"> <a:ObjectID>CE3E3702-3573-4BE0-9210-F126D2700E53</a:ObjectID> <a:Name>æ¯å¦ææ°è®°å½</a:Name> <a:Code>LAST_RECORD</a:Code> @@ -8857,7 +8838,7 @@ <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o405"> <o:Column Id="o403"> <a:ObjectID>894B0E69-4804-4E8B-9DB6-0D8775CDDF0D</a:ObjectID> <a:Name>åæ®ç±»å 1 éè´2 è°æ¨ 3åºåº4é¨é¨åå</a:Name> <a:Code>BUSINESS_TYPE</a:Code> @@ -8869,7 +8850,7 @@ <a:DataType>smallint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o406"> <o:Column Id="o404"> <a:ObjectID>7690EBD5-649D-4266-A668-C67815081E83</a:ObjectID> <a:Name>ä¸å¡åæ®ç¼å·</a:Name> <a:Code>BUSINESS_FORM_ID</a:Code> @@ -8881,7 +8862,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o407"> <o:Column Id="o405"> <a:ObjectID>457B674A-788C-4F34-8330-DFC71F009FB7</a:ObjectID> <a:Name>æä½äººç¼å·</a:Name> <a:Code>OPERATOR_ID</a:Code> @@ -8893,7 +8874,7 @@ <a:DataType>bigint</a:DataType> <a:GlobalObjectID/> </o:Column> <o:Column Id="o408"> <o:Column Id="o406"> <a:ObjectID>463D8ED6-6205-456F-A9D5-77D555AD4A22</a:ObjectID> <a:Name>æä½äººå§å</a:Name> <a:Code>OPERATOR_NAME</a:Code> @@ -8906,7 +8887,7 @@ <a:Length>32</a:Length> <a:GlobalObjectID/> </o:Column> <o:Column Id="o409"> <o:Column Id="o407"> <a:ObjectID>D8505766-962D-407E-85C4-D2CDF3637553</a:ObjectID> <a:Name>æä½æ¶é´</a:Name> <a:Code>DEAL_TIME</a:Code> @@ -8920,7 +8901,7 @@ </o:Column> </c:Columns> <c:Keys> <o:Key Id="o410"> <o:Key Id="o408"> <a:ObjectID>3E877553-853E-49FC-B433-CFEF2FD578D5</a:ObjectID> <a:Name>Key_1</a:Name> <a:Code>Key_1</a:Code> @@ -8930,12 +8911,12 @@ <a:Modifier>cy</a:Modifier> <a:GlobalObjectID/> <c:Key.Columns> <o:Column Ref="o401"/> <o:Column Ref="o399"/> </c:Key.Columns> </o:Key> </c:Keys> <c:PrimaryKey> <o:Key Ref="o410"/> <o:Key Ref="o408"/> </c:PrimaryKey> </o:Table> </c:Tables> @@ -8962,7 +8943,7 @@ <o:Key Ref="o226"/> </c:ParentKey> <c:Joins> <o:ReferenceJoin Id="o411"> <o:ReferenceJoin Id="o409"> <a:ObjectID>C0D70E1D-85A8-421C-9783-2B71A31600E8</a:ObjectID> <a:CreationDate>1696479126</a:CreationDate> <a:Creator>Administrator</a:Creator> @@ -9000,7 +8981,7 @@ <o:Key Ref="o234"/> </c:ParentKey> <c:Joins> <o:ReferenceJoin Id="o412"> <o:ReferenceJoin Id="o410"> <a:ObjectID>056260EE-7796-4235-8D53-EACA2B7909ED</a:ObjectID> <a:CreationDate>1696836074</a:CreationDate> <a:Creator>asus</a:Creator> @@ -9035,10 +9016,10 @@ <o:Table Ref="o206"/> </c:ChildTable> <c:ParentKey> <o:Key Ref="o324"/> <o:Key Ref="o322"/> </c:ParentKey> <c:Joins> <o:ReferenceJoin Id="o413"> <o:ReferenceJoin Id="o411"> <a:ObjectID>1A2CA4E4-9C0D-4B76-B985-CDCC6632D7A5</a:ObjectID> <a:CreationDate>1696999475</a:CreationDate> <a:Creator>asus</a:Creator> @@ -9046,10 +9027,10 @@ <a:Modifier>asus</a:Modifier> <a:GlobalObjectID/> <c:Object1> <o:Column Ref="o310"/> <o:Column Ref="o308"/> </c:Object1> <c:Object2> <o:Column Ref="o342"/> <o:Column Ref="o341"/> </c:Object2> </o:ReferenceJoin> </c:Joins> @@ -9076,7 +9057,7 @@ <o:Key Ref="o281"/> </c:ParentKey> <c:Joins> <o:ReferenceJoin Id="o414"> <o:ReferenceJoin Id="o412"> <a:ObjectID>51540050-E379-4527-A236-2D407A3D1A55</a:ObjectID> <a:CreationDate>1697267671</a:CreationDate> <a:Creator>39886</a:Creator> @@ -9087,7 +9068,7 @@ <o:Column Ref="o263"/> </c:Object1> <c:Object2> <o:Column Ref="o352"/> <o:Column Ref="o351"/> </c:Object2> </o:ReferenceJoin> </c:Joins> @@ -9111,10 +9092,10 @@ <o:Table Ref="o190"/> </c:ChildTable> <c:ParentKey> <o:Key Ref="o309"/> <o:Key Ref="o307"/> </c:ParentKey> <c:Joins> <o:ReferenceJoin Id="o415"> <o:ReferenceJoin Id="o413"> <a:ObjectID>C6025392-2066-4326-8B61-77E920BDFA93</a:ObjectID> <a:CreationDate>1698037943</a:CreationDate> <a:Creator>cy</a:Creator> @@ -9402,7 +9383,7 @@ <o:PhysicalDiagram Ref="o4"/> </c:DefaultDiagram> <c:MultidimensionalDiagrams> <o:MultidimensionalDiagram Id="o416"> <o:MultidimensionalDiagram Id="o414"> <a:ObjectID>49477777-FF6D-42D5-B8C7-645FB031B3CA</a:ObjectID> <a:Name>MultidimensionalDiagram_1</a:Name> <a:Code>MultidimensionalDiagram_1</a:Code> @@ -9770,7 +9751,7 @@ </o:MultidimensionalDiagram> </c:MultidimensionalDiagrams> <c:DefaultGroups> <o:Group Id="o417"> <o:Group Id="o415"> <a:ObjectID>46EC3E2A-6CBF-421A-9DA8-6BCCEDEC7DF5</a:ObjectID> <a:Name>PUBLIC</a:Name> <a:Code>PUBLIC</a:Code> @@ -9782,7 +9763,7 @@ </o:Group> </c:DefaultGroups> <c:TargetModels> <o:TargetModel Id="o418"> <o:TargetModel Id="o416"> <a:ObjectID>86C176DC-EF89-49F0-83BA-DBF35E50C91E</a:ObjectID> <a:Name>MySQL 5.0</a:Name> <a:Code>MYSQL50</a:Code> consum-base/src/main/java/com/consum/base/core/WhBusinessEnum.java
New file @@ -0,0 +1,37 @@ package com.consum.base.core; /** * @ClassName WhBusinessEnum * @Author cy * @Date 2023/10/24 * @Description åæ®ç±»å * @Version 1.0 **/ public enum WhBusinessEnum { /** * 1 éè´ */ CAIGOU((short) 1), /** * 2 è°æ¨ */ DIAOBO((short) 2), /** * 3åºåº */ CHUKU((short) 3), /** * 4é¨é¨åå */ BUMENFENFA((short) 4); private short value; WhBusinessEnum(short value) { this.value = value; } public short getValue() { return value; } } consum-base/src/main/java/com/consum/base/core/util/LockManage.java
New file @@ -0,0 +1,19 @@ package com.consum.base.core.util; import java.util.concurrent.ConcurrentHashMap; /** * @ClassName LockManage * @Author cy * @Date 2023/10/25 * @Description å ¨å±é管çå¨ * @Version 1.0 **/ public class LockManage { private static final ConcurrentHashMap<String, Object> lockMap = new ConcurrentHashMap<>(); public static Object acquireLock(Long warehouseId, Long goodsModelsId) { String key = warehouseId + "-" + goodsModelsId; return lockMap.computeIfAbsent(key, k -> new Object()); } } consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; /** * @Description ç©åæ¨¡æ¿ @@ -109,7 +110,7 @@ } /** * @Description ç©å模æ¿å表æ¥è¯¢ * @Description ç©å模æ¿å表æ¥è¯¢ * @Author å¢åºé³ * @Date 2023/10/24 */ @@ -146,8 +147,6 @@ if (param.getStates() != null) { sql.append(" and states =:states "); paramts.put("states", param.getStates()); } else { sql.append(" and states !=3 "); } sql.append(" ORDER BY CREATE_DATE DESC "); @@ -156,6 +155,7 @@ /** * æ ¹æ®ç©åidæ¥è¯¢ç©å详æ * * @author å¢åºé³ * @date 2023/9/26 */ @@ -173,7 +173,7 @@ //3.å°è£ BaseGoodsTemplateVo vo = new BaseGoodsTemplateVo(); if (goodsTemplate != null) { BeanUtils.copyProperties(goodsTemplate,vo); BeanUtils.copyProperties(goodsTemplate, vo); } if (!CollectionUtils.isEmpty(modelsList)) { vo.setModels(modelsList); @@ -203,7 +203,7 @@ } /** * @Description æ ¹æ®ç©åå称ååç±»idæ¥è¯¢ç©å * @Description æ ¹æ®ç©åå称ååç±»idæ¥è¯¢ç©å * @Author å¢åºé³ * @Date 2023/10/24 */ @@ -222,6 +222,28 @@ } /** * æ ¹æ®åå·IDæ¥è¯¢ç©åä¿¡æ¯ * * @param modelId * @return */ private static String QUERY_GOODSINFO_BY_MODELID = "SELECT model.MODEL_NAME modelName,model.UNIT,temp.id goodsId, temp.GOODS_CODE goodsCode,temp.GOODS_NAME goodsName,temp.CLASSIFICATION classification FROM BASE_GOODS_MODELS model LEFT JOIN BASE_GOODS_TEMPLATE temp ON model.GOODS_TEMPLATES_ID=temp.id WHERE 1=1 "; public Map<String, Object> queryGoodsInfoByModelId(Long modelId) { StringBuilder sqlStr = new StringBuilder(QUERY_GOODSINFO_BY_MODELID); Map<String, Object> params = new HashMap<>(); if (modelId != null) { sqlStr.append(" AND model.id=:modelId"); params.put("modelId", modelId); } List<Map<String, Object>> tempGoodsInfo = this.select(sqlStr.toString(), params); if (CollectionUtils.isEmpty(tempGoodsInfo)) { return null; } return tempGoodsInfo.get(0); } /** * ä¿®æ¹ç¶æ * @author å¢åºé³ * @date 2023/10/25 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowCoreService.java
New file @@ -0,0 +1,189 @@ package com.consum.base.service; import com.consum.base.core.util.LockManage; import com.consum.model.po.*; import com.walker.infrastructure.utils.CollectionUtils; import com.walker.infrastructure.utils.NumberGenerator; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcCall; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import java.util.stream.Collectors; /** * @ClassName LWarehouseFlowService * @Author cy * @Date 2023/10/24 * @Description * @Version 1.0 **/ @Service @Slf4j public class LWarehouseFlowCoreService { private final JdbcTemplate jdbcTemplate; private SimpleJdbcCall simpleJdbcCall; private LWarehouseFlowService lWarehouseFlowService; private LWhGoodsService lWhGoodsService; private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; @Autowired public LWarehouseFlowCoreService(JdbcTemplate jdbcTemplate, LWarehouseFlowService lWarehouseFlowService, LWhGoodsService lWhGoodsService, BaseGoodsTemplateServiceImpl baseGoodsTemplateService) { this.jdbcTemplate = jdbcTemplate; this.lWarehouseFlowService = lWarehouseFlowService; this.baseGoodsTemplateService = baseGoodsTemplateService; this.lWhGoodsService = lWhGoodsService; this.simpleJdbcCall = new SimpleJdbcCall(jdbcTemplate).withProcedureName("InsertL_WH_GOODS"); } /** * æ´æ°è¿åºåºæµæ°´ * * @param goodsModelNumList * @param warehouseFlow * @return */ public int insertWareFlow(List<LWhProcureModel> goodsModelNumList, LWhFormProcure lWhFormProcure, LWarehouseFlow warehouseFlow) { if (CollectionUtils.isEmpty(goodsModelNumList)) { log.error("没æè¦å ¥åºçç©å"); return 0; } if (lWhFormProcure == null || warehouseFlow == null) { return 0; } // æ¥è¯¢ä»åºä¿¡æ¯ Long warehouseFlowId = warehouseFlow.getId(); Long warehouseId = warehouseFlow.getWarehouseId(); Long dealTime = warehouseFlow.getDealTime(); BaseWarehouse baseWarehouses = lWarehouseFlowService.get(new BaseWarehouse(warehouseId)); String warehouseName = baseWarehouses.getWarehouseName(); //éè´æ¹å¼ï¼1ï¼ééï¼2=èªéï¼ short buyType = lWhFormProcure.getBuyType().shortValue(); //éè´æ¶é´ Long procureTime = lWhFormProcure.getProcureTime(); // æå ¥æµæ°´æ»è¡¨ int flowInsertFlag = lWarehouseFlowService.insert(warehouseFlow); if (flowInsertFlag == 0) { return 0; } //ç»è®¡ååå·æ°é Map<Long, Integer> countsSumByBaseGoodsModelsId = goodsModelNumList.stream() .collect(Collectors.groupingBy(LWhProcureModel::getBaseGoodsModelsId, Collectors.summingInt(LWhProcureModel::getCounts))); Map<Long, List<LWhProcureModel>> sameModelList = goodsModelNumList.stream() // æåå·å .collect(Collectors.groupingBy(LWhProcureModel::getBaseGoodsModelsId)); countsSumByBaseGoodsModelsId.forEach((baseGoodsModelsId, modelCount) -> { //æ¥è¯¢åå·ä¿¡æ¯ Map<String, Object> tempGoodsInfo = baseGoodsTemplateService.queryGoodsInfoByModelId(baseGoodsModelsId); //ä»·å¼ç±»å String classificationObj = (String) tempGoodsInfo.get("classification"); Short classificationT = 3; if (classificationObj != null) { classificationT = (short) ((classificationObj).charAt(0) - 64); } short classification = classificationT; Long tempGoodsId = (Long) tempGoodsInfo.get("goodsid"); String goodsName = (String) tempGoodsInfo.get("goodsname"); String modelName = (String) tempGoodsInfo.get("modelname"); String goodsUnit = (String) tempGoodsInfo.get("unit"); // æå ¥ åè§æ ¼ç©åçè¿åºåºè®°å½ L_WH_GOODS_RECORD long whGoodsRecordId = NumberGenerator.getLongSequenceNumberNano(); LWhGoodsRecord whGoodsRecord = new LWhGoodsRecord(); whGoodsRecord.setId(whGoodsRecordId); whGoodsRecord.setWarehouseId(warehouseId); whGoodsRecord.setWarehouseFlowId(warehouseFlowId); whGoodsRecord.setBaseGoodsTemplateId(tempGoodsId); whGoodsRecord.setGoodsTemplateName(goodsName); whGoodsRecord.setBaseGoodsModelsId(baseGoodsModelsId); whGoodsRecord.setBaseGoodsModelsName(modelName); whGoodsRecord.setDealTime(dealTime); //æ¬æ¬¡è°æ´ç±»å 1=è°å¢ï¼2=è°å whGoodsRecord.setThisType(1); //éè¿LockManageè·å¾é Object warehouseModelLockObj = LockManage.acquireLock(warehouseId, baseGoodsModelsId); synchronized (warehouseModelLockObj) { // è·å¾éåæ¥è¯¢è¯¥åå·çæåæ°é int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1); whGoodsRecord.setInitialCount(goodsModelNum); whGoodsRecord.setThisCount(modelCount); whGoodsRecord.setEndCount(goodsModelNum + modelCount); //å°ååå·çç©åæå ¥ åºåç©å详æ List<LWhProcureModel> lWhProcureModels = sameModelList.get(baseGoodsModelsId); lWhProcureModels.forEach(item -> { //ä¾åºå String supplier = item.getSupplier(); //ä»·æ ¼ Long price = item.getPrice(); //ç©åä¸ªæ° Integer counts = item.getCounts(); sameGoodsInsertMore(warehouseFlowId, warehouseId, whGoodsRecordId, (short) 1, warehouseName, classification, tempGoodsId, goodsName, baseGoodsModelsId, modelName, supplier, buyType, goodsUnit, price, procureTime, 1, dealTime, counts); }); } }); return 1; } /** * åæ ·è§æ ¼çç©å æå ¥å¤æ¬¡ï¼ * åæ¶å°ä¸»é®è®°å½å¨ è¿åºåºæµæ°´æç»ãL_WH_GOODS_RECORD_DETAILSã, * æ´æ° ç©åä»åºä¿ç®¡è®°å½ãL_GOODS_WH_RECORDã * * @param pWarehouseId ä»åºid * @param pWarehouseName ä»åºå称 * @param pCostType ç©åä»·å¼ç±»å * @param pBaseGoodsTemplateId ç©å模æ¿ID * @param pGoodsTemplateName ç©å模æ¿å称 * @param pBaseGoodsModelsId ç©ååå·ID * @param pBaseGoodsModelsName ç©ååå·å称 * @param pUnit ç©ååä½ * @param pSupplier ç©åä¾åºå * @param pBuyType ç©åè´ä¹°ç±»å * @param pPrice ç©åä»·æ ¼ * @param pProcureDate éè´æ¥æ * @param pStates ç¶æ * @param pTimes æå ¥æ¡æ° */ public void sameGoodsInsertMore(long pWarehouseFlowId, long pWarehouseId, long pWhGoodsRecordId, short pRecordType, String pWarehouseName, short pCostType, long pBaseGoodsTemplateId, String pGoodsTemplateName, long pBaseGoodsModelsId, String pBaseGoodsModelsName, String pSupplier, short pBuyType, String pUnit, long pPrice, long pProcureDate, int pStates, long pDealTime, int pTimes) { SqlParameterSource in = new MapSqlParameterSource() .addValue("p_WAREHOUSE_FLOW_ID", pWarehouseFlowId) .addValue("p_WAREHOUSE_ID", pWarehouseId) .addValue("p_WH_GOODS_RECORD_ID", pWhGoodsRecordId) .addValue("p_RECORD_TYPE", pRecordType) .addValue("p_WAREHOUSE_NAME", pWarehouseName) .addValue("p_COST_TYPE", pCostType) .addValue("p_BASE_GOODS_TEMPLATE_ID", pBaseGoodsTemplateId) .addValue("p_GOODS_TEMPLATE_NAME", pGoodsTemplateName) .addValue("p_BASE_GOODS_MODELS_ID", pBaseGoodsModelsId) .addValue("p_BASE_GOODS_MODELS_NAME", pBaseGoodsModelsName) .addValue("p_SUPPLIER", pSupplier) .addValue("p_BUY_TYPE", pBuyType) .addValue("p_UNIT", pUnit) .addValue("p_PRICE", pPrice) .addValue("p_PROCURE_DATE", pProcureDate) .addValue("p_STATES", pStates) .addValue("p_DEAL_TIME", pDealTime) .addValue("p_times", pTimes); Map<String, Object> out = simpleJdbcCall.execute(in); System.out.println("Procedure result: " + out); } } consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java
New file @@ -0,0 +1,16 @@ package com.consum.base.service; import com.walker.jdbc.service.BaseServiceImpl; import org.springframework.stereotype.Service; /** * @ClassName LWarehouseFlowService * @Author cy * @Date 2023/10/25 * @Description * @Version 1.0 **/ @Service public class LWarehouseFlowService extends BaseServiceImpl { } consum-base/src/main/java/com/consum/base/service/LWhFormProcureService.java
New file @@ -0,0 +1,16 @@ package com.consum.base.service; import com.walker.jdbc.service.BaseServiceImpl; import org.springframework.stereotype.Service; /** * @ClassName lWhFormProcureService * @Author cy * @Date 2023/10/24 * @Description éè´å * @Version 1.0 **/ @Service public class LWhFormProcureService extends BaseServiceImpl { } consum-base/src/main/java/com/consum/base/service/LWhGoodsService.java
New file @@ -0,0 +1,30 @@ package com.consum.base.service; import com.walker.jdbc.service.BaseServiceImpl; import org.springframework.stereotype.Service; /** * @ClassName LWhGoodsService * @Author cy * @Date 2023/10/24 * @Description * @Version 1.0 **/ @Service public class LWhGoodsService extends BaseServiceImpl { /** * @param warehouseId æå±ä»åºä»åºç¼å· * @param baseGoodsModelsId è§æ ¼åå·ç¼å· * @param states ï¼0=å¨éè°æ¨ï¼1=å ¥åºæªååï¼2=å·²ä¸åï¼3=æ¥åºï¼ * @return æ¥è¯¢æ个åå·å¨ä»åºä¸çæ°é */ private static String query_Goods_Model_Num = ""; public int queryGoodsModelNum(long warehouseId, long baseGoodsModelsId, Short states) { return 0; } } consum-base/src/main/java/com/consum/base/service/LWhProcureModelService.java
New file @@ -0,0 +1,42 @@ package com.consum.base.service; import com.consum.base.core.WhBusinessEnum; import com.consum.model.po.LWhProcureModel; import com.walker.jdbc.service.BaseServiceImpl; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; /** * @ClassName LWhProcureModelService * @Author cy * @Date 2023/10/24 * @Description * @Version 1.0 **/ @Service public class LWhProcureModelService extends BaseServiceImpl { private static String GET_MODEL_BY_FORM = "SELECT * FROM L_WH_PROCURE_MODEL WHERE 1=1 "; /** * éè¿åæ®ç±»å åæ®IDæ¥è¯¢è¯¥è®¢åå ³èç设å¤åå·ä»¥åæ°é * * @return */ public List<LWhProcureModel> getModelByForm(WhBusinessEnum businessType, Long businessId) { StringBuilder sql = new StringBuilder(GET_MODEL_BY_FORM); HashMap<String, Object> paramts = new HashMap<>(); //项ç®é¶æ®µid if (businessType != null) { sql.append(" and BUSINESS_TYPE=:businessType "); paramts.put("businessType", businessType.getValue()); } if (businessType != null) { sql.append(" and BUSINESS_ID=:businessId "); paramts.put("businessId", businessId); } return this.select(sql.toString(), paramts, new LWhProcureModel()); } } consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord.java
@@ -20,21 +20,17 @@ protected boolean isset_id = false; // å±æ§å表 private Long lWarehouseFlowId = null; private Long warehouseFlowId = null; @JsonIgnore protected boolean isset_lWarehouseFlowId = false; protected boolean isset_warehouseFlowId = false; private Long lWhGoodsId = null; private Long whGoodsId = null; @JsonIgnore protected boolean isset_lWhGoodsId = false; protected boolean isset_whGoodsId = false; private Long warehouseId = null; @JsonIgnore protected boolean isset_warehouseId = false; private Integer parentId = null; @JsonIgnore protected boolean isset_parentId = false; private Long dealTime = null; @JsonIgnore @@ -75,32 +71,32 @@ return this.id == null; } public Long getLWarehouseFlowId() { return this.lWarehouseFlowId; public Long getWarehouseFlowId() { return this.warehouseFlowId; } public void setLWarehouseFlowId(Long lWarehouseFlowId) { this.lWarehouseFlowId = lWarehouseFlowId; this.isset_lWarehouseFlowId = true; public void setWarehouseFlowId(Long warehouseFlowId) { this.warehouseFlowId = warehouseFlowId; this.isset_warehouseFlowId = true; } @JsonIgnore public boolean isEmptyLWarehouseFlowId() { return this.lWarehouseFlowId == null; public boolean isEmptyWarehouseFlowId() { return this.warehouseFlowId == null; } public Long getLWhGoodsId() { return this.lWhGoodsId; public Long getWhGoodsId() { return this.whGoodsId; } public void setLWhGoodsId(Long lWhGoodsId) { this.lWhGoodsId = lWhGoodsId; this.isset_lWhGoodsId = true; public void setWhGoodsId(Long whGoodsId) { this.whGoodsId = whGoodsId; this.isset_whGoodsId = true; } @JsonIgnore public boolean isEmptyLWhGoodsId() { return this.lWhGoodsId == null; public boolean isEmptyWhGoodsId() { return this.whGoodsId == null; } public Long getWarehouseId() { @@ -115,20 +111,6 @@ @JsonIgnore public boolean isEmptyWarehouseId() { return this.warehouseId == null; } public Integer getParentId() { return this.parentId; } public void setParentId(Integer parentId) { this.parentId = parentId; this.isset_parentId = true; } @JsonIgnore public boolean isEmptyParentId() { return this.parentId == null; } public Long getDealTime() { @@ -152,10 +134,9 @@ public String toString() { return new StringBuilder() .append("id=").append(this.id) .append("lWarehouseFlowId=").append(this.lWarehouseFlowId) .append("lWhGoodsId=").append(this.lWhGoodsId) .append("warehouseFlowId=").append(this.warehouseFlowId) .append("whGoodsId=").append(this.whGoodsId) .append("warehouseId=").append(this.warehouseId) .append("parentId=").append(this.parentId) .append("dealTime=").append(this.dealTime) .toString(); } @@ -174,17 +155,14 @@ l_goods_wh_record.setId(this.getId()); } // æ®éå±æ§ if (this.isset_lWarehouseFlowId) { l_goods_wh_record.setLWarehouseFlowId(this.getLWarehouseFlowId()); if (this.isset_warehouseFlowId) { l_goods_wh_record.setWarehouseFlowId(this.getWarehouseFlowId()); } if (this.isset_lWhGoodsId) { l_goods_wh_record.setLWhGoodsId(this.getLWhGoodsId()); if (this.isset_whGoodsId) { l_goods_wh_record.setWhGoodsId(this.getWhGoodsId()); } if (this.isset_warehouseId) { l_goods_wh_record.setWarehouseId(this.getWarehouseId()); } if (this.isset_parentId) { l_goods_wh_record.setParentId(this.getParentId()); } if (this.isset_dealTime) { l_goods_wh_record.setDealTime(this.getDealTime()); consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord_mapper.java
@@ -28,10 +28,9 @@ // ä¸»é® public static final String Id = "id"; // æ®éå±æ§ public static final String LWarehouseFlowId = "l_warehouse_flow_id"; public static final String LWhGoodsId = "l_wh_goods_id"; public static final String WarehouseFlowId = "warehouse_flow_id"; public static final String WhGoodsId = "wh_goods_id"; public static final String WarehouseId = "warehouse_id"; public static final String ParentId = "parent_id"; public static final String DealTime = "deal_time"; /** @@ -46,17 +45,14 @@ this.setId(lGoodsWhRecord.getId()); } //æ®éå±æ§ if (lGoodsWhRecord.isset_lWarehouseFlowId) { this.setLWarehouseFlowId(lGoodsWhRecord.getLWarehouseFlowId()); if (lGoodsWhRecord.isset_warehouseFlowId) { this.setWarehouseFlowId(lGoodsWhRecord.getWarehouseFlowId()); } if (lGoodsWhRecord.isset_lWhGoodsId) { this.setLWhGoodsId(lGoodsWhRecord.getLWhGoodsId()); if (lGoodsWhRecord.isset_whGoodsId) { this.setWhGoodsId(lGoodsWhRecord.getWhGoodsId()); } if (lGoodsWhRecord.isset_warehouseId) { this.setWarehouseId(lGoodsWhRecord.getWarehouseId()); } if (lGoodsWhRecord.isset_parentId) { this.setParentId(lGoodsWhRecord.getParentId()); } if (lGoodsWhRecord.isset_dealTime) { this.setDealTime(lGoodsWhRecord.getDealTime()); @@ -104,10 +100,9 @@ public SqlAndParameters<Map<String, Object>> getInsertSql_() { InsertBuilder ib = new InsertBuilder(this.getTableName_()); ib.set(Id, this.getId()); ib.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ib.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ib.set(ParentId, this.getParentId(), this.isset_parentId); ib.set(DealTime, this.getDealTime(), this.isset_dealTime); return ib.genMapSql(); } @@ -118,10 +113,9 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_() { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(ParentId, this.getParentId(), this.isset_parentId); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); ub.where(this.getPkName_(), this.getPkValue_()); return ub.genMapSql(); @@ -133,10 +127,9 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(ParentId, this.getParentId(), this.isset_parentId); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); return ub.genMapSql(where, parameters); } @@ -147,10 +140,9 @@ @Override public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(ParentId, this.getParentId(), this.isset_parentId); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); return ub.genArraySql(where, parameters); } @@ -199,7 +191,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { return new SqlAndParameters<>("select id, l_warehouse_flow_id, l_wh_goods_id, warehouse_id, parent_id, deal_time from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters); } /** @@ -207,7 +199,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { return new SqlAndParameters<>("select id, l_warehouse_flow_id, l_wh_goods_id, warehouse_id, parent_id, deal_time from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, warehouse_flow_id, wh_goods_id, warehouse_id, deal_time from " + this.getTableName_() + " " + where, parameters); } /** @@ -244,20 +236,20 @@ l_goods_wh_record.setId(rs.getLong(columnIndex)); } //æ®éå±æ§ columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.LWarehouseFlowId); columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WarehouseFlowId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_goods_wh_record.setLWarehouseFlowId(null); l_goods_wh_record.setWarehouseFlowId(null); } else { l_goods_wh_record.setLWarehouseFlowId(rs.getLong(columnIndex)); l_goods_wh_record.setWarehouseFlowId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.LWhGoodsId); columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WhGoodsId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_goods_wh_record.setLWhGoodsId(null); l_goods_wh_record.setWhGoodsId(null); } else { l_goods_wh_record.setLWhGoodsId(rs.getLong(columnIndex)); l_goods_wh_record.setWhGoodsId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.WarehouseId); @@ -266,14 +258,6 @@ l_goods_wh_record.setWarehouseId(null); } else { l_goods_wh_record.setWarehouseId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.ParentId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_goods_wh_record.setParentId(null); } else { l_goods_wh_record.setParentId(rs.getInt(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LGoodsWhRecord_mapper.DealTime); consum-model-pojo/src/main/java/com/consum/model/po/LWhGoods.java
@@ -60,7 +60,7 @@ @JsonIgnore protected boolean isset_unit = false; private Double price = null; private Long price = null; @JsonIgnore protected boolean isset_price = false; @@ -247,11 +247,11 @@ return this.unit == null || this.unit.length() == 0; } public Double getPrice() { public Long getPrice() { return this.price; } public void setPrice(Double price) { public void setPrice(Long price) { this.price = price; this.isset_price = true; } consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
@@ -20,9 +20,9 @@ protected boolean isset_id = false; // å±æ§å表 private Long lWarehouseFlowId = null; private Long warehouseId = null; @JsonIgnore protected boolean isset_lWarehouseFlowId = false; protected boolean isset_warehouseId = false; private Long warehouseFlowId = null; @JsonIgnore @@ -60,6 +60,10 @@ @JsonIgnore protected boolean isset_baseGoodsModelsName = false; private Long dealTime = null; @JsonIgnore protected boolean isset_dealTime = false; /** * é»è®¤æé å½æ° */ @@ -95,18 +99,18 @@ return this.id == null; } public Long getLWarehouseFlowId() { return this.lWarehouseFlowId; public Long getWarehouseId() { return this.warehouseId; } public void setLWarehouseFlowId(Long lWarehouseFlowId) { this.lWarehouseFlowId = lWarehouseFlowId; this.isset_lWarehouseFlowId = true; public void setWarehouseId(Long warehouseId) { this.warehouseId = warehouseId; this.isset_warehouseId = true; } @JsonIgnore public boolean isEmptyLWarehouseFlowId() { return this.lWarehouseFlowId == null; public boolean isEmptyWarehouseId() { return this.warehouseId == null; } public Long getWarehouseFlowId() { @@ -235,6 +239,20 @@ return this.baseGoodsModelsName == null || this.baseGoodsModelsName.length() == 0; } public Long getDealTime() { return this.dealTime; } public void setDealTime(Long dealTime) { this.dealTime = dealTime; this.isset_dealTime = true; } @JsonIgnore public boolean isEmptyDealTime() { return this.dealTime == null; } /** * éå toString() æ¹æ³ */ @@ -242,7 +260,7 @@ public String toString() { return new StringBuilder() .append("id=").append(this.id) .append("lWarehouseFlowId=").append(this.lWarehouseFlowId) .append("warehouseId=").append(this.warehouseId) .append("warehouseFlowId=").append(this.warehouseFlowId) .append("initialCount=").append(this.initialCount) .append("thisType=").append(this.thisType) @@ -252,6 +270,7 @@ .append("goodsTemplateName=").append(this.goodsTemplateName) .append("baseGoodsModelsId=").append(this.baseGoodsModelsId) .append("baseGoodsModelsName=").append(this.baseGoodsModelsName) .append("dealTime=").append(this.dealTime) .toString(); } @@ -269,8 +288,8 @@ l_wh_goods_record.setId(this.getId()); } // æ®éå±æ§ if (this.isset_lWarehouseFlowId) { l_wh_goods_record.setLWarehouseFlowId(this.getLWarehouseFlowId()); if (this.isset_warehouseId) { l_wh_goods_record.setWarehouseId(this.getWarehouseId()); } if (this.isset_warehouseFlowId) { l_wh_goods_record.setWarehouseFlowId(this.getWarehouseFlowId()); @@ -299,6 +318,9 @@ if (this.isset_baseGoodsModelsName) { l_wh_goods_record.setBaseGoodsModelsName(this.getBaseGoodsModelsName()); } if (this.isset_dealTime) { l_wh_goods_record.setDealTime(this.getDealTime()); } return l_wh_goods_record; } } consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecordDetails.java
@@ -20,13 +20,13 @@ protected boolean isset_id = false; // å±æ§å表 private Long lWhGoodsRecordId = null; private Long whGoodsRecordId = null; @JsonIgnore protected boolean isset_lWhGoodsRecordId = false; protected boolean isset_whGoodsRecordId = false; private Long lWhGoodsId = null; private Long whGoodsId = null; @JsonIgnore protected boolean isset_lWhGoodsId = false; protected boolean isset_whGoodsId = false; private Integer thisType = null; @JsonIgnore @@ -67,32 +67,32 @@ return this.id == null; } public Long getLWhGoodsRecordId() { return this.lWhGoodsRecordId; public Long getWhGoodsRecordId() { return this.whGoodsRecordId; } public void setLWhGoodsRecordId(Long lWhGoodsRecordId) { this.lWhGoodsRecordId = lWhGoodsRecordId; this.isset_lWhGoodsRecordId = true; public void setWhGoodsRecordId(Long whGoodsRecordId) { this.whGoodsRecordId = whGoodsRecordId; this.isset_whGoodsRecordId = true; } @JsonIgnore public boolean isEmptyLWhGoodsRecordId() { return this.lWhGoodsRecordId == null; public boolean isEmptyWhGoodsRecordId() { return this.whGoodsRecordId == null; } public Long getLWhGoodsId() { return this.lWhGoodsId; public Long getWhGoodsId() { return this.whGoodsId; } public void setLWhGoodsId(Long lWhGoodsId) { this.lWhGoodsId = lWhGoodsId; this.isset_lWhGoodsId = true; public void setWhGoodsId(Long whGoodsId) { this.whGoodsId = whGoodsId; this.isset_whGoodsId = true; } @JsonIgnore public boolean isEmptyLWhGoodsId() { return this.lWhGoodsId == null; public boolean isEmptyWhGoodsId() { return this.whGoodsId == null; } public Integer getThisType() { @@ -116,8 +116,8 @@ public String toString() { return new StringBuilder() .append("id=").append(this.id) .append("lWhGoodsRecordId=").append(this.lWhGoodsRecordId) .append("lWhGoodsId=").append(this.lWhGoodsId) .append("whGoodsRecordId=").append(this.whGoodsRecordId) .append("whGoodsId=").append(this.whGoodsId) .append("thisType=").append(this.thisType) .toString(); } @@ -136,11 +136,11 @@ l_wh_goods_record_details.setId(this.getId()); } // æ®éå±æ§ if (this.isset_lWhGoodsRecordId) { l_wh_goods_record_details.setLWhGoodsRecordId(this.getLWhGoodsRecordId()); if (this.isset_whGoodsRecordId) { l_wh_goods_record_details.setWhGoodsRecordId(this.getWhGoodsRecordId()); } if (this.isset_lWhGoodsId) { l_wh_goods_record_details.setLWhGoodsId(this.getLWhGoodsId()); if (this.isset_whGoodsId) { l_wh_goods_record_details.setWhGoodsId(this.getWhGoodsId()); } if (this.isset_thisType) { l_wh_goods_record_details.setThisType(this.getThisType()); consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecordDetails_mapper.java
@@ -7,6 +7,8 @@ import com.walker.jdbc.sqlgen.InsertBuilder; import com.walker.jdbc.sqlgen.SelectBuilder; import com.walker.jdbc.sqlgen.UpdateBuilder; import com.walker.jdbc.util.StringUtils; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; @@ -26,8 +28,8 @@ // ä¸»é® public static final String Id = "id"; // æ®éå±æ§ public static final String LWhGoodsRecordId = "l_wh_goods_record_id"; public static final String LWhGoodsId = "l_wh_goods_id"; public static final String WhGoodsRecordId = "wh_goods_record_id"; public static final String WhGoodsId = "wh_goods_id"; public static final String ThisType = "this_type"; /** @@ -42,11 +44,11 @@ this.setId(lWhGoodsRecordDetails.getId()); } //æ®éå±æ§ if (lWhGoodsRecordDetails.isset_lWhGoodsRecordId) { this.setLWhGoodsRecordId(lWhGoodsRecordDetails.getLWhGoodsRecordId()); if (lWhGoodsRecordDetails.isset_whGoodsRecordId) { this.setWhGoodsRecordId(lWhGoodsRecordDetails.getWhGoodsRecordId()); } if (lWhGoodsRecordDetails.isset_lWhGoodsId) { this.setLWhGoodsId(lWhGoodsRecordDetails.getLWhGoodsId()); if (lWhGoodsRecordDetails.isset_whGoodsId) { this.setWhGoodsId(lWhGoodsRecordDetails.getWhGoodsId()); } if (lWhGoodsRecordDetails.isset_thisType) { this.setThisType(lWhGoodsRecordDetails.getThisType()); @@ -94,8 +96,8 @@ public SqlAndParameters<Map<String, Object>> getInsertSql_() { InsertBuilder ib = new InsertBuilder(this.getTableName_()); ib.set(Id, this.getId()); ib.set(LWhGoodsRecordId, this.getLWhGoodsRecordId(), this.isset_lWhGoodsRecordId); ib.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ib.set(WhGoodsRecordId, this.getWhGoodsRecordId(), this.isset_whGoodsRecordId); ib.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ib.set(ThisType, this.getThisType(), this.isset_thisType); return ib.genMapSql(); } @@ -106,8 +108,8 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_() { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWhGoodsRecordId, this.getLWhGoodsRecordId(), this.isset_lWhGoodsRecordId); ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ub.set(WhGoodsRecordId, this.getWhGoodsRecordId(), this.isset_whGoodsRecordId); ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ub.set(ThisType, this.getThisType(), this.isset_thisType); ub.where(this.getPkName_(), this.getPkValue_()); return ub.genMapSql(); @@ -119,8 +121,8 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWhGoodsRecordId, this.getLWhGoodsRecordId(), this.isset_lWhGoodsRecordId); ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ub.set(WhGoodsRecordId, this.getWhGoodsRecordId(), this.isset_whGoodsRecordId); ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ub.set(ThisType, this.getThisType(), this.isset_thisType); return ub.genMapSql(where, parameters); } @@ -131,8 +133,8 @@ @Override public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWhGoodsRecordId, this.getLWhGoodsRecordId(), this.isset_lWhGoodsRecordId); ub.set(LWhGoodsId, this.getLWhGoodsId(), this.isset_lWhGoodsId); ub.set(WhGoodsRecordId, this.getWhGoodsRecordId(), this.isset_whGoodsRecordId); ub.set(WhGoodsId, this.getWhGoodsId(), this.isset_whGoodsId); ub.set(ThisType, this.getThisType(), this.isset_thisType); return ub.genArraySql(where, parameters); } @@ -181,7 +183,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { return new SqlAndParameters<>("select id, l_wh_goods_record_id, l_wh_goods_id, this_type from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, wh_goods_record_id, wh_goods_id, this_type from " + this.getTableName_() + " " + where, parameters); } /** @@ -189,7 +191,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { return new SqlAndParameters<>("select id, l_wh_goods_record_id, l_wh_goods_id, this_type from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, wh_goods_record_id, wh_goods_id, this_type from " + this.getTableName_() + " " + where, parameters); } /** @@ -226,20 +228,20 @@ l_wh_goods_record_details.setId(rs.getLong(columnIndex)); } //æ®éå±æ§ columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecordDetails_mapper.LWhGoodsRecordId); columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecordDetails_mapper.WhGoodsRecordId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_wh_goods_record_details.setLWhGoodsRecordId(null); l_wh_goods_record_details.setWhGoodsRecordId(null); } else { l_wh_goods_record_details.setLWhGoodsRecordId(rs.getLong(columnIndex)); l_wh_goods_record_details.setWhGoodsRecordId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecordDetails_mapper.LWhGoodsId); columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecordDetails_mapper.WhGoodsId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_wh_goods_record_details.setLWhGoodsId(null); l_wh_goods_record_details.setWhGoodsId(null); } else { l_wh_goods_record_details.setLWhGoodsId(rs.getLong(columnIndex)); l_wh_goods_record_details.setWhGoodsId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecordDetails_mapper.ThisType); consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord_mapper.java
@@ -7,8 +7,6 @@ import com.walker.jdbc.sqlgen.InsertBuilder; import com.walker.jdbc.sqlgen.SelectBuilder; import com.walker.jdbc.sqlgen.UpdateBuilder; import com.walker.jdbc.util.StringUtils; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; @@ -28,7 +26,7 @@ // ä¸»é® public static final String Id = "id"; // æ®éå±æ§ public static final String LWarehouseFlowId = "l_warehouse_flow_id"; public static final String WarehouseId = "warehouse_id"; public static final String WarehouseFlowId = "warehouse_flow_id"; public static final String InitialCount = "initial_count"; public static final String ThisType = "this_type"; @@ -38,6 +36,7 @@ public static final String GoodsTemplateName = "goods_template_name"; public static final String BaseGoodsModelsId = "base_goods_models_id"; public static final String BaseGoodsModelsName = "base_goods_models_name"; public static final String DealTime = "deal_time"; /** * é»è®¤æé å½æ° @@ -51,8 +50,8 @@ this.setId(lWhGoodsRecord.getId()); } //æ®éå±æ§ if (lWhGoodsRecord.isset_lWarehouseFlowId) { this.setLWarehouseFlowId(lWhGoodsRecord.getLWarehouseFlowId()); if (lWhGoodsRecord.isset_warehouseId) { this.setWarehouseId(lWhGoodsRecord.getWarehouseId()); } if (lWhGoodsRecord.isset_warehouseFlowId) { this.setWarehouseFlowId(lWhGoodsRecord.getWarehouseFlowId()); @@ -80,6 +79,9 @@ } if (lWhGoodsRecord.isset_baseGoodsModelsName) { this.setBaseGoodsModelsName(lWhGoodsRecord.getBaseGoodsModelsName()); } if (lWhGoodsRecord.isset_dealTime) { this.setDealTime(lWhGoodsRecord.getDealTime()); } // å»æï¼2022-09-07 // this.setDatabaseName_(l_wh_goods_record.getDatabaseName_()); @@ -124,7 +126,7 @@ public SqlAndParameters<Map<String, Object>> getInsertSql_() { InsertBuilder ib = new InsertBuilder(this.getTableName_()); ib.set(Id, this.getId()); ib.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ib.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ib.set(InitialCount, this.getInitialCount(), this.isset_initialCount); ib.set(ThisType, this.getThisType(), this.isset_thisType); @@ -134,6 +136,7 @@ ib.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName); ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ib.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ib.set(DealTime, this.getDealTime(), this.isset_dealTime); return ib.genMapSql(); } @@ -143,7 +146,7 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_() { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount); ub.set(ThisType, this.getThisType(), this.isset_thisType); @@ -153,6 +156,7 @@ ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName); ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); ub.where(this.getPkName_(), this.getPkValue_()); return ub.genMapSql(); } @@ -163,7 +167,7 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount); ub.set(ThisType, this.getThisType(), this.isset_thisType); @@ -173,6 +177,7 @@ ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName); ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); return ub.genMapSql(where, parameters); } @@ -182,7 +187,7 @@ @Override public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); ub.set(LWarehouseFlowId, this.getLWarehouseFlowId(), this.isset_lWarehouseFlowId); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseFlowId, this.getWarehouseFlowId(), this.isset_warehouseFlowId); ub.set(InitialCount, this.getInitialCount(), this.isset_initialCount); ub.set(ThisType, this.getThisType(), this.isset_thisType); @@ -192,6 +197,7 @@ ub.set(GoodsTemplateName, this.getGoodsTemplateName(), this.isset_goodsTemplateName); ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(DealTime, this.getDealTime(), this.isset_dealTime); return ub.genArraySql(where, parameters); } @@ -239,7 +245,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { return new SqlAndParameters<>("select id, l_warehouse_flow_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters); } /** @@ -247,7 +253,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { return new SqlAndParameters<>("select id, l_warehouse_flow_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, warehouse_id, warehouse_flow_id, initial_count, this_type, this_count, end_count, base_goods_template_id, goods_template_name, base_goods_models_id, base_goods_models_name, deal_time from " + this.getTableName_() + " " + where, parameters); } /** @@ -284,12 +290,12 @@ l_wh_goods_record.setId(rs.getLong(columnIndex)); } //æ®éå±æ§ columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.LWarehouseFlowId); columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_wh_goods_record.setLWarehouseFlowId(null); l_wh_goods_record.setWarehouseId(null); } else { l_wh_goods_record.setLWarehouseFlowId(rs.getLong(columnIndex)); l_wh_goods_record.setWarehouseId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.WarehouseFlowId); @@ -356,6 +362,14 @@ if (columnIndex > 0) { l_wh_goods_record.setBaseGoodsModelsName(rs.getString(columnIndex)); } columnIndex = resultSetUtils.findColumn(rs, LWhGoodsRecord_mapper.DealTime); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_wh_goods_record.setDealTime(null); } else { l_wh_goods_record.setDealTime(rs.getLong(columnIndex)); } } return l_wh_goods_record; } } consum-model-pojo/src/main/java/com/consum/model/po/LWhGoods_mapper.java
@@ -373,7 +373,7 @@ if (rs.getBigDecimal(columnIndex) == null) { l_wh_goods.setPrice(null); } else { l_wh_goods.setPrice(rs.getDouble(columnIndex)); l_wh_goods.setPrice(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhGoods_mapper.ProcureDate); consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel.java
@@ -36,15 +36,7 @@ @JsonIgnore protected boolean isset_baseGoodsModelsId = false; private String baseGoodsModelsName = null; @JsonIgnore protected boolean isset_baseGoodsModelsName = false; private String unit = null; @JsonIgnore protected boolean isset_unit = false; private Double price = null; private Long price = null; @JsonIgnore protected boolean isset_price = false; @@ -151,39 +143,11 @@ return this.baseGoodsModelsId == null; } public String getBaseGoodsModelsName() { return this.baseGoodsModelsName; } public void setBaseGoodsModelsName(String baseGoodsModelsName) { this.baseGoodsModelsName = baseGoodsModelsName; this.isset_baseGoodsModelsName = true; } @JsonIgnore public boolean isEmptyBaseGoodsModelsName() { return this.baseGoodsModelsName == null || this.baseGoodsModelsName.length() == 0; } public String getUnit() { return this.unit; } public void setUnit(String unit) { this.unit = unit; this.isset_unit = true; } @JsonIgnore public boolean isEmptyUnit() { return this.unit == null || this.unit.length() == 0; } public Double getPrice() { public Long getPrice() { return this.price; } public void setPrice(Double price) { public void setPrice(Long price) { this.price = price; this.isset_price = true; } @@ -246,8 +210,6 @@ .append("businessType=").append(this.businessType) .append("businessId=").append(this.businessId) .append("baseGoodsModelsId=").append(this.baseGoodsModelsId) .append("baseGoodsModelsName=").append(this.baseGoodsModelsName) .append("unit=").append(this.unit) .append("price=").append(this.price) .append("counts=").append(this.counts) .append("worehouseCount=").append(this.worehouseCount) @@ -280,12 +242,6 @@ } if (this.isset_baseGoodsModelsId) { l_wh_procure_model.setBaseGoodsModelsId(this.getBaseGoodsModelsId()); } if (this.isset_baseGoodsModelsName) { l_wh_procure_model.setBaseGoodsModelsName(this.getBaseGoodsModelsName()); } if (this.isset_unit) { l_wh_procure_model.setUnit(this.getUnit()); } if (this.isset_price) { l_wh_procure_model.setPrice(this.getPrice()); consum-model-pojo/src/main/java/com/consum/model/po/LWhProcureModel_mapper.java
@@ -7,6 +7,8 @@ import com.walker.jdbc.sqlgen.InsertBuilder; import com.walker.jdbc.sqlgen.SelectBuilder; import com.walker.jdbc.sqlgen.UpdateBuilder; import com.walker.jdbc.util.StringUtils; import org.springframework.jdbc.core.RowMapper; import java.sql.ResultSet; @@ -30,8 +32,6 @@ public static final String BusinessType = "business_type"; public static final String BusinessId = "business_id"; public static final String BaseGoodsModelsId = "base_goods_models_id"; public static final String BaseGoodsModelsName = "base_goods_models_name"; public static final String Unit = "unit"; public static final String Price = "price"; public static final String Counts = "counts"; public static final String WorehouseCount = "worehouse_count"; @@ -60,12 +60,6 @@ } if (lWhProcureModel.isset_baseGoodsModelsId) { this.setBaseGoodsModelsId(lWhProcureModel.getBaseGoodsModelsId()); } if (lWhProcureModel.isset_baseGoodsModelsName) { this.setBaseGoodsModelsName(lWhProcureModel.getBaseGoodsModelsName()); } if (lWhProcureModel.isset_unit) { this.setUnit(lWhProcureModel.getUnit()); } if (lWhProcureModel.isset_price) { this.setPrice(lWhProcureModel.getPrice()); @@ -126,8 +120,6 @@ ib.set(BusinessType, this.getBusinessType(), this.isset_businessType); ib.set(BusinessId, this.getBusinessId(), this.isset_businessId); ib.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ib.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ib.set(Unit, this.getUnit(), this.isset_unit); ib.set(Price, this.getPrice(), this.isset_price); ib.set(Counts, this.getCounts(), this.isset_counts); ib.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); @@ -145,8 +137,6 @@ ub.set(BusinessType, this.getBusinessType(), this.isset_businessType); ub.set(BusinessId, this.getBusinessId(), this.isset_businessId); ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(Unit, this.getUnit(), this.isset_unit); ub.set(Price, this.getPrice(), this.isset_price); ub.set(Counts, this.getCounts(), this.isset_counts); ub.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); @@ -165,8 +155,6 @@ ub.set(BusinessType, this.getBusinessType(), this.isset_businessType); ub.set(BusinessId, this.getBusinessId(), this.isset_businessId); ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(Unit, this.getUnit(), this.isset_unit); ub.set(Price, this.getPrice(), this.isset_price); ub.set(Counts, this.getCounts(), this.isset_counts); ub.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); @@ -184,8 +172,6 @@ ub.set(BusinessType, this.getBusinessType(), this.isset_businessType); ub.set(BusinessId, this.getBusinessId(), this.isset_businessId); ub.set(BaseGoodsModelsId, this.getBaseGoodsModelsId(), this.isset_baseGoodsModelsId); ub.set(BaseGoodsModelsName, this.getBaseGoodsModelsName(), this.isset_baseGoodsModelsName); ub.set(Unit, this.getUnit(), this.isset_unit); ub.set(Price, this.getPrice(), this.isset_price); ub.set(Counts, this.getCounts(), this.isset_counts); ub.set(WorehouseCount, this.getWorehouseCount(), this.isset_worehouseCount); @@ -237,7 +223,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, base_goods_models_name, unit, price, counts, worehouse_count, supplier from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, price, counts, worehouse_count, supplier from " + this.getTableName_() + " " + where, parameters); } /** @@ -245,7 +231,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, base_goods_models_name, unit, price, counts, worehouse_count, supplier from " + this.getTableName_() + " " + where, parameters); return new SqlAndParameters<>("select id, from_procure_goods_id, business_type, business_id, base_goods_models_id, price, counts, worehouse_count, supplier from " + this.getTableName_() + " " + where, parameters); } /** @@ -314,20 +300,12 @@ l_wh_procure_model.setBaseGoodsModelsId(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhProcureModel_mapper.BaseGoodsModelsName); if (columnIndex > 0) { l_wh_procure_model.setBaseGoodsModelsName(rs.getString(columnIndex)); } columnIndex = resultSetUtils.findColumn(rs, LWhProcureModel_mapper.Unit); if (columnIndex > 0) { l_wh_procure_model.setUnit(rs.getString(columnIndex)); } columnIndex = resultSetUtils.findColumn(rs, LWhProcureModel_mapper.Price); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { l_wh_procure_model.setPrice(null); } else { l_wh_procure_model.setPrice(rs.getDouble(columnIndex)); l_wh_procure_model.setPrice(rs.getLong(columnIndex)); } } columnIndex = resultSetUtils.findColumn(rs, LWhProcureModel_mapper.Counts);
