审核流程单 修改

yangle

2022-11-14 b0c5896b97c2f524d3637ff4b5ec14399c5646d3

审核流程单  修改

 WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs

@@ -136,7 +136,7 @@

                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_RoutingBill> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBill>>(msg2);
               

                long HInterID = mainList[0].HInterID;//递入type得到的单据ID
                string HBillNo = mainList[0].HBillNo;//递入type得到的单据号
                DateTime HDate = mainList[0].HDate;//日期
@@ -170,9 +170,22 @@
                string HProductNum = mainList[0].HProductNum;//成品编号
                string HVerNum = mainList[0].HVerNum;//版本

                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where  å•æ®å·='" + HBillNo + "'", "h_v_Gy_RoutingBillList");
                    if (ds.Tables[0].Rows.Count > 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据号重复,请重新输入!";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }

                ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList where hmainid=" + HInterID + " and å•æ®å·='" + HBillNo + "'", "h_v_Gy_RoutingBillList");

                if (OperationType == 1 && ds.Tables[0].Rows.Count == 0)//新增
                if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//新增
                {
                    //主表
                    oCN.RunProc("Insert Into Gy_RoutingBillMain   " +
@@ -202,10 +215,10 @@
                        ",HProductNum='" + HProductNum + "',HVerNum='" + HVerNum + "' where HInterID='" + HInterID + "'");

                    //删除子表
                    oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID+ "' and HProcNo!='9999'");
                    oCN.RunProc("delete from Gy_RoutingBillSub where HInterID='" + HInterID + "' and HProcNo!='9999'");
                }
                //保存子表
                objJsonResult = AddBillSub(msg3, HInterID);
                objJsonResult = AddBillSub(msg3, HInterID, OperationType);
                if (objJsonResult.code == "0")
                {
                    objJsonResult.code = "0";
@@ -220,7 +233,7 @@

                if (OperationType == 1)
                {
                    

                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
@@ -257,7 +270,7 @@
            }
        }

        public json AddBillSub(string msg3, long HInterID)
        public json AddBillSub(string msg3, long HInterID,int OperationType)
        {
            List<Gy_RoutingBillSub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_RoutingBillSub>>(msg3);
            int i = 0;
@@ -273,7 +286,7 @@
                    return objJsonResult;
                }

                if (oSub.HProcNo!="9999")
                if (oSub.HProcNo != "9999" || OperationType == 2)
                {
                    oCN.RunProc("Insert into Gy_RoutingBillSub " +
                    "(HInterID,HEntryID,HProcID,HProcNO,HSupID,HSupFlag" +
@@ -329,7 +342,7 @@
                file.SaveAs(ExcelPath);

                NpoiHelper np = new NpoiHelper();
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1,2, WorkBookName);
                DataSet ExcelDs = np.ReadExcel(ExcelPath, 1, 2, WorkBookName);

                //删除文件
                File.Delete(ExcelPath);
@@ -364,7 +377,7 @@

                if (!tb2.Columns.Contains("工序"))
                    error += "没有找到【工序】的标题,";
              

                if (!tb2.Columns.Contains("工作中心"))
                    error += "没有找到【工作中心】的标题,";

@@ -423,7 +436,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = $"Excel模板存在错误,{error}\r\n" ;
                    objJsonResult.Message = $"Excel模板存在错误,{error}\r\n";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
@@ -482,7 +495,7 @@
                                , æœ¬å·¥åºç¡®è®¤è®°å½•, å¤‡æ³¨, å›¾å·ç‰ˆæœ¬, æ€»è£…图号, æè´¨, æˆå“ç¼–号, ç‰ˆæœ¬
                                , æ¨¡å…·ç¼–号, ç¨‹åºå·, ç­äº§å®šé¢, å·¥è‰ºè·¯çº¿åç§°, æ—¶é—´å•ä½,工艺路线代码)values
                                ('" + tb2.Rows[i]["产品代码"].ToString() + "','" + tb2.Rows[i]["产品名称"].ToString() + "','" + tb2.Rows[i]["工序序号"].ToString() + "','" + tb2.Rows[i]["工序代码"].ToString() + "','" + tb2.Rows[i]["工序"].ToString() + "','" + tb2.Rows[i]["工作中心"].ToString() + "','" + tb2.Rows[i]["加工数量"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["良率"].ToString() + "','" + (tb2.Rows[i]["工序工价"].ToString()==""?"0": tb2.Rows[i]["工序工价"].ToString()) + "','" + tb2.Rows[i]["不合格单价"].ToString() + "','" + tb2.Rows[i]["报废单价"].ToString() + "','" + tb2.Rows[i]["本道固定开工天数"].ToString() + "','" + tb2.Rows[i]["本道开工余量"].ToString() + "','" + tb2.Rows[i]["上道等待天数"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["良率"].ToString() + "','" + (tb2.Rows[i]["工序工价"].ToString() == "" ? "0" : tb2.Rows[i]["工序工价"].ToString()) + "','" + tb2.Rows[i]["不合格单价"].ToString() + "','" + tb2.Rows[i]["报废单价"].ToString() + "','" + tb2.Rows[i]["本道固定开工天数"].ToString() + "','" + tb2.Rows[i]["本道开工余量"].ToString() + "','" + tb2.Rows[i]["上道等待天数"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["上道循环周期"].ToString() + "','" + tb2.Rows[i]["自动转移"].ToString() + "','" + tb2.Rows[i]["外协标记"].ToString() + "','" + tb2.Rows[i]["供应商代码"].ToString() + "','" + tb2.Rows[i]["供应商"].ToString() + "','" + tb2.Rows[i]["工艺参数"].ToString() + "','" + tb2.Rows[i]["图纸编号"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["本工序确认记录"].ToString() + "','" + tb2.Rows[i]["备注"].ToString() + "','" + tb2.Rows[i]["图号版本"].ToString() + "','" + tb2.Rows[i]["总装图号"].ToString() + "','" + tb2.Rows[i]["材质"].ToString() + "','" + tb2.Rows[i]["成品编号"].ToString() + "','" + tb2.Rows[i]["版本"].ToString() + "'" +
                                ",'" + tb2.Rows[i]["模具编号"].ToString() + "','" + tb2.Rows[i]["程序号"].ToString() + "','" + tb2.Rows[i]["班产定额"].ToString() + "','" + tb2.Rows[i]["工艺路线名称"].ToString() + "','" + tb2.Rows[i]["时间单位"].ToString() + "','" + tb2.Rows[i]["工艺路线代码"].ToString() + "')");
@@ -682,7 +695,7 @@
                        {
                            if (HBillNo != "")
                            {
                                if (dataSet.Tables[0].Rows.Count==0)
                                if (dataSet.Tables[0].Rows.Count == 0)
                                {
                                    break;
                                }

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

@@ -126,34 +126,21 @@
                         ",HRemark,HStandard,HName" + ") " +
                         " values('" + main.HBillTypeID.ToString() + "'," + main.HInterID.ToString() + "," + main.HDeptID.ToString() +
                         ",'" + main.HRemark + "'," + Convert.ToString(main.HStandard ? 1 : 0) + ",'" + main.HName.ToString() + "') ");

                    int i = 0;
                    foreach (Xt_CheckFlowSub oSub in lsmain)
                    {
                        i++;
                        bool bResult = false;

                        oCN.RunProc("Insert into Xt_CheckFlowSub " +
                                " (HInterID,HEntryID,HCheckMan" +
                                ",HFlowNo,HJumpFlag,HMakerSelf,HCheckItemID" +
                                " )values("
                                + main.HInterID.ToString() + "," + i + ",'" + oSub.HCheckMan + "'" +
                                "," + oSub.HFlowNo + "," + Convert.ToString(oSub.HJumpFlag ? 1 : 0) + "," + Convert.ToString(oSub.HMakerSelf ? 1 : 0) + "," + oSub.HCheckItemID + ") ");

                        bResult = true;


                        if (!bResult)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }

                    }
                }
                else
                {
                    //更新主表
                    oCN.RunProc("UpDate Xt_CheckFlowMain set  " +
                    "HRemark='" + main.HRemark + "'" +
                    ",HName='" + main.HName + "'" +
                    ",HDeptID=" + main.HDeptID.ToString() +
                    ",HBillTypeID='" + main.HBillTypeID + "'" +
                    ",HStandard='" + Convert.ToString(main.HStandard ? 1 : 0) + "'" +
                    " where HInterID=" + main.HInterID.ToString());
                    //删除子表
                    oCN.RunProc("delete from Xt_CheckFlowSub where HInterID=" + main.HInterID.ToString());
                }
                AddBillSub(lsmain, main.HInterID);

                oCN.Commit();

@@ -174,6 +161,27 @@
            }
        }

        public json AddBillSub(List<Xt_CheckFlowSub> DetailColl, long HInterID)
        {
            int i = 1;
            foreach (Xt_CheckFlowSub oSub in DetailColl)
            {

                oCN.RunProc("Insert into Xt_CheckFlowSub " +
                             " (HInterID,HEntryID,HCheckMan" +
                             ",HFlowNo,HJumpFlag,HMakerSelf,HCheckItemID" +
                             " )values("
                             + HInterID + "," + i + ",'" + oSub.HCheckMan + "'" +
                             "," + oSub.HFlowNo + "," + Convert.ToString(oSub.HJumpFlag ? 1 : 0) + "," + Convert.ToString(oSub.HMakerSelf ? 1 : 0) + "," + oSub.HCheckItemID + ") ");
                i++;
            }
            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = null;
            objJsonResult.data = null;
            return objJsonResult;
        }

        #endregion

        #region  å®¡æ ¸æµç¨‹å• åˆ é™¤