diff --git a/.vs/ProjectEvaluation/wmsmobileserve.metadata.v9.bin b/.vs/ProjectEvaluation/wmsmobileserve.metadata.v9.bin index ee937f3..1325588 100644 Binary files a/.vs/ProjectEvaluation/wmsmobileserve.metadata.v9.bin and b/.vs/ProjectEvaluation/wmsmobileserve.metadata.v9.bin differ diff --git a/.vs/ProjectEvaluation/wmsmobileserve.projects.v9.bin b/.vs/ProjectEvaluation/wmsmobileserve.projects.v9.bin index a6adae7..527bc60 100644 Binary files a/.vs/ProjectEvaluation/wmsmobileserve.projects.v9.bin and b/.vs/ProjectEvaluation/wmsmobileserve.projects.v9.bin differ diff --git a/.vs/ProjectEvaluation/wmsmobileserve.strings.v9.bin b/.vs/ProjectEvaluation/wmsmobileserve.strings.v9.bin index fed4537..3ab025d 100644 Binary files a/.vs/ProjectEvaluation/wmsmobileserve.strings.v9.bin and b/.vs/ProjectEvaluation/wmsmobileserve.strings.v9.bin differ diff --git a/.vs/WmsMobileServe/DesignTimeBuild/.dtbcache.v2 b/.vs/WmsMobileServe/DesignTimeBuild/.dtbcache.v2 index 1c76755..471e36d 100644 Binary files a/.vs/WmsMobileServe/DesignTimeBuild/.dtbcache.v2 and b/.vs/WmsMobileServe/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/WmsMobileServe/FileContentIndex/0f06f2be-79af-40f1-952e-9bca53c80c05.vsidx b/.vs/WmsMobileServe/FileContentIndex/0f06f2be-79af-40f1-952e-9bca53c80c05.vsidx deleted file mode 100644 index 0febb29..0000000 Binary files a/.vs/WmsMobileServe/FileContentIndex/0f06f2be-79af-40f1-952e-9bca53c80c05.vsidx and /dev/null differ diff --git a/.vs/WmsMobileServe/FileContentIndex/36e71cbf-081a-41e0-84e9-6bba798419eb.vsidx b/.vs/WmsMobileServe/FileContentIndex/36e71cbf-081a-41e0-84e9-6bba798419eb.vsidx new file mode 100644 index 0000000..c804c54 Binary files /dev/null and b/.vs/WmsMobileServe/FileContentIndex/36e71cbf-081a-41e0-84e9-6bba798419eb.vsidx differ diff --git a/.vs/WmsMobileServe/FileContentIndex/8d5b4896-2073-4de8-922e-17e82435c6a7.vsidx b/.vs/WmsMobileServe/FileContentIndex/8d5b4896-2073-4de8-922e-17e82435c6a7.vsidx deleted file mode 100644 index 6f8f53b..0000000 Binary files a/.vs/WmsMobileServe/FileContentIndex/8d5b4896-2073-4de8-922e-17e82435c6a7.vsidx and /dev/null differ diff --git a/.vs/WmsMobileServe/FileContentIndex/c348e413-f899-42b8-a9ab-f0482933c40c.vsidx b/.vs/WmsMobileServe/FileContentIndex/c348e413-f899-42b8-a9ab-f0482933c40c.vsidx new file mode 100644 index 0000000..f77989d Binary files /dev/null and b/.vs/WmsMobileServe/FileContentIndex/c348e413-f899-42b8-a9ab-f0482933c40c.vsidx differ diff --git a/.vs/WmsMobileServe/FileContentIndex/d19484ef-b339-4132-bf35-afdabe4955af.vsidx b/.vs/WmsMobileServe/FileContentIndex/d19484ef-b339-4132-bf35-afdabe4955af.vsidx new file mode 100644 index 0000000..ed22530 Binary files /dev/null and b/.vs/WmsMobileServe/FileContentIndex/d19484ef-b339-4132-bf35-afdabe4955af.vsidx differ diff --git a/.vs/WmsMobileServe/FileContentIndex/fe2a2976-264c-4e15-8f99-7e10f73fbeee.vsidx b/.vs/WmsMobileServe/FileContentIndex/fe2a2976-264c-4e15-8f99-7e10f73fbeee.vsidx deleted file mode 100644 index a2365bf..0000000 Binary files a/.vs/WmsMobileServe/FileContentIndex/fe2a2976-264c-4e15-8f99-7e10f73fbeee.vsidx and /dev/null differ diff --git a/.vs/WmsMobileServe/v17/.futdcache.v2 b/.vs/WmsMobileServe/v17/.futdcache.v2 index f263cb0..1153be4 100644 Binary files a/.vs/WmsMobileServe/v17/.futdcache.v2 and b/.vs/WmsMobileServe/v17/.futdcache.v2 differ diff --git a/.vs/WmsMobileServe/v17/.suo b/.vs/WmsMobileServe/v17/.suo index 0f709cf..8e089e0 100644 Binary files a/.vs/WmsMobileServe/v17/.suo and b/.vs/WmsMobileServe/v17/.suo differ diff --git a/.vs/WmsMobileServe/v17/DocumentLayout.backup.json b/.vs/WmsMobileServe/v17/DocumentLayout.backup.json index 558bd59..78c022c 100644 --- a/.vs/WmsMobileServe/v17/DocumentLayout.backup.json +++ b/.vs/WmsMobileServe/v17/DocumentLayout.backup.json @@ -3,24 +3,24 @@ "WorkspaceRootPath": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\service\\stockinservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\service\\stockinservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\dto\\bindingvehicleinreq.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\dto\\bindingvehicleinreq.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\database\\base\\dao\\tmistockdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\database\\base\\dao\\tmistockdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\database\\base\\dao\\tongoodsshelfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\database\\base\\dao\\tongoodsshelfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\dto\\getgoodsdetailresp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\dto\\getgoodsdetailresp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\service\\stockinservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\service\\stockinservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\database\\base\\dao\\cuxwmspolinesitfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\database\\base\\dao\\cuxwmspolinesitfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -30,7 +30,7 @@ "DocumentGroups": [ { "DockedWidth": 992, - "SelectedChildIndex": 6, + "SelectedChildIndex": 4, "Children": [ { "$type": "Bookmark", @@ -50,76 +50,70 @@ }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "GetGoodsDetailResp.cs", - "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "ViewState": "AgIAABMAAAAAAAAAAAA5wDAAAAAbAAAAAAAAAA==", + "DocumentIndex": 0, + "Title": "TMiStockDao.cs", + "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "RelativeDocumentMoniker": "WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "RelativeToolTip": "WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAMAAAArAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-30T07:49:03.656Z", + "WhenOpened": "2024-12-07T06:27:03.685Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 4, + "Title": "CuxWmsPoLinesItfDao.cs", + "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "RelativeDocumentMoniker": "WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "RelativeToolTip": "WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAAgAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-07T06:25:22.606Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, "Title": "TOnGoodsShelfDao.cs", "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", "RelativeDocumentMoniker": "WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", "RelativeToolTip": "WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAAbAAAAAAAAAA==", + "ViewState": "AgIAAAMAAAAAAAAAAAAgwCoAAACTAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-30T06:47:03.896Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 2, "Title": "StockInService.cs", "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", - "ViewState": "AgIAAJYAAAAAAAAAAAAswLwAAAAAAAAAAAAAAA==", + "ViewState": "AgIAANcAAAAAAAAAAAAswAMBAAA4AAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-27T03:58:09.272Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 3, "Title": "StockInController.cs", "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAACsAAAB4AAAAAAAAAA==", + "ViewState": "AgIAABEAAAAAAAAAAAAAwDsAAACBAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-27T02:43:33.699Z", "EditorCaption": "" } ] - }, - { - "DockedWidth": 992, - "SelectedChildIndex": 0, - "Children": [ - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "BindingVehicleInReq.cs", - "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "ViewState": "AgIAAD0AAAAAAAAAAAAwwFwAAAAYAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-30T12:13:17.451Z", - "EditorCaption": "" - } - ] } ] } diff --git a/.vs/WmsMobileServe/v17/DocumentLayout.json b/.vs/WmsMobileServe/v17/DocumentLayout.json index 57cfd4a..c1cdee8 100644 --- a/.vs/WmsMobileServe/v17/DocumentLayout.json +++ b/.vs/WmsMobileServe/v17/DocumentLayout.json @@ -2,25 +2,25 @@ "Version": 1, "WorkspaceRootPath": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\", "Documents": [ + { + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\service\\stockinservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\service\\stockinservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\dto\\bindingvehicleinreq.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\dto\\bindingvehicleinreq.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\controllers\\stockincontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\database\\base\\dao\\tmistockdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\database\\base\\dao\\tmistockdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\database\\base\\dao\\tongoodsshelfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\database\\base\\dao\\tongoodsshelfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\apiserve\\mobile\\dto\\getgoodsdetailresp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\apiserve\\mobile\\dto\\getgoodsdetailresp.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|f:\\a\u5F00\u53D1\u9879\u76EE\\a\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\application\\wmsmobileserve\\wmsmobileserve\\database\\base\\dao\\cuxwmspolinesitfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{EDF77B93-3209-4D19-9BC5-789FBB0960FA}|WmsMobileServe\\WmsMobileServe.csproj|solutionrelative:wmsmobileserve\\database\\base\\dao\\cuxwmspolinesitfdao.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -30,7 +30,7 @@ "DocumentGroups": [ { "DockedWidth": 992, - "SelectedChildIndex": 6, + "SelectedChildIndex": 8, "Children": [ { "$type": "Bookmark", @@ -50,15 +50,28 @@ }, { "$type": "Document", - "DocumentIndex": 4, - "Title": "GetGoodsDetailResp.cs", - "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\GetGoodsDetailResp.cs", - "ViewState": "AgIAABMAAAAAAAAAAAA5wDAAAAAbAAAAAAAAAA==", + "DocumentIndex": 2, + "Title": "TMiStockDao.cs", + "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "RelativeDocumentMoniker": "WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "RelativeToolTip": "WmsMobileServe\\DataBase\\Base\\Dao\\TMiStockDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAAMAAAArAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-30T07:49:03.656Z", + "WhenOpened": "2024-12-07T06:27:03.685Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "CuxWmsPoLinesItfDao.cs", + "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "RelativeDocumentMoniker": "WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "RelativeToolTip": "WmsMobileServe\\DataBase\\Base\\Dao\\CuxWmsPoLinesItfDao.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAAAA4AAAAgAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-12-07T06:25:22.606Z", "EditorCaption": "" }, { @@ -69,57 +82,38 @@ "RelativeDocumentMoniker": "WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", "RelativeToolTip": "WmsMobileServe\\DataBase\\Base\\Dao\\TOnGoodsShelfDao.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAAbAAAAAAAAAA==", + "ViewState": "AgIAAAMAAAAAAAAAAAAgwCoAAACTAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-30T06:47:03.896Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 1, "Title": "StockInService.cs", "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Service\\StockInService.cs", - "ViewState": "AgIAAIoAAAAAAAAAAAAswK4AAAA3AAAAAAAAAA==", + "ViewState": "AgIAANcAAAAAAAAAAAAswAYBAAAEAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-27T03:58:09.272Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 0, "Title": "StockInController.cs", "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Controllers\\StockInController.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAACsAAAB4AAAAAAAAAA==", + "ViewState": "AgIAABEAAAAAAAAAAAAAwBkAAAASAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-11-27T02:43:33.699Z", "EditorCaption": "" } ] - }, - { - "DockedWidth": 992, - "SelectedChildIndex": 0, - "Children": [ - { - "$type": "Document", - "DocumentIndex": 1, - "Title": "BindingVehicleInReq.cs", - "DocumentMoniker": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "RelativeDocumentMoniker": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "ToolTip": "F:\\A\u5F00\u53D1\u9879\u76EE\\A\u83F2\u8FBE\u5B9D\u5F00\u9879\u76EE\\2024-11-3_\u666F\u65FA\u7535\u5B50\\Application\\WmsMobileServe\\WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "RelativeToolTip": "WmsMobileServe\\ApiServe\\Mobile\\Dto\\BindingVehicleInReq.cs", - "ViewState": "AgIAAD0AAAAAAAAAAAAwwFwAAAAYAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-11-30T12:13:17.451Z", - "EditorCaption": "" - } - ] } ] } diff --git a/WmsMobileServe/ApiServe/Mobile/Controllers/StockInController.cs b/WmsMobileServe/ApiServe/Mobile/Controllers/StockInController.cs index 3577ebb..fcb6225 100644 --- a/WmsMobileServe/ApiServe/Mobile/Controllers/StockInController.cs +++ b/WmsMobileServe/ApiServe/Mobile/Controllers/StockInController.cs @@ -3,6 +3,7 @@ using WmsMobileServe.ApiClient.Mes.Dto; using WmsMobileServe.ApiServe.Mobile.Dto; using WmsMobileServe.ApiServe.Mobile.Service; using WmsMobileServe.ApiServe.Mobile.Vo; +using WmsMobileServe.DataBase.Base.Po; namespace WmsMobileServe.ApiServe.Mobile.Controllers; @@ -37,10 +38,25 @@ public class StockInController(StockInService stockInService) : ControllerBase public MobileApiResponse GetGoodsDetail([FromQuery] string? boxNo) => stockInService.GetGoodsDetail(boxNo); /// - /// 码盘入库 + /// MES码盘入库 /// /// [HttpPost("bindingVehicleIn")] public MobileApiResponse BindingVehicleIn([FromBody] BindingVehicleInReq request) => stockInService.BindingVehicleIn(request); + /// + /// 获取EBS码盘信息 + /// + /// + [HttpGet("getCuxData")] + public MobileApiResponse> GetCuxData() => stockInService.GetCuxData(); + + + /// + /// Ebs码盘入库 + /// + /// + [HttpPost("bindingVehicleInEbs")] + public MobileApiResponse BindingVehicleInEbs([FromBody] BindingVehicleInEbsReq request) => stockInService.BindingVehicleInEbs(request); + } diff --git a/WmsMobileServe/ApiServe/Mobile/Dto/BindingVehicleInEbsReq.cs b/WmsMobileServe/ApiServe/Mobile/Dto/BindingVehicleInEbsReq.cs new file mode 100644 index 0000000..a20c410 --- /dev/null +++ b/WmsMobileServe/ApiServe/Mobile/Dto/BindingVehicleInEbsReq.cs @@ -0,0 +1,126 @@ +using System.Text.Json.Serialization; + +namespace WmsMobileServe.ApiServe.Mobile.Dto; + +public class BindingVehicleInEbsReq +{ + /// + /// 载具号 + /// + [JsonPropertyName("vehicleNo")] + public string? VehicleNo { get; set; } + + /// + /// 入库模式 + /// + /// + /// 1 -- 直接入库 + /// 2 -- 去往站台 + /// + [JsonPropertyName("taskType")] + public int? TaskType { get; set; } + + /// + /// 绑定的物料 + /// + [JsonPropertyName("bindingGoods")] + public List? BindingGoodsDetails { get; set; } +} + + + +/// +/// 绑定的物品名称 +/// +public class BindingGoodsEbsDetails +{ + /// + /// 箱号 + /// + [JsonPropertyName("boxNo")] + public string? BoxNo { get; set; } + + /// + /// 每包数量 + /// + [JsonPropertyName("numPerBox")] + public decimal? NumPerBox { get; set; } + + /// + /// 包装数量 + /// + [JsonPropertyName("goodsNum")] + public decimal? GoodsNum { get; set; } + + /// + /// 包数量 + /// + [JsonPropertyName("picketNum")] + public decimal? PacketNum { get; set; } + + /// + /// 零包数量 + /// + [JsonPropertyName("otherNum")] + public decimal? OtherNum { get; set; } + + /// + /// 产品编码 + /// + [JsonPropertyName("goodsId")] + public string? GoodsId { get; set; } + + /// + /// 销售订单 + /// + [JsonPropertyName("saleOrderNo")] + public string? SaleOrderNo { get; set; } + + /// + /// 包装层级 + /// + [JsonPropertyName("packetLevel")] + public string? PacketLevel { get; set; } + + /// + /// 周期 + /// + [JsonPropertyName("cycle")] + public string? Cycle { get; set; } + + /// + /// 客户销售订单 + /// + [JsonPropertyName("customSaleOrderNo")] + public string? CustomSaleOrderNo { get; set; } + + /// + /// 子库 + /// + [JsonPropertyName("minorWarehouseId")] + public string? MinorWarehouseId { get; set; } + + /// + /// 产品描述 + /// + [JsonPropertyName("goodsDesc")] + public string? GoodsDesc { get; set; } + + /// + /// 订单头主键 + /// + [JsonPropertyName("poHeaderId")] + public string? PoHeaderId { get; set; } + + /// + /// 订单行主键 + /// + [JsonPropertyName("poLineId")] + public string? PoLineId { get; set; } + + /// + /// 发运行主键 + /// + [JsonPropertyName("lineLocationId")] + public string? LineLocationId { get; set; } +} diff --git a/WmsMobileServe/ApiServe/Mobile/Service/StockInService.cs b/WmsMobileServe/ApiServe/Mobile/Service/StockInService.cs index d7f2bee..4b98dbe 100644 --- a/WmsMobileServe/ApiServe/Mobile/Service/StockInService.cs +++ b/WmsMobileServe/ApiServe/Mobile/Service/StockInService.cs @@ -11,7 +11,7 @@ namespace WmsMobileServe.ApiServe.Mobile.Service; [Component] -public class StockInService(MesApiClient mesApiClient, TOnGoodsShelfDao onGoodsShelfDao, TMiStockDao miStockDao) +public class StockInService(MesApiClient mesApiClient, TOnGoodsShelfDao onGoodsShelfDao, TMiStockDao miStockDao, CuxWmsPoLinesItfDao cuxWmsPoLinesItfDao) { /// /// 空载具入库 @@ -131,7 +131,11 @@ public class StockInService(MesApiClient mesApiClient, TOnGoodsShelfDao onGoodsS return MobileApiResponse.Success(data: mesGoodsDetail); } - + /// + /// MES 码盘入库 + /// + /// + /// public MobileApiResponse BindingVehicleIn(BindingVehicleInReq request) { if (string.IsNullOrEmpty(request.VehicleNo) || request.BindingGoodsDetails == default) return MobileApiResponse.Fail("传入的数据无法识别"); @@ -164,7 +168,7 @@ public class StockInService(MesApiClient mesApiClient, TOnGoodsShelfDao onGoodsS StorageAreaId = item.MinorWarehouseId, UpGoodsId = UUIDUtils.GetNewUUID2(), GoodsTypeId = item.PacketLevel, - StorageMode = "码盘入库", + StorageMode = "MES码盘入库", ProdictionDate = DateTime.Now, Ctl = request.VehicleNo, BarCode = item.BoxNo, @@ -183,6 +187,78 @@ public class StockInService(MesApiClient mesApiClient, TOnGoodsShelfDao onGoodsS var insertResult = onGoodsShelfDao.Insert([.. onGoodsShelves]); if (insertResult > 0) return MobileApiResponse.Success(string.Format("载具：{0} 产生入库任务成功", request.VehicleNo)); return MobileApiResponse.Fail(string.Format("载具：{0} 产生入库任务失败，数据无法插入", request.VehicleNo)); + } + + /// + /// 获取EBS待码盘信息 + /// + /// + public MobileApiResponse> GetCuxData() + { + List? cuxWmsPoLinesItfs = cuxWmsPoLinesItfDao.SelectWithStatus(0); + if (cuxWmsPoLinesItfs == default) return MobileApiResponse>.Fail(); + return MobileApiResponse>.Success(data: cuxWmsPoLinesItfs); + } + + /// + /// Ebs 码盘入库 + /// + /// + /// + public MobileApiResponse BindingVehicleInEbs(BindingVehicleInEbsReq request) + { + if (string.IsNullOrEmpty(request.VehicleNo) || request.BindingGoodsDetails == default) return MobileApiResponse.Fail("传入的数据无法识别"); + if (request.BindingGoodsDetails.Count < 1) return MobileApiResponse.Fail("传入的数据为空"); + /* 检验载具是否有入库任务 */ + var stackInRasks = onGoodsShelfDao.SelectWithVehicleNo(request.VehicleNo); + if (stackInRasks == default) return MobileApiResponse.Fail("数据服务异常，请稍后再试"); + if (stackInRasks.Count > 0) return MobileApiResponse.Fail(string.Format("该载具号：{0} 存在入库任务，请核实后再试", request.VehicleNo)); + /* 检验载具是否在库存中 */ + var stocks = miStockDao.SelectWithVehicleNo(request.VehicleNo); + if (stocks == default) return MobileApiResponse.Fail("数据服务异常，请稍后再试"); + if (stocks.Count > 0) return MobileApiResponse.Fail(string.Format("该载具号：{0} 仍在库中，请核实后再试", request.VehicleNo)); + /* 构建入库任务 */ + List onGoodsShelves = []; // 需要入库的任务 + List<(string? PoHeaderId, string? PoLineId, string? LineLocationId)> orders = []; + foreach (var item in request.BindingGoodsDetails) + { + onGoodsShelves.Add(new() + { + LotId = UUIDUtils.GetNewUUID2(), + GoodsId = item.GoodsId, + ProviderId = item.SaleOrderNo, + LocationId = "", + StoNum = item.OtherNum, + AccNum = item.NumPerBox, + ShelfNum = item.GoodsNum, + StockNum = item.PacketNum, + OnDate = DateTime.Now, + OnShelfUserId = "Mobile_Android", + StorageId = "-", + StorageAreaId = item.MinorWarehouseId, + UpGoodsId = UUIDUtils.GetNewUUID2(), + GoodsTypeId = item.PacketLevel, + StorageMode = "EBS码盘入库", + ProdictionDate = DateTime.Now, + Ctl = request.VehicleNo, + BarCode = item.BoxNo, + CustomerId = item.CustomSaleOrderNo, + GoodsName = item.GoodsDesc, + Status = "0", + Unit = "-", + TaskType = request.TaskType.ToString(), + GoodsMeasureId = item.SaleOrderNo, + PackingNum = 1, + DamageNum = 1, + ScaleUnit = item.Cycle, + Remark = "" + }); + orders.Add((item.PoHeaderId, item.PoLineId, item.LineLocationId)); + } + // 插入数据，更新状态 + var insertResult = onGoodsShelfDao.InsertWithCux(onGoodsShelves, orders); + if (insertResult) return MobileApiResponse.Success(string.Format("载具：{0} 产生入库任务成功", request.VehicleNo)); + return MobileApiResponse.Fail(string.Format("载具：{0} 产生入库任务失败，数据无法插入", request.VehicleNo)); } } diff --git a/WmsMobileServe/DataBase/Base/Dao/CuxWmsPoLinesItfDao.cs b/WmsMobileServe/DataBase/Base/Dao/CuxWmsPoLinesItfDao.cs new file mode 100644 index 0000000..91217ad --- /dev/null +++ b/WmsMobileServe/DataBase/Base/Dao/CuxWmsPoLinesItfDao.cs @@ -0,0 +1,34 @@ +using WmsMobileServe.Annotation; +using WmsMobileServe.DataBase.Base.Po; + +namespace WmsMobileServe.DataBase.Base.Dao; + +[Component] +public class CuxWmsPoLinesItfDao(DataBaseClient client) +{ + + /// + /// 根据状态查询 + /// + /// + /// + public List? SelectWithStatus(int? status) + { + if (status == default) return default; + try + { + var sqlFuc = client.Instance().Queryable() + .Where(x => x.Status == status); + return sqlFuc.ToList(); + } + catch (Exception ex) + { + _ = ex; + return default; + } + } + + + + +} diff --git a/WmsMobileServe/DataBase/Base/Dao/TOnGoodsShelfDao.cs b/WmsMobileServe/DataBase/Base/Dao/TOnGoodsShelfDao.cs index 80476d7..79db2ad 100644 --- a/WmsMobileServe/DataBase/Base/Dao/TOnGoodsShelfDao.cs +++ b/WmsMobileServe/DataBase/Base/Dao/TOnGoodsShelfDao.cs @@ -30,6 +30,30 @@ public class TOnGoodsShelfDao(DataBaseClient client) } + public bool InsertWithCux(List onGoodsShelfs, List<(string? PoHeaderId, string? PoLineId, string? LineLocationId)> values) + { + try + { + var tranResult = client.Instance().UseTran(() => + { + client.Instance().Insertable(onGoodsShelfs).ExecuteCommand(); // 插入任务 + foreach (var item in values) + { + client.Instance().Updateable().SetColumns(s => s.Status == 1) + .Where(w => w.PoHeaderId.ToString() == item.PoHeaderId && w.PoLineId.ToString() == item.PoLineId && w.LineLocationId.ToString() == item.LineLocationId).ExecuteCommand(); + } + }); + + return tranResult.IsSuccess; + } + catch (Exception ex) + { + _ = ex; + return false; + } + } + + /// /// 根据载具号查询任务 /// diff --git a/WmsMobileServe/DataBase/Base/Po/CuxWmsPoLinesItf.cs b/WmsMobileServe/DataBase/Base/Po/CuxWmsPoLinesItf.cs new file mode 100644 index 0000000..e741644 --- /dev/null +++ b/WmsMobileServe/DataBase/Base/Po/CuxWmsPoLinesItf.cs @@ -0,0 +1,186 @@ +using System.Text.Json.Serialization; +using SqlSugar; + +namespace WmsMobileServe.DataBase.Base.Po; + +/// +/// 采购订单表 +/// +[SugarTable("CUX_WMS_PO_LINES_ITF")] +public class CuxWmsPoLinesItf +{ + /// + /// 订单头主键 + /// + [SugarColumn(ColumnName = "PO_HEADER_ID")] + [JsonPropertyName("poHeaderId")] + public int? PoHeaderId { get; set; } + + /// + /// 订单行主键 + /// + [SugarColumn(ColumnName = "PO_LINE_ID")] + [JsonPropertyName("poLineId")] + public int? PoLineId { get; set; } + + /// + /// 发运行主键 + /// + [SugarColumn(ColumnName = "LINE_LOCATION_ID")] + [JsonPropertyName("lineLocationId")] + public int? LineLocationId { get; set; } + + /// + /// 收货组织代码 + /// + [SugarColumn(ColumnName = "SHIP_TO_ORGANIZATION_CODE")] + [JsonPropertyName("shipToOrganization")] + public string? ShipToOrganization { get; set; } + + /// + /// 订单行号 + /// + [SugarColumn(ColumnName = "LINE_NUM")] + [JsonPropertyName("lineNum")] + public int? LineNum { get; set; } + + /// + /// 物料ID + /// + [SugarColumn(ColumnName = "ITEM_ID")] + [JsonPropertyName("itemId")] + public int? ItemId { get; set; } + + /// + /// 物料编码 + /// + [SugarColumn(ColumnName = "ITEM_CODE")] + [JsonPropertyName("itemCode")] + public string? ItemCode { get; set; } + + /// + /// 物料描述 + /// + [SugarColumn(ColumnName = "ITEM_DESCRIPTION")] + [JsonPropertyName("itemDesc")] + public string? ItemDesc { get; set; } + + /// + /// 采购单位 + /// + [SugarColumn(ColumnName = "PUR_UOM_CODE")] + [JsonPropertyName("purUomCode")] + public string? PurUomCode { get; set; } + + /// + /// 库存单位 + /// + [SugarColumn(ColumnName = "INV_UOM_CODE")] + [JsonPropertyName("invUomCode")] + public string? InvUomCode { get; set; } + + /// + /// 单位转换率 + /// + [SugarColumn(ColumnName = "CONVERSION_RATE")] + [JsonPropertyName("conversionRate")] + public int? ConversionRate { get; set; } + + /// + /// 型号 测试架用 + /// + [SugarColumn(ColumnName = "ITEM_TYPE")] + [JsonPropertyName("itemType")] + public string? ItemType { get; set; } + + /// + /// 发运行号 + /// + [SugarColumn(ColumnName = "SHIPMENT_NUM")] + [JsonPropertyName("shipmentNum")] + public int? ShipmentNum { get; set; } + + /// + /// 发运行接收人附注 + /// + [SugarColumn(ColumnName = "NOTE_TO_RECEIVER")] + [JsonPropertyName("noteToReceicer")] + public string? NoteToReceicer { get; set; } + + /// + /// 分配ID + /// + [SugarColumn(ColumnName = "PO_DISTRIBUTION_ID")] + [JsonPropertyName("poDistributionId")] + public int? PoDistributionId { get; set; } + + /// + /// 分配行号 + /// + [SugarColumn(ColumnName = "DISTRIBUTION_NUM")] + [JsonPropertyName("disTributionNum")] + public int? DisTributionNum { get; set; } + + /// + /// 数量 + /// + [SugarColumn(ColumnName = "QUANTITY")] + [JsonPropertyName("quantity")] + public int? Quantity { get; set; } + + /// + /// 已接收数量 + /// + [SugarColumn(ColumnName = "QUANTITY_RECEIVED")] + [JsonPropertyName("quantityReceives")] + public int? QuantityReceives { get; set; } + + /// + /// 取消数量 + /// + [SugarColumn(ColumnName = "QUANTITY_CANCELLED")] + [JsonPropertyName("quantityCancelled")] + public int? QuantityCancelled { get; set; } + + /// + /// 承诺日期 + /// + [SugarColumn(ColumnName = "PROMISED_DATE")] + [JsonPropertyName("promisdeDate")] + public DateTime? PromisdeDate { get; set; } + + /// + /// 需要日期 + /// + [SugarColumn(ColumnName = "NEED_BY_DATE")] + [JsonPropertyName("needByDate")] + public DateTime? NeedByDate { get; set; } + + /// + /// 最后更新日期 + /// + [SugarColumn(ColumnName = "LAST_UPDATE_DATE")] + [JsonPropertyName("lastUpdateDate")] + public DateTime? LastUpdateDate { get; set; } + + /// + /// 最后更新人 + /// + [SugarColumn(ColumnName = "LAST_UPDATED_BY")] + [JsonPropertyName("lastUpdatedBy")] + public int? LastUpdatedBy { get; set; } + + /// + /// 状态(1:未处理;2:错误;3:成功) + /// + [SugarColumn(ColumnName = "STATUS")] + [JsonPropertyName("status")] + public int? Status { get; set; } + + + + + + + +} diff --git a/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.dll b/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.dll index d2d1da6..3aabdcb 100644 Binary files a/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.dll and b/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.dll differ diff --git a/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.exe b/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.exe index 1c1660c..babf3b8 100644 Binary files a/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.exe and b/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.exe differ diff --git a/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.pdb b/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.pdb index 8cdebda..92193b5 100644 Binary files a/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.pdb and b/WmsMobileServe/bin/Debug/net8.0/WmsMobileServe.pdb differ diff --git a/WmsMobileServe/obj/Debug/net8.0/ApiEndpoints.json b/WmsMobileServe/obj/Debug/net8.0/ApiEndpoints.json index fff2517..9c9c15b 100644 --- a/WmsMobileServe/obj/Debug/net8.0/ApiEndpoints.json +++ b/WmsMobileServe/obj/Debug/net8.0/ApiEndpoints.json @@ -25,6 +25,32 @@ } ] }, + { + "ContainingType": "WmsMobileServe.ApiServe.Mobile.Controllers.StockInController", + "Method": "BindingVehicleInEbs", + "RelativePath": "api/mobile/stockIn/bindingVehicleInEbs", + "HttpMethod": "POST", + "IsController": true, + "Order": 0, + "Parameters": [ + { + "Name": "request", + "Type": "WmsMobileServe.ApiServe.Mobile.Dto.BindingVehicleInEbsReq", + "IsRequired": true + } + ], + "ReturnTypes": [ + { + "Type": "WmsMobileServe.ApiServe.Mobile.Vo.MobileApiResponse", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "WmsMobileServe.ApiServe.Mobile.Controllers.StockInController", "Method": "EmptyVehicleIn", @@ -51,6 +77,26 @@ } ] }, + { + "ContainingType": "WmsMobileServe.ApiServe.Mobile.Controllers.StockInController", + "Method": "GetCuxData", + "RelativePath": "api/mobile/stockIn/getCuxData", + "HttpMethod": "GET", + "IsController": true, + "Order": 0, + "Parameters": [], + "ReturnTypes": [ + { + "Type": "WmsMobileServe.ApiServe.Mobile.Vo.MobileApiResponse\u00601[[System.Collections.Generic.List\u00601[[WmsMobileServe.DataBase.Base.Po.CuxWmsPoLinesItf, WmsMobileServe, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]], System.Private.CoreLib, Version=8.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]", + "MediaTypes": [ + "text/plain", + "application/json", + "text/json" + ], + "StatusCode": 200 + } + ] + }, { "ContainingType": "WmsMobileServe.ApiServe.Mobile.Controllers.StockInController", "Method": "GetGoodsDetail", diff --git a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfo.cs b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfo.cs index a95fa3b..6374edd 100644 --- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfo.cs +++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("WmsMobileServe")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f6545e1135be56f2b1cd78e243b34b393d9edddf")] [assembly: System.Reflection.AssemblyProductAttribute("WmsMobileServe")] [assembly: System.Reflection.AssemblyTitleAttribute("WmsMobileServe")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfoInputs.cache b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfoInputs.cache index 9c62897..62a166f 100644 --- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfoInputs.cache +++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfoInputs.cache @@ -1 +1 @@ -0d9fca2e08bba88f81a075a3317b22a3d4588d4415ac0f5bdddc624faa3f0618 +e5028a0a2474731aa24a724562c71b46d7cc8ce975d9ff0dd6647025d9b918c4 diff --git a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.csproj.CoreCompileInputs.cache b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.csproj.CoreCompileInputs.cache index ad81790..d4afebd 100644 --- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.csproj.CoreCompileInputs.cache +++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -09e18ce3df8a5f636f39f7d5616907c4077590be16b1b57bac66d1c1621798da +c1a3b4de8f58a2a15dc85e7ff1c7fa09af737d6828fba1de306ab0098a50a80e diff --git a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.dll b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.dll index d2d1da6..3aabdcb 100644 Binary files a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.dll and b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.dll differ diff --git a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.pdb b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.pdb index 8cdebda..92193b5 100644 Binary files a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.pdb and b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.pdb differ diff --git a/WmsMobileServe/obj/Debug/net8.0/apphost.exe b/WmsMobileServe/obj/Debug/net8.0/apphost.exe index 1c1660c..babf3b8 100644 Binary files a/WmsMobileServe/obj/Debug/net8.0/apphost.exe and b/WmsMobileServe/obj/Debug/net8.0/apphost.exe differ diff --git a/WmsMobileServe/obj/Debug/net8.0/ref/WmsMobileServe.dll b/WmsMobileServe/obj/Debug/net8.0/ref/WmsMobileServe.dll index 4ae4721..0647314 100644 Binary files a/WmsMobileServe/obj/Debug/net8.0/ref/WmsMobileServe.dll and b/WmsMobileServe/obj/Debug/net8.0/ref/WmsMobileServe.dll differ diff --git a/WmsMobileServe/obj/Debug/net8.0/refint/WmsMobileServe.dll b/WmsMobileServe/obj/Debug/net8.0/refint/WmsMobileServe.dll index 4ae4721..0647314 100644 Binary files a/WmsMobileServe/obj/Debug/net8.0/refint/WmsMobileServe.dll and b/WmsMobileServe/obj/Debug/net8.0/refint/WmsMobileServe.dll differ