Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

chenhaozhe

1 天以前 14ae0e21c8660dbb3ac20a5b0d9db9b6dde3cfb9

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -1631,32 +1631,6 @@
                objJsonResult.data = null;
                return objJsonResult;
            }

            oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo);
            if(oSystemParameter.omodel.Sc_MESBeginWorkBill_FirstCheckCtl == "Y")
            {
                // 判断是否允许 未首检合格前开工
                DataSet ds = oCN.RunProcReturn($@"select top 1 * from QC_FirstPieceCheckBillMain 
                            where HMainSourceBillType = '{HBillType}' and HMainSourceBillNo = '{HSourceBillNo}'
                order by HDate desc", "QC_FirstPieceCheckBillMain");

                if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "检验首件检验失败，该单据没有做对印的首检单";

                    return objJsonResult;
                }

                if (ds.Tables[0].Rows[0]["HLastResult"].ToString() == "0")
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "首件检失败，首件检检验结果为不合格，不允许下推单据";
                    return objJsonResult;
                }
            }
            

            //判断会计期是否合理
@@ -1758,16 +1732,16 @@
                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);

                }
                ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    oCN.RollBack();
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查无单据!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //ds = oCN.RunProcReturn("select * from Sc_MESBeginWorkBillMain where HBillNo='" + oBill.omodel.HBillNo + "'", "Sc_MESBeginWorkBillMain");
                //if (ds.Tables[0].Rows.Count == 0)
                //{
                //    oCN.RollBack();
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "查无单据!";
                //    objJsonResult.data = 1;
                //    return objJsonResult;
                //}

                string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
                if (sAutoCheck == "Y")
@@ -1789,10 +1763,10 @@
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {                       
                        LogService.Write("自动生成工作联系单...");
                        LogService.Write("自动生成工作联系单..."+ oBill.omodel.HInterID);

                        //自动生成工作联系单
                        ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + ds.Tables[0].Rows[0]["HInterID"].ToString() + "," + 3772, "h_p_OA_WorkLinkBill_Create");
                        ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + oBill.omodel.HInterID + "," + 3787, "h_p_OA_WorkLinkBill_Create");
                    }
                }