WEBS引用更新

yxj

7 天以前 ae36a4639fff74935c27c8e7bb0ce6b39ad039a5

 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs

@@ -317,6 +317,33 @@
        }
        #endregion

        #region 获取车间号
        [Route("Gy_Material/Get_HDepartment")]
        [HttpGet]
        public object Get_HDepartment()
        {
            try
            {
                DataSet oDs = new DataSet();
                //==========
                oDs = oCN.RunProcReturn("select top(20) HItemID , HName from Gy_Department", "Gy_Department");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取成功！";
                objJsonResult.data = oDs.Tables[0];
                return objJsonResult; ;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        /// <summary>
        /// 获取项目列表
        /// </summary>
@@ -958,6 +985,7 @@
                lsmain = oListModels.getObjectByJson_Gy_Material(msg1); 

                oBill.oModel = lsmain[0];
                LogService.Write("物料同步插件,保存方法执行完成异常："+ msg1);
                //保存
                bool bResult = oBill.AddNewApi();
                if (bResult)
@@ -2945,7 +2973,7 @@
                ",HNowWHID=" + HNowWHID +
                ",HNowSPID=" + HNowSPID +
                ",HInitLife='" + HInitLife +
                ",HNextMainDate='" + HNextMainDate +
                "',HNextMainDate='" + HNextMainDate +
                "',HMouldUseStatus='" + HMouldUseStatus +
                "' where HInterID=" + HInterID.ToString());

@@ -3322,7 +3350,7 @@
        #region [同步基础资料]
        [Route("Gy_Material/Gy_MaterialViewApi")]
        [HttpGet]
        public json Gy_MaterialViewApi(string Number, string Type)
        public json Gy_MaterialViewApi(string Number, string Type, string HUseOrgID)
        {
            string sql = string.Empty;
            string sReturn = "";
@@ -3380,14 +3408,24 @@
                {
                    #region [公有云模式，调用WEBAPI的方式进行更新]
                    var json = new
                    // {
                    //     CreateOrgId = 0,
                    //     Number = Number,
                    //     Id = ""
                    // };
                    {
                        CreateOrgId = 0,
                        Number = Number,
                        Id = ""
                        FormId= "BD_MATERIAL",
                        FieldKeys= "FMASTERID,FNUMBER,FNAME,FSPECIFICATION,FFORBIDSTATUS,FErpClsID,FBaseUnitId,FLENGTH,FWIDTH,FHEIGHT,FNETWEIGHT,FGROSSWEIGHT,FOldNumber,FSTOCKPLACEID,FPLANMODE,FCREATEDATE,FCREATEORGID,FUSEORGID,FISBATCHMANAGE,FCheckIncoming,FIsEnable1,FIsKFPeriod,FAuxUnitID,FSNUNIT,FBaseUnitId,FSaleUnitId,FSalePriceUnitId,FPerUnitStandHour,FStdLaborPrePareTime,FStdMachinePrepareTime",
                        FilterString= $@"FNUMBER='{Number}' AND FUSEORGID={HUseOrgID}",
                        OrderString= "",
                        TopRowCount= 0,
                        StartRow= 0,
                        Limit= 0
                    };
                    #region [金蝶部分]
                    //登录金蝶
                    var loginRet = InvokeHelper.Login();

                #region [金蝶部分]
                //登录金蝶
                var loginRet = InvokeHelper.Login();
                    var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                    //判断是否登录成功
                    if (isSuccess < 0)
@@ -3399,14 +3437,22 @@
                        return objJsonResult;
                    }
                    //查看 获取数据                    
                    var _result = InvokeHelper.View("BD_MATERIAL", JsonConvert.SerializeObject(json));
                    var _saveObj = JObject.Parse(_result);
                    var _result = InvokeHelper.Query("BD_MATERIAL", JsonConvert.SerializeObject(json));
                    var _saveObj = JArray.Parse(_result);
                    //判断数据是否获取成功
                    if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    // if (_saveObj["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    // {
                    //     objJsonResult.code = "0";
                    //     objJsonResult.count = 0;
                    //     objJsonResult.Message = "金蝶物料同步失败jsonRoot：" + _result;
                    //     objJsonResult.data = null;
                    //     return objJsonResult;
                    // }
                    if (_saveObj.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "金蝶物料同步失败jsonRoot：" + _result;
                        objJsonResult.Message = "金蝶客户同步失败，使用组织对应的物料代码无对应的物料";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -3422,47 +3468,89 @@

                    #region [表数据赋值]
                    var jsonData = new
                    // {
                    //     HItemID = _saveObj["Result"]["Result"]["Id"],
                    //     HERPItemID = _saveObj["Result"]["Result"]["Id"],
                    //     HNumber      = _saveObj["Result"]["Result"]["Number"],
                    //     HName        = _saveObj["Result"]["Result"]["Name"][1]["Value"],
                    //     HModel       = _saveObj["Result"]["Result"]["Specification"][0]["Value"],
                    //     HShortNumber = _saveObj["Result"]["Result"]["Number"],
                    //     HParentID    = 0,
                    //     HLevel       = 1,
                    //     HEndFlag     = 1,
                    //     HStopflag    = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1 ,
                    //     HRemark      = "CLD-ERP导入",
                    //     HMaterClsID  = _saveObj["Result"]["Result"]["MaterialBase"][0]["ErpClsID"],
                    //     HUnitID      = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
                    //     HUnitGroupID       = 0,
                    //     HLength         = _saveObj["Result"]["Result"]["MaterialBase"][0]["LENGTH"],
                    //     HWidth          = _saveObj["Result"]["Result"]["MaterialBase"][0]["WIDTH"],
                    //     HHeight         = _saveObj["Result"]["Result"]["MaterialBase"][0]["HEIGHT"],
                    //     HJQty           = _saveObj["Result"]["Result"]["MaterialBase"][0]["NETWEIGHT"],
                    //     HMQty           = _saveObj["Result"]["Result"]["MaterialBase"][0]["GROSSWEIGHT"],
                    //     HOldMaterNumber = _saveObj["Result"]["Result"]["OldNumber"],
                    //     HWHID           = 0,
                    //     HSPID           = _saveObj["Result"]["Result"]["MaterialStock"][0]["StockPlaceId_Id"],
                    //     HPlanMode       = _saveObj["Result"]["Result"]["MaterialPlan"][0]["PlanMode"],
                    //     HUseFlag        = "未检验",
                    //     HMakeTime       = _saveObj["Result"]["Result"]["CreateDate"],
                    //     HMinPickQty     = 0,
                    //     HCREATEORGID    = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
                    //     HUSEORGID       = _saveObj["Result"]["Result"]["UseOrgId_Id"],
                    //     HBatchManager   = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsBatchManage"].ToString() == "false" ? 0 : 1,
                    //     HCHECKINCOMING  = _saveObj["Result"]["Result"]["MaterialQM"][0]["CheckIncoming"].ToString() == "false" ? 0 : 1,
                    //     HAuxPropFlag    = _saveObj["Result"]["Result"]["MaterialAuxPty"][0]["IsEnable1"].ToString() == "false" ? 0 : 1,
                    //     HISKFPERIOD     = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsKFPeriod"].ToString() == "false" ? 0 : 1,
                    //     HAuxUnitID      = _saveObj["Result"]["Result"]["MaterialStock"][0]["AuxUnitID_Id"],
                    //     HSNUnitID       = _saveObj["Result"]["Result"]["MaterialStock"][0]["SNUnit_Id"],
                    //     HBASEUNITID     = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
                    //     HSALEUNITID        = _saveObj["Result"]["Result"]["MaterialSale"][0]["SaleUnitId_Id"],
                    //     HSALEPRICEUNITID   = _saveObj["Result"]["Result"]["MaterialSale"][0]["SalePriceUnitId_Id"],
                    //     HPERUNITSTANDHOUR = _saveObj["Result"]["Result"]["MaterialProduce"][0]["PerUnitStandHour"],
                    //     HSTDLABORPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdLaborPrePareTime"],
                    //     HSTDMACHINEPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdMachinePrepareTime"]                       
                    // };
                    {
                        HItemID = _saveObj["Result"]["Result"]["Id"],
                        HERPItemID = _saveObj["Result"]["Result"]["Id"],
                        HNumber      = _saveObj["Result"]["Result"]["Number"],
                        HName        = _saveObj["Result"]["Result"]["Name"][1]["Value"],
                        HModel       = _saveObj["Result"]["Result"]["Specification"][0]["Value"],
                        HShortNumber = _saveObj["Result"]["Result"]["Number"],
                        HParentID    = 0,
                        HLevel       = 1,
                        HEndFlag     = 1,
                        HStopflag    = _saveObj["Result"]["Result"]["ForbidStatus"].ToString() == "A" ? 0 : 1 ,
                        HRemark      = "CLD-ERP导入",
                        HMaterClsID  = _saveObj["Result"]["Result"]["MaterialBase"][0]["ErpClsID"],
                        HUnitID      = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
                        HUnitGroupID       = 0,
                        HLength         = _saveObj["Result"]["Result"]["MaterialBase"][0]["LENGTH"],
                        HWidth          = _saveObj["Result"]["Result"]["MaterialBase"][0]["WIDTH"],
                        HHeight         = _saveObj["Result"]["Result"]["MaterialBase"][0]["HEIGHT"],
                        HJQty           = _saveObj["Result"]["Result"]["MaterialBase"][0]["NETWEIGHT"],
                        HMQty           = _saveObj["Result"]["Result"]["MaterialBase"][0]["GROSSWEIGHT"],
                        HOldMaterNumber = _saveObj["Result"]["Result"]["OldNumber"],
                        HWHID           = 0,
                        HSPID           = _saveObj["Result"]["Result"]["MaterialStock"][0]["StockPlaceId_Id"],
                        HPlanMode       = _saveObj["Result"]["Result"]["MaterialPlan"][0]["PlanMode"],
                        HUseFlag        = "未检验",
                        HMakeTime       = _saveObj["Result"]["Result"]["CreateDate"],
                        HMinPickQty     = 0,
                        HCREATEORGID    = _saveObj["Result"]["Result"]["CreateOrgId_Id"],
                        HUSEORGID       = _saveObj["Result"]["Result"]["UseOrgId_Id"],
                        HBatchManager   = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsBatchManage"].ToString() == "false" ? 0 : 1,
                        HCHECKINCOMING  = _saveObj["Result"]["Result"]["MaterialQM"][0]["CheckIncoming"].ToString() == "false" ? 0 : 1,
                        HAuxPropFlag    = _saveObj["Result"]["Result"]["MaterialAuxPty"][0]["IsEnable1"].ToString() == "false" ? 0 : 1,
                        HISKFPERIOD     = _saveObj["Result"]["Result"]["MaterialStock"][0]["IsKFPeriod"].ToString() == "false" ? 0 : 1,
                        HAuxUnitID      = _saveObj["Result"]["Result"]["MaterialStock"][0]["AuxUnitID_Id"],
                        HSNUnitID       = _saveObj["Result"]["Result"]["MaterialStock"][0]["SNUnit_Id"],
                        HBASEUNITID     = _saveObj["Result"]["Result"]["MaterialBase"][0]["BaseUnitId_Id"],
                        HSALEUNITID        = _saveObj["Result"]["Result"]["MaterialSale"][0]["SaleUnitId_Id"],
                        HSALEPRICEUNITID   = _saveObj["Result"]["Result"]["MaterialSale"][0]["SalePriceUnitId_Id"],
                        HPERUNITSTANDHOUR = _saveObj["Result"]["Result"]["MaterialProduce"][0]["PerUnitStandHour"],
                        HSTDLABORPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdLaborPrePareTime"],
                        HSTDMACHINEPREPARETIME = _saveObj["Result"]["Result"]["MaterialProduce"][0]["StdMachinePrepareTime"]                       
                        HItemID = _saveObj[0][0],  // 对应FMASTERID
                        HERPItemID = _saveObj[0][0],  // 对应FMASTERID
                        HNumber = _saveObj[0][1],  // 对应FNUMBER
                        HName = _saveObj[0][2],  // 对应FNAME
                        HModel = _saveObj[0][3],  // 对应FSPECIFICATION
                        HShortNumber = _saveObj[0][1],  // 对应FNUMBER
                        HParentID = 0,
                        HLevel = 1,
                        HEndFlag = 1,
                        HStopflag = _saveObj[0][4].ToString() == "A" ? 0 : 1,  // 对应FFORBIDSTATUS
                        HRemark = "CLD-ERP导入",
                        HMaterClsID = _saveObj[0][5],  // 对应FErpClsID
                        HUnitID = _saveObj[0][6],  // 对应FBaseUnitId
                        HUnitGroupID = 0,
                        HLength = _saveObj[0][7],  // 对应FLENGTH
                        HWidth = _saveObj[0][8],  // 对应FWIDTH
                        HHeight = _saveObj[0][9],  // 对应FHEIGHT
                        HJQty = _saveObj[0][10],  // 对应FNETWEIGHT
                        HMQty = _saveObj[0][11],  // 对应FGROSSWEIGHT
                        HOldMaterNumber = _saveObj[0][12],  // 对应FOldNumber
                        HWHID = 0,
                        HSPID = _saveObj[0][13],  // 对应FSTOCKPLACEID
                        HPlanMode = _saveObj[0][14],  // 对应FPLANMODE
                        HUseFlag = "未检验",
                        HMakeTime = _saveObj[0][15],  // 对应FCREATEDATE
                        HMinPickQty = 0,
                        HCREATEORGID = _saveObj[0][16],  // 对应FCREATEORGID
                        HUSEORGID = _saveObj[0][17],  // 对应FUSEORGID
                        HBatchManager = (bool)_saveObj[0][18] ? 1 : 0,  // 对应FISBATCHMANAGE
                        HCHECKINCOMING = (bool)_saveObj[0][19] ? 1 : 0,  // 对应FCheckIncoming
                        HAuxPropFlag = (bool)_saveObj[0][20] ? 1 : 0,  // 对应FIsEnable1
                        HISKFPERIOD = (bool)_saveObj[0][21] ? 1 : 0,  // 对应FIsKFPeriod
                        HAuxUnitID = _saveObj[0][22],  // 对应FAuxUnitID
                        HSNUnitID = _saveObj[0][23],  // 对应FSNUNIT
                        HBASEUNITID = _saveObj[0][24],  // 对应FBaseUnitId
                        HSALEUNITID = _saveObj[0][25],  // 对应FSaleUnitId
                        HSALEPRICEUNITID = _saveObj[0][26],  // 对应FSalePriceUnitId
                        HPERUNITSTANDHOUR = _saveObj[0][27],  // 对应FPerUnitStandHour
                        HSTDLABORPREPARETIME = _saveObj[0][28],  // 对应FStdLaborPrePareTime
                        HSTDMACHINEPREPARETIME = _saveObj[0][29]  // 对应FStdMachinePrepareTime
                    };
                    #endregion
                    // 删除主表对应数据