1

zrg

2024-06-25 4bfab3d9173fcced07cea4afb71227b83b47c469

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -852,7 +852,7 @@
                    return objJsonResult;
                }

                string sql1 = "select top 1000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql1 = "select top 5000 * from h_v_IF_BarCodeBillList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by hmainid desc";
                ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");

@@ -938,7 +938,18 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                

                //进行 会计期间 结账 的判断和控制
                string s = "";
                int sYear = 0;
                int sPeriod = 0;
                DateTime HDate = DateTime.Now;
                if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(HDate, ref sYear, ref sPeriod, ref s) == false)
                {
                    objJsonResult.Message = s;
                    return objJsonResult;
                }

                Ds = oCN.RunProcReturn("Select * from h_v_IF_BarCodeBillList Where HItemID in (" + HInterID + ")", "h_v_IF_BarCodeBillList");
                if (Ds.Tables[0].Rows.Count != 0)
                {
@@ -1171,7 +1182,7 @@
                return objJsonResult;
            }
            //保存主表
            objJsonResult = AddBillMain(msg2);
            objJsonResult = AddBillMain(msg1);
            if (objJsonResult.code == "0")
            {
                oCN.RollBack();
@@ -1188,8 +1199,13 @@
            return objJsonResult;
        }

        public json AddBillMain(string msg2)
        public json AddBillMain(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();//模块权限
            string msg4 = sArray[2].ToString();//当前人
            string msg5 = sArray[3].ToString();//子表数据
            try
            {
                msg2 = "[" + msg2.ToString() + "]";
@@ -1244,7 +1260,8 @@
                int HNowSupTypeID = mainList[0].HNowSupTypeID;
                int HMadeSupID = mainList[0].HMadeSupID;
                string HMouldClass = mainList[0].HMouldClass;

                int HNowWHID = mainList[0].HNowWHID;
                int HNowSPID = mainList[0].HNowSPID;

                //主表
                oCN.RunProc("Insert Into Gy_MouldFileMain   " +
@@ -1257,7 +1274,7 @@
                ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID,HBarCode,HMadeSupID" +
                ",HMouldClass) " +
                ",HMouldClass,HNowWHID,HNowSPID) " +
                " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()" +
                ",'" + HMouldNo + "','" + HName + "','" + HModel + "','" + HModel2 + "','" + HDiameter + "'" +
@@ -1267,8 +1284,7 @@
                "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID + "," + HCaveQty +
                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID + "','" + HNowSupTypeID + "'" +
                ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID + "','" + HMouldMaintainRuleInterID + "','" + HBarCode + "'," + HMadeSupID +
                ",'"+ HMouldClass + "') ");

                ",'"+ HMouldClass + "'," + HNowWHID + "," + HNowSPID + ") ");

                //子表
                oCN.RunProc("Insert into Gy_MouldFileSub " +
@@ -1278,6 +1294,8 @@
                " values('" + HInterID + "',0,''" +
                ",0,0,'','',0,0 " +
                ") ");

                objJsonResult = AddBillSub(msg5,HInterID, HBillNo);

                if (objJsonResult.code == "0")
                {
@@ -1320,6 +1338,7 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();//模块权限
            string msg4 = sArray[2].ToString();//当前人
            string msg5 = sArray[3].ToString();//子表数据
            try
            {
                if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
@@ -1386,6 +1405,8 @@
                int HNowSupTypeID = mainList[0].HNowSupTypeID;
                int HMadeSupID = mainList[0].HMadeSupID;
                string HMouldClass = mainList[0].HMouldClass;
                int HNowWHID = mainList[0].HNowWHID;
                int HNowSPID = mainList[0].HNowSPID;

                //若MAINDI重复则重新获取
                oCN.BeginTran();
@@ -1440,13 +1461,19 @@
                ",HProdWeight=" + HProdWeight.ToString() +
                ",HBarCode='" + HBarCode.ToString() + "'" +
                ",HMadeSupID=" + HMadeSupID +
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                " where HInterID=" + HInterID.ToString());

                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Department,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 为非末级
                // oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                //

                oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");

                objJsonResult = AddBillSub(msg5, HInterID, HBillNo);

                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -1465,6 +1492,39 @@
            }
        }

        public json AddBillSub(string msg5, long HInterID, string HBillNo)
        {
            List<Gy_MouldFileSub_SubMater> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_MouldFileSub_SubMater>>(msg5);
            int i = 0;                                          //作为子表内码
            foreach (Gy_MouldFileSub_SubMater oSub in DetailColl)
            {
                i++;                                            //同一个主表下的子表的内码自增

                int HEntryID = i;
                string HRemark = oSub.HRemark;
                int HMouldFileID = oSub.HMouldFileID;
                DateTime HUnionDate = oSub.HUnionDate;
                            
                string sql = "insert into Gy_MouldFileSub_SubMater" +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HMouldFileID,HUnionDate) " +
                    "values(" +
                    "" + HInterID +
                    ",'" + HBillNo +
                    "'," + HEntryID +
                    ",'" + HRemark +
                    "','" + HMouldFileID +
                    "','" + HUnionDate +                   
                    "')";

                oCN.RunProc(sql);
            }

            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = null;
            objJsonResult.data = null;
            return objJsonResult;
        }

        /// <summary>
        /// 磨具档案修改按钮方法-计算下次保养/校正日期-获取档案最近一次的保养记录
@@ -1512,7 +1572,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList where hmainid=" + HInterID, "h_v_Gy_MouldFileList");
                ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFile_Edit where hmainid=" + HInterID, "h_v_Gy_MouldFile_Edit");

                objJsonResult.code = "1";
                objJsonResult.count = 1;