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

yusijie

2023-01-04 9bf9b1c4df6f49d770858410974fc3cbd960c5e5

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

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -328,7 +328,6 @@
        [HttpPost]
        public object SaveGy_MaterialListApi([FromBody] JObject msg)
        {
            LogService.Write("物料同步插件,post 开始：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
            var _value = msg["model"].ToString();
            string msg3 = _value.ToString();
            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -342,11 +341,9 @@
                msg1 = msg1.Replace("\\", "");
                msg1 = msg1.Replace("\n", "");  //\n
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1);
                LogService.Write("物料同步插件,物料json反序列化结束 开始：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                oBill.oModel = lsmain[0];
                //保存
                bool bResult = oBill.AddNewApi();
                LogService.Write("物料同步插件,保存方法执行完成 开始：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                if (bResult)
                {
                    objJsonResult.code = "1";
@@ -366,6 +363,7 @@
            }
            catch (Exception e)
            {
                LogService.Write("物料同步插件,保存方法执行完成异常：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff")+ e.Message.ToString());
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();

 WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs

@@ -960,6 +960,8 @@
        {
            try
            {
                LogService.Write("采购订单同步,保存方法执行完成异常：" + sMainSub.ToString());

                var model = sMainSub["model"].ToString();
                var entry = sMainSub["model"]["HENTRY"].ToString();

@@ -1022,6 +1024,8 @@
            }
            catch (Exception e)
            {
                LogService.Write("采购订单同步异常,保存方法执行完成异常：" + e.Message.ToString());

                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;

 WebAPI/DLL/ClsGy_Material_Ctl.cs

@@ -49,7 +49,6 @@
        {
            try
            {
                LogService.Write("物料同步插件,保存方法执行开始：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                string sql = string.Empty;
                oCn.BeginTran();
                sql = $"delete Gy_Material where hitemid ={oModel.HItemID}";
@@ -70,13 +69,12 @@
                    ", " + oModel.HWhID.ToString() + "," + oModel.HRoutingID.ToString() + "," + oModel.HBomID.ToString() + "," + oModel.HSecUnitID.ToString() + "," + oModel.HSecUnitRate.ToString() +
                    ", " + oModel.HHighStock.ToString() + "," + oModel.HLowStock.ToString() + "," + oModel.HSafeStock.ToString() + "," + oModel.HOrderPrice.ToString() + ",'" + oModel.HSalePrice + "'" +
                    ", " + oModel.HKeepDays.ToString() + "," + oModel.HPlanPrice.ToString() + "," + oModel.HstdPrice.ToString() + "," + oModel.HQtyMin.ToString() + "," + oModel.HQtyMax.ToString() +
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HBatchManager + "," + oModel.HOldMaterNumber + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    ",'" + oModel.HSubjoin + "','" + oModel.HSubjoin2 + "','" + oModel.HColor + "','" + oModel.HVersion + "','" + oModel.HEngName + "','" + oModel.HEngModel + "'," + oModel.HPropertyTypeID.ToString() + "," + oModel.HSPGroupID.ToString() + "," + oModel.HSPID.ToString() + "," + oModel.HMinPickQty.ToString() + "," + oModel.HCREATEORGID + "," + oModel.HUSEORGID + "," + oModel.HERPItemID + "," + oModel.HBatchManager + ",'" + oModel.HOldMaterNumber + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                sql = "set identity_insert gy_material off";
                oCn.RunProc(sql);
                //修改上级为非末级代码
                oCn.RunProc("Update " + MvarItemKey + " set HEndflag=0 where HItemID=" + oModel.HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                LogService.Write("物料同步插件,保存方法执行结束：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                return true;
            }
            catch (Exception e)