Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePart90AppService.cs

@@ -175,7 +175,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         itm.Remark,
                         itm.Qty,
                         tm1 == null ? 0 : tm1.Qty,
-                        itm.Qty
+                        itm.OutPutQty != 0 ? itm.OutPutQty : itm.Qty
                         );
 
 
@@ -236,9 +236,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                                string.Empty,
                                0,
                                !string.IsNullOrEmpty(p.Extend1) ? p.Extend1 : string.Empty,
-
-                               string.Empty,
                                string.Empty,
+                p.Version,
                                p.MaterialCode,
                                _billNum,
                                GuidGenerator.Create(),
@@ -284,8 +283,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                               string.Empty,
                               0,
                               string.Empty,
+                               string.Empty,
                               input.Version,
-                              string.Empty,
                               p.MaterialCode,
                               _billNum,
                               GuidGenerator.Create(),