1

wtt

2 天以前 409529b1a6e7478d691e95f84713bdd5ad5ffed2

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -570,6 +570,7 @@
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HMakeEmp = msg2;
                    oBill.oModel = oItem;
                }
                //保存
@@ -582,6 +583,18 @@
                }
                else
                {
                    //已审核不允许修改
                    DataSet dss;
                    dss = oCN.RunProcReturn("select * from Gy_Material where HItemID=" + oBill.oModel.HItemID, "Gy_Material");
                    //判断是否可编辑
                    if (dss.Tables[0].Rows[0]["HCheckEmp"].ToString() != "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "此单据状态已经审核，不允许修改！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
                }
                if (bResult)
@@ -612,6 +625,320 @@
            }
        }

        #region 保存物料_批量
        /// <summary>
        /// 保存物料
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Gy_Material/SaveGy_MaterialList_Batch")]
        [HttpPost]
        public object SaveGy_MaterialList_Batch([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            string msg_HUSEORGID = sArray[2].ToString();
            bool bResult = false;
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Gy_Material_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            //获取最大ID值赋值
            DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
            if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
            {
                //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
                var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
                maxid += 1;
                HItemID = maxid;
            }
            ListModels oListModels = new ListModels();

            try
            {
                DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
                List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
                foreach (ClsGy_Material_Model oItem in lsmain)
                {
                    if (oItem.HNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！代码不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItem.HName.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！名称不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    if (oItem.HMaterTypeID == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！物料分类不能为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    //if (!DBUtility.ClsPub.AllowNumber(oItem.HNumber.Trim()))
                    //{
                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "保存失败！代码中不能出现连续‘.’并且首位末位不能为‘.’！";
                    //    objJsonResult.data = 1;
                    //    return objJsonResult;
                    //}
                    //查询数据中是否存在重复代码
                    ds = oCN.RunProcReturn("select * from  Gy_Material where HStopflag=0 and HNumber='" + oItem.HNumber.Trim() + "'", "Gy_Material");
                    //新增时判断
                    #region 父级校验方法（api调用先注释掉，）
                    /*
                    if (oItem.HItemID == 0)
                    {
                        if (ds == null || ds.Tables[0].Rows.Count > 0)
                        {
                            objJsonResult.code = "0";
                            objJsonResult.count = 0;
                            objJsonResult.Message = "保存失败！代码重复！";
                            objJsonResult.data = 1;
                            return objJsonResult;
                        }
                        //检查父级是否存在
                        string sParent;
                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
                        if (sParent.Trim() == "")
                        {
                            oBill.oModel.HParentID = 0;
                        }
                        else
                        {
                            if (oBill.HavParentCode(sParent.Trim(), HItemID))
                            {
                                oBill.oModel.HParentID = oBill.oModel.HItemID;
                            }
                            else
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
                                objJsonResult.data = 1;
                                return objJsonResult;
                            }
                        }
                    }
                    else//编辑时判断
                    {
                        //检查父级是否存在
                        string sParent;
                        sParent = DBUtility.ClsPub.GetParentCode(oItem.HNumber.Trim());
                        if (sParent.Trim() == "")
                        {
                            oBill.oModel.HParentID = 0;
                        }
                        else
                        {
                            if (oBill.HavParentCode(sParent.Trim(), oItem.HItemID))
                            {
                                oBill.oModel.HParentID = oBill.oModel.HItemID;
                            }
                            else
                            {
                                objJsonResult.code = "0";
                                objJsonResult.count = 0;
                                objJsonResult.Message = "保存失败！上级代码不存在或被禁用！";
                                objJsonResult.data = 1;
                                return objJsonResult;
                            }
                        }
                    }
                    */
                    #endregion
                    //得到短代码
                    string sShortNumber;
                    sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim());
                    if (sShortNumber.Trim() == "")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "保存失败！短代码为空！";
                        objJsonResult.data = 1;
                        return objJsonResult;
                    }
                    oItem.HUSEORGID = Convert.ToInt32(msg_HUSEORGID); //组织id
                    oItem.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oItem.HModifyEmp = msg2;
                    oBill.oModel = oItem;  
                    
                    if (oBill.oModel.HItemID == 0)
                    {
                        //bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                        bResult = oBill.AddNew();
                    }
                    else
                    {
                        bResult = oBill.ModifyByIDDynamic(oBill.oModel.HItemID);
                    }
                }
                //保存
                //保存完毕后处理
                
                /*if (oBill.oModel.HItemID == 0)
                {
                    //bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
                    bResult = oBill.AddNew();
                }
                else
                {
                    bResult = oBill.ModifyByID(oBill.oModel.HItemID);
                }*/
                if (bResult)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    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.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        #region 保存物料_批量
        /// <summary>
        /// 保存物料
        /// </summary>
        /// <param name="msg"></param>
        /// <returns></returns>
        [Route("Gy_Material/SaveGy_MaterialList_Modify")]
        [HttpPost]
        public object SaveGy_MaterialList_Modify([FromBody] JObject msg)
        {
            DataSet ds;
            var _value = msg["msg"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg2 = sArray[1].ToString();
            string msg_HUSEORGID = sArray[2].ToString();
            string msg_itemIdList = sArray[3].ToString();
            string msg_UpdateInfo = sArray[4].ToString();
            bool bResult = false;
            Int64 HItemID = 0;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();

            //编辑权限
            if (!DBUtility.ClsPub.Security_Log_second("Gy_Material_Edit", 1, false, msg2))
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "无保存权限！";
                objJsonResult.data = null;
                return objJsonResult;
            }

            //获取最大ID值赋值
            DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
            if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
            {
                //HItemID= Maxds.Tables[0].Rows[0]["HItemID"]
                var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]);
                maxid += 1;
                HItemID = maxid;
            }
            ListModels oListModels = new ListModels();

            try
            {
                DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
                List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
                JObject jobject = JObject.Parse(msg_UpdateInfo);
                var paramStr = "";
                foreach (var property in jobject.Properties())
                {
                    string key = property.Name;
                    string value = property.Value.ToString();

                    // 拼接格式: key=value
                    paramStr += string.Format("{0}='{1}',", key, value);
                    // 删除最后一个逗号
                   
                }
                paramStr = paramStr.Substring(0, paramStr.Length - 1);

                bResult = oBill.ModifyByIDListDynamic(msg_itemIdList, paramStr, lsmain);


                if (bResult)
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功！";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    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.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        [Route("Gy_Material/SaveGy_MaterialListApi")]
        [HttpPost]
        public object SaveGy_MaterialListApi([FromBody] JObject msg)
@@ -628,7 +955,8 @@
                List<Models.ClsGy_Material_Model> lsmain = new List<Models.ClsGy_Material_Model>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1); 

                oBill.oModel = lsmain[0];
                //保存
                bool bResult = oBill.AddNewApi();
@@ -1890,6 +2218,24 @@
                //进行需要进行的作废/反作废操作
                if (IsAudit == 0) //作废提交
                {
                    string sql_deleteBeforeCtrl = "exec h_p_Gy_BarCodeBill_Cancelltion_Before " + HInterID;
                    DataSet ds_deleteBeforeCtrl = oCN.RunProcReturn(sql_deleteBeforeCtrl, "h_p_Gy_BarCodeBill_Cancelltion_Before");
                    if (ds_deleteBeforeCtrl == null || ds_deleteBeforeCtrl.Tables.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "作废失败：条码作废前控制失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }else if(ds_deleteBeforeCtrl.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "作废失败：" + ds_deleteBeforeCtrl.Tables[0].Rows[0]["HRemark"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    oCN.BeginTran();

                    //作废条码
@@ -1968,6 +2314,187 @@
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        string HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString();
                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','反作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','反作废'", ref DBUtility.ClsPub.sExeReturnInfo);

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "[0000-1-043]反作废成功";
                        objJsonResult.data = null;
                        oCN.Commit();
                        return objJsonResult;
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "[0000-1-042]反作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;
                        oCN.RollBack();
                        return objJsonResult;
                    }
                }
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "[0000-1-044]作废失败或者反作废失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 条码主档维护 批量作废/批量反作废
        /// <summary>
        /// </summary>
        /// <param name="HInterID">单据ID</param>
        /// <param name="IsAudit">作废(0),反作废(1)</param>
        /// <param name="CurUserName">作废人</param>
        /// <returns></returns>
        [Route("Gy_BarCodeBillList/DeleteBatchGy_BarCodeBillList")]
        [HttpGet]
        public object DeleteBatchGy_BarCodeBillList(string HInterID, int IsAudit, string CurUserName)
        {
            string ModRightNameCheck = "Gy_BarCodeBillList_Delete";
            DBUtility.ClsPub.CurUserName = CurUserName;
            try
            {
                //检查权限
                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, false, CurUserName))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "[0000-1-063]作废/反作废失败！无权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //HInterID数据判断
                if (HInterID.Length<=0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "未选择需要作废/反作废 的条码";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                Int64 lngBillKey = 0;
                lngBillKey = DBUtility.ClsPub.isLong(HInterID);                                         //对HInterID进行类型的转换

                //进行需要进行的作废/反作废操作
                if (IsAudit == 0) //作废提交
                {
                    string sql_deleteBeforeCtrl = "exec h_p_Gy_BarCodeBill_Cancelltion_Before '" + HInterID + "'";
                    DataSet ds_deleteBeforeCtrl = oCN.RunProcReturn(sql_deleteBeforeCtrl, "h_p_Gy_BarCodeBill_Cancelltion_Before");
                    if (ds_deleteBeforeCtrl == null || ds_deleteBeforeCtrl.Tables.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "作废失败：条码作废前控制失败！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    else if (ds_deleteBeforeCtrl.Tables[0].Rows[0]["HBack"].ToString() != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "作废失败：" + ds_deleteBeforeCtrl.Tables[0].Rows[0]["HRemark"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    oCN.BeginTran();

                    //作废条码
                    oCN.RunProc("update Gy_BarCodeBill set HStopflag=1,HDeleteMan='" + CurUserName + "',HDeleteDate=getdate() where HItemID in (" + HInterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);

                    string sql = "select * from Gy_BarCodeBill where HItemID in (" + HInterID + ")";
                    ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        string HBarCode = "";
                        for(int i = 0; i < ds.Tables[0].Rows.Count; i++)
                        {
                            HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString() + "；";
                        }


                        //添加操作日志
                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','作废'", ref DBUtility.ClsPub.sExeReturnInfo);

                        objJsonResult.code = "1";
                        objJsonResult.count = 1;
                        objJsonResult.Message = "[0000-1-040]作废成功";
                        objJsonResult.data = null;

                        oCN.Commit();
                    }
                    else
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "[0000-1-042]作废失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
                        objJsonResult.data = null;

                        oCN.RollBack();
                    }


                    return objJsonResult;
                }
                if (IsAudit == 1) //反关闭提交
                {
                    oCN.BeginTran();

                    //#region 反作废条码前进行判断
                    ////反作废条码前进行判断------------------------------------------------------------------------------------------------------------------------------------------------------
                    ////--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
                    //DataSet DS = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_UnCancelltion '" + HInterID + "','N'", "h_p_Gy_BarCodeBill_UnCancelltion", ref DBUtility.ClsPub.sExeReturnInfo);
                    //if (DS == null || DS.Tables[0].Rows.Count <= 0)
                    //{
                    //    oCN.RollBack();

                    //    objJsonResult.code = "0";
                    //    objJsonResult.count = 0;
                    //    objJsonResult.Message = "[0000-1-042]反作废失败，原因：反作废条码前判断发生错误！";
                    //    objJsonResult.data = null;
                    //    return objJsonResult;
                    //}
                    //else
                    //{
                    //    if (DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0][0]) == "1")
                    //    {
                    //        oCN.RollBack();

                    //        objJsonResult.code = "1";
                    //        objJsonResult.count = 1;
                    //        objJsonResult.Message = "[0000-1-042]反作废失败，原因：" + DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HRemark"]);
                    //        objJsonResult.data = null;
                    //        return objJsonResult;
                    //    }
                    //}
                    ////--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
                    ////--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
                    //#endregion

                    //反作废条码
                    oCN.RunProc("update Gy_BarCodeBill set HStopflag=0,HDeleteMan='',HDeleteDate=null where HItemID in (" + HInterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);

                    //增加操作日志
                    string sql = "select * from Gy_BarCodeBill where HItemID in (" + HInterID + ")";
                    ds = oCN.RunProcReturn(sql, "Gy_BarCodeBill");
                    if (ds != null && ds.Tables[0].Rows.Count > 0)
                    {
                        string HBarCode = "";
                        for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
                        {
                            HBarCode = ds.Tables[0].Rows[0]["HBarCode"].ToString() + "；";
                        }

                        oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + CurUserName + "','" + DBUtility.ClsPub.ComputerName + "','反作废条码：" + HBarCode + "','WMS系统-条码档案列表模块','" + DBUtility.ClsPub.IPAddress + "','反作废'", ref DBUtility.ClsPub.sExeReturnInfo);

                        objJsonResult.code = "1";
@@ -2337,6 +2864,7 @@
                int HNowSPID = mainList[0].HNowSPID;
                string HMouldUseStatus = mainList[0].HMouldUseStatus;
                int HUSEORGID = mainList[0].HUSEORGID;
                DateTime HNextMainDate = mainList[0].HNextMainDate;
                //若MAINDI重复则重新获取
                oCN.BeginTran();

@@ -2417,6 +2945,7 @@
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                ",HInitLife='" + HInitLife +
                ",HNextMainDate='" + HNextMainDate +
                "',HMouldUseStatus='" + HMouldUseStatus +
                "' where HInterID=" + HInterID.ToString());

@@ -2636,6 +3165,17 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ds = oCN.RunProcReturn("select * from Gy_MouldFileMain where HInterID = " + hmainid + " and ISNULL(HChecker,'') <> ''", "Gy_MouldFileMain");
                if (ds.Tables[0].Rows.Count > 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！单据已审核！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    oCN.BeginTran();