智云MES后端API代码
parent: 76b2a787 | 补丁 | 提交 | ignore whitespace
yxj
2023-11-19 b01e1fddc24128e23a5a4528dbf903676f5f7681 
销售码单打印模块，新增反审核功能，打印码单去除审核判断控制；新增PDA缓存列表调用方法
5个文件已修改
229 ■■■■■ 已修改文件
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.cs 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.designer.cs 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/仓库管理/Kf_SellOutBill_BarCodeNote.resx 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WarM/²Ö¿â¹ÜÀí/Kf_SellOutBill_BarCodeNote.cs


@@ -29,6 +29,7 @@


        public Int64 HStockOrgID = DBUtility.ClsPub.HOrgID;


        public DateTime HDate = DateTime.Today;


        public DBUtility.ClsPub.Enum_BillStatus BillStatus;


        public DAL.ClsKf_SellOutBill BillOld = new DAL.ClsKf_SellOutBill();   //对应单据类


        SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();




        #region  //固定代码


@@ -338,28 +339,31 @@


                //画线


                GraphLine();




                //未审核


                if (cmbHBillStatus.Text == "已审核")


                {


                    sh.Enabled = false;


                    fsh.Enabled = true;


                    pic1.Visible = true;


                    pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");


                }


                else if (cmbHBillStatus.Text == "已关闭")


                {


                    sh.Enabled = false;


                    fsh.Enabled = false;


                    pic1.Visible = true;


                    pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Closed.jpg");


                }


                else if (cmbHBillStatus.Text == "已作废")


                {


                    sh.Enabled = false;


                    fsh.Enabled = false;


                    pic1.Visible = true;


                    pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Deleted.jpg");


                }


                else


                {


                    sh.Enabled = true;


                    fsh.Enabled = false;


                    pic1.Visible = false;


                    pic1.Image = null;


                }


@@ -398,9 +402,32 @@


            {


                cmbHBillStatus.Text="已审核";


                sh.Enabled = false;


                fsh.Enabled = true;


                pic1.Visible = true;


                pic1.Image = System.Drawing.Image.FromFile(DBUtility.ClsPub.AppPath + @"/Pic/Checked.jpg");


                MessageBox.Show("审核成功！", "提示");


                return;


            }


        }




        #endregion




        #region  //反审核销售出库单


        private void fsh_Click(object sender, EventArgs e)


        {


            if (BillOld.AbandonCheck(HInterID, ref DBUtility.ClsPub.sExeReturnInfo) == true)


            {


                cmbHBillStatus.Text = "创建";


                sh.Enabled = true;


                fsh.Enabled = false;


                pic1.Visible = false;


                pic1.Image = null;


                MessageBox.Show("反审核成功！", "提示");


                return;


            }


            else


            {


                MessageBox.Show("反审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo, "提示");


                return;


            }


        }


@@ -505,11 +532,11 @@




        private void BarCodedy_Click(object sender, EventArgs e)


        {


            if (cmbHBillStatus.Text != "已审核")


            {


                MessageBox.Show("所选单据对应单据状态不为‘已审核’状态，不允许打印！", "提示");


                return;


            }


            //if (cmbHBillStatus.Text != "已审核")


            //{


            //    MessageBox.Show("所选单据对应单据状态不为‘已审核’状态，不允许打印！", "提示");


            //    return;


            //}


            //选择打印模板


            BLL.Gy_OpenTmp oFrm = new BLL.Gy_OpenTmp();


            oFrm.sBillName = ModName;




 WarM/²Ö¿â¹ÜÀí/Kf_SellOutBill_BarCodeNote.designer.cs


@@ -30,8 +30,8 @@


        {


            this.components = new System.ComponentModel.Container();


            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_SellOutBill_BarCodeNote));


            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();


            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();


            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();


            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();


            this.Tool = new System.Windows.Forms.ToolStrip();


            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();


            this.mrlk = new System.Windows.Forms.ToolStripButton();


@@ -101,6 +101,8 @@


            this.tabPage1 = new System.Windows.Forms.TabPage();


            this.tabPage2 = new System.Windows.Forms.TabPage();


            this.grdBarCode = new System.Windows.Forms.DataGridView();


            this.tabPage3 = new System.Windows.Forms.TabPage();


            this.grdTM = new System.Windows.Forms.DataGridView();


            this.panel1 = new System.Windows.Forms.Panel();


            this.groupBox1 = new System.Windows.Forms.GroupBox();


            this.label1 = new System.Windows.Forms.Label();


@@ -111,8 +113,8 @@


            this.中间 = new System.Windows.Forms.Panel();


            this.底部 = new System.Windows.Forms.Panel();


            this.右侧 = new System.Windows.Forms.Panel();


            this.tabPage3 = new System.Windows.Forms.TabPage();


            this.grdTM = new System.Windows.Forms.DataGridView();


            this.fsh = new System.Windows.Forms.ToolStripButton();


            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();


            this.Tool.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();


            this.gbUp.SuspendLayout();


@@ -122,11 +124,11 @@


            this.tabPage1.SuspendLayout();


            this.tabPage2.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).BeginInit();


            this.tabPage3.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit();


            this.panel1.SuspendLayout();


            this.groupBox1.SuspendLayout();


            this.panel2.SuspendLayout();


            this.tabPage3.SuspendLayout();


            ((System.ComponentModel.ISupportInitialize)(this.grdTM)).BeginInit();


            this.SuspendLayout();


            // 


            // Tool


@@ -144,6 +146,8 @@


            this.tp,


            this.toolStripSeparator1,


            this.sh,


            this.toolStripSeparator6,


            this.fsh,


            this.toolStripSeparator2,


            this.Billdy,


            this.toolStripSeparator5,


@@ -313,14 +317,14 @@


            this.grdMain.AllowUserToDeleteRows = false;


            this.grdMain.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;


            this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;


            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;


            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));


            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;


            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;


            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;


            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;


            this.grdMain.DefaultCellStyle = dataGridViewCellStyle3;


            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;


            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;


            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));


            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;


            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;


            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;


            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;


            this.grdMain.DefaultCellStyle = dataGridViewCellStyle1;


            this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdMain.Location = new System.Drawing.Point(3, 3);


            this.grdMain.Margin = new System.Windows.Forms.Padding(0);


@@ -870,14 +874,14 @@


            this.grdSub.AllowUserToDeleteRows = false;


            this.grdSub.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;


            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;


            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window;


            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));


            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText;


            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;


            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;


            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;


            this.grdSub.DefaultCellStyle = dataGridViewCellStyle4;


            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;


            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;


            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));


            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;


            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;


            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;


            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;


            this.grdSub.DefaultCellStyle = dataGridViewCellStyle2;


            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdSub.Location = new System.Drawing.Point(0, 73);


            this.grdSub.Margin = new System.Windows.Forms.Padding(0);


@@ -940,6 +944,34 @@


            this.grdBarCode.Size = new System.Drawing.Size(1091, 377);


            this.grdBarCode.TabIndex = 46;


            this.grdBarCode.Paint += new System.Windows.Forms.PaintEventHandler(this.grdBarCode_Paint);


            // 


            // tabPage3


            // 


            this.tabPage3.Controls.Add(this.grdTM);


            this.tabPage3.Location = new System.Drawing.Point(4, 22);


            this.tabPage3.Name = "tabPage3";


            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);


            this.tabPage3.Size = new System.Drawing.Size(1097, 383);


            this.tabPage3.TabIndex = 2;


            this.tabPage3.Text = "条码明细";


            this.tabPage3.UseVisualStyleBackColor = true;


            // 


            // grdTM


            // 


            this.grdTM.AllowUserToAddRows = false;


            this.grdTM.AllowUserToDeleteRows = false;


            this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;


            this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl;


            this.grdTM.Location = new System.Drawing.Point(3, 3);


            this.grdTM.Name = "grdTM";


            this.grdTM.ReadOnly = true;


            this.grdTM.RowHeadersWidth = 30;


            this.grdTM.RowTemplate.Height = 23;


            this.grdTM.Size = new System.Drawing.Size(1091, 377);


            this.grdTM.TabIndex = 47;


            this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint);


            // 


            // panel1


            // 


@@ -1040,33 +1072,24 @@


            this.右侧.Size = new System.Drawing.Size(12, 627);


            this.右侧.TabIndex = 64;


            // 


            // tabPage3


            // fsh


            // 


            this.tabPage3.Controls.Add(this.grdTM);


            this.tabPage3.Location = new System.Drawing.Point(4, 22);


            this.tabPage3.Name = "tabPage3";


            this.tabPage3.Padding = new System.Windows.Forms.Padding(3);


            this.tabPage3.Size = new System.Drawing.Size(1097, 383);


            this.tabPage3.TabIndex = 2;


            this.tabPage3.Text = "条码明细";


            this.tabPage3.UseVisualStyleBackColor = true;


            this.fsh.AutoSize = false;


            this.fsh.Image = ((System.Drawing.Image)(resources.GetObject("fsh.Image")));


            this.fsh.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.fsh.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;


            this.fsh.ImageTransparentColor = System.Drawing.Color.Magenta;


            this.fsh.Name = "fsh";


            this.fsh.Size = new System.Drawing.Size(70, 47);


            this.fsh.Text = "反审核单据";


            this.fsh.TextAlign = System.Drawing.ContentAlignment.BottomCenter;


            this.fsh.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;


            this.fsh.Click += new System.EventHandler(this.fsh_Click);


            // 


            // grdTM


            // toolStripSeparator6


            // 


            this.grdTM.AllowUserToAddRows = false;


            this.grdTM.AllowUserToDeleteRows = false;


            this.grdTM.BackgroundColor = System.Drawing.SystemColors.ControlLightLight;


            this.grdTM.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;


            this.grdTM.Dock = System.Windows.Forms.DockStyle.Fill;


            this.grdTM.ImeMode = System.Windows.Forms.ImeMode.NoControl;


            this.grdTM.Location = new System.Drawing.Point(3, 3);


            this.grdTM.Name = "grdTM";


            this.grdTM.ReadOnly = true;


            this.grdTM.RowHeadersWidth = 30;


            this.grdTM.RowTemplate.Height = 23;


            this.grdTM.Size = new System.Drawing.Size(1091, 377);


            this.grdTM.TabIndex = 47;


            this.grdTM.Paint += new System.Windows.Forms.PaintEventHandler(this.grdTM_Paint);


            this.toolStripSeparator6.Name = "toolStripSeparator6";


            this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);


            // 


            // Kf_SellOutBill_BarCodeNote


            // 


@@ -1097,12 +1120,12 @@


            this.tabPage1.ResumeLayout(false);


            this.tabPage2.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.grdBarCode)).EndInit();


            this.tabPage3.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit();


            this.panel1.ResumeLayout(false);


            this.groupBox1.ResumeLayout(false);


            this.groupBox1.PerformLayout();


            this.panel2.ResumeLayout(false);


            this.tabPage3.ResumeLayout(false);


            ((System.ComponentModel.ISupportInitialize)(this.grdTM)).EndInit();


            this.ResumeLayout(false);




        }


@@ -1189,5 +1212,7 @@


        private System.Windows.Forms.PictureBox pic1;


        private System.Windows.Forms.TabPage tabPage3;


        private System.Windows.Forms.DataGridView grdTM;


        private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;


        private System.Windows.Forms.ToolStripButton fsh;


    }


}




 WarM/²Ö¿â¹ÜÀí/Kf_SellOutBill_BarCodeNote.resx


@@ -410,6 +410,19 @@


        8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==


</value>


  </data>


  <data name="fsh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8


        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPlZPPK8NhHMc/5T7tRM0cOCAHJXGbxQ7c/AEc


        d1EcjEwytSiH4SZcRHLQ7FemtlJDOPiZml8XSzMWMz9mK7Xevs/z7DvDzLzr9X2253k+r8+nvn0pM10t


        hGykjnMndRE1ZWJlVKvF+qdErytIF/1G6k72sMPTBULIRcCF4H2bcOMknC8SNsb/IXheJ8R8hAfPPwUH


        M4Qz6fKVlXBtJwRWxP99aX/NnKfgcJZwMkfwS9OwdW86TwFLc6MGmxPE2Zok+CwCzwjB5XDkLpbDJHYj


        cax9ArbHDzukt5HJ9wxbpuGe7+fvvL1esLU6BTmsSHpyfggGRiaxe3yJaJzfhbI/wGHJ7MqKS1ZKv+xx


        gWFoDDtH57h7jCGeSGDQHoTJGUwL5M6MSrsKFd5y/jst6DaapQkuEI6+4eU1hoZRP4dFFhTMK6FYUKB4


        SQHVciGKbMpPQafBxAWhiDRBPA7S73O4gH0HWtGtza9BrVslCnUSrSmBPAET3Eee0GO9Ra8tjGQyySUs


        8iQ1XvVn58xU1WnxG1zAJmn61pmIPgBiIY95z/CSIgAAAABJRU5ErkJggg==


</value>


  </data>


  <data name="Billdy.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">


    <value>


        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8




 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs


@@ -780,6 +780,58 @@




        #region ç¼“存列表模块调用




        #region ç¼“存列表界面，返回缓存列表信息




        /// <summary>


        /// ç¼“存列表界面，返回缓存列表信息


        /// </summary>


        /// <returns></returns>


        [Route("WEBSController/GetKf_PonderationBillMain_TempList_New_Json")]


        [HttpGet]


        public object GetKf_PonderationBillMain_TempList_New_Json(string HBillType, string HMaker, Int64 HStockOrgID)


        {


            try


            {


                ds = oWebs.GetKf_PonderationBillMain_TempList_New(HBillType, HMaker, HStockOrgID);


                if (ds == null || ds.Tables[0].Rows.Count == 0)


                {


                    objJsonResult.code = "0";


                    objJsonResult.count = 0;


                    objJsonResult.Message = "没有返回任何记录！";


                    objJsonResult.data = null;


                    return objJsonResult;


                }


                else


                {


                    List<object> columnNameList = new List<object>();


                    //添加列名


                    foreach (DataColumn col in ds.Tables[0].Columns)


                    {


                        Type dataType = col.DataType;


                        string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                        columnNameList.Add(JsonConvert.DeserializeObject(ColmString));  //获取到DataColumn列对象的列名


                    }


                    objJsonResult.code = "0";


                    objJsonResult.count = 1;


                    objJsonResult.Message = "获取单据缓存列表信息成功！";


                    objJsonResult.data = ds.Tables[0];


                    objJsonResult.list = columnNameList;


                    return objJsonResult;


                }


            }


            catch (Exception e)


            {


                objJsonResult.code = "0";


                objJsonResult.count = 0;


                objJsonResult.Message = "获取单据缓存列表信息失败！" + e.ToString();


                objJsonResult.data = null;


                return objJsonResult;


            }


        }




        #endregion






        #region ç¼“存列表    ç¼–辑功能调用




        /// <summary>




 WebAPI/Web.config


@@ -22,7 +22,7 @@


        <!--<add key="FileIP" value="http://localhost:8082/LuBaoAPI"/>-->


        <!--<add key="FileIP" value="http://localhost:8080/" />-->


        <!--<add key="sUrl" value="http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx"/>    -->


        <!--<add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/>--><!--颜台式机-->


        <add key="sUrl" value="http://192.168.63.20/WEBS-WMS/WebService1.asmx"/><!--颜台式机-->


        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> å¤å®-->


        <!--<add key="sUrl" value="http://60.190.4.42:9003/WebService/WebService1.asmx" /> -->


        <!--<add key="sUrl" value="http://10.10.130.181/WEBS-WMS/WebService1.asmx"/>    åšæ—¥ç§‘技-->


@@ -34,7 +34,7 @@


        <!--<add key="sUrl" value="http://192.168.80.90:9090/WEBS-WMS/WebService1.asmx"/>     å®‰ç‘žæœåŠ¡å™¨-->


        <!--<add key="sUrl" value="http://47.96.97.237/WEBS-WMS/WebService1.asmx"/> -->    <!--测试服务器-->


        <!--<add key="sUrl" value="http://localhost:8082/WEBS/WebService1.asmx"/>    æœ¬åœ°-->


        <add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/>    <!--陈雯静本地配置-->


        <!--<add key="sUrl" value="http://192.168.56.1:81/web/WebService1.asmx"/>-->    <!--陈雯静本地配置-->


        <add key="webpages:Version" value="3.0.0.0" />


        <add key="webpages:Enabled" value="false" />


        <add key="ClientValidationEnabled" value="true" />