111

王 垚

2022-12-28 16200ede0202462da9217396c9942f991cfc2fa6

111

 zymes/OperationService/zymes_RealessCurrency.cs

@@ -59,7 +59,6 @@
inner join T_BD_CURRENCY_L l with(nolock) on a.FCURRENCYID=l.FCURRENCYID and FLOCALEID=2052
Where a.FCURRENCYID={id}
";

                DataTable dt = DBServiceHelper.ExecuteDataSet(Context, sql).Tables[0];
                if (dt.Rows.Count == 0)
                {

 zymes/OperationService/zymes_RealessMaterial.cs

@@ -192,7 +192,7 @@
                    LogService.Write($"组织:{forgName},{forgID}");
                    if (!forgName.Contains("杭州斯莫尔磁性材料有限公司"))
                        continue;
                    LogService.Write("物料同步插件执行开始：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                    //LogService.Write("物料同步插件执行开始：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                    //var sql = $"exec zymes_RealessMaterial {billObj["Id"]} ";
                    var id = billObj["Id"].ToString();
                    string sql = string.Empty;
@@ -233,7 +233,7 @@
                    {
                        ["model"] = model
                    };
                    LogService.Write("物料同步插件,JSON拼接完成：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                    //LogService.Write("物料同步插件,JSON拼接完成：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                    //var client = new RestSharp.RestClient("http://47.96.97.237/api/");
                    //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 业务站点地址
                    var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
@@ -250,7 +250,7 @@
                    var requestPost = new RestRequest("Gy_Material/SaveGy_MaterialListApi", Method.POST);
                    requestPost.AddParameter("application/json", JsonConvert.SerializeObject(_jsonRoot), ParameterType.RequestBody);
                    IRestResponse responsePost = client.Execute(requestPost);
                    LogService.Write("物料同步插件,post完成：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                    //LogService.Write("物料同步插件,post完成：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
                    var contentPost = responsePost.Content;
                    if (!contentPost.Contains("成功"))
                    {
@@ -272,7 +272,7 @@
            {
                LogService.Write("物料同步插件，抛出异常：" + ex.Message.ToString());
            }
            LogService.Write("物料同步插件,代码执行完成：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
            //LogService.Write("物料同步插件,代码执行完成：" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff:ffffff"));
            //foreach (var item in dictionary)
            //{
            //    ResultMessage.dataError(this.OperationResult.OperateResult, item.Key, item.Value);

 zymes/OperationService/zymes_RealessPrdMo.cs

@@ -218,14 +218,44 @@
,case when a.FISREWORK=1 then '返工' else '普通' end HBillSubType
from T_PRD_MO a with(nolock)
Where a.FID={id} 
select a.FID AS HInterID,a.FEntryID HEntryID,isnull(a.FMATERIALID,0) HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,'CLOUD导入' HRemark
,isnull(a.FMOID,0) HSourceInterID,isnull(a.FMOENTRYID,0) HSourceEntryID,isnull(a.FMOBILLNO,'') HSourceBillNo,'3710' HSourceBillType,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID,isnull(a.FMOBILLNO,'') HICMOBillNo
,isnull(c.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(c.FSUPPLYORG,0) HSUPPLYORGID,isnull(c.FENTRUSTPICKORGID,0) HENTRUSTPICKORGID,isnull(c.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(c.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(c.FOWNERID,0) HOWNERID,isnull(c.FOWNERTYPEID,'') HOWNERTYPEID
,(q.FSELPICKEDQTY - q.FSELPRCDRETURNQTY) HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(c.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,a.FBASENUMERATOR/a.FBASEDENOMINATOR HQtyScrap,isnull(a.FID,0) HERPInterID,a.FEntryID HERPEntryID
,q.FWIPQTY HBackRelationQty,a.FNumerator HNumerator,a.FDenominator HDenominator
,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FProcessID,0) HProcessID,isnull(a.FMOENTRYSEQ,0) HICMOENTRYSEQ,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID
,isnull(c.FLOT,0) HLOT,c.FOPTQUEUE HOPTQUEUE,isnull(c.FRESERVETYPE,0) HRESERVETYPE,q.FSelPickedQty HSelPickedQty,q.FSELPRCDRETURNQTY HSELPRCDRETURNQTY,isnull(tp.FNAME,0) as HProcName
from T_PRD_PPBOMEntry a with(nolock)
left join T_PRD_PPBOMENTRY_LK l with(nolock) on a.FENTRYID=l.FENTRYID
inner join T_PRD_PPBOMENTRY_C c with(nolock) on A.FENTRYID=c.FENTRYID
inner join T_PRD_PPBOMENTRY_Q q with(nolock) on A.FENTRYID=q.FENTRYID
left join T_ENG_PROCESS_L tp with(nolock) on A.FProcessID=tp.FID
left join T_ENG_PROCESS_L tl on tp.FID =tl.fid and tl.FLOCALEID=2052
Where a.FMOID={id}
select a.FID HInterID,YEAR(a.FCREATEDate) AS HYear,MONTH(a.FCREATEDate) AS HPeriod,'3720' HBillType,'3720' HBillSubType,a.FCREATEDate HDate
,isnull(a.FbillNo,'') HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID
,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FWORKSHOPID,0) HDeptID,isnull(a.FCREATORID,0) HMaker,getdate() HMakeDate,isnull(a.FAPPROVERID,0) HChecker,a.FAPPROVEDATE HCheckDate
,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID
,isnull(a.FPRDORGID,0) HPRDORGID,isnull(a.FENTRUSTORGID,0) HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID,isnull(a.FREQSRC,'') HREQSRC
,a.FID HERPInterID,'PPBOM' HERPBillType,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderEntrySEQ,isnull(a.FMOEntrySEQ,0) HICMOEntrySEQ
from T_PRD_PPBOM a with(nolock)
Where a.FMOID={id}
";
                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);
                DataTable maindt = ds.Tables[1];
                DataTable subdt = ds.Tables[0];
                DataTable maindt = ds.Tables[1];
                DataTable ppbomsubdt = ds.Tables[2];
                DataTable ppbommaindt = ds.Tables[3];
                if (maindt.Rows.Count == 0 || subdt.Rows.Count == 0)
                {
                    LogService.Write("生产订单同步异常：" + sql);
                    continue;
                }
                JObject model = new JObject();//主表
                DataRow maindr = maindt.Rows[0];
                foreach (DataColumn column in maindt.Columns)
                {
                    model.Add(column.ColumnName, maindr[column.ColumnName].ToString());
                }
                JArray array = new JArray();//明细表
                foreach (DataRow dr in subdt.Rows)
@@ -237,13 +267,29 @@
                    }
                    array.Add(fentrymodel);
                }
                JObject model = new JObject();//主表
                DataRow maindr = maindt.Rows[0];
                foreach (DataColumn column in maindt.Columns)
                {
                    model.Add(column.ColumnName, maindr[column.ColumnName].ToString());
                }
                model.Add("HENTRY", array);
                array = new JArray();//ppbom明细表
                foreach (DataRow dr in ppbommaindt.Rows)
                {
                    JObject fentrymodel = new JObject();
                    foreach (DataColumn column in ppbommaindt.Columns)
                    {
                        fentrymodel.Add(column.ColumnName, dr[column.ColumnName].ToString());
                    }
                    array.Add(fentrymodel);
                }
                model.Add("HPPBOMMAINENTRY", array); 
                array = new JArray();//ppbom明细表
                foreach (DataRow dr in ppbomsubdt.Rows)
                {
                    JObject fentrymodel = new JObject();
                    foreach (DataColumn column in ppbomsubdt.Columns)
                    {
                        fentrymodel.Add(column.ColumnName, dr[column.ColumnName].ToString());
                    }
                    array.Add(fentrymodel);
                }
                model.Add("HPPBOMSUBENTRY", array);
                JObject jsonRoot = new JObject()
                {
                    ["model"] = model

 zymes/OperationService/zymes_RealessPrdMoReport.cs

@@ -201,7 +201,7 @@
,a.FSRCINTERID as HSourceInterID,a.FSRCENTRYID as HSourceEntryID,a.FSRCBILLNO as HSourceBillNo,a.FSRCBILLTYPE as HSourceBillType,0 HRelationQty,0 as HRelationMoney
,0 HSeOrderInterID,0 HSeOrderEntryID,'' HSeOrderBillNo
,a.FMOID HICMOInterID,a.FMOBILLNO HICMOBillNo, '' HBarCode
,0 HOWNERTYPEID,0 HISENTRUST,0 HSTOCKINORGID,0 HOWNERID,0 HCHECKPRODUCT,'' HQAIP,0 HCOSTRATE,0 HISBACKFLUSH
,FOWNERTYPEID HOWNERTYPEID,0 HISENTRUST,FSTOCKINORGID HSTOCKINORGID,FOWNERID HOWNERID,FCHECKPRODUCT HCHECKPRODUCT,'' HQAIP,FCOSTRATE HCOSTRATE,FISBACKFLUSH HISBACKFLUSH
,'' HREQSRC,'' HREQBILLNO,0 HREQBILLID,0 HREQENTRYSEQ,0 HREQENTRYID,a.FMOENTRYID HMOMAINENTRYID,0 HSTOCKINQUASELQTY 
,a.FPRODUCTTYPE HPRODUCTTYPE,a.FPROJECTNO HPROJECTNO,a.FMOENTRYSEQ HICMOENTRYSEQ,a.FSEQ as HSEQ,null HPRODUCEDATE,null HEXPIRYDATE,a.FBASEUNITID HBASEUNITID,isnull(a.FWORKSHOPID,0) HDEPTID
,a.FSHIFTGROUPID HGroupID,'' HDESCRIPTION,'' HSourceNumber,0 HQPQty,a.FMOENTRYID HICMOEntryID
@@ -250,7 +250,7 @@
                {
                    ["model"] = model
                };
                //LogService.Write("生产汇报单同步示例" + JsonConvert.SerializeObject(jsonRoot));
                LogService.Write("生产汇报单同步示例" + JsonConvert.SerializeObject(jsonRoot));
                //string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 业务站点地址
                var client = new RestSharp.RestClient(" http://10.11.18.195:8080/simoerapi/");
                //新增

 zymes/OperationService/zymes_RealessPrdPpbom.cs

@@ -196,23 +196,25 @@
select a.FID AS HInterID,a.FEntryID HEntryID,isnull(a.FMATERIALID,0) HMaterID,a.FUnitID HUnitID,a.FNEEDQTY HQty,a.FNEEDQTY HQtyMust,isnull(C.FStockID,0) HWHID,'CLOUD导入' HRemark
,isnull(a.FMOID,0) HSourceInterID,isnull(a.FMOENTRYID,0) HSourceEntryID,isnull(a.FMOBILLNO,'') HSourceBillNo,'3710' HSourceBillType,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID,isnull(a.FMOBILLNO,'') HICMOBillNo
,isnull(c.FCHILDSUPPLYORGID,0) HCHILDSUPPLYORGID,isnull(c.FSUPPLYORG,0) HSUPPLYORGID,isnull(c.FENTRUSTPICKORGID,0) HENTRUSTPICKORGID,isnull(c.FSRCTRANSORGID,0) HSRCTRANSORGID,isnull(c.FGROUPBYOWNERID,0) HGROUPBYOWNERID,isnull(c.FOWNERID,0) HOWNERID,isnull(c.FOWNERTYPEID,'') HOWNERTYPEID
,q.FSELPICKEDQTY-q.FSELPRCDRETURNQTY HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(c.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,a.FBASENUMERATOR/a.FBASEDENOMINATOR HQtyScrap,isnull(a.FID,0) HERPInterID,a.FEntryID HERPEntryID
,(q.FSELPICKEDQTY - q.FSELPRCDRETURNQTY) HRelationQty,q.FSELTRANSLATEQTY HMoveStockQty,isnull(a.FAUXPROPID,0) HAuxPropID,isnull(c.FLOT_TEXT,'') HBatchNO,isnull(a.FMTONo,'') HMTONo,a.FBASENUMERATOR/a.FBASEDENOMINATOR HQtyScrap,isnull(a.FID,0) HERPInterID,a.FEntryID HERPEntryID
,q.FWIPQTY HBackRelationQty,a.FNumerator HNumerator,a.FDenominator HDenominator
,isnull(a.FBASEUNITID,0) HBASEUNITID,isnull(a.FProcessID,0) HProcessID,isnull(a.FMOENTRYSEQ,0) HICMOENTRYSEQ,isnull(a.FPROJECTNO,'') HPROJECTNO,isnull(a.FOPERID,0) HOPERID,isnull(a.FSEQ,0) HSEQ,isnull(c.FSTOCKSTATUSID,0) HSTOCKSTATUSID
,isnull(c.FLOT,0) HLOT,c.FOPTQUEUE HOPTQUEUE,isnull(c.FRESERVETYPE,0) HRESERVETYPE,q.FSelPickedQty HSelPickedQty,q.FSELPRCDRETURNQTY HSELPRCDRETURNQTY
,isnull(c.FLOT,0) HLOT,c.FOPTQUEUE HOPTQUEUE,isnull(c.FRESERVETYPE,0) HRESERVETYPE,q.FSelPickedQty HSelPickedQty,q.FSELPRCDRETURNQTY HSELPRCDRETURNQTY,isnull(tp.FNAME,0) as HProcName
from T_PRD_PPBOMEntry a with(nolock)
left join T_PRD_PPBOMENTRY_LK l with(nolock) on a.FENTRYID=l.FENTRYID
inner join T_PRD_PPBOMENTRY_C c with(nolock) on A.FENTRYID=c.FENTRYID
inner join T_PRD_PPBOMENTRY_Q q with(nolock) on A.FENTRYID=q.FENTRYID
left join T_ENG_PROCESS_L tp with(nolock) on A.FProcessID=tp.FID
left join T_ENG_PROCESS_L tl on tp.FID =tl.fid and tl.FLOCALEID=2052
Where a.FID={id}

select a.FID HInterID,year(a.FCREATEDate) HYear,month(a.FCREATEDate) HPeriod,'3720' HBillType,'3720' HBillSubType,a.FCREATEDate HDate
select a.FID HInterID,YEAR(a.FCREATEDate) AS HYear,MONTH(a.FCREATEDate) AS HPeriod,'3720' HBillType,'3720' HBillSubType,a.FCREATEDate HDate
,isnull(a.FbillNo,'') HBillNo,case when isnull(a.FAPPROVERID,0)=0 then 1 else 2 end HBillStatus,isnull(a.FMOID,0) HICMOInterID,isnull(a.FMOENTRYID,0) HICMOEntryID
,a.FMATERIALID HMaterID,a.FUNITID HUnitID,a.FQTY HQty,isnull(a.FWORKSHOPID,0) HDeptID,isnull(a.FCREATORID,0) HMaker,getdate() HMakeDate,isnull(a.FAPPROVERID,0) HChecker,a.FAPPROVEDATE HCheckDate
,isnull(a.FSALEORDERNO,'') HSeOrderBillNo,isnull(a.FSALEORDERID,0) HSeOrderInterID,isnull(a.FSALEORDERENTRYID,0) HSeOrderEntryID
,isnull(a.FPRDORGID,0) HPRDORGID,isnull(a.FENTRUSTORGID,0) HENTRUSTORGID,isnull(a.FPARENTOWNERID,0) HPARENTOWNERID,isnull(a.FPARENTOWNERTYPEID,'') HPARENTOWNERTYPEID,isnull(a.FREQSRC,'') HREQSRC
,a.FID HERPInterID,'PPBOM' HERPBillType,isnull(a.FSALEORDERENTRYSEQ,0) HSeOrderEntrySEQ,isnull(a.FMOEntrySEQ,0) HICMOEntrySEQ
from .T_PRD_PPBOM a with(nolock)
from T_PRD_PPBOM a with(nolock)
Where a.FID={id}
";
                DataSet ds = DBServiceHelper.ExecuteDataSet(Context, sql);

 zymes/OperationService/zymes_RealessPurReceive.cs

@@ -210,7 +210,7 @@
from T_PUR_RECEIVEENTRY a with(nolock)
inner join T_PUR_RECEIVEENTRY_S b with(nolock) on a.FENTRYID=b.FENTRYID 
left join T_PUR_RECEIVEENTRY_F f with(nolock) on a.FENTRYID=f.FENTRYID 
left join T_PUR_RECEIVEFIN fin with(nolock) on a.FENTRYID=fin.FENTRYID 
left join T_PUR_RECEIVEFIN fin with(nolock) on  a.FID=fin.FID
left join T_PUR_RECEIVEENTRY_TAX t with(nolock) on a.FENTRYID=t.FENTRYID
where a.FID={id}


 zymes/OperationService/zymes_RealessStock.cs

@@ -62,7 +62,7 @@
Where a.FSTOCKID = {0}

select  t1.FSTOCKLOCID as HItemID,t1.FSTOCKLOCID as HERPItemID,t3.FNUMBER HNumber,t4.FNAME HName,t3.FNUMBER HShortNumber,1 HParentID,'' HSPType,''  HSrcSPType,'' HDesSPType
,1 as HLevel,1 as HEndFlag,0 as HStopflag,'CLD-ERP导入' HRemark,t1.fstockid as HSPGroupID,'已使用' as HUseFlag,getdate() as HMakeTime,st.FCREATORID HCREATEORGID,st.FUSEORGID HUSEORGID from 
,1 as HLevel,'true' as HEndFlag, 'false' as HStopflag,'CLD-ERP导入' HRemark,t1.fstockid as HSPGroupID,'已使用' as HUseFlag,getdate() as HMakeTime,st.FCREATORID HCREATEORGID,st.FUSEORGID HUSEORGID from 
T_BD_FLEXVALUESCOM t1 
join T_BD_STOCK st on t1.FSTOCKID = st.FSTOCKID 
join T_BD_STOCK_l stl on t1.FSTOCKID = stl.FSTOCKID  and stl.FLOCALEID = 2052