pengcong001
/
bbwyb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

10013

updatebug
shanji 2 years ago
parent
e98deb9ff5
commit
5abdea8bd2
4 changed files with 139 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      BBWYB.Client/Views/MainWindow.xaml
  2. 4
      BBWYB.Client/Views/Order/OrderList.xaml
  3. 172
      doc/.back_bbwyB端库/bbwyB端库-backup-2023517215051.pdma.json
  4. 67
      doc/bbwyB端库.pdma.json

2
BBWYB.Client/Views/MainWindow.xaml
View File

@ -24,7 +24,7 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0">
<TextBlock Text="{Binding GlobalContext.User.Name}"/> <TextBlock Text="{Binding GlobalContext.User.Name}"/>
<TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/> <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}" Margin="5,0,0,0"/>
<TextBlock Text="v10012" Margin="5,0,0,0"/> <TextBlock Text="v10013" Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
</Border> </Border>
<Grid Grid.Row="1"> <Grid Grid.Row="1">

4
BBWYB.Client/Views/Order/OrderList.xaml
View File

@ -373,10 +373,6 @@
<c:BButton Style="{StaticResource LinkButton}" Content="{Binding SourceShopName}" Margin="5,0,0,0" <c:BButton Style="{StaticResource LinkButton}" Content="{Binding SourceShopName}" Margin="5,0,0,0"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}" Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding SourceShopName}"/> CommandParameter="{Binding SourceShopName}"/>
<TextBlock VerticalAlignment="Center" Margin="5,0,0,0" Text="店铺SKU:"/>
<c:BButton Style="{StaticResource LinkButton}" Content="{Binding SourceSku}" Margin="5,0,0,0"
Command="{Binding DataContext.CopyTextCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
CommandParameter="{Binding SourceSku}"/>
</StackPanel> </StackPanel>
<Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/> <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
</Grid> </Grid>

172
doc/.back_bbwyB端库/bbwyB端库-backup-2023517184355.pdma.json → doc/.back_bbwyB端库/bbwyB端库-backup-2023517215051.pdma.json
View File

@ -4,7 +4,7 @@
"avatar": "", "avatar": "",
"version": "4.5.1", "version": "4.5.1",
"createdTime": "2023-5-12 20:56:05", "createdTime": "2023-5-12 20:56:05",
"updatedTime": "2023-5-17 18:43:53", "updatedTime": "2023-5-17 19:12:18",
"dbConns": [], "dbConns": [],
"profile": { "profile": {
"default": { "default": {
@ -1780,7 +1780,16 @@
"hideInGraph": true "hideInGraph": true
} }
], ],
"correlations": [] "correlations": [
{
"myField": "144B14DF-B01B-4EF7-9163-24A3124BB808",
"refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F",
"refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
]
}, },
{ {
"id": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E", "id": "C52E23C2-6CC5-4404-92A5-7CCE77E8AB1E",
@ -2134,7 +2143,16 @@
"hideInGraph": true "hideInGraph": true
} }
], ],
"correlations": [] "correlations": [
{
"myField": "E9728883-C797-4973-82A6-58F0DD7306F7",
"refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F",
"refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
]
}, },
{ {
"id": "93074B87-BE55-41BF-8358-B0E84C4E249A", "id": "93074B87-BE55-41BF-8358-B0E84C4E249A",
@ -2820,7 +2838,16 @@
"hideInGraph": true "hideInGraph": true
} }
], ],
"correlations": [], "correlations": [
{
"myField": "C972C40D-0C81-455D-8598-37DC80F7A538",
"refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F",
"refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
],
"notes": {} "notes": {}
}, },
{ {
@ -3331,7 +3358,16 @@
"hideInGraph": true "hideInGraph": true
} }
], ],
"correlations": [], "correlations": [
{
"myField": "DD093BC7-0374-421D-A4B5-7D471C5444B2",
"refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F",
"refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
],
"notes": {} "notes": {}
}, },
{ {
@ -3848,7 +3884,16 @@
"hideInGraph": true "hideInGraph": true
} }
], ],
"correlations": [], "correlations": [
{
"myField": "2CE3E553-81E6-40B3-A711-98A8EBF41716",
"refEntity": "3A48F81A-49D5-423B-8A92-228615DCEA6F",
"refField": "31AF4355-53ED-42E2-AB7F-A8AC17D17DBB",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
],
"notes": {} "notes": {}
}, },
{ {
@ -5283,7 +5328,16 @@
"id": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570" "id": "FB279AC5-DB2B-498B-9DC9-5EE05BCED570"
} }
], ],
"correlations": [], "correlations": [
{
"myField": "1AC7EBFF-8FCC-40C9-A17B-2BACE1030CAB",
"refEntity": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214",
"refField": "36136AA8-299D-4616-8F98-7172BFB06DDB",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
],
"indexes": [] "indexes": []
}, },
{ {
@ -5612,26 +5666,18 @@
"extProps": {}, "extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "C76F8758-9EEC-4108-9F30-ECE489720FC8" "id": "C76F8758-9EEC-4108-9F30-ECE489720FC8"
},
{
"defKey": "PruchaseOrderEntryId",
"defName": "采购Sku订单Id(来自采购平台)",
"comment": "",
"type": "VARCHAR",
"len": 100,
"scale": "",
"primaryKey": false,
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
"hideInGraph": false,
"refDict": "",
"extProps": {},
"domain": "",
"id": "8B25DD45-6396-4F51-969D-EE6FA1CA8719"
} }
], ],
"correlations": [], "correlations": [
{
"myField": "8B25DD45-6396-4F51-969D-EE6FA1CA8719",
"refEntity": "EE319D46-61D9-47DB-80AD-AD97D460ACB4",
"refField": "667BC789-09BB-49B8-A7BF-0EBAEE7FC36C",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
],
"indexes": [] "indexes": []
} }
], ],
@ -6060,16 +6106,6 @@
} }
} }
}, },
{
"id": "6593da18-d55c-47e3-bb4c-cf75fc56702a",
"shape": "table",
"position": {
"x": 1690,
"y": 83
},
"count": 0,
"originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B"
},
{ {
"id": "53bec785-6ee3-497e-bfa6-0318b99147db", "id": "53bec785-6ee3-497e-bfa6-0318b99147db",
"shape": "table", "shape": "table",
@ -6091,44 +6127,82 @@
"originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A" "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A"
}, },
{ {
"id": "2c258cf1-71de-432b-835a-7fe52c849443", "id": "414ef58f-57e8-4362-971a-85af3ea9a44f",
"shape": "table", "shape": "table",
"position": { "position": {
"x": 1100, "x": 390,
"y": -90 "y": -90
}, },
"count": 0, "count": 0,
"originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" "originKey": "3A48F81A-49D5-423B-8A92-228615DCEA6F"
}, },
{ {
"id": "471ac35d-30de-48a3-8743-eec20f919eba", "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a",
"shape": "table", "shape": "table",
"position": { "position": {
"x": 1100, "x": 1690,
"y": 614 "y": 83
}, },
"count": 0, "count": 0,
"originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C" "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B"
}, },
{ {
"id": "414ef58f-57e8-4362-971a-85af3ea9a44f", "id": "ff369484-e2eb-4af8-9b98-6fd2d9f202f9",
"shape": "table", "shape": "table",
"position": { "position": {
"x": 390, "x": 501,
"y": 587
},
"count": 0,
"originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09"
},
{
"id": "2c258cf1-71de-432b-835a-7fe52c849443",
"shape": "table",
"position": {
"x": 1100,
"y": -90 "y": -90
}, },
"count": 0, "count": 0,
"originKey": "3A48F81A-49D5-423B-8A92-228615DCEA6F" "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214"
}, },
{ {
"id": "ff369484-e2eb-4af8-9b98-6fd2d9f202f9", "id": "21f63eec-82ac-4156-aa34-1ea862ff1eb5",
"shape": "erdRelation",
"source": {
"cell": "471ac35d-30de-48a3-8743-eec20f919eba",
"port": "8B25DD45-6396-4F51-969D-EE6FA1CA8719%in"
},
"target": {
"cell": "b968f678-c31b-4396-b761-dd3269ba6fb8",
"port": "667BC789-09BB-49B8-A7BF-0EBAEE7FC36C%in"
},
"relation": "1:n",
"vertices": [
{
"x": 980,
"y": 382
}
],
"fillColor": "#ACDAFC",
"router": {
"name": "manhattan"
},
"attrs": {
"line": {
"strokeDasharray": ""
}
}
},
{
"id": "471ac35d-30de-48a3-8743-eec20f919eba",
"shape": "table", "shape": "table",
"position": { "position": {
"x": 501, "x": 1100,
"y": 587 "y": 614
}, },
"count": 0, "count": 0,
"originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09" "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C"
}, },
{ {
"id": "b968f678-c31b-4396-b761-dd3269ba6fb8", "id": "b968f678-c31b-4396-b761-dd3269ba6fb8",

67
doc/bbwyB端库.pdma.json
View File

@ -4,7 +4,7 @@
"avatar": "", "avatar": "",
"version": "4.5.1", "version": "4.5.1",
"createdTime": "2023-5-12 20:56:05", "createdTime": "2023-5-12 20:56:05",
"updatedTime": "2023-5-17 19:12:18", "updatedTime": "2023-5-17 21:50:51",
"dbConns": [], "dbConns": [],
"profile": { "profile": {
"default": { "default": {
@ -5668,16 +5668,7 @@
"id": "C76F8758-9EEC-4108-9F30-ECE489720FC8" "id": "C76F8758-9EEC-4108-9F30-ECE489720FC8"
} }
], ],
"correlations": [ "correlations": [],
{
"myField": "8B25DD45-6396-4F51-969D-EE6FA1CA8719",
"refEntity": "EE319D46-61D9-47DB-80AD-AD97D460ACB4",
"refField": "667BC789-09BB-49B8-A7BF-0EBAEE7FC36C",
"myRows": "1",
"refRows": "n",
"innerType": ""
}
],
"indexes": [] "indexes": []
} }
], ],
@ -6146,16 +6137,6 @@
"count": 0, "count": 0,
"originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B" "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B"
}, },
{
"id": "ff369484-e2eb-4af8-9b98-6fd2d9f202f9",
"shape": "table",
"position": {
"x": 501,
"y": 587
},
"count": 0,
"originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09"
},
{ {
"id": "2c258cf1-71de-432b-835a-7fe52c849443", "id": "2c258cf1-71de-432b-835a-7fe52c849443",
"shape": "table", "shape": "table",
@ -6167,52 +6148,34 @@
"originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214" "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214"
}, },
{ {
"id": "21f63eec-82ac-4156-aa34-1ea862ff1eb5", "id": "ff369484-e2eb-4af8-9b98-6fd2d9f202f9",
"shape": "erdRelation", "shape": "table",
"source": { "position": {
"cell": "471ac35d-30de-48a3-8743-eec20f919eba", "x": 501,
"port": "8B25DD45-6396-4F51-969D-EE6FA1CA8719%in" "y": 587
},
"target": {
"cell": "b968f678-c31b-4396-b761-dd3269ba6fb8",
"port": "667BC789-09BB-49B8-A7BF-0EBAEE7FC36C%in"
},
"relation": "1:n",
"vertices": [
{
"x": 980,
"y": 382
}
],
"fillColor": "#ACDAFC",
"router": {
"name": "manhattan"
}, },
"attrs": { "count": 0,
"line": { "originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09"
"strokeDasharray": ""
}
}
}, },
{ {
"id": "471ac35d-30de-48a3-8743-eec20f919eba", "id": "b968f678-c31b-4396-b761-dd3269ba6fb8",
"shape": "table", "shape": "table",
"position": { "position": {
"x": 1100, "x": 1100,
"y": 614 "y": 342
}, },
"count": 0, "count": 0,
"originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C" "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4"
}, },
{ {
"id": "b968f678-c31b-4396-b761-dd3269ba6fb8", "id": "471ac35d-30de-48a3-8743-eec20f919eba",
"shape": "table", "shape": "table",
"position": { "position": {
"x": 1100, "x": 1100,
"y": 342 "y": 614
}, },
"count": 0, "count": 0,
"originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4" "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C"
} }
] ]
}, },

Write Preview
Loading…
Cancel
Save