jhz
2022-07-08 8973ed24937566fc3a6b583cfeb1909bac4e574a
Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
6个文件已修改
5个文件已添加
86 ■■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/MoveStockBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/OtherInStockController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/OtherOutBillController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SellOutController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Sc_MouldProdInBill/Log/637922798809005613.log 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Sc_MouldProdInBill/Log/637922798810445635.log 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Sc_MouldProdInBill/Log/637922798810495634.log 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Sc_MouldProdOutBill/Log/637922798844003795.log 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Vlog/webapi20220701.txt 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -803,6 +803,7 @@
                int HYear = DBUtility.ClsPub.isInt(DateTime.Now.Year);
                double HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month);
                string HMouldNo = mainList[0].HMouldNo;
                string HBarCode = mainList[0].HBarCode;
                string HName = mainList[0].HName;
                string HModel = mainList[0].HModel;
                string HModel2 = mainList[0].HModel2;
@@ -883,16 +884,17 @@
                ",HSPGroupID=" + HSPGroupID.ToString() +
                ",HSPID=" + HSPID.ToString() +
                ",HDesignLife=" + HDesignLife.ToString() +
                ",HCaveQty="+ HCaveQty.ToString()+
                ",HCaveQty=" + HCaveQty.ToString() +
                ",HUseLife=" + HUseLife.ToString() +
                ",HLeaveLife=" + HLeaveLife.ToString() +
                ",HProdQty=" + HProdQty.ToString() +
                ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
                ",HMouldDotCheckRuleInterID=" + HMouldDotCheckRuleInterID.ToString() +
                ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
                ",HMouldOWNER='" + HMouldOWNER + "'" +
                ",HNowSupID="+HNowSupID.ToString()+
                ",HNowSupTypeID="+HNowSupTypeID.ToString()+
                ",HNowSupID=" + HNowSupID.ToString() +
                ",HNowSupTypeID=" + HNowSupTypeID.ToString() +
                ",HProdWeight=" + HProdWeight.ToString() +
                ",HBarCode="+ HBarCode.ToString()+
                " where HInterID=" + HInterID.ToString());
                //修改子项目代码
WebAPI/Controllers/MoveStockBillController.cs
@@ -618,7 +618,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成调拨单成功!单据号为:";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/OtherInStockController.cs
@@ -358,7 +358,7 @@
                {            
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成其他入库单成功!单据号为:";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/OtherOutBillController.cs
@@ -412,7 +412,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成其他出库单成功!单据号为:";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/SellOutController.cs
@@ -578,7 +578,7 @@
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "生成销售出库单成功!单据号为:";
                    objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
WebAPI/Controllers/WebAPIController.cs
@@ -3420,7 +3420,62 @@
        }
        #region PDA其他入库列表模块
        /// <summary>
        /// 其他入库缓存列表刷新信息
        /// </summary>
        /// <param name="HBillType"></param>
        /// <param name="sHMaker"></param>
        /// <param name="HOrgID"></param>
        /// <returns></returns>
        [Route("Web/GetOtherInBillMain_TempList_New")]
        [HttpGet]
        public object GetOtherInBillMain_TempList_New (string HBillType, string sHMaker, Int64 HOrgID)
        {
            WebS.WebService1 oWebs = new WebS.WebService1();
            try
            {
                List<object> columnNameList = new List<object>();
                DataSet ds = oCN.RunProcReturn("exec h_p_KF_GetPonderationBillMain_TempList_New1 '" + HBillType + "','" + sHMaker + "'," + HOrgID.ToString(), "h_p_KF_GetPonderationBillMain_TempList_New1");
                //添加列名
                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列对象的列名
                }
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有返回任何记录!";
                    objJsonResult.data = ds.Tables[0];
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                    //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "获取信息成功!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "没有返回任何记录!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}
WebAPI/Sc_MouldProdInBill/Log/637922798809005613.log
New file
@@ -0,0 +1,3 @@
------------------------2022/7/1 13:44:40------------------------------
成功!
WebAPI/Sc_MouldProdInBill/Log/637922798810445635.log
New file
@@ -0,0 +1,3 @@
------------------------2022/7/1 13:44:41------------------------------
有权限
WebAPI/Sc_MouldProdInBill/Log/637922798810495634.log
New file
@@ -0,0 +1,3 @@
------------------------2022/7/1 13:44:41------------------------------
select * from h_v_Sc_MouldProdInHouseBillList where 库存组织='蓝海实业集团' and CONVERT(varchar(100),日期, 23) >= '2022-06-01' and CONVERT(varchar(100),日期, 23) <= '2022-07-01'order by hmainid desc
WebAPI/Sc_MouldProdOutBill/Log/637922798844003795.log
New file
@@ -0,0 +1,3 @@
------------------------2022/7/1 13:44:44------------------------------
select * from h_v_Sc_MouldProdOutHouseBillList where 库存组织='蓝海实业集团'
WebAPI/Vlog/webapi20220701.txt
New file
@@ -0,0 +1 @@
2022/7/1 13:44:41  and CONVERT(varchar(100),日期, 23) >= '2022-06-01' and CONVERT(varchar(100),日期, 23) <= '2022-07-01';蓝海实业集团