新增销售出库扫码模块相关调用方法；条码生成模块，选源单增加返回生产日期有效期至等

yxj

2023-11-07 20cad24a52eed56cf3c790112496f2df27255656

 WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs

@@ -1,4 +1,5 @@
using DBUtility;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -45,6 +46,7 @@
            string UserName = sArray[1].ToString();
            string refSav = sArray[2].ToString();
            DBUtility.ClsPub.CurUserName = UserName;

            //保存权限
            if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName))
            {
@@ -54,6 +56,7 @@
                objJsonResult.data = null;
                return objJsonResult;
            }

            //判断会计期是否合理
            string s = "";
            int sYear = 0;
@@ -127,10 +130,11 @@
                    }

                    DBUtility.ClsPub.CurUserName = oItem.HMaker;
                    oItem.HBillType = "3787";
                    oItem.HBillSubType = "3787";
                    oItem.HBillType = "4502";
                    oItem.HBillSubType = "4502";
                    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.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                    oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd"));
                    if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "")
                    {
@@ -371,23 +375,44 @@
        {
            try
            {
                ds = Get_TransFerBillList(sWhere);
                if (ds == null)
                List<object> columnNameList = new List<object>();

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("OA_ErrMsgBackBill_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常，请与管理员联系！";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (sWhere == null || sWhere.Equals(""))
                {
                    string sql = "select * from h_v_OA_ErrMsgBackBillList order by 单据号 desc";
                    ds = oCN.RunProcReturn(sql, "p_v_OA_ErrMsgBackBillList");
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                    string sql1 = "select * from h_v_OA_ErrMsgBackBillList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by 单据号 desc";
                    ds = oCN.RunProcReturn(sql, "p_v_OA_ErrMsgBackBillList");
                }

                //添加列名
                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 ex)
            {
@@ -556,5 +581,170 @@
        }

        #endregion

        #region 报工平台异常反馈单回复
        /// <summary>
        /// 异常反馈单
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Sc_MESTransFerWorkBill/ReplyMESTransFerWorkFrom")]
        [HttpPost]
        public object ReplyMESTransFerWorkFrom([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("OA_ErrMsgBackBill_Edit", 1, false, 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.ClsOA_ErrMsgBackBill oBill = new DLL.ClsOA_ErrMsgBackBill();
                List<Models.ClsOA_ErrMsgBackBillSub> lsmain = new List<Models.ClsOA_ErrMsgBackBillSub>();
                msg2 = msg2.Replace("\\", "");
                msg2 = msg2.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_MESTransFerWorkBillSub(msg2);

                foreach (Models.ClsOA_ErrMsgBackBillSub DetailReply in lsmain)
                {
                    oBill.DetailReply = DetailReply;
                }

                //保存
                //保存完毕后处理
                bool bResult;

                if (oBill.DetailReply.HInterID != 0)
                {
                    bResult = oBill.ReplyBill(ref DBUtility.ClsPub.sExeReturnInfo);
                }
                else
                {
                    bResult = false;
                }

                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

        #region 异常反馈列表回复获取数据
        [Route("Sc_MESTransFerWorkBill/Get_TransFerReplyBill")]
        [HttpGet]
        public object Get_TransFerReplyBill(string sWhere, string user)
        {
            try
            {                
               
                string sql1 = "select * from h_v_OA_ErrMsgBackBillSubList where 1 = 1 ";
                string sql = sql1 + sWhere + " order by HInterID desc";
                ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillSubList");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                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("Sc_MESTransFerWorkBill/Update_TransFerReplyBill")]
        [HttpGet]
        public object Update_TransFerReplyBill(Int64 HInterID, string HEntryID,Int64 Type)
        {
            try
            {
                string sql = "";
                switch (Type)
                {
                    case 9:
                        sql = "update OA_ErrMsgBackBillSub set HSendStatus = 9 where HInterID = " + HInterID + " and HEntryID in (" + HEntryID + ")";
                        break;
                    case 10:
                        sql = "update OA_ErrMsgBackBillSub set HSendStatus = 10 where HInterID = " + HInterID + " and HEntryID in (" + HEntryID + ")";
                        break;
                }                
              
                oCN.RunProc(sql);

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

    }
}