diff --git a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-shm b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-shm index a065a1f..ff6e97b 100644 Binary files a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-shm and b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-shm differ diff --git a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-wal b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-wal index bca18cf..6aa25de 100644 Binary files a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-wal and b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/CodeChunks.db-wal differ diff --git a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-shm b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-shm index 30eee33..ff41f4a 100644 Binary files a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-shm and b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-shm differ diff --git a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-wal b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-wal index 5c33c8f..a7a1427 100644 Binary files a/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-wal and b/.vs/GZ_LTHPilot_ORDER/CopilotIndices/17.14.734.62261/SemanticSymbols.db-wal differ diff --git a/.vs/GZ_LTHPilot_ORDER/FileContentIndex/c732c6ad-edae-4156-ad36-c5c07043390b.vsidx b/.vs/GZ_LTHPilot_ORDER/FileContentIndex/c732c6ad-edae-4156-ad36-c5c07043390b.vsidx deleted file mode 100644 index 2349630..0000000 Binary files a/.vs/GZ_LTHPilot_ORDER/FileContentIndex/c732c6ad-edae-4156-ad36-c5c07043390b.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHPilot_ORDER/FileContentIndex/f918ec6f-94b0-4fd2-aa95-95d4be6d2692.vsidx b/.vs/GZ_LTHPilot_ORDER/FileContentIndex/f918ec6f-94b0-4fd2-aa95-95d4be6d2692.vsidx deleted file mode 100644 index 4f60ff1..0000000 Binary files a/.vs/GZ_LTHPilot_ORDER/FileContentIndex/f918ec6f-94b0-4fd2-aa95-95d4be6d2692.vsidx and /dev/null differ diff --git a/.vs/GZ_LTHPilot_ORDER/v17/.suo b/.vs/GZ_LTHPilot_ORDER/v17/.suo index 831146d..91aaa87 100644 Binary files a/.vs/GZ_LTHPilot_ORDER/v17/.suo and b/.vs/GZ_LTHPilot_ORDER/v17/.suo differ diff --git a/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.backup.json b/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.backup.json index 7cbacd0..b2256f3 100644 --- a/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.backup.json +++ b/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.backup.json @@ -1,23 +1,38 @@ { "Version": 1, - "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\", + "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolot_order_th\\xmyslrb\\onloadlr.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\sal_order\\savewl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:sal_order\\savewl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\sal_deliverynotice\\pushcelue.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:sal_deliverynotice\\pushcelue.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\sql\\sqlmanage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:sql\\sqlmanage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\xmyslrb\\onloadlr.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:xmyslrb\\onloadlr.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" }, { "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\zglhqyne..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" }, { - "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\t_pur_receive\\savedate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:t_pur_receive\\savedate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" }, { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:T_PUR_RECEIVE\\SaveDate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -32,43 +47,98 @@ { "$type": "Document", "DocumentIndex": 0, + "Title": "SaveWL.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_ORDER\\SaveWL.cs", + "RelativeDocumentMoniker": "SAL_ORDER\\SaveWL.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_ORDER\\SaveWL.cs", + "RelativeToolTip": "SAL_ORDER\\SaveWL.cs", + "ViewState": "AgIAABYAAAAAAAAAAAAAwCIAAAAeAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-07T02:01:06.513Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "PushCeLue.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_DELIVERYNOTICE\\PushCeLue.cs", + "RelativeDocumentMoniker": "SAL_DELIVERYNOTICE\\PushCeLue.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_DELIVERYNOTICE\\PushCeLue.cs", + "RelativeToolTip": "SAL_DELIVERYNOTICE\\PushCeLue.cs", + "ViewState": "AgIAAAgAAAAAAAAAAAAlwBEAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-07T02:00:56.431Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 2, + "Title": "SqlManage.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SQL\\SqlManage.cs", + "RelativeDocumentMoniker": "SQL\\SqlManage.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SQL\\SqlManage.cs", + "RelativeToolTip": "SQL\\SqlManage.cs", + "ViewState": "AgIAAJkBAAAAAAAAAAAjwJoBAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-07T02:00:11.818Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", + "DocumentMoniker": "C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", + "ToolTip": "C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-04T02:20:41.315Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "hlhmzvrj..sql", + "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql", + "ToolTip": "C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-04T02:16:21.384Z" + }, + { + "$type": "Document", + "DocumentIndex": 3, "Title": "OnLoadLR.cs", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", "RelativeDocumentMoniker": "XMYSLRB\\OnLoadLR.cs", - "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", "RelativeToolTip": "XMYSLRB\\OnLoadLR.cs", - "ViewState": "AgIAAD8AAAAAAAAAAAAQwFIAAABEAAAAAAAAAA==", + "ViewState": "AgIAACAAAAAAAAAAAAAUwDgAAABSAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-03T16:20:53.545Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 6, "Title": "zglhqyne..sql", "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\zglhqyne..sql", "ToolTip": "C:\\Users\\21985\\AppData\\Local\\Temp\\zglhqyne..sql", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-07-03T06:57:41.635Z", - "EditorCaption": "" + "WhenOpened": "2025-07-03T06:57:41.635Z" }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "blkihh5f..sql ", + "DocumentIndex": 7, + "Title": "blkihh5f..sql", "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql", - "ToolTip": "blkihh5f..sql ", + "ToolTip": "C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-07-03T06:50:53.431Z", - "EditorCaption": "" + "WhenOpened": "2025-07-03T06:50:53.431Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 8, "Title": "SaveDate.cs", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", "RelativeDocumentMoniker": "T_PUR_RECEIVE\\SaveDate.cs", - "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", "RelativeToolTip": "T_PUR_RECEIVE\\SaveDate.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", diff --git a/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.json b/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.json index 24c3232..0c20f32 100644 --- a/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.json +++ b/.vs/GZ_LTHPilot_ORDER/v17/DocumentLayout.json @@ -1,9 +1,21 @@ { "Version": 1, - "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\", + "WorkspaceRootPath": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\piolot_order_th\\xmyslrb\\onloadlr.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\sql\\sqlmanage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:sql\\sqlmanage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\sal_order\\savewl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:sal_order\\savewl.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\sal_deliverynotice\\pushcelue.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:sal_deliverynotice\\pushcelue.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|e:\\gzc#code\\\u6D3E\u8BFA\\gzth_piolot_order\\piolot_order_th\\xmyslrb\\onloadlr.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:xmyslrb\\onloadlr.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { @@ -19,23 +31,8 @@ "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|" }, { - "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\t_pur_receive\\savedate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:t_pur_receive\\savedate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\AppData\\Local\\Temp\\zglhqyne..sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|CodeFrame" - }, - { - "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql||{CC5D8DF0-88F4-4BB2-9DBB-B48CEE65C30A}|ResultFrame" + "AbsoluteMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{FC4B0055-BAB5-4E5F-84FF-02F4712BF1FE}|GZ_LTHPilot_ORDER.csproj|solutionrelative:T_PUR_RECEIVE\\SaveDate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -50,49 +47,85 @@ { "$type": "Document", "DocumentIndex": 1, - "Title": "\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql ", - "DocumentMoniker": "C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", - "ToolTip": "\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql *", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-07-04T02:20:41.315Z", + "Title": "SaveWL.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_ORDER\\SaveWL.cs", + "RelativeDocumentMoniker": "SAL_ORDER\\SaveWL.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_ORDER\\SaveWL.cs", + "RelativeToolTip": "SAL_ORDER\\SaveWL.cs", + "ViewState": "AgIAABYAAAAAAAAAAAAAwCIAAAAeAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-07T02:01:06.513Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 2, - "Title": "SQLQuery1.sql ", - "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql", - "ToolTip": "SQLQuery1.sql *", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-07-04T02:16:21.384Z", + "Title": "PushCeLue.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_DELIVERYNOTICE\\PushCeLue.cs", + "RelativeDocumentMoniker": "SAL_DELIVERYNOTICE\\PushCeLue.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SAL_DELIVERYNOTICE\\PushCeLue.cs", + "RelativeToolTip": "SAL_DELIVERYNOTICE\\PushCeLue.cs", + "ViewState": "AgIAAAgAAAAAAAAAAAAlwBEAAAAiAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-07T02:00:56.431Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 0, + "Title": "SqlManage.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SQL\\SqlManage.cs", + "RelativeDocumentMoniker": "SQL\\SqlManage.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\SQL\\SqlManage.cs*", + "RelativeToolTip": "SQL\\SqlManage.cs*", + "ViewState": "AgIAAK0AAAAAAAAAAAAWwFoBAAAJAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-07T02:00:11.818Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", + "DocumentMoniker": "C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", + "ToolTip": "C:\\Users\\21985\\Desktop\\\u683C\u81F4\u5B9E\u65BD-\u5BA2\u6237\\\u73E0\u6D77-\u6D3E\u8BFA\\\u6D3E\u8BFA\\\u66F4\u65B0\u53D1\u8D27\u6570\u91CF\u548C\u9000\u8D27\u901A\u77E5\u6570\u91CF.sql", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-04T02:20:41.315Z" + }, + { + "$type": "Document", + "DocumentIndex": 5, + "Title": "hlhmzvrj..sql", + "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql", + "ToolTip": "C:\\Users\\21985\\AppData\\Local\\Temp\\hlhmzvrj..sql", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", + "WhenOpened": "2025-07-04T02:16:21.384Z" + }, + { + "$type": "Document", + "DocumentIndex": 3, "Title": "OnLoadLR.cs", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", "RelativeDocumentMoniker": "XMYSLRB\\OnLoadLR.cs", - "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\XMYSLRB\\OnLoadLR.cs", "RelativeToolTip": "XMYSLRB\\OnLoadLR.cs", - "ViewState": "AgIAAB8AAAAAAAAAAAAAADgAAABSAAAAAAAAAA==", + "ViewState": "AgIAACAAAAAAAAAAAAAUwDgAAABSAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-07-03T16:20:53.545Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, - "Title": "zglhqyne..sql ", + "DocumentIndex": 6, + "Title": "zglhqyne..sql", "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\zglhqyne..sql", - "ToolTip": "zglhqyne..sql ", + "ToolTip": "C:\\Users\\21985\\AppData\\Local\\Temp\\zglhqyne..sql", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000826|", - "WhenOpened": "2025-07-03T06:57:41.635Z", - "EditorCaption": "" + "WhenOpened": "2025-07-03T06:57:41.635Z" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 7, "Title": "blkihh5f..sql", "DocumentMoniker": "C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql", "ToolTip": "C:\\Users\\21985\\AppData\\Local\\Temp\\blkihh5f..sql", @@ -101,11 +134,11 @@ }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 8, "Title": "SaveDate.cs", - "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", + "DocumentMoniker": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", "RelativeDocumentMoniker": "T_PUR_RECEIVE\\SaveDate.cs", - "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", + "ToolTip": "E:\\GZC#Code\\\u6D3E\u8BFA\\GZTH_Piolot_ORDER\\Piolot_Order_TH\\T_PUR_RECEIVE\\SaveDate.cs", "RelativeToolTip": "T_PUR_RECEIVE\\SaveDate.cs", "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", diff --git a/GZ_LTHPilot_ORDER.csproj b/GZ_LTHPilot_ORDER.csproj index 45826fd..7ecd82b 100644 --- a/GZ_LTHPilot_ORDER.csproj +++ b/GZ_LTHPilot_ORDER.csproj @@ -238,11 +238,10 @@ -<<<<<<< HEAD + -======= ->>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 + diff --git a/SAL_DELIVERYNOTICE/PushCeLue.cs b/SAL_DELIVERYNOTICE/PushCeLue.cs index 274745f..0feb40f 100644 --- a/SAL_DELIVERYNOTICE/PushCeLue.cs +++ b/SAL_DELIVERYNOTICE/PushCeLue.cs @@ -16,13 +16,12 @@ namespace GZ_LTHPilot_ORDER.SAL_DELIVERYNOTICE public override void OnParseFilter(ParseFilterEventArgs e) { base.OnParseFilter(e); -<<<<<<< HEAD e.FilterPolicySQL += $"AND (SELECT CASE WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID <> C.F_SaleOrgId AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND NOT(E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId <> 100302 AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID AND D.F_Allocatedquantity <> 0) > 0 THEN 1 ELSE (SELECT COUNT(*) FROM T_PRD_MO A INNER JOIN T_PRD_MOENTRY B ON A.FID = B.FID INNER JOIN T_PRD_MOENTRY_LK C ON B.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' WHERE A.FDocumentStatus = 'C' AND C.FSBILLID IN (SELECT C.FID FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID)) END AS Result) > 0"; e.PlugFilterDesc = "当销售订单的销售组织为珠海派诺且销售组织=备货组织时，销售订单需下推生产订单或包装工单处于审核状态后，才可由发货通知单下推销售出库"; -======= + e.FilterPolicySQL += $"AND (SELECT CASE WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID <> C.F_SaleOrgId AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID WHERE C.FSaleOrgId <> 100302 AND A.FENTRYID = t1.FENTRYID) > 0 THEN 1 WHEN (SELECT COUNT(*) FROM T_PRD_MO A INNER JOIN T_PRD_MOENTRY B ON A.FID = B.FID INNER JOIN T_PRD_MOENTRY_LK C ON B.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' WHERE A.FDocumentStatus = 'C' AND C.FSBILLID IN (SELECT C.FID FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER NOT LIKE 'H.10%' OR E.FNUMBER NOT LIKE 'H.20%' OR E.FNUMBER NOT LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID)) > 0 THEN 1 ELSE (SELECT COUNT(*) FROM T_PRD_MO A INNER JOIN T_PRD_MOENTRY B ON A.FID = B.FID INNER JOIN T_PRD_MOENTRY_LK C ON B.FENTRYID = C.FENTRYID AND C.FSTABLENAME = 'T_SAL_ORDERENTRY' WHERE A.FDocumentStatus = 'C' AND C.FSBILLID IN (SELECT C.FID FROM T_SAL_DELIVERYNOTICEENTRY A INNER JOIN T_SAL_DELIVERYNOTICEENTRY_LK B ON A.FENTRYID = B.FENTRYID AND B.FSTABLENAME = 'T_SAL_ORDERENTRY' INNER JOIN T_SAL_ORDER C ON C.FID = B.FSBILLID INNER JOIN T_SAL_ORDERENTRY D ON C.FID = D.FID INNER JOIN T_BD_MATERIAL E ON D.FMATERIALID = E.FMATERIALID WHERE C.FSaleOrgId = 100302 AND C.FSALEORGID = C.F_SaleOrgId AND (E.FNUMBER LIKE 'H.10%' OR E.FNUMBER LIKE 'H.20%' OR E.FNUMBER LIKE 'H.30%') AND A.FENTRYID = t1.FENTRYID)) END AS Result) > 0"; e.PlugFilterDesc = "当销售订单的销售组织为珠海派诺且销售组织=备货组织时，销售订单需下推生产订单且生产订单处于审核状态后，才可由发货通知单下推销售出库"; ->>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 + } } } diff --git a/SAL_ORDER/SaveWL.cs b/SAL_ORDER/SaveWL.cs index f5552c9..4da1247 100644 --- a/SAL_ORDER/SaveWL.cs +++ b/SAL_ORDER/SaveWL.cs @@ -30,11 +30,8 @@ namespace GZ_LTHPilot_ORDER.SAL_ORDER { e.Cancel = true; throw new Exception( -<<<<<<< HEAD - string.Format(@"物料编码J.06.00开头,且订单日期大于2025/05/10，则明细物联网卡使用年份字段必填") -======= - string.Format(@"物料编码J开头，则明细物联网卡使用年份字段必填") ->>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 + + string.Format(@"物料编码J.06.00开头,且订单日期大于2025/05/10，则明细物联网卡使用年份字段必填") ); } } diff --git a/SQL/SqlManage.cs b/SQL/SqlManage.cs index c063408..dd31740 100644 --- a/SQL/SqlManage.cs +++ b/SQL/SqlManage.cs @@ -338,20 +338,12 @@ namespace GZ_LTHPilot_ORDER.SqlManage return DBServiceHelper.ExecuteDynamicObject(ctx, getSql.ToString(), null, null, CommandType.Text, null); } //根据获取的销售订单FID和FentryId，更新开票数量和开票金额 -<<<<<<< HEAD - public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string KPZZ,string F_INVOICEQTY, string F_F_INVOICEAMOUNT) + + public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string KPZZ, string F_INVOICEQTY, string F_F_INVOICEAMOUNT) { string sql = string.Format(@"/*dialect*/ EXEC TrueUpdateSal_OrderF_INVOICEQTYAndF_F_INVOICEAMOUNTAndF_invoiceAmount_TH '{0}','{1}','{2}','{3}','{4}' ", FID, FENTRYID, KPZZ, F_INVOICEQTY, F_F_INVOICEAMOUNT); -======= - public static void UpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string F_INVOICEQTY, string F_F_INVOICEAMOUNT) - { - string sql = string.Format(@"/*dialect*/ - EXEC TrueUpdateSal_OrderF_INVOICEQTYAndF_F_INVOICEAMOUNTAndF_invoiceAmount_TH '{0}','{1}','{2}','{3}' - ", FID, FENTRYID, F_INVOICEQTY, F_F_INVOICEAMOUNT); ->>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 - DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); } //根据获取的销售订单FID和FentryId，更新开票数量和开票金额(当销售订单的累计核销金额>价税合计本位币后) public static void FalseUpSal_OrderKPJEAndKPSL(Context ctx, string FID, string FENTRYID, string KPZZ,string F_INVOICEQTY, string F_F_INVOICEAMOUNT) @@ -410,7 +402,6 @@ namespace GZ_LTHPilot_ORDER.SqlManage return DBServiceHelper.ExecuteDynamicObject(ctx, getSql.ToString(), null, null, CommandType.Text, null); } -<<<<<<< HEAD //根据项目预算利润表FID，更新财务信息字段 public static void GZTH_XMYSBSave(Context ctx,string FID) { @@ -420,7 +411,6 @@ namespace GZ_LTHPilot_ORDER.SqlManage DBServiceHelper.ExecuteDynamicObject(ctx, sql.ToString(), null, null, CommandType.Text, null); } -======= ->>>>>>> 569ca39775cea8d77f2c873e1bc5556b7aa583c2 + } } diff --git a/bin/Debug/GZ_LTHPilot_ORDER.dll b/bin/Debug/GZ_LTHPilot_ORDER.dll index 9e086a5..b164894 100644 Binary files a/bin/Debug/GZ_LTHPilot_ORDER.dll and b/bin/Debug/GZ_LTHPilot_ORDER.dll differ diff --git a/bin/Debug/GZ_LTHPilot_ORDER.pdb b/bin/Debug/GZ_LTHPilot_ORDER.pdb index ae86dd0..1628fa0 100644 Binary files a/bin/Debug/GZ_LTHPilot_ORDER.pdb and b/bin/Debug/GZ_LTHPilot_ORDER.pdb differ diff --git a/bin/Debug/Microsoft.Dynamic.dll b/bin/Debug/Microsoft.Dynamic.dll deleted file mode 100644 index 20ae62b..0000000 Binary files a/bin/Debug/Microsoft.Dynamic.dll and /dev/null differ diff --git a/bin/Debug/Microsoft.Scripting.dll b/bin/Debug/Microsoft.Scripting.dll deleted file mode 100644 index e768906..0000000 Binary files a/bin/Debug/Microsoft.Scripting.dll and /dev/null differ diff --git a/bin/Debug/Newtonsoft.Json.dll b/bin/Debug/Newtonsoft.Json.dll index 416bd37..341d08f 100644 Binary files a/bin/Debug/Newtonsoft.Json.dll and b/bin/Debug/Newtonsoft.Json.dll differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 4814b91..6b0de58 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/GZ_LTHPilot_ORDER.csproj.AssemblyReference.cache b/obj/Debug/GZ_LTHPilot_ORDER.csproj.AssemblyReference.cache index acdeea2..1f229a7 100644 Binary files a/obj/Debug/GZ_LTHPilot_ORDER.csproj.AssemblyReference.cache and b/obj/Debug/GZ_LTHPilot_ORDER.csproj.AssemblyReference.cache differ diff --git a/obj/Debug/GZ_LTHPilot_ORDER.csproj.CoreCompileInputs.cache b/obj/Debug/GZ_LTHPilot_ORDER.csproj.CoreCompileInputs.cache index e017fe6..f0a44c0 100644 --- a/obj/Debug/GZ_LTHPilot_ORDER.csproj.CoreCompileInputs.cache +++ b/obj/Debug/GZ_LTHPilot_ORDER.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -0545a015722289505f24944f798ea024eff2ad95ee1670eca10a6c7fdb273898 +9f614548e908f264396ac30ff1fb02b3ddd892627fc769c022e7a231008773f8 diff --git a/obj/Debug/GZ_LTHPilot_ORDER.csproj.FileListAbsolute.txt b/obj/Debug/GZ_LTHPilot_ORDER.csproj.FileListAbsolute.txt index 3374adc..fa2ee54 100644 --- a/obj/Debug/GZ_LTHPilot_ORDER.csproj.FileListAbsolute.txt +++ b/obj/Debug/GZ_LTHPilot_ORDER.csproj.FileListAbsolute.txt @@ -142,3 +142,26 @@ E:\GZC#Code\派诺\Piolot_Order_TH\bin\Debug\System.Runtime.CompilerServices.Uns E:\GZC#Code\派诺\Piolot_Order_TH\obj\Debug\GZ_LTHPi.26F84E92.Up2Date E:\GZC#Code\派诺\Piolot_Order_TH\obj\Debug\GZ_LTHPilot_ORDER.dll E:\GZC#Code\派诺\Piolot_Order_TH\obj\Debug\GZ_LTHPilot_ORDER.pdb +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\obj\Debug\GZ_LTHPilot_ORDER.csproj.AssemblyReference.cache +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\obj\Debug\GZ_LTHPilot_ORDER.csproj.CoreCompileInputs.cache +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\obj\Debug\GZ_LTHPilot_ORDER.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\obj\Debug\GZ_LTHPilot_ORDER.pdb +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\libSkiaSharp.dylib +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\x86\libSkiaSharp.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\x64\libSkiaSharp.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\arm64\libSkiaSharp.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\GZ_LTHPilot_ORDER.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\GZ_LTHPilot_ORDER.pdb +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\Newtonsoft.Json.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\SkiaSharp.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Buffers.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Memory.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Numerics.Vectors.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\SkiaSharp.pdb +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\SkiaSharp.xml +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Buffers.xml +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Memory.xml +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Numerics.Vectors.xml +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml +E:\GZC#Code\派诺\GZTH_Piolot_ORDER\Piolot_Order_TH\obj\Debug\GZ_LTHPi.26F84E92.Up2Date diff --git a/obj/Debug/GZ_LTHPilot_ORDER.dll b/obj/Debug/GZ_LTHPilot_ORDER.dll index 9e086a5..b164894 100644 Binary files a/obj/Debug/GZ_LTHPilot_ORDER.dll and b/obj/Debug/GZ_LTHPilot_ORDER.dll differ diff --git a/obj/Debug/GZ_LTHPilot_ORDER.pdb b/obj/Debug/GZ_LTHPilot_ORDER.pdb index ae86dd0..1628fa0 100644 Binary files a/obj/Debug/GZ_LTHPilot_ORDER.pdb and b/obj/Debug/GZ_LTHPilot_ORDER.pdb differ