质量模块测试完善；物料编辑模块新增字段；工序出站汇报单编辑模块新增字段。

yusijie

2024-05-06 5dad27b8350e419bd5fc13627c161fc75c5bf824

质量模块测试完善；物料编辑模块新增字段；工序出站汇报单编辑模块新增字段。

 DAL/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_QCCheckProjectMain.cs

@@ -67,9 +67,10 @@
                ",HMaterTypeID=" + omodel.HMaterTypeID.ToString() +
                ",HUnitID=" + omodel.HUnitID.ToString() +
                ",HUnitNumber='" + omodel.HUnitNumber + "'" +
                ",HStandard=" + Convert.ToString(omodel.HStandard ? 1 : 0) +
                ",HStandard=" + Convert.ToString(omodel.HStandard == false ? 0 : 1) +
                ",HProcID=" + omodel.HProcID.ToString() +
                ",HDeptID=" + omodel.HDeptID.ToString() +
                ",HSampleSchemeID=" + omodel.HSampleSchemeID.ToString() +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
@@ -84,11 +85,26 @@
                      ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
                      ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HPrjNo,HQCCheckItemID,HQCStd,HQCStdMax,HQCUnit" +

                      ",HQCTool,HAnalysisMethod,HDefectLevel,HDestructInspect,HKeyInspect,HQualityStdID" +
                      ",HInspectMethodID,HInspectInstruMentID,HInspectBasisID,HSampleSchemeID,HStatus,HCompareSymbol" +
                      ",HTargetVal,HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HTargetValKey,HUpLimitKey" +
                      ",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
                      ",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
                      ",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
                      "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HPrjNo.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCStdMax + "','" + oSub.HQCUnit + "'" +
                      ",'" + oSub.HQCTool + "','" + oSub.HAnalysisMethod + "','" + oSub.HDefectLevel + "'," + oSub.HDestructInspect + "," + oSub.HKeyInspect +
                      "," + oSub.HQualityStdID + "," + oSub.HInspectMethodID + "," + oSub.HInspectInstruMentID + "," + oSub.HInspectBasisID + "," + oSub.HSampleSchemeID +
                      ",'" + oSub.HStatus + "','" + oSub.HCompareSymbol + "','" + oSub.HTargetVal + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit +
                      "','" + oSub.HUpLimit + "','" + oSub.HDownOffSet + "','" + oSub.HTargetValKey + "','" + oSub.HUpLimitKey + "','" + oSub.HDownLimitKey +
                      "','" + oSub.HUpOffSetKey + "','" + oSub.HDownOffSetKey + "'," + oSub.HTargetValQ + "," + oSub.HUpLimitQ + "," + oSub.HDownLimitQ +
                      "," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB +
                      "," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt
                      + "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
                      ") ");
                }

@@ -128,13 +144,13 @@
                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark" +
                ",HMaterID,HName,HMaterNumber,HMaterTypeID,HUnitID" +
                ",HUnitNumber,HStandard,HProcID,HDeptID" +
                ",HUnitNumber,HStandard,HProcID,HDeptID,HSampleSchemeID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",'" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'"+
                "," + omodel.HMaterID.ToString() + ",'" + omodel.HName + "','" + omodel.HMaterNumber + "'," + omodel.HMaterTypeID.ToString() + "," + omodel.HUnitID.ToString() +
                ",'" + omodel.HUnitNumber + "', " + Convert.ToString(omodel.HStandard ? 1 : 0) + "," + omodel.HProcID.ToString() + "," + omodel.HDeptID.ToString() +
                ") ");
                "," + omodel.HSampleSchemeID + ") ");
                //插入子表
                foreach (Model.ClsGy_QCCheckProjectSub oSub in DetailColl)
                {
@@ -143,11 +159,26 @@
                      ",HEntryCloseDate,HCloseType,HRemark,HSourceInterID" +
                      ",HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
                      ",HPrjNo,HQCCheckItemID,HQCStd,HQCStdMax,HQCUnit" +

                      ",HQCTool,HAnalysisMethod,HDefectLevel,HDestructInspect,HKeyInspect,HQualityStdID" +
                      ",HInspectMethodID,HInspectInstruMentID,HInspectBasisID,HSampleSchemeID,HStatus,HCompareSymbol" +
                      ",HTargetVal,HUpLimit,HDownLimit,HUpOffSet,HDownOffSet,HTargetValKey,HUpLimitKey" +
                      ",HDownLimitKey,HUpOffSetKey,HDownOffSetKey,HTargetValQ,HUpLimitQ,HDownLimitQ" +
                      ",HUpOffSetQ,HDownOffSetQ,HTargetValB,HUpLimitB,HDownLimitB,HUpOffSetB" +
                      ",HDownOffSetB,HTargetValTxt,HUpLimitTxt,HDownLimitTxt,HUpOffSetTxt,HDownOffSetTxt" +
                      ") values("
                      + omodel.HInterID.ToString() + ",'" + oSub.HBillNo_bak + "'," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "'" +
                      ",getdate()," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'," + oSub.HSourceInterID.ToString() +
                      "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HPrjNo.ToString() + "," + oSub.HQCCheckItemID.ToString() + ",'" + oSub.HQCStd + "','" + oSub.HQCStdMax + "','" + oSub.HQCUnit + "'" +
                      ",'" + oSub.HQCTool + "','" + oSub.HAnalysisMethod + "','" + oSub.HDefectLevel + "'," + oSub.HDestructInspect + "," + oSub.HKeyInspect +
                      "," + oSub.HQualityStdID + "," + oSub.HInspectMethodID + "," + oSub.HInspectInstruMentID + "," + oSub.HInspectBasisID + "," + oSub.HSampleSchemeID +
                      ",'" + oSub.HStatus + "','" + oSub.HCompareSymbol + "','" + oSub.HTargetVal  + "','" + oSub.HUpLimit + "','" + oSub.HDownLimit + 
                      "','" + oSub.HUpLimit + "','" + oSub.HDownOffSet + "','" + oSub.HTargetValKey + "','" + oSub.HUpLimitKey + "','" + oSub.HDownLimitKey + 
                      "','" + oSub.HUpOffSetKey + "','" + oSub.HDownOffSetKey + "'," + oSub.HTargetValQ + "," + oSub.HUpLimitQ + "," + oSub.HDownLimitQ + 
                      "," + oSub.HUpOffSetQ + "," + oSub.HDownOffSetQ + "," + oSub.HTargetValB + "," + oSub.HUpLimitB + "," + oSub.HDownLimitB + 
                      "," + oSub.HUpOffSetB + "," + oSub.HDownOffSetB + ",'" + oSub.HTargetValTxt + "','" + oSub.HUpLimitTxt + "','" + oSub.HDownLimitTxt 
                      + "','" + oSub.HUpOffSetTxt + "','" + oSub.HDownOffSetTxt + "'" +
                      ") ");
                }
                

 Model/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_QCCheckProjectMain.cs

@@ -16,5 +16,6 @@
        public bool HStandard;
        public Int64 HProcID;
        public Int64 HDeptID;
        public Int64 HSampleSchemeID;
    }
}

 Model/»ù´¡×ÊÁÏ/ÆäËû»ù´¡×ÊÁÏ/ClsGy_QCCheckProjectSub.cs

@@ -14,5 +14,42 @@
        public String HQCStdMax;
        public String HQCUnit;

        public String HQCTool;
        public String HAnalysisMethod;
        public String HDefectLevel;
        public Int64 HDestructInspect;
        public Int64 HKeyInspect;
        public Int64 HQualityStdID;
        public Int64 HInspectMethodID;
        public Int64 HInspectInstruMentID;
        public Int64 HInspectBasisID;
        public Int64 HSampleSchemeID;
        public String HStatus;
        public String HCompareSymbol;
        public String HTargetVal;
        public String HUpLimit;
        public String HDownLimit;
        public String HUpOffSet;
        public String HDownOffSet;
        public String HTargetValKey;
        public String HUpLimitKey;
        public String HDownLimitKey;
        public String HUpOffSetKey;
        public String HDownOffSetKey;
        public Decimal HTargetValQ;
        public Decimal HUpLimitQ;
        public Decimal HDownLimitQ;
        public Decimal HUpOffSetQ;
        public Decimal HDownOffSetQ;
        public Int64 HTargetValB;
        public Int64 HUpLimitB;
        public Int64 HDownLimitB;
        public Int64 HUpOffSetB;
        public Int64 HDownOffSetB;
        public String HTargetValTxt;
        public String HUpLimitTxt;
        public String HDownLimitTxt;
        public String HUpOffSetTxt;
        public String HDownOffSetTxt;
    }
}

 WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs

@@ -19,6 +19,7 @@
        private json objJsonResult = new json();
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        public DAL.ClsGy_QCCheckItem_Ctl BillOld = new DAL.ClsGy_QCCheckItem_Ctl();

        #region æ£€éªŒé¡¹ç›®åˆ—表数据
        /// <summary>
@@ -254,6 +255,18 @@
                long HQCCheckClassID = list[0].HQCCheckClassID;
                string HDefaultResult = list[0].HDefaultResult;

                long HUnitID = list[0].HUnitID;
                string HAnalysisMethod = list[0].HAnalysisMethod;
                string HDefectLevel = list[0].HDefectLevel;
                long HDestructInspect = list[0].HDestructInspect;
                long HKeyInspect = list[0].HKeyInspect;
                long HQualityStdID = list[0].HQualityStdID;
                long HInspectMethodID = list[0].HInspectMethodID;
                long HInspectInstruMentID = list[0].HInspectInstruMentID;
                long HInspectBasisID = list[0].HInspectBasisID;
                long HSampleSchemeID = list[0].HSampleSchemeID;
                long HISsystemSet = list[0].HISsystemSet;

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
@@ -270,9 +283,13 @@
                //主表
                oCN.RunProc("Insert Into Gy_QCCheckItem " +
                "(HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID,HDefaultResult) " +
                ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HQCCheckClassID,HDefaultResult" +
                ",HAnalysisMethod,HDefectLevel,HUnitID,HDestructInspect,HKeyInspect,HQualityStdID" +
                ",HInspectMethodID,HInspectInstruMentID,HInspectBasisID,HSampleSchemeID,HISsystemSet) " +
                " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HItemID + "'" +
                ",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','未使用','"+ HQCCheckClassID + "','" + HDefaultResult + "')");
                ",'"+ HLevel + "','0','" + Convert.ToString(HStopflag ? 1 : 0) + "','" + HRemark + "','未使用','"+ HQCCheckClassID + "','" + HDefaultResult + 
                "','" + HAnalysisMethod + "','" + HDefectLevel + "'," + HUnitID + "," + HDestructInspect + "," + HKeyInspect + "," + HQualityStdID +
                "," + HInspectMethodID + "," + HInspectInstruMentID + "," + HInspectBasisID + "," + HSampleSchemeID + "," + HISsystemSet + ")");
                //修改上级为非末级代码
                if (list[0].HItemID.ToString() != "")
                {
@@ -345,7 +362,19 @@
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                bool HUseFlag = list[0].HUseFlag;

                string HDefaultResult = list[0].HDefaultResult;
                long HUnitID = list[0].HUnitID;
                string HAnalysisMethod = list[0].HAnalysisMethod;
                string HDefectLevel = list[0].HDefectLevel;
                long HDestructInspect = list[0].HDestructInspect;
                long HKeyInspect = list[0].HKeyInspect;
                long HQualityStdID = list[0].HQualityStdID;
                long HInspectMethodID = list[0].HInspectMethodID;
                long HInspectInstruMentID = list[0].HInspectInstruMentID;
                long HInspectBasisID = list[0].HInspectBasisID;
                long HSampleSchemeID = list[0].HSampleSchemeID;
                long HISsystemSet = list[0].HISsystemSet;

                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
@@ -378,6 +407,19 @@
                    ",HStopflag='" + HStopflag + "'" +
                    ",HQCCheckClassID='" + HQCCheckClassID + "'" +
                    ",HDefaultResult='" + HDefaultResult + "'" +

                    ",HAnalysisMethod='" + HAnalysisMethod + "'" +
                    ",HDefectLevel='" + HDefectLevel + "'" +
                    ",HUnitID='" + HUnitID + "'" +
                    ",HDestructInspect='" + HDestructInspect + "'" +
                    ",HKeyInspect='" + HKeyInspect + "'" +
                    ",HQualityStdID='" + HQualityStdID + "'" +
                    ",HInspectMethodID='" + HInspectMethodID + "'" +
                    ",HInspectInstruMentID='" + HInspectInstruMentID + "'" +
                    ",HInspectBasisID='" + HInspectBasisID + "'" +
                    ",HSampleSchemeID='" + HSampleSchemeID + "'" +
                    ",HISsystemSet='" + HISsystemSet + "'" +

                    ",HRemark= '" + HRemark + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -434,6 +476,37 @@
        }
        #endregion

        #region æ£€éªŒé¡¹ç›®ä¿®æ”¹èŽ·å–绑定数据视图
        /// <summary>
        /// ç»´ä¿®åˆ—表修改按钮方法
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Gy_CheckItem/xg_View")]
        [HttpGet]
        public object xg_View(long HInterID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Gy_QCCheckItemList_Edit where HItemID=" + HInterID, "h_v_Gy_QCCheckItemList_Edit");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ£€éªŒé¡¹ç›®èŽ·å–树型列表数据
        [Route("Gy_CheckItem/LoadTree")]
        [HttpGet]
@@ -461,5 +534,109 @@
            }
        }
        #endregion

        #region æ£€éªŒé¡¹ç›®å®¡æ ¸/反审核
        [Route("Gy_CheckItem/AuditGy_CheckItem")]
        [HttpGet]
        public object AuditGy_CheckItem(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                oCN.BeginTran();//开始事务

                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckItem where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核!不能再次审核！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //审核单据
                    if (!BillOld.AuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                else
                {
                    //判断单据是否已经反审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckItem where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, BillOld.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCheckEmp"] == null || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!BillOld.DeAuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/Controllers/CJGL/Cj_StationOutBillController.cs

@@ -142,6 +142,10 @@
                double HmaterOutqty = list[0].HmaterOutqty;//白坯发布
                double HProcPriceRate = list[0].HProcPriceRate;//工价系数
                int HTemporaryAreaID = list[0].HTemporaryAreaID;//暂放区
                double HWasterQty_Work = list[0].HWasterQty_Work;//工废数量
                double HWasterQty_Mater = list[0].HWasterQty_Mater;//料废数量
                double HBackWorkQty = list[0].HBackWorkQty;//返工数量
                Int64 HShiftsID = list[0].HShiftsID;//生产班次

                LogService.Write($"1.字段赋值，用时" + sw.Elapsed );

@@ -368,7 +372,7 @@
                    ",HSupID,HQty,HPrice,HMoney,HBadCount,HCenterID,HProcNo,HOrderProcNO,HSourceNameList" +
                    ",HMainSourceInterID,HMainSourceBillNo,HMainSourceBillType,HLastSubProc" +
                    ",HEmpID2,HEmpID3,HEmpID4,HEmpID5,HDSQty,HChongQty,HPriceRate,HWorkTimes,HQCCheckID,HMainInterID,HPRDOrgID" +
                        ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID" +
                    ",HmaterOutqty,HProcPriceRate,HTemporaryAreaID,HWasterQty_Work,HWasterQty_Mater,HBackWorkQty,HShiftsID" +
                    ") " +
                    " values('" + BillType + "','" + (OperationType == "5" ? "SUB" : HBillSubType)  + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate(),'" + HMouldNum + "'" +
                    "," + HYear + "," + HPeriod + ",'" + HRemark + "','" + HSourceName + "'," + HPieceQty + "," + HWasterQty + "," + HPlanPieceQty + "," + HBadPNL +
@@ -378,7 +382,8 @@
                    "," + HSupID + "," + HQty + "," + HPrice + "," + HMoney + "," + HBadCount + "," + HCenterID + "," + HProcNo + ",'" + HOrderProcNO + "'" + ",'" + HSourceNameList + "'" +
                    "," + HMainSourceInterID + ",'" + HMainSourceBillNo + "','" + HMainSourceBillType + "'," + Convert.ToString(HLastSubProc ? 1 : 0) +
                    "," + HEmpID2 + "," + HEmpID3 + "," + HEmpID4 + "," + HEmpID5 + "," + HDSQty + "," + HChongQty + "," + HPriceRate + "," + HWorkTimes + "," + HQCCheckID + "," + HMainInterID + "," + HPRDOrgID +
                  ","+ HmaterOutqty + "," + HProcPriceRate + ","+ HTemporaryAreaID + ") ");
                    ","+ HmaterOutqty + "," + HProcPriceRate + ","+ HTemporaryAreaID + "," + HWasterQty_Work + "," + HWasterQty_Mater + "," + HBackWorkQty +
                    "," + HShiftsID + ") ");

                    LogService.Write($"4.新增结束，用时" + sw.Elapsed);
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增工序出站单据:" + HBillNo);
@@ -415,6 +420,10 @@
                    ",HSourceNameList='" + HSourceNameList + "'" +
                    ",HWasterQty=" + HWasterQty +
                    ",HLastSubProc=" + Convert.ToString(HLastSubProc ? 1 : 0) +
                    ",HWasterQty_Work=" + HWasterQty_Work +
                    ",HWasterQty_Mater=" + HWasterQty_Mater +
                    ",HBackWorkQty=" + HBackWorkQty +
                    ",HShiftsID=" + HShiftsID +
                    " where HInterID=" + HInterID);

                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改工序出站单据:" + HBillNo);

 WebAPI/Controllers/QC_ManagementController.cs

@@ -939,9 +939,9 @@
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_NEW  where hmainid= " + HID + " ", "h_v_Gy_QCCheckProjectList_NEW");
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Gy_QCCheckProjectList_Edit  where hmainid= " + HID + " ", "h_v_Gy_QCCheckProjectList_Edit");
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "不存在生产汇报单号" };
                return new ApiResult<DataSet> { code = -1, msg = "不存在检验方案" };

            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
@@ -956,14 +956,12 @@
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                ds = oCN.RunProcReturn(string.Format(@"select æ¬¡åºå· HPrjNo,检验项目ID HQCCheckItemID,检验项目代码 HQCCheckItemNumber,检验项目 HQCCheckItemName,
                                                       æ£€éªŒæ ‡å‡† HQCStd,最大检验标准 HQCStdMax,检验单位 HQCUnit,表体备注 HRemark from h_v_Gy_QCCheckProjectList_NEW
                                                       where hinterid='"+HInterID+"'"), "h_v_Gy_QCCheckProjectList_NEW");
                ds = oCN.RunProcReturn(string.Format(@"select * from h_v_Gy_QCCheckProjectList_Edit where hinterid='" + HInterID+"'"), "h_v_Gy_QCCheckProjectList_Edit");

                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功！";
                    objJsonResult.data = ds.Tables[0];
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.data = ds.Tables[0];
            }
            catch (Exception e)
            {
@@ -1025,7 +1023,6 @@
                    oItem.HBillStatus = 0;
                    oItem.HPeriod = 0;
                    oItem.HMaker = "";
                    oItem.HStandard = false;
                    oItem.HMainSourceInterID = oItem.HInterID;
                    //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo);
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
@@ -1262,6 +1259,109 @@
        }
        #endregion

        #region æ£€éªŒæ–¹æ¡ˆå®¡æ ¸/反审核
        [Route("Gy_QCCheckProject/AuditGy_QCCheckProject")]
        [HttpGet]
        public object AuditGy_QCCheckProject(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckProject_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsGy_QCCheckProjectMain oBill = new DAL.ClsGy_QCCheckProjectMain();
                ClsPub.CurUserName = user;
                oCN.BeginTran();//开始事务

                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds.Tables[0].Rows[0]["HChecker"] != null && ds.Tables[0].Rows[0]["HChecker"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核!不能再次审核！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //审核单据
                    if (!oBill.CheckBill(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                else
                {
                    //判断单据是否已经反审核
                    DataSet ds;
                    string sql = "select * from  Gy_QCCheckProjectMain  where HInterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HChecker"] == null || ds.Tables[0].Rows[0]["HChecker"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!oBill.AbandonCheck(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region æ¥æ–™æ£€éªŒ
        /// <summary>
        /// ä¿å­˜æ¥æ–™æ£€éªŒå•

 WebAPI/Controllers/WebAPIController.cs

@@ -2909,7 +2909,7 @@


        /// <summary>
        /// ä¸å¼‚常类型删除功能
        /// å¼‚常类型删除功能
        /// </summary>
        /// <returns></returns>
        [Route("DeltetGy_ErrType")]
@@ -2969,6 +2969,108 @@
            }
        }

        #region å¼‚常类型审核/反审核
        [Route("Gy_ErrType/AuditGy_ErrType")]
        [HttpGet]
        public object AuditGy_ErrType(string HInterID, int Type, string user)
        {
            try
            {
                //判断是否有审核权限
                if (!DBUtility.ClsPub.Security_Log("Gy_ErrType_Check", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无权限审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsGy_ErrType_Ctl oBill = new DAL.ClsGy_ErrType_Ctl();
                ClsPub.CurUserName = user;
                oCN.BeginTran();//开始事务

                //Type 1 å®¡æ ¸  2  åå®¡æ ¸
                if (Type == 1)
                {
                    //判断单据是否已经审核
                    DataSet ds;
                    string sql = "select * from  Gy_ErrType where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds.Tables[0].Rows[0]["HCheckEmp"] != null && ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据已审核!不能再次审核！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    //审核单据
                    if (!oBill.AuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "审核失败!原因:" + ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                else
                {
                    //判断单据是否已经反审核
                    DataSet ds;
                    string sql = "select * from  Gy_ErrType where HItemID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, oBill.MvarItemKey);
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (ds.Tables[0].Rows[0]["HCheckEmp"] == null || ds.Tables[0].Rows[0]["HCheckEmp"].ToString() == "")
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据未审核!不需要反审核!";
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                        //反审核单据
                        if (!oBill.DeAuditByID2(Int64.Parse(HInterID), ref ClsPub.sExeReturnInfo))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 1;
                            objJsonResult.Message = "反审核失败!原因:" + ClsPub.sExeReturnInfo;
                            objJsonResult.data = null;
                            return objJsonResult;
                        }
                    }
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        /// <summary>
        /// ä¸è‰¯ç±»åž‹èŽ·å–信息

 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -27,7 +27,7 @@
                    ",HSubjoin,HSubjoin2,HColor,HVersion,HEngName,HEngModel,HPropertyTypeID,HSPGroupID,HSPID,HMinPickQty,HUSEORGID,HERPItemID" +
                    ",HSALEUNITID,HSALEPRICEUNITID,HBASEUNITID,HSTOREUNITID,HCHECKINCOMING,HCHECKPRODUCT,HPERUNITSTANDHOUR" +
                    ",HSTDLABORPREPARETIME,HSTDMACHINEPREPARETIME,HWidth,HWeight,HColorRemark,HQCSchemeID_Fst,HQCSchemeID_Proc,HQCSchemeID_Patrol" +
                    ",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost) " +
                    ",HMaterRuleType,HColorNo,HPieceMaxQty,HCommonUseFlag,HAvgStockPrice,HFootPrice,HTaxCost,HNoTaxCost,HOnceRightRate) " +
                    " Values('" + oModel.HNumber + "','" + oModel.HName + "','" + oModel.HHelpCode + "','" + oModel.HShortNumber + "'," + oModel.HParentID.ToString() +
                    ", " + oModel.HLevel.ToString() + "," + Convert.ToString(oModel.HEndFlag ? 1 : 0) + "," + Convert.ToString(oModel.HStopflag ? 1 : 0) + ",'" + oModel.HRemark + "'" +
                    ",'" + oModel.HModel + "'," + oModel.HUnitID.ToString() + "," + oModel.HMaterClsID.ToString() + "," + oModel.HMaterTypeID.ToString() + "," + oModel.HUnitGroupID.ToString() +
@@ -36,7 +36,7 @@
                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HSALEUNITID + "," + oModel.HSALEPRICEUNITID + "," + oModel.HBASEUNITID + "," + oModel.HSTOREUNITID + "," + oModel.HCHECKINCOMING + "," + oModel.HCHECKPRODUCT + "," + oModel.HPERUNITSTANDHOUR + "," + oModel.HSTDLABORPREPARETIME + "," + oModel.HSTDMACHINEPREPARETIME + ","+ oModel.HWidth + "," + oModel.HWeight + ",'"+ oModel.HColorRemark + "'," + oModel.HQCSchemeID_Fst + ","
                       + oModel.HQCSchemeID_Proc + "," + oModel.HQCSchemeID_Patrol + "" +
                       ",'"+ oModel.HMaterRuleType + "','"+ oModel.HColorNo + "','" + oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                       ",'"+ oModel.HMaterRuleType + "','"+ oModel.HColorNo + "','" + oModel.HPieceMaxQty.ToString() + "','" + oModel.HCommonUseFlag.ToString() + "','" + oModel.HAvgStockPrice.ToString() + "','" + oModel.HFootPrice.ToString() + "','" + oModel.HTaxCost.ToString() + "','" + oModel.HNoTaxCost.ToString() + "'," + oModel.HOnceRightRate + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
@@ -154,6 +154,7 @@
                    ",HFootPrice=" + oModel.HFootPrice.ToString() +
                    ",HTaxCost=" + oModel.HTaxCost.ToString() +
                    ",HNoTaxCost=" + oModel.HNoTaxCost.ToString() +
                    ",HOnceRightRate=" + oModel.HOnceRightRate.ToString() +
                    ",HSTDMACHINEPREPARETIME=" + oModel.HSTDMACHINEPREPARETIME.ToString() + "Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Models/CheckItem.cs

@@ -27,5 +27,17 @@

        public string HQCCheckClassName { get; set; }//检验项目类别
        public string HDefaultResult { get; set; }//默认结论

        public long HUnitID { get; set; }      //
        public string HAnalysisMethod { get; set; }      //
        public string HDefectLevel { get; set; }      //
        public long HDestructInspect { get; set; }      //
        public long HKeyInspect { get; set; }      //
        public long HQualityStdID { get; set; }      //
        public long HInspectMethodID { get; set; }      //
        public long HInspectInstruMentID { get; set; }      //
        public long HInspectBasisID { get; set; }      //
        public long HSampleSchemeID { get; set; }      //
        public long HISsystemSet { get; set; }      //
    }
}

 WebAPI/Models/ClsGy_Material_Model.cs

@@ -75,5 +75,6 @@

        public double HNoTaxCost; // ä¸å«ç¨Žæˆæœ¬ä»·

        public double HOnceRightRate; //一次合格率标准值
    }
}

 WebAPI/Models/StationBill.cs

@@ -81,5 +81,10 @@
        public long HMainSourceInterID { get; set; }
        public long HMainSourceEntryID { get; set; }
        public string HMainSourceBillNo { get; set; }

        public double HWasterQty_Work { get; set; }
        public double HWasterQty_Mater { get; set; }
        public double HBackWorkQty { get; set; }
        public Int64 HShiftsID { get; set; }
    }
}