Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

zrg

9 天以前 38bd77018665edaae981bf1c9d80b66711802f93

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsEqiupMaterWorkTimes_Model.cs

@@ -6,9 +6,8 @@
{
    public class ClsEqiupMaterWorkTimes_Model : DBUtility.ClsGy_Base_Model
    {

        public string HEquipNumber { get; set; }
        public string HMaterNumber { get; set; }
        public string HWorkTimes { get; set; }
        public string HEquipNumber;
        public string HMaterNumber;
        public string HWorkTimes;
    }
}

 WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs

@@ -12417,7 +12417,16 @@
            try
            {
                List<object> columnNameList = new List<object>();
               

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql1 = "select * from  h_v_Sb_EqiupMaterWorkTimes where 1 = 1";
                string sql = sql1 + sWhere + " order by è®¾å¤‡ä»£ç  ";

 WebAPI/Controllers/CJGL/Cj_SingleStationController.cs

@@ -307,6 +307,7 @@
            //修改条码表的状态
            oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'");

            LogService.Write("类型:" + oSub.HBadTypeID + ",制单人:" + oSub.HMaker + ",制单日期:" + oSub.HMakeDate);
            //修改出站单的 ä¸è‰¯ æŠ¥åºŸæ•°é‡
            if (HResult == "不良")
            {

 WebAPI/Controllers/POStockInBillController.cs

@@ -5013,7 +5013,16 @@
        {
            try
            {
                string _msg = msg["msg"].ToString();
                string HMaker ="";           //制单人
                var _value = msg["msg"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string _msg = sArray[0].ToString();
                if(sArray.Length>1)
                {
                    HMaker = sArray[1].ToString();
                }

                _msg = _msg.Replace("\\", "");
                _msg = _msg.Replace("\n", "");
                List<Models.ReciveBill_FastModel> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ReciveBill_FastModel>>(_msg);
@@ -5174,7 +5183,8 @@
                                ["IsVerifyBaseDataField"] = "false",
                                ["Model"] = model
                            };
                            var loginRet = InvokeHelper.Login();
                            //登录
                            var loginRet = InvokeHelper.LoginUser(HMaker);
                            var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                            if (isSuccess == 0)
                            {
@@ -5220,7 +5230,54 @@
                        LogService.Write("收料通知单审核无数据：" + sql);
                    }
                }
                else //夏宝 ï¼Œæ›´æ–°erp信息
                else if(FCusName.Contains("夏宝"))
                {
                    JObject jsonRoot = new JObject();
                    jsonRoot.Add("Creator", "");
                    jsonRoot.Add("NeedUpDateFields", new JArray());
                    jsonRoot.Add("NeedReturnFields", new JArray());
                    jsonRoot.Add("IsDeleteEntry", "True"); //注意IsDeleteEntry参数，如为True，则原分录行的FEntryId未在分录json出现的行，将会被删除 ï¼ˆå¦‚无需删除分录行，可改为fasle）
                    jsonRoot.Add("SubSystemId", "");
                    jsonRoot.Add("IsVerifyBaseDataField", "");

                    JObject jsonModel = new JObject();
                    jsonModel.Add("FID", FID);
                    JArray Entry = new JArray();
                    foreach (var item in list)
                    {
                        if (item.HSQty == 0)
                            continue;
                        JObject jsonFPOOrderEntry = new JObject();
                        jsonFPOOrderEntry.Add("FEntryID", item.FEntryID);
                        jsonFPOOrderEntry.Add("FActReceiveQty ", item.HSQty); ;
                        Entry.Add(jsonFPOOrderEntry);
                    }
                    jsonModel.Add("FDetailEntity", Entry);
                    jsonRoot.Add("Model", jsonModel);
                    //登录
                    var loginRet = InvokeHelper.LoginUser(HMaker);
                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                    if (isSuccess <= 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = loginRet;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
                    //LogService.Write(result);
                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    {
                        LogService.Write("收料通知单修改失败jsonRoot:" + jsonRoot.ToString());
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "金蝶收料通知单更新失败" + result;
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }
                else //更新erp信息
                {
                    JObject jsonRoot = new JObject();
                    jsonRoot.Add("Creator", "");
@@ -5244,7 +5301,8 @@
                    }
                    jsonModel.Add("FDetailEntity", Entry);
                    jsonRoot.Add("Model", jsonModel);
                    var loginRet = InvokeHelper.Login();
                    //登录
                    var loginRet = InvokeHelper.LoginUser(HMaker);
                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                    if (isSuccess <= 0)
                    {

 WebAPI/Controllers/WebAPIController.cs

@@ -17920,6 +17920,16 @@
            ListModels oListModels = new ListModels();
            try
            {
                //保存权限
                if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_Edit", 1, false, msg2))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无保存权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }


                WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl oBill = new WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl();
                List<Model.ClsEqiupMaterWorkTimes_Model> lsmain = new List<Model.ClsEqiupMaterWorkTimes_Model>();
@@ -17992,6 +18002,16 @@
            DataSet ds;
            try
            {
                //删除权限
                if (!DBUtility.ClsPub.Security_Log("EqiupMaterWorkTimes_Delete", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (string.IsNullOrWhiteSpace(HItemID))
                {

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationEntrustInBillList.cs

@@ -317,7 +317,7 @@
                    //写入删除日志 
                    string WorkList = "删除委外发出单：" + oBill.omodel.HBillNo;
                    //BLL.ClsPub_BLL.System_Log_DropAdd(WorkList);
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, oBill.omodel.HBillNo, "h_p_Sc_StationInBill_WW_AfterDelCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "提示");
                        return;

 WorkM/Á÷ת¿¨¹ÜÀí/MES_StationEntrustOutBillList.cs

@@ -324,7 +324,7 @@
                    //写入删除日志 
                    string WorkList = "删除委外接收单：" + oBill.omodel.HBillNo;
                    //BLL.ClsPub_BLL.System_Log_DropAdd(WorkList); 
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, ref DBUtility.ClsPub.sExeReturnInfo))
                    if (!oBill.DeleteBill(oBill.omodel.HInterID, oBill.omodel.HProcExchInterID, oBill.omodel.HProcExchEntryID, oBill.omodel.HBillNo, "h_p_StationEntrustOutBill_WW_AfterDelCtrl", DBUtility.ClsPub.CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
                    {
                        MessageBox.Show(DBUtility.ClsPub.sExeReturnInfo, "提示");
                        return;