返工单

zzr99

2021-12-10 06d732de3d904d6db368d051d61e28eb45e01b1c

返工单

 Model/³µ¼ä¹ÜÀí/ClsSc_ProcessPlanMain.cs

@@ -22,5 +22,12 @@
        public string HInnerBillNo;//    varchar(50)   --内部单据号
        public bool HCloseType;//      bit          --关闭类型   ï¼ˆé»˜è®¤ä¸º0）   
        
        
        public int HWorkerID;
        public int HProcNo;
        public int HProcID;
        public int HGroupID;
        public int HDeptID;
        public int HQty;
    }
}

 Pub_Class/CustomerCls/ClsXt_SystemParameter.cs

@@ -732,6 +732,12 @@
                    {
                        omodel.Sc_MESBeginWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========返工单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESReturnWorkBill_AutoCheck")
                    {
                        omodel.Sc_MESReturnWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
                    }
                    //==========结班单
                    //自动审核
                    if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "Sc_MESEndWorkBill_AutoCheck")

 Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs

@@ -205,6 +205,8 @@

        //开班单
        public string Sc_MESBeginWorkBill_AutoCheck; //自动审核
        //返工单
        public string Sc_MESReturnWorkBill_AutoCheck; //自动审核
        //结班单
        public string Sc_MESEndWorkBill_AutoCheck; //自动审核
        //停工挂起单

 WebAPI/Controllers/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Sc_MESReturnStepWorkBillController.cs

@@ -1,4 +1,6 @@
using System;
using DBUtility;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
@@ -72,17 +74,17 @@
        #endregion

        #region[返工单编辑时获取表头数据]
        [Route("Sc_MESBeginStepWorkBill/Sc_MESBeginStepWorkBillListCheckDetai")]
        [Route("Sc_MESReturnStepWorkBill/Sc_MESReturnStepWorkBillListCheckDetai")]
        [HttpGet]
        public ApiResult<DataSet> Sc_MESBeginStepWorkBillListCheckDetai(string HID)
        public ApiResult<DataSet> Sc_MESReturnStepWorkBillListCheckDetai(string HID)
        {
            if (string.IsNullOrEmpty(HID))
                return new ApiResult<DataSet> { code = -1, msg = "ID不能为空" };
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MESBeginWorkBillList_NEW  where hmainid= " + HID + " ", "h_v_Sc_MESBeginWorkBillList_NEW");
            var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sc_MESReturnWorkBillList  where hmainid= " + HID + " ", "h_v_Sc_MESReturnWorkBillList");
            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 };
        }
@@ -99,7 +101,7 @@
        {
            DBUtility.ClsPub.CurUserName = UserName;
            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("MES_MESReturnWorkBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
            if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Drop", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
@@ -181,7 +183,7 @@
        [HttpGet]
        public object AuditReturnStepProcessReportList(int HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "MES_MESReturnWorkBill_Check";
            string ModRightNameCheck = "Sc_ProcessPlan_Check";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
@@ -308,6 +310,182 @@
        }
        #endregion

        #region è¿”工单保存/编辑
        /// <summary>
        /// è¿”工单
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom")]
        [HttpPost]
        public object SaveGetMESReturnStepWorkFrom([FromBody] JObject msg)
        {

            var _value = msg["msg"].ToString();
            string msg1 = _value.ToString();
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg2 = sArray[0].ToString();
            string UserName = sArray[1].ToString();
            string refSav = sArray[2].ToString();
            DBUtility.ClsPub.CurUserName = UserName;
            
            //保存权限
            if (!DBUtility.ClsPub.Security_Log_second("Sc_ProcessPlan_Edit", 1, true, DBUtility.ClsPub.CurUserName))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            //判断会计期是否合理
            string s = "";
            int sYear = 0;
            int sPeriod = 0;
            if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = s;
                objJsonResult.data = null;
                return objJsonResult;
            }

            ListModels oListModels = new ListModels();
            try
            {
                DLL.ClsSc_MESReturnStepWorkBill oBill = new DLL.ClsSc_MESReturnStepWorkBill();
                List<Model.ClsSc_ProcessPlanMain> lsmain = new List<Model.ClsSc_ProcessPlanMain>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_MESReturnWorkFrom(msg2);
                foreach (Model.ClsSc_ProcessPlanMain oItem in lsmain)
                {
                    if (refSav == "Add")
                    {
                        //单据号是否重复
                        if (BillNew.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "单据号重复！不允许保存！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }
                    if (refSav == "Update")
                    {
                        if (BillOld.ShowBill(oItem.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;
                        }
                        if (BillOld.omodel.HBillStatus > 1)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "此单据处于不可编辑状态，不允许修改！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s))
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = s + "，不允许修改";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                    }

                    DBUtility.ClsPub.CurUserName = oItem.HMaker;
                    oItem.HBillType = "3718";
                    oItem.HBillSubType = "3718";
                    oItem.HBillStatus = 1;   //单据状态（1未审，2审核通过，3关闭，4作废，5审核退回,6审核中,7已阅，8已回复，9结案，10验证,11下达，12开工,13申请审批,15申请检验，16 åˆ¤å®šåˆæ ¼ï¼Œ17判定不合格）     
                    oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！没有单据日期，无法保存！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oBill.omodel = oItem;
                }

                //保存
                //保存完毕后处理
                bool bResult;
                if (oBill.omodel.HInterID == 0)
                {

                    bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    if (bResult)
                    {
                        objJsonResult.HInterID = DBUtility.ClsPub.sExeReturnInfo; //返回主ID
                        //系统参数  è‡ªåŠ¨å®¡æ ¸
                        string sReturn = "";
                        if (oSystemParameter.ShowBill(ref sReturn) == true)
                        {
                            if (oSystemParameter.omodel.Sc_ICMOBillWorkQtyStatus_AutoCheck == "Y") //系统参数  è‡ªåŠ¨å®¡æ ¸ 
                            {
                                objJsonResult.Verify = "Y";
                            }
                            else
                            {
                                objJsonResult.Verify = "N";
                            }
                        }
                    }

                }
                else
                {
                    bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.Verify = "N";
                }
                if (bResult)
                {

                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo;
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = e.Message;
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
        #endregion
    }
}

 WebAPI/DLL/ClsSc_MESReturnStepWorkBill.cs

@@ -22,5 +22,106 @@
            base.HBillSubType = "3718";

        }

        #region å›ºå®šä»£ç 

        ~ClsSc_MESReturnStepWorkBill()
        {
            DetailColl = null;
        }

        #endregion   è‡ªå®šä¹‰æ–¹æ³•

        //修改单据
        public override bool ModifyBill(Int64 lngBillKey, ref string sReturn)
        {
            try
            {
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sc_ProcessPlanMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
                ",HPeriod='" + omodel.HPeriod.ToString() + "'" +
                ",HBillStatus='" + omodel.HBillStatus + "'" +
                ",HRemark='" + omodel.HRemark + "'" +
                ",HUpDater='" + DBUtility.ClsPub.CurUserName + "'" +
                ",HUpDateDate=getdate()" +
                //========================================
                //",HSupID=" + omodel.HSupID.ToString() +
                //",HEmpID=" + omodel.HEmpID.ToString() +
                ",HICMOInterID=" + omodel.HICMOInterID.ToString() +
                ",HICMOBillNo='" + omodel.HICMOBillNo + "'" +
                ",HMaterID=" + omodel.HMaterID.ToString() +
                " where HInterID=" + lngBillKey.ToString());
                //删除关联
                DeleteRelation(ref sReturn, lngBillKey);
                //删除子表
                DeleteBillSub(lngBillKey);
                //插入子表
                omodel.HInterID = lngBillKey;
                //插入子表
                oCn.RunProc("Insert Into Sc_ProcessPlanSub " +
                    "(HInterID,HEntryID,HBillNo" +
                    ",HICMOInterID,HICMOBillNo,HProcNo,HProcID" +
                    ",HGroupID,HDeptID,HWorkerID,HQty,HPlanBeginDate" +
                    ") " +
                    " values(" + omodel.HInterID.ToString() + ",0,'" + omodel.HBillNo +
                    "'," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "','" + omodel.HProcNo + "'," + omodel.HProcID.ToString() + "," + omodel.HGroupID.ToString() +
                    "," + omodel.HDeptID.ToString() + "," + omodel.HWorkerID.ToString() + "," + omodel.HQty.ToString() + ",'" + omodel.HPlanBeginDate.ToString() +
                     "') ");
                sReturn = "修改单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
        //新增单据
        public override bool AddBill(ref string sReturn)
        {
            try
            {
                //得到mainid
                omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo);
                //若MAINDI重复则重新获取
                oCn.BeginTran();
                //主表
                oCn.RunProc("Insert Into Sc_ProcessPlanMain " +
                "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" +
                ",HYear,HPeriod,HRemark" +
                ",HICMOInterID,HICMOBillNo,HMaterID" +
                ") " +
                " values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "'," + omodel.HBillStatus.ToString() + ",getdate(),'" + DBUtility.ClsPub.CurUserName + "',getdate()" +
                "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'" +
                "," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "'," +  omodel.HMaterID.ToString() + 
                 ") ");
                //插入子表
                oCn.RunProc("Insert Into Sc_ProcessPlanSub " +
                    "(HInterID,HEntryID,HBillNo" +
                    ",HICMOInterID,HICMOBillNo,HProcNo,HProcID" +
                    ",HGroupID,HDeptID,HWorkerID,HQty,HPlanBeginDate" +
                    ") " +
                    " values(" + omodel.HInterID.ToString() + ",0,'" + omodel.HBillNo +
                    "'," + omodel.HICMOInterID.ToString() + ",'" + omodel.HICMOBillNo + "','" + omodel.HProcNo + "'," + omodel.HProcID.ToString() + "," + omodel.HGroupID.ToString() +
                    "," + omodel.HDeptID.ToString() + "," + omodel.HWorkerID.ToString() + "," + omodel.HQty.ToString() + ",'" + omodel.HPlanBeginDate.ToString() +
                     "') ");
                sReturn = "新增单据成功！";
                oCn.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCn.RollBack();
                throw (e);
            }
        }
    }
}

 WebAPI/ListModels.cs

@@ -1653,7 +1653,19 @@
            List<Models.ClsSc_MESBeginWorkBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillMain>>(jsonString);
            return list;
        }
    

        /// <summary>
        /// æŠ¥å·¥å¹³å°è¿”工单主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_ProcessPlanMain> getObjectByJson_Gy_MESReturnWorkFrom(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcessPlanMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcessPlanMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// æŠ¥å·¥å¹³å°äº§é‡æ±‡æŠ¥ä¸»è¡¨json
        /// </summary>

 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -18,25 +18,25 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>12/08/2021 17:59:13</publishTime>
      <publishTime>12/10/2021 16:24:07</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>12/08/2021 17:59:13</publishTime>
      <publishTime>12/10/2021 16:24:07</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>12/08/2021 17:59:11</publishTime>
      <publishTime>12/10/2021 16:24:05</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>12/08/2021 17:59:11</publishTime>
      <publishTime>12/10/2021 16:24:05</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>12/08/2021 17:59:08</publishTime>
      <publishTime>12/10/2021 16:24:02</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>12/08/2021 17:59:08</publishTime>
      <publishTime>12/10/2021 16:24:02</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>12/08/2021 17:59:08</publishTime>
      <publishTime>12/10/2021 16:24:03</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>12/08/2021 17:59:08</publishTime>
      <publishTime>12/10/2021 16:24:03</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>12/08/2021 17:59:05</publishTime>
      <publishTime>12/10/2021 16:24:00</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>12/08/2021 17:59:05</publishTime>
      <publishTime>12/10/2021 16:24:00</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>12/08/2021 17:59:06</publishTime>
      <publishTime>12/10/2021 16:24:01</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>12/08/2021 17:59:06</publishTime>
      <publishTime>12/10/2021 16:24:01</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>12/08/2021 17:59:07</publishTime>
      <publishTime>12/10/2021 16:24:01</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>12/08/2021 17:59:07</publishTime>
      <publishTime>12/10/2021 16:24:01</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>12/08/2021 17:59:17</publishTime>
      <publishTime>12/10/2021 16:24:10</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>12/08/2021 17:59:17</publishTime>
      <publishTime>12/10/2021 16:24:10</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>12/08/2021 17:59:26</publishTime>
      <publishTime>12/10/2021 16:24:31</publishTime>
    </File>
  </ItemGroup>
</Project>