Revert "1"

yangle

2024-08-19 862097cc6f2f14118ea0672f74e751af8a82be0d

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -990,6 +990,7 @@
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //判断是否有查询权限
                if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 1, false, user))
                {
@@ -1004,10 +1005,19 @@
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");

                //添加列名
                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)
@@ -1420,6 +1430,7 @@
                long HSPID = mainList[0].HSPID;
                Double HDesignLife = mainList[0].HDesignLife;
                Double HUseLife = mainList[0].HUseLife;
                Double HInitLife = mainList[0].HInitLife;//上线初始化寿命
                Double HLeaveLife = mainList[0].HLeaveLife;
                Double HProdQty = mainList[0].HProdQty;
                Double HProdWeight = mainList[0].HProdWeight;
@@ -1451,7 +1462,7 @@
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
                ",HMouldClass,HNowWHID,HNowSPID) " +
                ",HMouldClass,HNowWHID,HNowSPID,HInitLife) " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
@@ -1461,7 +1472,7 @@
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ") ");
                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ",'" + HInitLife + "') ");

                //子表
                oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -1568,6 +1579,7 @@
                long HSPID = mainList[0].HSPID;
                Double HDesignLife = mainList[0].HDesignLife;
                Double HUseLife = mainList[0].HUseLife;
                Double HInitLife = mainList[0].HInitLife;
                Double HLeaveLife = mainList[0].HLeaveLife;
                Double HProdQty = mainList[0].HProdQty;
                Double HProdWeight = mainList[0].HProdWeight;
@@ -1643,7 +1655,8 @@
                ",HMadeSupID=" + HMadeSupID +
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                " where HInterID=" + HInterID.ToString());
                ",HInitLife='" + HInitLife +
                "' where HInterID=" + HInterID.ToString());

                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);