yusijie
2024-09-20 22431386b2f13aa6bd30b9444974e98a3e8d7e01
关键件绑定,物料新增编辑,流转卡
6个文件已修改
45 ■■■■■ 已修改文件
Model/车间管理/ClsSc_ProcessExchangeBillSub_BatchSplit.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/基础资料/基础资料/Gy_StockPlace_Controller.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/条码管理/WEBSController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/DLL/ClsGy_Material_Ctl.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/³µ¼ä¹ÜÀí/ClsSc_ProcessExchangeBillSub_BatchSplit.cs
@@ -19,6 +19,7 @@
        public Int64 HInterID;//流转卡内码
        public string HBillNo;//流转卡号
        public string HBatchNo;//批次
        public string HGroupNumber;//班组
    }
}
WebAPI/Controllers/CJGL/Sc_KeyElementBindingController.cs
@@ -190,6 +190,42 @@
        }
        #endregion
        #region å…³é”®ä»¶ç»‘定查询同一追溯单号下的历史扫码记录
        [Route("Sc_KeyElementBinding/HistoryInfo_Temp")]
        [HttpGet]
        public object HistoryInfo_Temp(string sWhere, string user)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = new DataTable();
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select","select");
                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_KeyElementBinding/Save")]
        [HttpPost]
WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs
@@ -2242,7 +2242,7 @@
                        oItemSubs.HDeptID = Pub_Class.ClsPub.isLong(ds.Tables[0].Rows[i]["HDeptID"]);
                        oItemSubs.HDeptNumber = ds.Tables[0].Rows[i]["HDeptNumber"].ToString();
                        oItemSubs.HGroupID = 0;
                        oItemSubs.HGroupNumber = "";
                        oItemSubs.HGroupNumber = oItemSub.HGroupNumber;
                        oItemSubs.HWorkerID = 0;
                        oItemSubs.HWorkerNumber = "";
                        oItemSubs.HSourceID = 0;
WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_StockPlace_Controller.cs
@@ -37,7 +37,7 @@
            {
                List<object> columnNameList = new List<object>();
          
                string sql1 = string.Format(@"select * from h_v_IF_StockPlaceList_ where ä½¿ç”¨ç»„织='" + Organization + "'");
                string sql1 = string.Format(@"select top 1000 * from h_v_IF_StockPlaceList_ where ä½¿ç”¨ç»„织='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HMainID", "h_v_IF_StockPlaceList_");
WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -509,7 +509,7 @@
                //界面上未选择仓库 æˆ– ä»“位选择列表界面输入过滤条件
                if (HWhID == 0)
                {
                    ds = oCn.RunProcReturn("select HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace");
                    ds = oCn.RunProcReturn("select top 50 HItemID,HNumber,HName,HWHID,HWhNumber,HWhName from h_v_IF_StockPlace where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + StockPlace + "%' or HName like '%" + StockPlace + "%')", "h_v_IF_StockPlace");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
WebAPI/DLL/ClsGy_Material_Ctl.cs
@@ -53,6 +53,7 @@
                       "," + oModel.HMoneyDec +
                       "," + oModel.HTaxRate +
                       "," + oModel.HProfitRate +
                       "," + oModel.HLotcardQty +
                       ",'" + oModel.HProjectBillMainID +
                       "','" + oModel.HDivisionID +
                       "')", ref DBUtility.ClsPub.sExeReturnInfo);
@@ -225,6 +226,7 @@
                    ",HProfitRate=" + oModel.HProfitRate.ToString() +
                    ",HProjectBillMainID='" + oModel.HProjectBillMainID + "'" +
                    ",HDivisionID='" + oModel.HDivisionID + "'" +
                    ",HLotcardQty='" + oModel.HLotcardQty + "'" +
                    " Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                oCn.RunProc("exec h_p_Gy_UpdateNumber '" + MvarItemKey + "','" + oModel.HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);