工序流转卡、生产任务单、工艺路线新增保存组织，列表组织过滤

YL

2021-09-27 a3f4fe73cfc233c4a912d603344a5cb650db4c93

工序流转卡、生产任务单、工艺路线新增保存组织，列表组织过滤

 DAL/Éú²ú¹ÜÀí/ClsSc_ICMOBill.cs

@@ -38,6 +38,7 @@
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sc_ICMOBillMain set  " +
                ",HPRDORGID=" + omodel.HPRDORGID.ToString() +
                " HBillNo='" + omodel.HBillNo + "'" +
                ",HSeOrderBillNo='" + omodel.HSeOrderBillNo + "'" +
                ",HSeOrderInterID=" + omodel.HSeOrderInterID.ToString() +
@@ -116,14 +117,14 @@
                ",HSeOrderInterID,HSeOrderEntryID,HDeptID,HDeptNumber,HCusID,HCusNumber" +
                ",HCenterID,HCenterNumber,HMaterID,HMaterNumber,HUnitID,HUnitNumber" +
                ",HBomID,HBomNumber,HRoutingInterID,HPlanBeginDate,HPlanEndDate,HBeginDate" +
                ",HEndDate,HLevNum,HReadyQty,HPlanQty,HRelationQty,HOrderProcNo" +
                ",HEndDate,HLevNum,HReadyQty,HPlanQty,HRelationQty,HOrderProcNo,HPRDORGID" +
                ") " +
                " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "','" + omodel.HSeOrderBillNo + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + DBUtility.ClsPub.CurUserName + "',getdate(),'" + omodel.HRemark + "'," + omodel.HEmpID.ToString() + ",'" + omodel.HEmpNumber + "'" +
                "," + omodel.HSeOrderInterID.ToString() + "," + omodel.HSeOrderEntryID.ToString() + "," + omodel.HDeptID.ToString() + ",'" + omodel.HDeptNumber + "'," + omodel.HCusID.ToString() + ",'" + omodel.HCusNumber +"'"+
                "," + omodel.HCenterID.ToString() + ",'" + omodel.HCenterNumber + "'," + omodel.HMaterID.ToString() + ",'" + omodel.HMaterNumber + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HUnitNumber + "'" +
                "," + omodel.HBomID.ToString() + ",'" + omodel.HBomNumber + "'," + omodel.HRoutingInterID.ToString() + ",'" + omodel.HPlanBeginDate.ToShortDateString() + "','" + omodel.HPlanEndDate.ToShortDateString() + "','" + omodel.HBeginDate.ToShortDateString() + "'" +
                ",'" + omodel.HEndDate.ToShortDateString() + "'," + omodel.HLevNum.ToString() + "," + omodel.HReadyQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HRelationQty.ToString() + ",'" + omodel.HOrderProcNo.ToString() +   "'" + 
                ",'" + omodel.HEndDate.ToShortDateString() + "'," + omodel.HLevNum.ToString() + "," + omodel.HReadyQty.ToString() + "," + omodel.HPlanQty.ToString() + "," + omodel.HRelationQty.ToString() + ",'" + omodel.HOrderProcNo.ToString() +   "','"+omodel.HPRDORGID.ToString()+"'" + 
                ") ");
                ////插入子表
                //foreach (Model.ClsSc_ICMOBillSub oSub in DetailColl)
@@ -154,7 +155,7 @@
            {
                //查询主表
                DataSet Ds ;
                Ds = oCn.RunProcReturn("Select * from Sc_ICMOBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_ICMOBillMain");
                Ds = oCn.RunProcReturn("Select * from Sc_ICMOBillMain Where HInterID=" + lngBillKey.ToString()+ " and HPRDORGID="+DBUtility.ClsPub.HOrgID+"", "Sc_ICMOBillMain");
                if(Ds.Tables[0].Rows.Count==0)
                {
                    sReturn = "单据未找到！";

 DAL/¼Æ»®¹ÜÀí/ClsGy_RoutingBill.cs

@@ -38,6 +38,7 @@
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Gy_RoutingBillMain set  " +
                ",HPRDORGID=" + omodel.HPRDORGID.ToString() +
                " HName='" + omodel.HName + "'" +
                ",HBillNo='" + omodel.HBillNo + "'" +
                ",HMaterTypeID=" + omodel.HMaterTypeID.ToString() +
@@ -184,14 +185,14 @@
                ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
                ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HPRDORGID,HVerNum" +
                ") " +
                " values('" + this.BillType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "'" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "'," + omodel.HMaterTypeID.ToString() +
                ",'" + omodel.HRoutingGroupID.ToString() + "'," + omodel.HUnitID.ToString() + ",'" + omodel.HMaterNumber + "','" + omodel.HUnitNumber + "'," + DBUtility.ClsPub.BoolToString(omodel.HStandard) +
                "," + omodel.HMainGroupID.ToString() + "," + omodel.HMainProcID.ToString() + "," + omodel.HMainCenterID.ToString() + ",'" + omodel.HMainTimeUnit + "'," + omodel.HMainUnitTime.ToString() + "," + omodel.HMainWorkQty.ToString() +
                "," + omodel.HMainPrice.ToString() + "," + omodel.HStdSourceQty.ToString() + "," + omodel.HAddSourceRate + "," + omodel.HDelSourceRate.ToString() +
                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','" + omodel.HVerNum.ToString() + "'"+
                ",'" + omodel.HPicNumVer.ToString() + "','" + omodel.HPicNumAssemble.ToString() + "','" + omodel.HMaterTexture.ToString() + "','" + omodel.HProductNum.ToString() + "','"+omodel.HPRDORGID.ToString()+"','" + omodel.HVerNum.ToString() + "'"+
                ") ");
                //插入子表
                foreach (Model.ClsGy_RoutingBillSub oSub in DetailColl)
@@ -261,7 +262,7 @@
            {
                //查询主表
                DataSet Ds ;
                Ds = oCn.RunProcReturn("Select * from Gy_RoutingBillMain Where HInterID=" + lngBillKey.ToString(), "Gy_RoutingBillMain");
                Ds = oCn.RunProcReturn("Select * from Gy_RoutingBillMain Where HInterID=" + lngBillKey.ToString()+" and HPRDORGID='"+DBUtility.ClsPub.HOrgID.ToString()+"'", "Gy_RoutingBillMain");
                if(Ds.Tables[0].Rows.Count==0)
                {
                    sReturn = "单据未找到！";

 DAL/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBill.cs

@@ -63,6 +63,7 @@
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPRDORGID='" + omodel.HPRDORGID.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
@@ -287,7 +288,7 @@
                ",HProdMaterName,HCusName,HWorkRemark,HImportNote,HMaterNumber_A" +
                ",HMaterNumber_B,HMaterNumber_C,HMaterNumber_D,HProdType,HMaterShortName" +
                ",HMaterIDA,HMaterIDB,HMaterIDC,HMaterIDD,HICMOEntryID" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum" +
                ",HPicNumVer,HPicNumAssemble,HMaterTexture,HProductNum,HVerNum,HPRDORGID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + omodel.HMaker + "',getdate()," + "" + (omodel.HPrevMainSourceInterID == 0 ? omodel.HInterID : omodel.HPrevMainSourceInterID) +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + omodel.HBatchNo + "'," + omodel.HMainMaterID.ToString() + "," + omodel.HKeyMaterID.ToString() + "," + omodel.HNo.ToString() + ",'" + omodel.HOrderProcNO + "'" +
@@ -299,7 +300,7 @@
                ",'" + omodel.HProdMaterName + "','" + omodel.HCusName + "','" + omodel.HWorkRemark + "','" + omodel.HImportNote + "','" + omodel.HMaterNumber_A + "'" +
                ",'" + omodel.HMaterNumber_B + "','" + omodel.HMaterNumber_C + "','" + omodel.HMaterNumber_D + "','" + omodel.HProdType + "','" + omodel.HMaterShortName + "'" +
                ",'" + omodel.HMaterIDA + "','" + omodel.HMaterIDB + "','" + omodel.HMaterIDC + "','" + omodel.HMaterIDD + "'," + omodel.HICMOEntryID +
                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "'" +
                ",'" + omodel.HPicNumVer + "','" + omodel.HPicNumAssemble + "','" + omodel.HMaterTexture + "','" + omodel.HProductNum + "','" + omodel.HVerNum + "','"+ omodel.HPRDORGID+ "'" +
                ") ");
                //插入子表
                foreach (Model.ClsSc_ProcessExchangeBillSub oSub in DetailColl)
@@ -456,7 +457,7 @@
            {
                //查询主表
                DataSet Ds;
                Ds = oCn.RunProcReturn("Select * from Sc_ProcessExchangeBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_ProcessExchangeBillMain");
                Ds = oCn.RunProcReturn("Select * from Sc_ProcessExchangeBillMain Where HInterID=" + lngBillKey.ToString()+" and HPRDORGID=" + DBUtility.ClsPub.HOrgID + " ", "Sc_ProcessExchangeBillMain");
                if (Ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据未找到！";

 DBUtility/ÒµÎñµ¥¾Ý/ClsXt_BaseBillMain.cs

@@ -39,6 +39,9 @@
        public string HMainSourceBillNo;
        public string HMainSourceBillType; 
        public Int64 HMainSourceInterID;
        public Int64 HMainSourceEntryID; 
        public Int64 HMainSourceEntryID;

        //组织
        public Int64 HPRDORGID;
    }
}

 PlanM/¼Æ»®¹ÜÀí/Gy_RoutingBill.cs

@@ -1042,6 +1042,7 @@
            if (BillStatus ==DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                BillNew.omodel.HInterID = BillOld.omodel.HInterID;
            //主类赋值
            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //组织
            BillNew.omodel.HYear = 2011;
            BillNew.omodel.HPeriod = 1;
            BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //在赋值类前就处理好字符串和数字

 PlanM/¼Æ»®¹ÜÀí/Gy_RoutingBillList.cs

@@ -46,7 +46,7 @@
            //过滤条件
            if (frmCondition.SqlStr.Trim().Length == 0)
                return;
            sSql = frmCondition.SqlStr + sWhere + " order by å•æ®å· desc,hsubid ";
            sSql = frmCondition.SqlStr + sWhere + " and HPRDORGID='"+DBUtility.ClsPub.HOrgID.ToString()+"' order by å•æ®å· desc,hsubid ";
            //
            DSet = SubCn.RunProcReturn(sSql, ViewName, ref DBUtility.ClsPub.sExeReturnInfo);
            //生成首行标题

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -57,6 +57,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                BillNew.omodel.HPRDORGID= mainList[0].HPRDORGID;//组织
                BillNew.omodel.HInterID = mainList[0].HInterID;//递入type得到的单据ID
                BillNew.omodel.HYear = sYear;
                BillNew.omodel.HPeriod = sPeriod;

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -134,6 +134,7 @@
                double HStdSourceQty = mainList[0].HStdSourceQty;//标准资源数
                double HAddSourceRate = mainList[0].HAddSourceRate;//加资源增量
                double HDelSourceRate = mainList[0].HDelSourceRate;//减资源减量
                int HPRDORGID = mainList[0].HPRDORGID;  //组织

                //主表
                oCN.RunProc("Insert Into Gy_RoutingBillMain   " +
@@ -141,13 +142,13 @@
                ",HYear,HPeriod,HRemark,HMaker,Hmakedate,HMaterID,HName,HMaterTypeID" +
                ",HRoutingGroupID,HUnitID,HMaterNumber,HUnitNumber,HStandard" +
                ",HMainGroupID,HMainProcID,HMainCenterID,HMainTimeUnit,HMainUnitTime,HMainWorkQty" +
                ",HMainPrice,HStdSourceQty,HAddSourceRate,HDelSourceRate" +
                ",HMainPrice,HStdSourceQty,HAddSourceRate,HPRDORGID,HDelSourceRate" +
                ") " +
                " values('" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
                "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HMaker + "',getdate()," + HMaterID + ",'" + HName + "'," + HMaterTypeID +
                "," + HRoutingGroupID + "," + HUnitID + ",'" + HMaterNumber + "','" + HUnitNumber + "'," + Convert.ToString(HStandard ? 1 : 0) +
                "," + HMainGroupID + "," + HMainProcID + "," + HMainCenterID + ",'" + HMainTimeUnit + "'," + HMainUnitTime + "," + HMainWorkQty +
                "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HDelSourceRate +
                "," + HMainPrice + "," + HStdSourceQty + "," + HAddSourceRate + "," + HPRDORGID + "," + HDelSourceRate +
                ") ");

                //保存子表

 WebAPI/Models/Gy_RoutingBill.cs

@@ -29,5 +29,7 @@
        public double HAddSourceRate { get; set; }
        public double HDelSourceRate { get; set; }

        public int HPRDORGID { get; set; }

    }
}

 WorkM/Á÷ת¿¨¹ÜÀí/Sc_ProcessExchangeBill.cs

@@ -1357,6 +1357,7 @@
            //
            BillNew.omodel.HYear = sYear;
            BillNew.omodel.HPeriod = sPeriod;
            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //组织
            //固定赋值=================================
            BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //在赋值类前就处理好字符串和数字
            BillNew.omodel.HDate = this.dtpHDate.Value;

 WorkM/Á÷ת¿¨¹ÜÀí/Sc_ProcessExchangeBillList.cs

@@ -858,6 +858,7 @@
            //    MessageBox.Show("没有输入条件!");
            //    return;
            //}
            sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
            sDlgWhere = sFastSQL;
            Display();
            sDlgWhere = "";

 WorkM/Éú²ú¹ÜÀí/Sc_ICMOBill.cs

@@ -893,6 +893,7 @@
            if (BillStatus == DBUtility.ClsPub.Enum_BillStatus.BillStatus_Modify)
                BillNew.omodel.HInterID = BillOld.omodel.HInterID;
            //主类赋值
            BillNew.omodel.HPRDORGID = DBUtility.ClsPub.HOrgID;  //组织
            BillNew.omodel.HYear = 2011;
            BillNew.omodel.HPeriod = 1;
            BillNew.omodel.HBillNo = this.txtHBillNo.Text.Trim();  //在赋值类前就处理好字符串和数字

 WorkM/Éú²ú¹ÜÀí/Sc_ICMOBillList.cs

@@ -646,6 +646,7 @@
            //    MessageBox.Show("没有输入条件!");
            //    return;
            //}
            sFastSQL = sFastSQL + " and HPRDORGID=" + DBUtility.ClsPub.HOrgID + "";
            sDlgWhere = sFastSQL;
            Display();
            sDlgWhere = "";