售退

lu

4 天以前 9c6b86409bd6d4802d8de3275627cdd3e87fd7e8

售退

 DevApp/Gs.DevApp/DevFrm/RkQC/RkDetect01.cs

@@ -507,6 +507,10 @@
            {
                _sbSqlWhere.Append(" and isnull(qtrk.qt028,0)=1 and isnull(qtrk.qt032,0)=1 and isnull(qtrk.qt015,0)=1 ");
            }
            if (strType == QcSeason.受托入库.ToString())
            {
                _sbSqlWhere.Append(" and isnull(st.isCheck,0)=1 and isnull(st.qt032,0)=1");
            }
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", " and a.order_type='" + strType + "' " + _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.Designer.cs

@@ -30,14 +30,14 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -328,8 +328,6 @@
            this.gv_boardItem.Name = "gv_boardItem";
            this.gv_boardItem.OptionsColumn.AllowEdit = false;
            this.gv_boardItem.Tag = "query_a.board_item";
            this.gv_boardItem.Visible = true;
            this.gv_boardItem.VisibleIndex = 3;
            this.gv_boardItem.Width = 94;
            // 
            // gridColumn9
@@ -339,7 +337,7 @@
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 4;
            this.gridColumn9.VisibleIndex = 3;
            this.gridColumn9.Width = 94;
            // 
            // gridColumn1
@@ -349,7 +347,7 @@
            this.gridColumn1.MinWidth = 120;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 5;
            this.gridColumn1.VisibleIndex = 4;
            this.gridColumn1.Width = 120;
            // 
            // gridColumn2
@@ -358,8 +356,6 @@
            this.gridColumn2.FieldName = "cusId";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 6;
            this.gridColumn2.Width = 94;
            // 
            // gridColumn10
@@ -369,7 +365,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 7;
            this.gridColumn10.VisibleIndex = 6;
            this.gridColumn10.Width = 94;
            // 
            // gridColumn12
@@ -379,7 +375,7 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 8;
            this.gridColumn12.VisibleIndex = 7;
            this.gridColumn12.Width = 94;
            // 
            // gv_outType
@@ -392,7 +388,7 @@
            this.gv_outType.OptionsColumn.AllowEdit = false;
            this.gv_outType.Tag = "query_a.out_type";
            this.gv_outType.Visible = true;
            this.gv_outType.VisibleIndex = 9;
            this.gv_outType.VisibleIndex = 8;
            this.gv_outType.Width = 94;
            // 
            // gv_checkUser
@@ -405,7 +401,7 @@
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.check_user";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 10;
            this.gv_checkUser.VisibleIndex = 9;
            this.gv_checkUser.Width = 94;
            // 
            // gv_checkDate
@@ -418,7 +414,7 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.check_date";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 11;
            this.gv_checkDate.VisibleIndex = 10;
            this.gv_checkDate.Width = 120;
            // 
            // gv_createBy
@@ -431,7 +427,7 @@
            this.gv_createBy.OptionsColumn.AllowEdit = false;
            this.gv_createBy.Tag = "query_a.create_by";
            this.gv_createBy.Visible = true;
            this.gv_createBy.VisibleIndex = 12;
            this.gv_createBy.VisibleIndex = 11;
            this.gv_createBy.Width = 94;
            // 
            // gv_createDate
@@ -444,7 +440,7 @@
            this.gv_createDate.OptionsColumn.AllowEdit = false;
            this.gv_createDate.Tag = "query_a.create_date";
            this.gv_createDate.Visible = true;
            this.gv_createDate.VisibleIndex = 13;
            this.gv_createDate.VisibleIndex = 12;
            this.gv_createDate.Width = 94;
            // 
            // gv_remark
@@ -457,7 +453,7 @@
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.remark";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 14;
            this.gv_remark.VisibleIndex = 13;
            this.gv_remark.Width = 94;
            // 
            // gridColumn8
@@ -475,7 +471,7 @@
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 15;
            this.gridColumn11.VisibleIndex = 14;
            this.gridColumn11.Width = 94;
            // 
            // pageBar1
@@ -701,32 +697,32 @@
            this.layoutControlItem14});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1126, 144);
            this.Root.TextVisible = false;
            // 

 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuiDj.cs

@@ -190,7 +190,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
        private void getModel(string strGuid)
@@ -200,7 +200,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行！");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            var _obj = new
@@ -258,11 +258,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示：" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示：" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示：" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示：" + ex.Message);
            }
        }

@@ -287,7 +287,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行！");
                MsgHelper.ShowError("请先选择你要操作的行！");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】，确定" + strMsg + "吗？"))
@@ -304,9 +304,9 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -315,10 +315,12 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示：" + ex.Message);
                MsgHelper.ShowError("提示：" + ex.Message);
            }
        }
    }

 DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.Designer.cs

@@ -30,6 +30,7 @@
        {
            this.gcMain = new DevExpress.XtraGrid.GridControl();
            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_supplierItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -42,7 +43,6 @@
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.colChkInt = new DevExpress.XtraGrid.Columns.GridColumn();
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
@@ -89,11 +89,21 @@
            this.gridView1.OptionsView.ShowAutoFilterRow = true;
            this.gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // colChkInt
            // 
            this.colChkInt.Caption = ".";
            this.colChkInt.FieldName = "chkInt";
            this.colChkInt.MinWidth = 25;
            this.colChkInt.Name = "colChkInt";
            this.colChkInt.Visible = true;
            this.colChkInt.VisibleIndex = 0;
            this.colChkInt.Width = 94;
            // 
            // gv_guid
            // 
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键不能删除";
            this.gv_guid.FieldName = "rkmxGuid";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
@@ -231,16 +241,6 @@
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.OptionsColumn.ReadOnly = true;
            this.gridColumn1.Width = 94;
            // 
            // colChkInt
            // 
            this.colChkInt.Caption = ".";
            this.colChkInt.FieldName = "chkInt";
            this.colChkInt.MinWidth = 25;
            this.colChkInt.Name = "colChkInt";
            this.colChkInt.Visible = true;
            this.colChkInt.VisibleIndex = 0;
            this.colChkInt.Width = 94;
            // 
            // panelControl1
            // 

 DevApp/Gs.DevApp/DevFrm/Warehouse/SelectShuoTuiSq.cs

@@ -49,12 +49,12 @@
                    foreach (DataRow dr in dt.Rows)
                    {
                        string checkBox = dr["chkInt"].ToString();
                        string _guid = dr["rkmxGuid"].ToString();
                        //string _guid = dr["guid"].ToString();
                        if (Gs.DevApp.ToolBox.UtilityHelper.ToCheck(checkBox))
                        {
                            list.Add(new
                            {
                                rkmxGuid = dr["rkmxGuid"].ToString(),
                                rkmxGuid = dr["guid"].ToString(),
                                invBillNo = dr["invBillNo"].ToString(),
                                itemNo = dr["itemNo"].ToString(),
                                itemName = dr["itemName"].ToString(),