1
duhe
2023-12-01 992c1b2a44134896ddbe9941307959c2b9d022e3
1
13个文件已修改
1个文件已添加
444 ■■■■■ 已修改文件
DAL/生产管理/设备管理/ClsSb_EquipDotCheckBill.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/设备管理/ClsSb_EquipDotCheckBillMain.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/生产管理/设备管理/ClsSb_EquipMaintainBillMain.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Kf_WeighToBarCode.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Kf_WeighToBarCode.designer.cs 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MateOutController.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/POStockInBillController.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_ProcessMangementController.cs 142 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Web.config 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBill.cs
@@ -137,6 +137,9 @@
                      "'," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" +
                      ") ");
                }
                //点检完成,反写设备点检计划单子表是否点检标记
                oCn.RunProc("exec h_p_Sb_EquipDotCheck_AfterSaveCtrl " + omodel.HEquipDotCheckPlanInterID + "," + omodel.HEquipDotCheckPlanEntryID);
                //
                //foreach (Model.ClsSb_EquipDotCheckBillSub oSub in DetailColl)
                //{
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBill.cs
@@ -162,6 +162,10 @@
                          "'" +
                          ") ");
                }
                //保养完成,反写设备保养计划单子表是否点检标记
                oCn.RunProc("exec h_p_Sb_EquipMaintain_AfterSaveCtrl " + omodel.HEquipMaintainPlanInterID + "," + omodel.HEquipMaintainPlanEntryID);
                sReturn = "新增单据成功!";
                oCn.Commit();
                return true;
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipDotCheckBillMain.cs
@@ -16,7 +16,8 @@
        public int HEquipMaintainRuleInterID;
        public int HEquipDotCheckRuleInterID;
        public int HEquipDotCheckPlanInterID; //设备点检计划单(Sb_EquipDotCheckPlanBillSub_Plan)主内码
        public int HEquipDotCheckPlanEntryID; //设备点检计划单(Sb_EquipDotCheckPlanBillSub_Plan)子内码
    }
}
Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBillMain.cs
@@ -15,6 +15,7 @@
        public Int64 HDeptID;
        public int HEquipMaintainRuleInterID;
        public int HEquipMaintainPlanInterID; //设备保养计划单(Sb_EquipMaintainPlanBillSub_Plan)主内码
        public int HEquipMaintainPlanEntryID; //设备保养计划单(Sb_EquipMaintainPlanBillSub_Plan)子内码
    }
}
WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.cs
@@ -795,6 +795,7 @@
            HProcessExchangeInterID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("ProcessExchangeInterID")].Value);
            HSupID = DBUtility.ClsPub.isLong(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HSupID")].Value);
            HMaterWeight = DBUtility.ClsPub.isDoule(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("HMaterWeight")].Value);
            txtHOrderPickRemark.Text = DBUtility.ClsPub.isStrNull(grdSub.SelectedRows[0].Cells[Fun_GetSubCol("订单包装备注")].Value);
        }
        //返回源单列表信息
WarM/ÌõÂë´òÓ¡/Kf_WeighToBarCode.designer.cs
@@ -30,8 +30,8 @@
        {
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Kf_WeighToBarCode));
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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();
@@ -98,6 +98,8 @@
            this.中间 = new System.Windows.Forms.Panel();
            this.底部 = new System.Windows.Forms.Panel();
            this.右侧 = new System.Windows.Forms.Panel();
            this.label17 = new System.Windows.Forms.Label();
            this.txtHOrderPickRemark = new System.Windows.Forms.TextBox();
            this.Tool.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
            this.gbUp.SuspendLayout();
@@ -270,14 +272,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;
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdMain.DefaultCellStyle = dataGridViewCellStyle5;
            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);
@@ -285,7 +287,7 @@
            this.grdMain.ReadOnly = true;
            this.grdMain.RowHeadersWidth = 51;
            this.grdMain.RowTemplate.Height = 23;
            this.grdMain.Size = new System.Drawing.Size(1091, 377);
            this.grdMain.Size = new System.Drawing.Size(1091, 334);
            this.grdMain.TabIndex = 19;
            this.grdMain.Paint += new System.Windows.Forms.PaintEventHandler(this.grdMain_Paint);
            // 
@@ -354,6 +356,8 @@
            // gbUp
            // 
            this.gbUp.BackColor = System.Drawing.Color.Transparent;
            this.gbUp.Controls.Add(this.label17);
            this.gbUp.Controls.Add(this.txtHOrderPickRemark);
            this.gbUp.Controls.Add(this.label15);
            this.gbUp.Controls.Add(this.txtHCusModel);
            this.gbUp.Controls.Add(this.label16);
@@ -393,7 +397,7 @@
            this.gbUp.Dock = System.Windows.Forms.DockStyle.Top;
            this.gbUp.Location = new System.Drawing.Point(0, 0);
            this.gbUp.Name = "gbUp";
            this.gbUp.Size = new System.Drawing.Size(1105, 218);
            this.gbUp.Size = new System.Drawing.Size(1105, 261);
            this.gbUp.TabIndex = 58;
            this.gbUp.TabStop = false;
            // 
@@ -474,7 +478,7 @@
            // chkHDYFlag
            // 
            this.chkHDYFlag.AutoSize = true;
            this.chkHDYFlag.Location = new System.Drawing.Point(558, 188);
            this.chkHDYFlag.Location = new System.Drawing.Point(558, 236);
            this.chkHDYFlag.Margin = new System.Windows.Forms.Padding(2);
            this.chkHDYFlag.Name = "chkHDYFlag";
            this.chkHDYFlag.Size = new System.Drawing.Size(72, 16);
@@ -486,7 +490,7 @@
            // 
            this.cmdFZF.BackColor = System.Drawing.Color.White;
            this.cmdFZF.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdFZF.Location = new System.Drawing.Point(729, 174);
            this.cmdFZF.Location = new System.Drawing.Point(729, 222);
            this.cmdFZF.Margin = new System.Windows.Forms.Padding(2);
            this.cmdFZF.Name = "cmdFZF";
            this.cmdFZF.Size = new System.Drawing.Size(86, 32);
@@ -499,7 +503,7 @@
            // 
            this.cmdZF.BackColor = System.Drawing.Color.White;
            this.cmdZF.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdZF.Location = new System.Drawing.Point(635, 174);
            this.cmdZF.Location = new System.Drawing.Point(635, 222);
            this.cmdZF.Margin = new System.Windows.Forms.Padding(2);
            this.cmdZF.Name = "cmdZF";
            this.cmdZF.Size = new System.Drawing.Size(86, 32);
@@ -635,7 +639,7 @@
            // 
            this.cmdSave.BackColor = System.Drawing.Color.White;
            this.cmdSave.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSave.Location = new System.Drawing.Point(209, 174);
            this.cmdSave.Location = new System.Drawing.Point(209, 222);
            this.cmdSave.Margin = new System.Windows.Forms.Padding(2);
            this.cmdSave.Name = "cmdSave";
            this.cmdSave.Size = new System.Drawing.Size(86, 32);
@@ -659,7 +663,7 @@
            // 
            this.cmdSourceBillNo.BackColor = System.Drawing.Color.White;
            this.cmdSourceBillNo.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 174);
            this.cmdSourceBillNo.Location = new System.Drawing.Point(102, 222);
            this.cmdSourceBillNo.Margin = new System.Windows.Forms.Padding(2);
            this.cmdSourceBillNo.Name = "cmdSourceBillNo";
            this.cmdSourceBillNo.Size = new System.Drawing.Size(86, 32);
@@ -728,14 +732,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;
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
            dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window;
            dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText;
            dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
            dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
            this.grdSub.DefaultCellStyle = dataGridViewCellStyle6;
            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);
@@ -751,10 +755,10 @@
            // 
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabControl1.Location = new System.Drawing.Point(0, 218);
            this.tabControl1.Location = new System.Drawing.Point(0, 261);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            this.tabControl1.Size = new System.Drawing.Size(1105, 409);
            this.tabControl1.Size = new System.Drawing.Size(1105, 366);
            this.tabControl1.TabIndex = 149;
            // 
            // tabPage1
@@ -763,7 +767,7 @@
            this.tabPage1.Location = new System.Drawing.Point(4, 22);
            this.tabPage1.Name = "tabPage1";
            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage1.Size = new System.Drawing.Size(1097, 383);
            this.tabPage1.Size = new System.Drawing.Size(1097, 340);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "称重记录";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -867,6 +871,31 @@
            this.右侧.Size = new System.Drawing.Size(12, 627);
            this.右侧.TabIndex = 64;
            // 
            // label17
            //
            this.label17.AutoSize = true;
            this.label17.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label17.ForeColor = System.Drawing.Color.Black;
            this.label17.Location = new System.Drawing.Point(15, 177);
            this.label17.Name = "label17";
            this.label17.Size = new System.Drawing.Size(77, 12);
            this.label17.TabIndex = 324;
            this.label17.Text = "订单包装备注";
            //
            // txtHOrderPickRemark
            //
            this.txtHOrderPickRemark.BackColor = System.Drawing.SystemColors.Window;
            this.txtHOrderPickRemark.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtHOrderPickRemark.ForeColor = System.Drawing.Color.Red;
            this.txtHOrderPickRemark.ImeMode = System.Windows.Forms.ImeMode.NoControl;
            this.txtHOrderPickRemark.Location = new System.Drawing.Point(95, 173);
            this.txtHOrderPickRemark.Multiline = true;
            this.txtHOrderPickRemark.Name = "txtHOrderPickRemark";
            this.txtHOrderPickRemark.ReadOnly = true;
            this.txtHOrderPickRemark.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
            this.txtHOrderPickRemark.Size = new System.Drawing.Size(726, 44);
            this.txtHOrderPickRemark.TabIndex = 325;
            //
            // Kf_WeighToBarCode
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -968,5 +997,7 @@
        private System.Windows.Forms.TextBox txtHCusModel;
        private System.Windows.Forms.Label label16;
        private System.Windows.Forms.TextBox txtHCusMaterName;
        private System.Windows.Forms.Label label17;
        private System.Windows.Forms.TextBox txtHOrderPickRemark;
    }
}
WebAPI/Controllers/MateOutController.cs
@@ -2076,6 +2076,7 @@
            public string HProductName { get; set; }
            public string HOtherSearch { get; set; }
            public string HEmpName { get; set; }
            public string sWheres { get; set; }
        }
        [Route("MaterOutEntryReport/SC_DayRkReport")]
        [HttpGet]
@@ -2086,7 +2087,7 @@
               DayRkReport DayRkReportList = JsonConvert.DeserializeObject<DayRkReport>(sWhere);
                string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
                    $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}'";
                    $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}','{DayRkReportList.HOtherSearch}','{DayRkReportList.HEmpName}','{DayRkReportList.sWheres}'";
                //string sql = $"exec h_p_Gy_DayRkReport '{DayRkReportList.HBeginDate}','{DayRkReportList.HEndDate}','{DayRkReportList.HMaterNumber}'" +
                //    $",'{DayRkReportList.HProductName}','{DayRkReportList.HCustomerName}'";
WebAPI/Controllers/POStockInBillController.cs
@@ -4439,6 +4439,7 @@
                            jobject16.Add("FSRCENTRYID", dataRow2["FENTRYID"].ToString());
                            jobject16.Add("FORDERBILLNO", dataRow2["FBILLNO"].ToString());
                            jobject16.Add("FPOORDERENTRYID", dataRow2["FENTRYID"].ToString());
                            jobject16.Add("FGiveAway", dataRow2["FGIVEAWAY"].ToString());//是否赠品
                            //jobject16.Add("FPrice", dataRow2["FPRICE"].ToString());
                            //jobject16.Add("FTaxPrice", dataRow2["FTAXPRICE"].ToString());
                            //jobject16.Add("FEntryTaxRate", dataRow2["FTAXRATE"].ToString());
@@ -5060,6 +5061,7 @@
,D.FSUPPLIERID,DS.FNUMBER AS FSUPPLIERNUMBER,D.FPURCHASEORGID,DOO.FNUMBER AS FPURCHASEORGNUMBER,CROO.FNUMBER  AS FSETTLEORGNUMBER,
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
,C.FGIVEAWAY AS FGIVEAWAY
FROM CG_POINSTOCKBILLSUB B  
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -5143,6 +5145,7 @@
                                FentityModel.Add("FPrice", item["FPRICE"].ToString());//单价
                                FentityModel.Add("FTaxPrice", item["FTAXPRICE"].ToString());//含税单价
                                FentityModel.Add("FEntryTaxRate", item["FTAXRATE"].ToString());//税率
                                FentityModel.Add("FGiveAway", item["FGIVEAWAY"].ToString());//是否赠品
                                JArray Fentity2 = new JArray();
                                JObject FentityModel2 = new JObject();
WebAPI/Controllers/SBGL/Sb_EquipDotCheckPlanBillController.cs
@@ -355,6 +355,44 @@
        }
        #endregion
        #region[设备点检记录表,选点检计划获取点检计划清单信息]
        [Route("Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBill_PlanList")]
        [HttpGet]
        public object Sb_EquipDotCheckPlanBill_PlanList(string HInterID,string HDate)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn("exec h_p_Sb_EquipDotCheck_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipDotCheck_GetPlanList");
                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有查询到数据信息!";
                    objJsonResult.data = ds.Tables[0];
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "发生异常,没有返回任何计划!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region[设备点检计划表编辑时获取表体数据--点检计划]
        [Route("Sb_EquipDotCheckPlanBill/GetPlanList")]
        [HttpGet]
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -413,6 +413,54 @@
        }
        #endregion
        #region[设备保养记录表,选保养计划获取保养计划清单信息]
        [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBill_PlanList")]
        [HttpGet]
        public object Sb_EquipMaintainPlanBill_PlanList(string HInterID, string HDate)
        {
            DataSet ds,ds1;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                List<DataTable> tableList = new List<DataTable>();
                //获取保养项目
                ds = oCN.RunProcReturn("exec h_p_Sb_EquipMaintain_GetPlanList " + HInterID + ",'" + HDate + "'", "h_p_Sb_EquipMaintain_GetPlanList");
                //获取配件项目编辑数据
                string sql1 = "select HMaterID, é…ä»¶ä»£ç  HMaterNumber,配件名称 HMaterName,单位ID HUnitID,单位代码 HUnitNumber,单位名称 HUnitName,用量 HQty,标准用量 HQtyMust,表体备注 HRemark,负责人ID HManagerID,负责人代码 HManagerNumber,负责人 HManagerName  from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 and hmainid = " + HInterID;
                ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList");
                tableList.Add(ds.Tables[0]);
                tableList.Add(ds1.Tables[0]);
                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = tableList;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "没有查询到数据信息!";
                    objJsonResult.data = tableList;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "发生异常,没有返回任何计划!" + e.ToString();
                objJsonResult.data = null;
            }
            return objJsonResult;
        }
        #endregion
        #region[设备保养计划表编辑时获取表体数据--保养计划]
        [Route("Sb_EquipMaintainPlanBill/GetPlanList")]
        [HttpGet]
WebAPI/Controllers/SCGL/Sc_ICMOBillWorkQtyStatus_TmpController.cs
New file
@@ -0,0 +1,105 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Web.Http;
using WebAPI.DLL;
using WebAPI.Models;
using WebAPI.Service;
using Kingdee.BOS.WebApi.Client;
namespace WebAPI.Controllers
{
    public class Sc_ICMOBillWorkQtyStatus_TmpController : ApiController
    {
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        #region è®¾å¤‡äº§é‡é‡‡é›†åˆ—表
        [Route("Sc_ICMOBillWorkQtyStatus_Tmp/Sc_ICMOBillWorkQtyStatus_TmpList")]
        [HttpGet]
        public object Sc_ICMOBillWorkQtyStatus_TmpList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from Sc_ICMOBillWorkQtyStatus_TmpList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by é‡‡é›†æ—¶é—´ desc";
                ds = oCN.RunProcReturn(sql, "Sc_ICMOBillWorkQtyStatus_TmpList");
                //添加列名
                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 = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.list = columnNameList;
                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
        #region è®¾å¤‡äº§é‡é‡‡é›†åˆ—表
        [Route("Sc_ICMOBillQualityStatus_Tmp/Sc_ICMOBillQualityStatus_TmpList")]
        [HttpGet]
        public object Sc_ICMOBillQualityStatus_TmpList(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                string sql1 = "select * from Sc_ICMOBillQualityStatus_TmpList where 1 = 1  ";
                string sql = sql1 + sWhere + " order by åˆ¶å•日期 desc";
                ds = oCN.RunProcReturn(sql, "Sc_ICMOBillQualityStatus_TmpList");
                //添加列名
                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 = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess!";
                objJsonResult.list = columnNameList;
                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
    }
}
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -394,6 +394,83 @@
        //}
        #endregion
        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
        /// <param name="InterID">工序汇报单主ID</param>
        /// <returns></returns>
        [Route("Sc_ProcessMangement/SaveICMOReportBill_Batch")]
        [HttpPost]
        public object SaveICMOReportBill_Batch([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string InterID = sArray[0].ToString();
            string user = sArray[1].ToString();
            string BillNo = sArray[2].ToString();
            string OrganizationID = sArray[3].ToString();
            ArrayList InterIDArray = new ArrayList(InterID.Split(','));
            ArrayList BillNoArray = new ArrayList(BillNo.Split(','));
            try
            {
                string bResult;
                string HMessage = "";
                string HSuccessBillNo = "";
                string HFailBillNo = "";
                WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController();
                if (InterIDArray.Count != BillNoArray.Count)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "数据不完整,内码数量不等于单据号数量";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    for (int i = 0; i < InterIDArray.Count;i++)
                    {
                        bResult = JsonConvert.SerializeObject(oBill.SaveICMOReportBill(InterIDArray[i].ToString(), user, BillNoArray[i].ToString(), OrganizationID));
                        //反序列化
                        bResult = "[" + bResult.ToString() + "]";
                        List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult);
                        if (list[0].count == 1)
                        {
                            HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString()+"," + "\r\n" ;
                        }
                        else
                        {
                            HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n";
                        }
                        HMessage = "汇报成功单号:" + HSuccessBillNo + "\r\n" + "  æ±‡æŠ¥å¤±è´¥å•号:" + HFailBillNo;
                    }
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = HMessage;
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
@@ -613,6 +690,71 @@
            }
        }
        /// <summary>
        /// å…¥åº“——生产汇报单
        /// </summary>
        /// <param name="InterID">工序汇报单主ID</param>
        /// <returns></returns>
        [Route("Sc_ProcessMangement/SaveProcdutInBill_Batch")]
        [HttpPost]
        public object SaveProcdutInBill_Batch([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string BillNo = sArray[0].ToString();
            BillNo = BillNo.Replace("\r\n", "").Replace("[ ", "").Replace("]", "");
            BillNo = BillNo.Replace("\\", "").Replace("\n", "").Replace("\"", "");
            BillNo = BillNo.Trim();
            ArrayList BillNoArray = new ArrayList(BillNo.Split(','));
            try
            {
                string bResult;
                string HMessage = "";
                string HSuccessBillNo = "";
                string HFailBillNo = "";
                WebAPI.Controllers.Sc_ProcessMangementController oBill = new WebAPI.Controllers.Sc_ProcessMangementController();
                for (int i = 0; i < BillNoArray.Count; i++)
                {
                    bResult = JsonConvert.SerializeObject(oBill.SaveProcdutInBill(BillNoArray[i].ToString().Trim()));
                    //反序列化
                    bResult = "[" + bResult.ToString() + "]";
                    List<JsonResult> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<JsonResult>>(bResult);
                    if (list[0].count == 1)
                    {
                        HSuccessBillNo = HSuccessBillNo + BillNoArray[i].ToString() + "," + "\r\n";
                    }
                    else
                    {
                        HFailBillNo = HFailBillNo + BillNoArray[i].ToString() + ":" + list[0].Message + "," + "\r\n";
                    }
                    HMessage = "入库成功单号:" + HSuccessBillNo + "\r\n" + "  å…¥åº“失败单号:" + HFailBillNo;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = HMessage;
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// å…¥åº“——产品入库单
WebAPI/Web.config
@@ -51,8 +51,9 @@
      </system.Web>
  -->
    <system.web>
        <customErrors mode="Off"/>
        <compilation debug="true" targetFramework="4.5" />
        <httpRuntime />
        <httpRuntime maxQueryStringLength="102400" />
        <pages controlRenderingCompatibilityVersion="4.0" />
    </system.web>
WebAPI/WebAPI.csproj
@@ -425,6 +425,7 @@
    <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
    <Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
    <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\DataHelper.cs" />
    <Compile Include="Controllers\SCGL\日计划管理\JIT_Cg_PODemandPlanBillController.cs" />