合并

ch

2022-11-23 695d9c4cda618bae357d6f70a068b604dac4fdd3

 WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_SOPBillEditController.cs

@@ -27,7 +27,7 @@
        public DAL.ClsGy_SOPBill BillOld = new DAL.ClsGy_SOPBill();
        public bool BillChange;   //
        public DataGridView grdMain = new System.Windows.Forms.DataGridView();
        ClsGridViewSum oSumGrid = new ClsGridViewSum();
        ClsGridViewSum oSumGrid = new ClsGridViewSum();        

        //定义
        public const Int16 HTagCol = 0;
@@ -139,7 +139,7 @@
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();//当前人
                string msg3 = sArray[2].ToString();//当前人

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
@@ -159,6 +159,17 @@
                string HRemark = list[0].HRemark;
                bool HStandard = list[0].HStandard;
                bool HUse = list[0].HUse;
                string HMaker = msg3;
                int HMaterTypeID = list[0].HMaterTypeID;

                //子表
                List<SOPBillSub> list2 = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SOPBillSub>>(msg2);

                int HProcNo = list2[0].HProcNo;
                long HProcID = list2[0].HProcID;
                long HWorkStationID = list2[0].HWorkStationID;
                long HCenterID = list2[0].HCenterID;
                string HRemark2 = list2[0].HRemark;

                //判断权限
                //if (!ClsPub.Security_Log("Gy_Repair_Edit", 1, false, msg3))
@@ -170,6 +181,17 @@
                //    return objJsonResult;
                //}

                DataSet CS;
                Int64 lID = 0;
                string BillType = "";
                CS = oCN.RunProcReturn("select * from Gy_BillNumber with (nolock) where BillCode='" + 3305 + "'", "Gy_BillNumber");

                if (CS.Tables[0].Rows.Count != 0)
                {
                    lID = ClsPub.isLong(CS.Tables[0].Rows[0]["IDNow"].ToString());
                    BillType = CS.Tables[0].Rows[0]["BillType"].ToString().Trim();
                }
               
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -178,16 +200,28 @@
                 ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
                 ",HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                 ") " +
                  " values('" + 3305 + "'," + HMaterID + ",'" + HMaterID + "','" + "2022-11-04" + "'" +
                "," + 2022 + "," + 11 + ",'" + HRemark + "','" + "Test" + "'," + "2022-11-04" + "," + HMaterID.ToString() + ",'" + HName + "'," + 656 +
                  " values('" + 3305 + "'," + lID + ",'" + HBillNo + "'," + "getdate()" +
                "," + "datepart(yyyy,GETDATE())" + "," + "datepart(mm,getdate())" + ",'" + HRemark + "','" + HMaker + "'," + "getdate()" + "," + HMaterID.ToString() + ",'" + HName + "'," + HMaterTypeID +
                "," + HUnitID.ToString() + ",'" + HMaterNumber + "','" + HUnitNumber + "','" + HStandard.ToString() +
                "') ");
            
                oCN.RunProc("update Gy_BillNumber set IDNow=IDNow+1 where BillType='" + BillType.Trim() + "'");
                //" values(" + 3305 + "','" + 12333 + "','" + "test" + "','" + HDate + "','" +
                //2022 + "','" + 11 + "','" + HRemark + "','" + "Test" + "','" + "2022-11-04" + "','" + HMaterID.ToString() + "','" + HName + "','" + "656" +
                //"','" + HUnitID.ToString() + "','" + HMaterNumber + "','" + HUnitNumber + "','" + HStandard.ToString() +
                //") ");
                //修改上级为非末级代码
                //oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

                //插入子表
              oCN.RunProc("Insert into Gy_SOPBillSub " +
                "(HInterID,HEntryID,HProcID,HProcNO" +
                ",HWorkStationID,HCenterID,HRemark" +
                ") values("
                + lID + "," + 1 + "," + HProcID + "," + HProcNo +
                "," + HWorkStationID + "," + HCenterID + ",'" + HRemark2 + "'" +
                ") ");
              

                oCN.Commit();
                objJsonResult.code = "1";
@@ -291,6 +325,25 @@
            int filesize = files.ContentLength;//获取上传文件的大小单位为字节byte
            int Maxsize = 40000 * 1024;//定义上传文件的最大空间大小为40M

            DataSet CS;
            Int64 lID = 0;
            string BillType = "";
            CS = oCN.RunProcReturn("select * from Gy_BillNumber with (nolock) where BillCode='" + 3305 + "'", "Gy_BillNumber");
            if (CS.Tables[0].Rows.Count != 0)
            {
                lID = ClsPub.isLong(CS.Tables[0].Rows[0]["IDNow"].ToString())-1;
                BillType = CS.Tables[0].Rows[0]["BillType"].ToString().Trim();
            }

            DataSet Ds;
            Int64 Sno = 1;
            Ds = oCN.RunProcReturn("select MAX(HSno) HSno from Gy_SOPBillSub2" , "Gy_SOPBillSub2");
            if (Ds.Tables[0].Rows.Count != 0 && ClsPub.isLong(Ds.Tables[0].Rows[0]["HSno"].ToString())!= 0)
            {
                Sno = ClsPub.isLong(Ds.Tables[0].Rows[0]["HSno"].ToString());
                Sno += 1;
            }

            try
            {
                if (files == null || files.ContentLength <= 0)
@@ -322,11 +375,11 @@
                        //这里可以执行一些其它的操作，比如更新数据库
                        //写入数据表
                        oCN.RunProc("Insert into Gy_SOPBillSub2 (HFileName,HPath,HFileType" +
                                    ",HUpMan,HUpTime,HInterID,HEntryID,HSno,HFileID,HFileSize" +
                                   ") values('"
                                    + filename.ToString() + "','" + filePath.ToString() + "','" +  fileExtension.ToString() + "'" +
                                    ",'" + HUserName + "',getdate()"  + ",'" + 0 + "','" + 0 + "','" + 0 + "','" + 0 + "','" + 0 +
                                   "') ");
                               ",HUpMan,HUpTime,HInterID,HEntryID,HSno,HFileID,HFileSize" +
                              ") values('"
                               + filename.ToString() + "','" + filePath.ToString() + "','" +  fileExtension.ToString() + "'" +
                               ",'" + HUserName + "',getdate()"  + ",'" + Sno + "','" + 0 + "','" + Sno + "','" + lID + "','" + 0 +
                        "') ");
                    }
                    else
                    {