基础资料的功能完善

yangle

2022-06-15 bc117c27cab90a7da821d29107109dffb35fa5dc

基础资料的功能完善

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_Source_Model.cs

@@ -22,5 +22,6 @@
        public double HMaxWorkTimes;//money        //单班最大工时             --addnew
        public double HMinAdd;//        money        //最小进阶             --addnew
        public Int64 HClassCount;//    int        //每日班次                  --addnew
        public int HUSEORGID;
    }
}

 WebAPI/Controllers/BaseSet/Gy_GroupController.cs

@@ -286,6 +286,7 @@
                var HBarCodeForBase = list[0].HBarCodeForBase;
                var HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;
                int HUSEORGID = list[0].HUSEORGID;
                var HDeptNumber = "";
                //var HEndFlag = 0;
                long HLevel = 1;
@@ -326,10 +327,10 @@
                    oCN.RunProc("Insert into Gy_Group " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HEmpQty,HDeptID,HDeptNumber,HProcID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase) " +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HBarCodeForBase,HUSEORGID) " +
                    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    "," + HEmpQty.ToString() + "," + HDeptID.ToString() + ",'" + HDeptNumber + "'," + HProcID.ToString() +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "','" + HBarCodeForBase + "',"+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();

 WebAPI/Controllers/BaseSet/Gy_ProcessController.cs

@@ -321,6 +321,7 @@
                string HBarCodeForBase = list[0].HBarCodeForBase;
                long HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;
                int HUSEORGID = list[0].HUSEORGID;

                //判断权限
                //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
@@ -358,12 +359,14 @@
                        " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                        ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
                        ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
                        ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
                        ",HUSEORGID) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
                        "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
                        ",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
                        ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                        ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
                        ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();

 WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs

@@ -256,8 +256,8 @@
                }

                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
                msg1 = "[" + msg1.ToString() + "]";
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);

                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
@@ -277,9 +277,10 @@
                var HProcID = list[0].HProcID;
                var HLevel = list[0].HLevel;
                var HWorkTimes = list[0].HWorkTimes;
                int HUSEORGID = list[0].HUSEORGID;

                //判断权限
                if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg3))
                if (!ClsPub.Security_Log("Gy_WorkCenter_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -314,11 +315,11 @@
                   " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                   ",HDeptNumber,HWorkTimes,HQty" +
                   ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase" +
                   ",HProcID,HDayMoney) " +
                   ",HProcID,HDayMoney,HUSEORGID) " +
                   " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                    ",'" + HDeptNumber + "'," + HWorkTimes + "," + HQty +
                    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) +
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + HRemark + "'," + HDeptID + ",'" + HBarCodeForBase + "'," + HProcID + "," + HDayMoney + ","+ HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update  Gy_WorkCenter set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();

 WebAPI/DLL/ClsGy_Source_Ctl.cs

@@ -22,12 +22,12 @@
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HType,HRelationID,HCenterID,HEquipFileID_K3,HDeptID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HProcID,HOverTimes " +
                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID)" +
                    ",HWorkTimes,HMaxWorkTimes,HMinAdd,HClassCount,HGroupID,HGroupK3ID,HUSEORGID)" +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ",'" + oModel.HType + "'," + oModel.HRelationID.ToString() + "," + oModel.HCenterID.ToString() + "," + oModel.HEquipFileID_K3.ToString() + "," + oModel.HDeptID.ToString() +
                    "," + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) +
                    ",'" + oModel.HRemark + "'," + oModel.HProcID + "," + oModel.HOverTimes + "," + oModel.HWorkTimes + "," + oModel.HMaxWorkTimes +
                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    "," + oModel.HMinAdd + "," + oModel.HClassCount + "," + oModel.HGroupID.ToString() + "," + oModel.HGroupK3ID.ToString() + ","+ oModel.HUSEORGID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();

 WebAPI/Models/Gy_Group.cs

@@ -20,6 +20,7 @@
        public long HDeptID { get; set; }
        public long HEmpQty { get; set; }
        public long HProcID { get; set; }
        public int HUSEORGID;

        public string HBarCodeForBase { get; set; }
        

 WebAPI/Models/Gy_WorkCenter.cs

@@ -24,6 +24,7 @@
        public long HProcID { get; set; }
        public long HLevel { get; set; }
        public long HDayMoney { get; set; }
        public int HUSEORGID { get; set; }

        public string HBarCodeForBase { get; set; }
        

 WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Process.cs

@@ -33,6 +33,7 @@
        public long HDeptID { get; set; }
        public long HEmpQty { get; set; }
        public long HProcID { get; set; }
        public int HUSEORGID { get; set; }

        public string HBarCodeForBase { get; set; }