Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

cdk

昨天 723980fb8737acec1df3609457e93f9dcd565d63

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs

@@ -206,7 +206,7 @@
                                    _row["itemModel"] = dym.itemModel;//规格型号,
                                    _row["xxDw"] = dym.xxDw;
                                    _row["salesQuantity"] = dym.salesQuantity;
                                    _row["isFreeChk"] = dym.isFreeChk;
                                    _row["isFreeChk"] = false;
                                    _row["fhQuantity"] = dym.fhQuantity;
                                    gvMx1.UpdateCurrentRow();
                                    _Table.Rows.Add(_row);
@@ -249,7 +249,7 @@
                                    _row["itemModel"] = dym.itemModel;//规格型号,
                                    _row["xxDw"] = dym.xxDw;
                                    _row["salesQuantity"] = dym.salesQuantity;
                                    _row["isFreeChk"] = dym.isFreeChk;
                                    _row["isFreeChk"] = false;
                                    _row["fhQuantity"] = dym.fhQuantity;
                                    gvMx1.UpdateCurrentRow();
                                    _Table.Rows.Add(_row);
@@ -291,7 +291,7 @@
                                _row["itemModel"] = dym.itemModel;//规格型号,
                                _row["xxDw"] = dym.xxDw;
                                _row["salesQuantity"] = dym.salesQuantity;
                                _row["isFreeChk"] = dym.isFreeChk;
                                _row["isFreeChk"] = false;
                                _row["fhQuantity"] = dym.fhQuantity;
                                gvMx1.UpdateCurrentRow();
                                _Table.Rows.Add(_row);
@@ -660,6 +660,7 @@
                        Thlx = (row["returnType"].ToString()),
                        Thrq = (row["returnDate"].ToString()),
                        ItemId = (row["ItemId"].ToString()),
                        IsFreeChk = (row["IsFreeChk"].ToString()),
                    });
                }
            }