Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

ch

2022-09-22 bfb964a3d1c4c30989e0cf88aeecc2a49c3a950e

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -86,9 +86,9 @@
                //    return objJsonResult;
                //}

                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HCzybm);
                if (lngBillKey == 0)
                string lngBillKey = "";
                lngBillKey = DBUtility.ClsPub.isStrNull(HCzybm);
                if (lngBillKey == "")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;

 WebAPI/Controllers/BaseSet/Xt_grdAlignment_WMESController.cs

@@ -56,7 +56,7 @@
            public string HSortFlag;
            public string HSelTotal;
            public string HColumnWidth;
          

        }
        public class grdAlignmentSub
        {
@@ -123,7 +123,7 @@
                    ")  values('" + user + "','" + HModName + "','" + HGridString + "'," + (omdelMian.HFixCols == "" ? "0" : omdelMian.HFixCols) +
                    "," + (omdelMian.HFontSize == "" ? "0" : omdelMian.HFontSize) + ",0" +
                    ",0,'" + omdelMian.HSortFlag + "','" + omdelMian.HSelTotal + "'" +
                    ","+ (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");
                    "," + (omdelMian.HColumnWidth == "" ? "0" : omdelMian.HColumnWidth) + ")");


                objJsonResult.code = "1";

 WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs

@@ -40,7 +40,8 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList  order by hmainid desc", "h_v_MES_StationEntrustInBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustInBillList", "h_v_MES_StationEntrustInBillList");
                    //  order by hmainid desc æŽ’序丢到数据库里进行处理
                }
                else
                {

 WebAPI/Controllers/CJGL/Cj_StationEntrustOutBillController.cs

@@ -40,7 +40,8 @@

                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList order by hmainid desc", "h_v_MES_StationEntrustOutBillList");
                    ds = oCN.RunProcReturn("select * from h_v_MES_StationEntrustOutBillList ", "h_v_MES_StationEntrustOutBillList");
                    //order by hmainid desc æŽ’序丢到数据库里进行处理
                }
                else
                {

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -670,11 +670,28 @@
                omdelMian = Newtonsoft.Json.JsonConvert.DeserializeObject<Gy_RoutingBill_temporary>(msg2);


                ds = oCN.RunProcReturn("select  distinct äº§å“ä»£ç ,工艺路线代码 from  diyipi ", "diyipi");
                ds = oCN.RunProcReturn("select  distinct äº§å“ä»£ç ,isnull(工艺路线代码,'') å·¥è‰ºè·¯çº¿ä»£ç  from  diyipi ", "diyipi");

                for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                {
                    var HBillNo = ds.Tables[0].Rows[i]["工艺路线代码"].ToString();//获得一个新的单据号
                    if (HBillNo == "")
                    {
                        DataSet dataSet = oCN.RunProcReturn($"select HBillNo  from  Gy_RoutingBillMain where HBillNo='1' ", "Gy_RoutingBillMain");
                        while (1 == 1)
                        {
                            if (HBillNo != "")
                            {
                                if (dataSet.Tables[0].Rows.Count==0)
                                {
                                    break;
                                }
                            }
                            HBillNo = DBUtility.ClsPub.CreateBillCode(BillType, ref DBUtility.ClsPub.sExeReturnInfo, true);
                            dataSet = oCN.RunProcReturn($"select HBillNo  from  Gy_RoutingBillMain where HBillNo='{HBillNo}' ", "Gy_RoutingBillMain");
                        }

                    }
                    var HInterID = DBUtility.ClsPub.CreateBillID_Prod(BillType, ref DBUtility.ClsPub.sExeReturnInfo);//获得一个新的id
                    oCN.RunProc($"exec Gy_RoutingBill_Excel '{ds.Tables[0].Rows[i]["产品代码"].ToString()}',{HInterID},'{HBillNo}','{user}',{omdelMian.HOrgID},{omdelMian.HTProcessFlag} ");
                }

 WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs

@@ -176,7 +176,7 @@
                        var HMaterModel = list[i]["规格型号"].ToString();
                        var HUnitID = list[i]["HUnitID"].ToString();
                        var HSeOrderBillQty = list[i]["销售订单数量"].ToString();
                        var HOrderNeedQty = list[i]["订单需求数量"].ToString();
                        //var HOrderNeedQty = list[i]["订单需求数量"].ToString();
                        var HSplitQty = list[i]["拆单数量"].ToString();
                        var HDayPlanSumQty = list[i]["日计划数量总量"].ToString();
                        var HPlanBeginDate = list[i]["计划开始日期"].ToString();
@@ -218,16 +218,18 @@
                            "HICMOEntrySEQ,HWorkShopID,HSourceID, HYX, HProdORGID," +
                            " HMaterID, HMaterName, HMaterModel, HUnitID, HSeOrderBillQty," +
                            " HOrderNeedQty, HSplitQty, HDayPlanSumQty,HPlanBeginDate," +
                            "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate)values" +
                            "HSeOrderBillNo,HICMOBillType,HSourceStockInQty,HLeftPlanQty,HOrderLev,HPreparatDate," +
                            "HMainSourceInterID,HMainSourceEntryID)values" +
                            $"({HInterID},'{HBillNo}',{DateTime.Now.Year},{DateTime.Now.Month},'{BillType}'," +
                            $"'{BillType}',GETDATE(),1,'{user}',getdate(),'{HICMOBillNo}','{HOrderType}'," +
                            $"{(HICMOEntrySEQ == "" ? 0.ToString() : HICMOEntrySEQ)},{(HWorkShopID == "" ? 0.ToString() : HWorkShopID)},{(HSourceID == "" ? 0.ToString() : HSourceID)}, {(HYX == "" ? 0.ToString() : HYX)}, {(HProdORGID == "" ? 0.ToString() : HProdORGID)}," +
                            $" {(HMaterID == "" ? 0.ToString() : HMaterID)}, '{HMaterName}', '{HMaterModel}', {(HUnitID == "" ? 0.ToString() : HUnitID)}, {(HSeOrderBillQty == "" ? 0.ToString() : HSeOrderBillQty)}," +
                            $" {(HOrderNeedQty == "" ? 0.ToString() : HOrderNeedQty)}, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
                            $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate())");
                            $" 0, {(HSplitQty == "" ? 0.ToString() : HSplitQty)}, {(HDayPlanSumQty == "" ? 0.ToString() : HDayPlanSumQty)},'{HPlanBeginDate}'," +
                            $"'{HSeOrderBillNo}','{HICMOBillType}',{(HSourceStockInQty == "" ? 0.ToString() : HSourceStockInQty)},{(HLeftPlanQty == "" ? 0.ToString() : HLeftPlanQty)},'{HOrderLev}',getdate()," +
                            $"{HMainSourceInterID},{HMainSourceEntryID})");
                    }

                    oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["日计划数量总量"].ToString()} where HInterID={list[i]["hmainid"].ToString()} and HBillNo='{list[i]["单据号"].ToString()}'");
                    oCN.RunProc($"update Sc_WorkBillSortBillMain set HDayPlanSumQty={list[i]["日计划数量总量"].ToString()} where HInterID={(HInterID==0?int.Parse(list[i]["hmainid"].ToString()):HInterID)} and HBillNo='{(HBillNo==""?list[i]["单据号"].ToString(): HBillNo)}'");

                    int SumDay = 31; //动态两月之差 DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days;

@@ -1150,5 +1152,33 @@
        }
        #endregion

        #region ç”Ÿäº§æ—¥è®¡åˆ’平台 ç”Ÿäº§è®¢å•æŸ¥è¯¢
        [Route("JIT_DayPlanPlatFormBill/JIT_ICMOBillList")]
        [HttpGet]
        public object JIT_ICMOBillList(string hmainid, string HEntryID)
        {
            try
            {

                oCN.RunProc("exec h_p_ICMOBillList_PrimarySubTable");
                ds = oCN.RunProcReturn($"select * from  ##ICMOBillList where æºå•ä¸»å†…码 in({hmainid}) and  æºå•å­å†…码 in({HEntryID})", "##ICMOBillList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationInBill.designer.cs

@@ -62,7 +62,6 @@
            this.cmdCancel = new System.Windows.Forms.Button();
            this.lblCaption = new System.Windows.Forms.Label();
            this.gbUp = new System.Windows.Forms.GroupBox();
            this.grdSub = new System.Windows.Forms.DataGridView();
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.txtHGroupName = new System.Windows.Forms.TextBox();
@@ -100,15 +99,18 @@
            this.label23 = new System.Windows.Forms.Label();
            this.label22 = new System.Windows.Forms.Label();
            this.label21 = new System.Windows.Forms.Label();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.grdCardList = new System.Windows.Forms.DataGridView();
            this.panel2 = new System.Windows.Forms.Panel();
            this.txtHBarCode_Mater = new System.Windows.Forms.TextBox();
            this.label25 = new System.Windows.Forms.Label();
            this.txtHBarCode = new System.Windows.Forms.TextBox();
            this.label19 = new System.Windows.Forms.Label();
            this.grdSub = new System.Windows.Forms.DataGridView();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.grdCardList = new System.Windows.Forms.DataGridView();
            this.timer1 = new System.Windows.Forms.Timer(this.components);
            this.panel1 = new System.Windows.Forms.Panel();
            this.cmdHmrlk = new System.Windows.Forms.Button();
            this.cmdHbclk = new System.Windows.Forms.Button();
            this.cmdDelLine = new System.Windows.Forms.Button();
            this.cmdXZ = new System.Windows.Forms.Button();
            this.button2 = new System.Windows.Forms.Button();
@@ -116,16 +118,14 @@
            this.cmdHDelBill = new System.Windows.Forms.Button();
            this.cmdXG = new System.Windows.Forms.Button();
            this.cmdAddNew = new System.Windows.Forms.Button();
            this.cmdHbclk = new System.Windows.Forms.Button();
            this.cmdHmrlk = new System.Windows.Forms.Button();
            this.gbUp.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.tabControl1.SuspendLayout();
            this.tabPage1.SuspendLayout();
            this.tabPage2.SuspendLayout();
            this.panel2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).BeginInit();
            this.groupBox1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).BeginInit();
            this.panel2.SuspendLayout();
            this.panel1.SuspendLayout();
            this.SuspendLayout();
            // 
@@ -513,35 +513,20 @@
            // gbUp
            // 
            this.gbUp.BackColor = System.Drawing.Color.Transparent;
            this.gbUp.Controls.Add(this.grdSub);
            this.gbUp.Controls.Add(this.tabControl1);
            this.gbUp.Controls.Add(this.groupBox1);
            this.gbUp.Controls.Add(this.panel2);
            this.gbUp.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gbUp.Location = new System.Drawing.Point(0, 0);
            this.gbUp.Name = "gbUp";
            this.gbUp.Size = new System.Drawing.Size(1036, 589);
            this.gbUp.Size = new System.Drawing.Size(811, 413);
            this.gbUp.TabIndex = 114;
            this.gbUp.TabStop = false;
            // 
            // grdSub
            // 
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdSub.Location = new System.Drawing.Point(3, 407);
            this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdSub.Name = "grdSub";
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 27;
            this.grdSub.Size = new System.Drawing.Size(752, 179);
            this.grdSub.TabIndex = 149;
            // 
            // tabControl1
            // 
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Top;
            this.tabControl1.Location = new System.Drawing.Point(3, 61);
            this.tabControl1.Location = new System.Drawing.Point(3, 65);
            this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
@@ -1046,33 +1031,6 @@
            this.label21.TabIndex = 122;
            this.label21.Text = "生产资源2：";
            // 
            // groupBox1
            // 
            this.groupBox1.Controls.Add(this.grdCardList);
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
            this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
            this.groupBox1.Location = new System.Drawing.Point(755, 61);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Size = new System.Drawing.Size(278, 525);
            this.groupBox1.TabIndex = 152;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "本站工单";
            // 
            // grdCardList
            // 
            this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdCardList.Location = new System.Drawing.Point(2, 21);
            this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdCardList.Name = "grdCardList";
            this.grdCardList.RowHeadersWidth = 51;
            this.grdCardList.RowTemplate.Height = 27;
            this.grdCardList.Size = new System.Drawing.Size(274, 502);
            this.grdCardList.TabIndex = 150;
            // 
            // panel2
            // 
            this.panel2.Controls.Add(this.txtHBarCode_Mater);
@@ -1084,7 +1042,7 @@
            this.panel2.Location = new System.Drawing.Point(3, 17);
            this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(1030, 44);
            this.panel2.Size = new System.Drawing.Size(805, 44);
            this.panel2.TabIndex = 151;
            // 
            // txtHBarCode_Mater
@@ -1137,6 +1095,46 @@
            this.label19.TabIndex = 112;
            this.label19.Text = "流转卡：";
            // 
            // grdSub
            // 
            this.grdSub.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdSub.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.grdSub.Location = new System.Drawing.Point(0, 413);
            this.grdSub.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdSub.Name = "grdSub";
            this.grdSub.ReadOnly = true;
            this.grdSub.RowHeadersWidth = 51;
            this.grdSub.RowTemplate.Height = 27;
            this.grdSub.Size = new System.Drawing.Size(811, 176);
            this.grdSub.TabIndex = 149;
            // 
            // groupBox1
            // 
            this.groupBox1.Controls.Add(this.grdCardList);
            this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
            this.groupBox1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.groupBox1.ForeColor = System.Drawing.Color.Yellow;
            this.groupBox1.Location = new System.Drawing.Point(811, 0);
            this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.groupBox1.Size = new System.Drawing.Size(225, 589);
            this.groupBox1.TabIndex = 152;
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "本站工单";
            // 
            // grdCardList
            // 
            this.grdCardList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            this.grdCardList.Dock = System.Windows.Forms.DockStyle.Fill;
            this.grdCardList.Location = new System.Drawing.Point(2, 21);
            this.grdCardList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
            this.grdCardList.Name = "grdCardList";
            this.grdCardList.RowHeadersWidth = 51;
            this.grdCardList.RowTemplate.Height = 27;
            this.grdCardList.Size = new System.Drawing.Size(221, 566);
            this.grdCardList.TabIndex = 150;
            // 
            // timer1
            // 
            this.timer1.Enabled = true;
@@ -1160,6 +1158,28 @@
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(1036, 65);
            this.panel1.TabIndex = 115;
            // 
            // cmdHmrlk
            // 
            this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
            this.cmdHmrlk.Name = "cmdHmrlk";
            this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
            this.cmdHmrlk.TabIndex = 127;
            this.cmdHmrlk.Text = "默认列宽";
            this.cmdHmrlk.UseVisualStyleBackColor = true;
            this.cmdHmrlk.Visible = false;
            this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
            // 
            // cmdHbclk
            // 
            this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
            this.cmdHbclk.Name = "cmdHbclk";
            this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
            this.cmdHbclk.TabIndex = 126;
            this.cmdHbclk.Text = "保存列宽";
            this.cmdHbclk.UseVisualStyleBackColor = true;
            this.cmdHbclk.Visible = false;
            this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
            // 
            // cmdDelLine
            // 
@@ -1235,26 +1255,6 @@
            this.cmdAddNew.Visible = false;
            this.cmdAddNew.Click += new System.EventHandler(this.cmdAddNew_Click);
            // 
            // cmdHbclk
            // 
            this.cmdHbclk.Location = new System.Drawing.Point(659, 5);
            this.cmdHbclk.Name = "cmdHbclk";
            this.cmdHbclk.Size = new System.Drawing.Size(85, 28);
            this.cmdHbclk.TabIndex = 126;
            this.cmdHbclk.Text = "保存列宽";
            this.cmdHbclk.UseVisualStyleBackColor = true;
            this.cmdHbclk.Click += new System.EventHandler(this.cmdHbclk_Click);
            // 
            // cmdHmrlk
            // 
            this.cmdHmrlk.Location = new System.Drawing.Point(659, 33);
            this.cmdHmrlk.Name = "cmdHmrlk";
            this.cmdHmrlk.Size = new System.Drawing.Size(85, 28);
            this.cmdHmrlk.TabIndex = 127;
            this.cmdHmrlk.Text = "默认列宽";
            this.cmdHmrlk.UseVisualStyleBackColor = true;
            this.cmdHmrlk.Click += new System.EventHandler(this.cmdHmrlk_Click);
            // 
            // MES_StationInBill
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1262,6 +1262,8 @@
            this.BackColor = System.Drawing.Color.Gray;
            this.ClientSize = new System.Drawing.Size(1036, 654);
            this.Controls.Add(this.gbUp);
            this.Controls.Add(this.grdSub);
            this.Controls.Add(this.groupBox1);
            this.Controls.Add(this.panel1);
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.KeyPreview = true;
@@ -1273,16 +1275,16 @@
            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.MES_StationInBill_KeyDown);
            this.Resize += new System.EventHandler(this.Sc_StationInBill_Resize);
            this.gbUp.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
            this.tabControl1.ResumeLayout(false);
            this.tabPage1.ResumeLayout(false);
            this.tabPage1.PerformLayout();
            this.tabPage2.ResumeLayout(false);
            this.tabPage2.PerformLayout();
            this.groupBox1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).EndInit();
            this.panel2.ResumeLayout(false);
            this.panel2.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdSub)).EndInit();
            this.groupBox1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.grdCardList)).EndInit();
            this.panel1.ResumeLayout(false);
            this.ResumeLayout(false);