zzr99
2021-12-14 bef6120383b2e8d5695f7c21d0db05681f2c7fdb
新增盘点方案
7个文件已修改
2个文件已添加
351 ■■■■■ 已修改文件
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_StockCheckItemBillController.cs 254 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/ListModels.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsGy_StockCheckItemBill.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
@@ -92,7 +92,7 @@
                    return objJsonResult;
                }
               
                bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
@@ -90,7 +90,7 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oBill.omodel.HChecker != "")
                if (oBill.omodel.HChecker != ""&& oBill.omodel.HChecker != null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
@@ -99,7 +99,7 @@
                    return objJsonResult;
                }
                bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
                if (IsDete)
                {
                    objJsonResult.code = "0";
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockCheckItemBillController.cs
New file
@@ -0,0 +1,254 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using WebAPI.Models;
namespace WebAPI.Controllers.基础资料.基础资料
{
    public class Gy_StockCheckItemBillController : ApiController
    {
        public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态(新增,修改,浏览,更新单价,变更)
        private json objJsonResult = new json();
        public DataSet ds = new DataSet();
        public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
        public Models.ClsGy_StockCheckItemBill BillNew0 = new Models.ClsGy_StockCheckItemBill();
        #region ç›˜ç‚¹æ–¹æ¡ˆåˆ—表
        [Route("Gy_StockCheckItemBill/Get_StockCheckItemList")]
        [HttpGet]
        public object Get_StockCheckItemList(string sWhere)
        {
            try
            {
                ds = StockCheckItemList(sWhere);
                if (ds == null)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "查询数据异常,请与管理员联系!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "返回记录成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception ex)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "查询数据异常,请与管理员联系!" + ex.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        public static DataSet StockCheckItemList(string sWhere)
        {
            string sql1 = string.Format(@"select * from h_v_Gy_StockCheckItemList");
            if (sWhere == null || sWhere.Equals(""))
            {
                return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_StockCheckItemList");
            }
            else
            {
                string sql = sql1 + sWhere + "order by hitemid desc";
                return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_StockCheckItemList");
            }
        }
        #endregion
        #region [盘点方案删除功能]
        [Route("Gy_StockCheckItemBill/set_DeleteBill")]
        [HttpGet]
        public object set_DeleteBill(string HItemID)
        {
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HItemID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            ds = oCn.RunProcReturn("select * from Gy_StockCheckItem where HItemID=" + lngBillKey, "Gy_StockCheckItem");
            if (ds != null)
            {
                oCn.RunProc("Delete from Gy_StockCheckItem where HItemID=" + lngBillKey);
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "删除成功!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "此单据不存在,请查看是否重复删除";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region [编辑显示表头]
        [Route("Gy_StockCheckItemBill/GetStockCheckItemByID")]
        [HttpGet]
        public object GetStockCheckItemByID(string HID)
        {
            Int64 lngBillKey = 0;
            lngBillKey = DBUtility.ClsPub.isLong(HID);
            if (lngBillKey == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "单据ID为空!";
                objJsonResult.data = null;
                return objJsonResult;
            }
            ds = oCn.RunProcReturn("select * from Gy_StockCheckItem where HItemID=" + lngBillKey, "Gy_ConkReason");
            if (ds != null)
            {
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            else
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "此单据不存在";
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ä¿å­˜ç›˜ç‚¹æ–¹æ¡ˆ
        [Route("Gy_StockCheckItemBill/SaveGy_StockCheckItem")]
        [HttpPost]
        public object SaveGy_StockCheckItem([FromBody] JObject msg)
        {
            var _value = msg["msg"].ToString();
            string msg2 = _value.ToString();
            string[] sArray = msg2.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
            string msg1 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();//当前人
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            ListModels oListModels = new ListModels();
            try
            {
                Models.ClsGy_StockCheckItemBill oBill = new Models.ClsGy_StockCheckItemBill();
                List<Models.ClsGy_StockCheckItemBill> lsmain = new List<Models.ClsGy_StockCheckItemBill>();
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_StockCheckItem(msg1);
                foreach (Models.ClsGy_StockCheckItemBill 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;
                    }
                    //得到短代码
                    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.HShortNumber = sShortNumber;//短代码
                    oItem.HEndFlag = true;//末级标志
                    oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //等级
                    oBill = oItem;
                }
                //保存
                //保存完毕后处理
                if (oBill.HItemID == 0)
                {
                    oCn.RunProc("Insert into Gy_StockCheckItem " +
                    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                    ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HEndDate,HOrgID) " +
                    " Values('" + oBill.HNumber + "','" + oBill.HName + "','" + oBill.HHelpCode + "','" + oBill.HShortNumber + "'," + oBill.HParentID.ToString() +
                    "," + oBill.HLevel.ToString() + "," + Convert.ToString(oBill.HEndFlag ? 1 : 0) + "," + Convert.ToString(oBill.HStopflag ? 1 : 0) + ",'" + oBill.HRemark +
                    "','" + oBill.HUseFlag + "',getdate(),'" + msg3 + "','" + oBill.HEndDate.ToString() + "'," + oBill.HOrgID.ToString()+
                    ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCn.RunProc("Update Gy_StockCheckItem set HEndflag=0 where HItemID=" + oBill.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "保存成功!";
                    //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单");
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
                else
                {
                    oCN.RunProc("UpDate Gy_StockCheckItem set  " +
                    " HNumber='" + oBill.HNumber + "'" +  //固定赋值===============
                    ",HName='" + oBill.HName + "'" +
                    ",HShortNumber='" + oBill.HShortNumber + "'" +
                    ",HHelpCode='" + oBill.HHelpCode + "'" +
                    ",HUseFlag='" + oBill.HUseFlag + "'" +
                    ",HRemark='" + oBill.HRemark + "'" +
                    ",HEndDate='" + oBill.HEndDate + "'" +
                    ",HModifyTime=getdate()" +
                    ",HModifyEmp='" + msg3 + "'" +
                    ",HStopflag=" + Convert.ToString(oBill.HStopflag ? 1 : 0) +
                    " where HItemID=" + oBill.HItemID.ToString());
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "修改成功!";
                    objJsonResult.data = 1;
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败!" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs
@@ -12,7 +12,7 @@
        public ClsSb_EquipDotCheckRuleBill()
        {
            base.MvarItemKeySub = "ClsSb_EquipDotCheckRuleBillSub";
            base.MvarItemKeySub = "Sb_EquipDotCheckRuleBillSub";
            base.MvarItemKeySub2 = "";
            base.MvarItemKeySub3 = "";
            base.MvarItemKeySub4 = "";
WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
@@ -42,7 +42,7 @@
                //
                oCn.BeginTran();
                //更新主表
                oCn.RunProc("UpDate Sb_EquipMaintainPlanBillMain set  " +
                oCn.RunProc("UpDate Sb_EquipMaintainRuleBillMain set  " +
                " HBillNo='" + omodel.HBillNo + "'" +  //固定赋值===============
                ",HDate='" + omodel.HDate + "'" +
                ",HYear='" + omodel.HYear.ToString() + "'" +
@@ -83,7 +83,7 @@
                //插入配件子表
                foreach (Models.ClsSb_EquipMaintainRuleBillSub oSub in DetailColl_Mater)
                {
                    oCn.RunProc("Insert into Sb_EquipMaintainRuleBillSub " +
                    string sql = "Insert into Sb_EquipMaintainRuleBillSub " +
                      " (HInterID,HEntryID," +
                      "HCloseMan,HEntryCloseDate,HCloseType,HRemark," +
                      "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," +
@@ -92,8 +92,9 @@
                      + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() +
                      ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
                      "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
                      "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + "," + oSub.HQtyMust.ToString() +
                      ") ");
                      "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + "," + oSub.HUnitID.ToString() + ",0" +
                      ") ";
                    oCn.RunProc(sql);
                }
                sReturn = "修改单据成功!";
                oCn.Commit();
WebAPI/ListModels.cs
@@ -583,6 +583,18 @@
        }
        /// <summary>
        /// å¤„理新盘点方案表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsGy_StockCheckItemBill> getObjectByJson_Gy_StockCheckItem(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsGy_StockCheckItemBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_StockCheckItemBill>>(jsonString);
            return list;
        }
        /// <summary>
        /// å¤„理新增模具保养记录表主表的json
        /// </summary>
        /// <param name="jsonString"></param>
WebAPI/Models/ClsGy_StockCheckItemBill.cs
New file
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class ClsGy_StockCheckItemBill : DBUtility.ClsGy_Base_Model
    {
        //public int HItemID;              // int                     //主键 int
        //public string HNumber;          //         varchar(50)        //代码
        //public string HName;            // varchar(50)        //名称
        //public string HShortNumber;     // varchar(50)        //短代码
        //public int HParentID;           // int           //父级ID int
        //public int HLevel;              //         int            //等级    int
        //public bool HEndFlag;           //            bit            //末级标志 bit
        //public bool HStopflag;          //       bit            //禁用标志 bit
        //public string HRemark;          //         varchar(500)        //备注 varchar(50)
        //public string HHelpCode;        // varchar(20)        //助记码  varchar(20)
        //public string HUseFlag;         // varchar(10)        //使用状态(未检测,未使用,已使用)
        //public DateTime HMakeTime;      // datetime            //建立时间(getdate())
        public string HMakeEmp;         // varchar(100)        //创建人
        public string HCheckEmp;        // varchar(100)        //审核人
        public DateTime HCheckTime;     // datetime            //审核时间
        public string HModifyEmp;       // varchar(100)        //修改人
        public DateTime HModifyTime;    // datetime            //修改时间
        public string HStopEmp;         // varchar(100)        //禁用人
        public DateTime HStopTime;      // datetime            //禁用时间
        public DateTime HEndDate;
        public int HOrgID;
    }
}
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/10/2021 16:24:07</publishTime>
      <publishTime>12/14/2021 15:46:52</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>12/10/2021 16:24:07</publishTime>
      <publishTime>12/14/2021 15:46:52</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>12/10/2021 16:24:05</publishTime>
      <publishTime>12/14/2021 15:46:49</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>12/10/2021 16:24:05</publishTime>
      <publishTime>12/14/2021 15:46:49</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>12/10/2021 16:24:02</publishTime>
      <publishTime>12/14/2021 15:46:43</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>12/10/2021 16:24:02</publishTime>
      <publishTime>12/14/2021 15:46:43</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/10/2021 16:24:03</publishTime>
      <publishTime>12/14/2021 15:46:44</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>12/10/2021 16:24:03</publishTime>
      <publishTime>12/14/2021 15:46:44</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/10/2021 16:24:00</publishTime>
      <publishTime>12/14/2021 15:46:39</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>12/10/2021 16:24:00</publishTime>
      <publishTime>12/14/2021 15:46:39</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>12/10/2021 16:24:01</publishTime>
      <publishTime>12/14/2021 15:46:40</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>12/10/2021 16:24:01</publishTime>
      <publishTime>12/14/2021 15:46:40</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>12/10/2021 16:24:01</publishTime>
      <publishTime>12/14/2021 15:46:41</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>12/10/2021 16:24:01</publishTime>
      <publishTime>12/14/2021 15:46:41</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/10/2021 16:24:10</publishTime>
      <publishTime>12/14/2021 15:47:00</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>12/10/2021 16:24:10</publishTime>
      <publishTime>12/14/2021 15:47:00</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/10/2021 16:24:31</publishTime>
      <publishTime>12/14/2021 15:49:27</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -349,6 +349,7 @@
    <Compile Include="Controllers\Open_PrintTemController.cs" />
    <Compile Include="Controllers\ReportStepPlatFormController.cs" />
    <Compile Include="Controllers\博日自动扫码线\ScanlineAPIController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_StockCheckItemBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OtherBalBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_GroupBalBillController.cs" />
    <Compile Include="Controllers\PurchaseOrderController.cs" />
@@ -451,6 +452,7 @@
    <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
    <Compile Include="DLL\工资管理\ClsPay_GroupBalBill.cs" />
    <Compile Include="DLL\工资管理\ClsPay_WorkTimesBill.cs" />
    <Compile Include="Models\ClsGy_StockCheckItemBill.cs" />
    <Compile Include="Models\jsonScanline.cs" />
    <Compile Include="Models\ScanLineCode.cs" />
    <Compile Include="Models\工资管理\ClsPay_GroupBalBillEmp.cs" />