进站单控制打开 开工单 保存后控制往后放

yangle

2024-09-10 35ede7c9c6277fcbaeabf8d475c802f43b51627c

 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs

@@ -606,6 +606,49 @@
        }
        #endregion

        #region 器具寿命耗用分析报表 
        [Route("Sc_MouldRepairInBillList/Get_Sc_MouldLifeUsePicReport")]
        [HttpGet]
        public object Get_Sc_MouldLifeUsePicReport(string sWhere)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Sc_MouldLifeUsePicReport order by 月份 desc", "h_v_Sc_MouldLifeUsePicReport");
                }
                else
                {
                    string sql1 = "select * from h_v_Sc_MouldLifeUsePicReport where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 日期 ";
                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldLifeUsePicReport");
                }
                //添加列名
                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.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        /// <summary>
@@ -1248,8 +1291,6 @@
                    }
                    //================================================================================== 

                    //更新及时库存表   减少调入库存,增加调出库存
                    ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory_Move  '"+ oBill.omodel.HInterID + "','"+ oBill.omodel.HBillType+ "','1'", "h_KF_UPDateICinventory_Move");

                    //审核单据
                    if (!oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)
@@ -1301,9 +1342,6 @@
                        return objJsonResult;
                    }
                    //===========================================================          

                    //更新及时库存表   增加调入库存,减少调出库存
                    ds = oCN.RunProcReturn("exec h_KF_UPDateICinventory_Move  '" + oBill.omodel.HInterID + "','" + oBill.omodel.HBillType + "','2'", "h_KF_UPDateICinventory_Move");

                    //反审核单据
                    if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_Kf_MoveStockBill_AfterUnCheckCtrl", user, ref DBUtility.ClsPub.sExeReturnInfo) == true)