收料通知单同步双计量单位；打印模板设置；json版本

yusijie

2024-09-24 c7a507c5d77652d5ceb722ff032f68514d369deb

收料通知单同步双计量单位；打印模板设置；json版本

 WebAPI/Controllers/POInStockController.cs

@@ -1062,6 +1062,7 @@
E.FPRICETIMEPOINT,E.FSETTLECURRID,EC.FNUMBER AS FSETTLECURRNUMBER,C.FMATERIALID,CM.FNUMBER AS FMATERIALNUMBER ,C.FUNITID 
,CU.FNUMBER AS FUNITNUMBER,CR.FPRICE,CR.FTAXPRICE,CR.FTAXRATE,D.FPURCHASERID,isnull(T4.FNUMBER,'') AS FPURCHASERNUMBER
,B.HExpressNumberSub,B.HExpressSupplierSub,B.HRemark,B.HPlanArrivalDate,B.HBoxNumber,B.HBatChNo,D.FBILLTYPEID 
,CU2.FNUMBER AS FPRICEUNITNUMBER 
FROM CG_POINSTOCKBILLSUB B  
JOIN CG_POINSTOCKBILLMAIN M ON B.HINTERID = M.HINTERID
JOIN {0}..T_PUR_POORDERENTRY C ON B.HSOURCEINTERID = C.FID AND B.HSOURCEENTRYID = C.FENTRYID
@@ -1079,6 +1080,8 @@
LEFT JOIN {0}..T_ORG_ORGANIZATIONS DOO ON D.FPURCHASEORGID = DOO.FORGID
JOIN {0}..T_PUR_POORDERFIN E ON C.FID =E.FID
LEFT JOIN {0}..T_BD_CURRENCY EC ON E. FSETTLECURRID =EC.FCURRENCYID  
LEFT JOIN {0}..T_PUR_POORDERENTRY_F CF ON C.FID = CF.FID AND C.FENTRYID = CF.FENTRYID
LEFT JOIN {0}..T_BD_UNIT CU2 ON CF.FPRICEUNITID =CU2.FUNITID
 WHERE b.hinterid in ({1}) and M.HERPInterID = 0
", kdTbaleName, HInterID, CustomFields);
                        dt = oCn.RunProcReturn(sql, "sltz").Tables[0];
@@ -1128,7 +1131,7 @@
                                    FentityModel.Add("FMaterialId", new JObject() { ["Fnumber"] = item["FMATERIALNUMBER"].ToString() }); // 物料编码   
                                    FentityModel.Add("FUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 单位   
                                    FentityModel.Add("FPreDeliveryDate", DateTime.Now.ToString("yyyy-MM-dd")); //预计到货日期   
                                    FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); // 计价单位   
                                    FentityModel.Add("FPriceUnitId", new JObject() { ["Fnumber"] = item["FPRICEUNITNUMBER"].ToString() }); // 计价单位   
                                    FentityModel.Add("FStockUnitID", new JObject() { ["Fnumber"] = item["FUNITNUMBER"].ToString() }); //  库存单位   
                                    FentityModel.Add("FStockID", new JObject() { ["Fnumber"] = "BJCK-SH.01.005" }); //  库存单位   
                                    FentityModel.Add("FActReceiveQty", Convert.ToDecimal(item["HQTY"])); // 供应商送货数量（提料计划数量 - 已生成送货单数量）
@@ -1189,7 +1192,7 @@
                                    objjson.data = null;
                                    return objjson;
                                }
                                //LogService.Write("jsonRoot:" + jsonRoot.ToString());
                                LogService.Write("jsonRoot:" + jsonRoot.ToString());
                                var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());                               

                                //LogService.Write(result);

 WebAPI/Controllers/WebAPIController.cs

@@ -468,6 +468,87 @@
            }

        }
        /// <summary>
        /// 设置默认打印模板
        /// </summary>
        /// <returns></returns>
        [Route("Open_PrintTem/DefaultOpenTmp")]
        [HttpGet]
        public object DefaultOpenTmp(string HNumber, string HName)
        {
            ClsCN oCn = new ClsCN();
            try
            {
                oCn.BeginTran();
                //先把此模块下的模板默认模板标记都关闭
                oCn.RunProc("update SRM_OpenTmp set HStdFlag = 0 where HNumber='" + HNumber + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                //更新当前模板为默认模板
                oCn.RunProc("update SRM_OpenTmp set HStdFlag = 1 where HNumber='" + HNumber + "' and HName='" + HName + "'", ref DBUtility.ClsPub.sExeReturnInfo);
                oCn.Commit();
                objjson.code = "0";
                objjson.count = 1;
                objjson.Message = "设置成功!";
                objjson.data = null;
                return objjson;
            }
            catch (Exception e)
            {
                oCn.RollBack();
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "设置失败" + e.ToString();
                objjson.data = null;
                return objjson;
            }
        }

        #region [获取默认打印模板]
        /// <summary>
        /// 获取打印模板列表
        /// </summary>
        /// <returns></returns>
        [Route("Open_PrintTem/GetDefaultOpenTmp_Json")]
        [HttpGet]
        public object GetDefaultOpenTmp_Json(string HNumber)
        {
            sWhere = " Where 默认标记=1 ";
            //sWhere = " Where HStopFlag=0  and HEndFlag=1  and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
            if (HNumber != "")
            {
                sWhere = sWhere + " and ( HNumber = '" + HNumber + "') ";
            }
            ClsCN oCn = new ClsCN();
            try
            {
                ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败,没有设置默认模板" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "0";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "异常" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        #endregion

        #region 基础资料
        /// <summary>
        /// 获取仓库列表

 WebAPI/WebAPI.csproj

@@ -100,9 +100,10 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\Model.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
    <Reference Include="Newtonsoft.Json, Version=13.0.1.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\..\..\WeChat Files\shenjie1112005\FileStorage\File\2019-12\webapi接口\FurjaFlatFormAPI\packages\Newtonsoft.Json.5.0.6\lib\net45\Newtonsoft.Json.dll</HintPath>
      <HintPath>..\..\..\..\网站发布\安瑞供应商平台-json版本\SRMAPI\bin\Newtonsoft.Json.dll</HintPath>
      <Private>True</Private>
    </Reference>
    <Reference Include="NPOI, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
      <HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.dll</HintPath>
@@ -154,7 +155,9 @@
    <Reference Include="System.Web.Entity" />
    <Reference Include="System.Web.ApplicationServices" />
    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System" />
    <Reference Include="System">
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Data" />
    <Reference Include="System.Drawing" />
    <Reference Include="System.Web" />