1

dytyqx

2 天以前 19bf4875b4cf6ca5f74c08816773a764008e5ab5

 WebAPI/Controllers/Æ·ÖʹÜÀí/Ѳ¼ìµ¥/QC_PatrolProcCheckOtherBillController.cs

@@ -7,6 +7,7 @@
using System.Data;
using System.Data.SqlClient;
using System.Web.Http;
using WebAPI.Controllers.SCGL;
using WebAPI.Models;

namespace WebAPI.Controllers
@@ -172,7 +173,22 @@
            var _value = sMainSub["sMainSub"].ToString();
            string msg1 = _value.ToString();
            //保存单据
            return objJsonResult = AddBillMain(msg1);
            objJsonResult = AddBillMain(msg1);
            JObject resultJObj = JObject.FromObject(objJsonResult);
            if (oSystemParameter.ShowBill(ref DBUtility.ClsPub.sErrInfo))
            {
                
                if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                {
                    resultJObj["NotShowTips"] = true;
                }
                else
                {
                    resultJObj["NotShowTips"] = false;
                }
            }

            return resultJObj;
        }

        public json AddBillMain(string msg1)
@@ -244,8 +260,14 @@
                BillNew.omodel.HBatchNo = ClsPub.isStrNull(mainList[0].HBatchNo);
                BillNew.omodel.HTakeSampleCheckBillID = ClsPub.isLong(mainList[0].HTakeSampleCheckBillID);
                BillNew.omodel.HTakeSampleCheckBillNo = ClsPub.isStrNull(mainList[0].HTakeSampleCheckBillNo);
                BillNew.omodel.HCheckQty = ClsPub.isLong(mainList[0].HCheckQty);
               

                List<Model.ClsQC_PatrolProcCheckOtherBillSub> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub>>(msg3);
                BillNew.DetailColl = new List<Model.ClsQC_PatrolProcCheckOtherBillSub>();
                

                
                for (int i = 0; i < subList.ToArray().Length; i++)
                {
                    if (i >= 0)//HQty
@@ -305,20 +327,62 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
               
                }               

                //保存完毕后处理
                if (OperationType.Equals("1") || OperationType.Equals("2"))
                {
                    bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);
                    string sAutoCheck = oSystemParameter.GetSingleSystemParameter("QC_ProcessCheckBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.Verify = sAutoCheck;
                    bResult = BillNew.AddBill(ref ClsPub.sExeReturnInfo);                   
                }
                else
                {
                    if (BillOld.ShowBill(mainList[0].HInterID, ref s) == false)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据有误！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //判断是否可编辑
                    if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据已经被审核，不允许修改！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }

                    bResult = BillNew.ModifyBill(BillNew.omodel.HInterID, ref ClsPub.sExeReturnInfo);
                }
                //提示
                if (bResult == true)
                {
                    string sReturn = "";
                    // åŽèˆŸ ä¿å­˜æˆåŠŸåŽä¸‹æŽ¨å·¥ä½œè”系单 
                    if (oSystemParameter.ShowBill(ref sReturn) == true)
                    {
                        if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                        {
                            //自动生成工作联系单
                            var ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + BillNew.omodel.HInterID + "," + 7507, "h_p_OA_WorkLinkBill_Create");

                            if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
                            {
                                int HInterID = int.Parse(ds2.Tables[0].Rows[0]["NewHInterID"].ToString());
                                LogService.Write("执行消息推送..." + HInterID);

                                // è§¦å‘消息推送
                                Service.GeTuiService.PubishSingle(HInterID);

                            }
                        }
                    }


                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = ClsPub.sExeReturnInfo+"单据号:" + mainList[0].HBillNo.Trim();
@@ -1032,6 +1096,24 @@
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
               
                if (BillOld.ShowBill(long.Parse(HInterID), ref s) == false)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据有误！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                //判断是否可删除
                if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "此单据已经被审核，不允许删除！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }

                //开始事物
                oCN.BeginTran();
@@ -1290,6 +1372,63 @@
        }
        #endregion

        #region å·¡æ£€å•æ ¹æ®æºå•ç±»åž‹èŽ·å–信息-源单为取样单
        [Route("QC_PatrolProcCheckBill/get_TakeSampleCheckBill")]
        [HttpGet]
        public object get_TakeSampleCheckBill(string HInterID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                string sReturn = "";
                string sql = "";
                if (oSystemParameter.ShowBill(ref sReturn))
                {
                    switch (oSystemParameter.omodel.QC_ProcessCheckBill_QCSchemeSource)
                    {
                        case "工序":
                            sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'工序','" + HInterID + "'";
                            break;
                        case "物料":
                            sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'物料','" + HInterID + "'";
                            break;
                        case "工艺路线":
                            sql = "exec h_p_QC_PatrolProc_GetTakeSampleCheckBillList " + "'工艺路线','" + HInterID + "'";
                            break;
                    }

                }

                ds = oCN.RunProcReturn(sql, "h_p_QC_PatrolProc_GetTakeSampleCheckBillList");

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常，请与管理员联系！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion


        #region  PDA巡检记录单 æŸ¥è¯¢åˆ—表
        [Route("QC_PatrolProcCheckOtherBill/QC_PatrolProcCheckOtherBillList_PDA")]
        [HttpGet]