From 7bfc5fa90cca3f861a5b51a714a1e75f194e55c9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 29 四月 2025 16:26:17 +0800
Subject: [PATCH] 1
---
zymes/OperationService/zymes_RealessPrdMo.cs | 2 ++
zymes/OperationService/zymes_RealessMaterial.cs | 7 +++++++
zymes/OperationService/zymes_MOCHANGE.cs | 2 +-
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/zymes/OperationService/zymes_MOCHANGE.cs b/zymes/OperationService/zymes_MOCHANGE.cs
index 2fc3ad0..dc59f59 100644
--- a/zymes/OperationService/zymes_MOCHANGE.cs
+++ b/zymes/OperationService/zymes_MOCHANGE.cs
@@ -88,7 +88,7 @@
,FPRDORGID HPRDORGID,FENTRUSTORGID HENTRUSTORGID,FOWNERID HOWNERID,FOWNERTYPEID HOWNERTYPEID
,0 HCusID,isnull(a.FWORKSHOPID,0) HDeptID,'CLOUD瀵煎叆' HRemark,a.FCREATORID HMaker,getdate() HMakeDate,a.FAPPROVERID HChecker,a.FAPPROVEDATE HCheckDate,'' HMTONo,a.FID HERPInterID,a.FBILLTYPE HERPBillType
,case when a.FISREWORK=1 then '杩斿伐' else '鏅��' end HBillSubType
-,o.FNUMBER as HOrganNumber
+,o.FNUMBER as HOrganNumber,a.FComboXSLX HComboXSLX
from T_PRD_MO a with(nolock)
left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
Where a.FID={ids}
diff --git a/zymes/OperationService/zymes_RealessMaterial.cs b/zymes/OperationService/zymes_RealessMaterial.cs
index 87cb3f6..e45b934 100644
--- a/zymes/OperationService/zymes_RealessMaterial.cs
+++ b/zymes/OperationService/zymes_RealessMaterial.cs
@@ -206,6 +206,10 @@
,case when isnull(ap.FISENABLE,0)='1' then 1 else 0 end as HAuxPropFlag,isnull(s.FAUXUNITID,0) as HAuxUnitID,isnull(s.FSNUNIT,0) as HSNUnitID
,case when isnull(s.FISKFPERIOD,0)='1' then 1 else 0 end as HISKFPERIOD
,b.FERPCLSID as HMaterTypeID,o.FNUMBER as HOrganNumber
+,case when isnull(q.FCHECKINCOMING,0)='1' then 1 else 0 end as HCHECKINCOMING,isnull(s.FEXPUNIT,'') as HEXPUNIT,isnull(s.FEXPPERIOD,0) as HEXPPERIOD
+,isnull(b.FBASEUNITID,0) as HBASEUNITID,isnull(ms.FSALEUNITID,0) as HSALEUNITID,isnull(ms.FSALEPRICEUNITID,0) HSALEPRICEUNITID
+,isnull(mp.FPERUNITSTANDHOUR,0) as HPERUNITSTANDHOUR,isnull(mp.FSTDLABORPREPARETIME,0) as HSTDLABORPREPARETIME,isnull(mp.FSTDMACHINEPREPARETIME,0) as HSTDMACHINEPREPARETIME
+,isnull(a.FMASTERID,0) as HMASTERID
from T_BD_MATERIAL a with(nolock)
inner join T_BD_MATERIAL_L l with(nolock) on a.FMATERIALID=l.FMATERIALID
inner join T_BD_MATERIALBASE b with(nolock) on a.FMATERIALID=b.FMATERIALID
@@ -213,6 +217,9 @@
inner join T_BD_MATERIALPLAN p with(nolock) on a.FMATERIALID=p.FMATERIALID
left join (select max(FISENABLE) FISENABLE,FMATERIALID from T_BD_MATERIALAUXPTY with(nolock)
group by FISENABLE,FMATERIALID) ap on a.FMATERIALID=ap.FMATERIALID
+left join T_BD_MATERIALQUALITY q with(nolock) on a.FMATERIALID=q.FMATERIALID
+left join t_BD_MaterialSale ms with(nolock) on a.FMATERIALID=ms.FMATERIALID
+left join t_BD_MaterialProduce mp with(nolock) on a.FMATERIALID=mp.FMATERIALID
left join T_ORG_Organizations o with(nolock) on a.FUseOrgId=o.FORGID
Where l.FLOCALEID=2052
and a.FMATERIALID = {id}
diff --git a/zymes/OperationService/zymes_RealessPrdMo.cs b/zymes/OperationService/zymes_RealessPrdMo.cs
index a1bb055..e7e611b 100644
--- a/zymes/OperationService/zymes_RealessPrdMo.cs
+++ b/zymes/OperationService/zymes_RealessPrdMo.cs
@@ -216,6 +216,7 @@
,FPRDORGID HPRDORGID,FENTRUSTORGID HENTRUSTORGID,FOWNERID HOWNERID,FOWNERTYPEID HOWNERTYPEID
,0 HCusID,isnull(a.FWORKSHOPID,0) HDeptID,'CLOUD瀵煎叆' HRemark,a.FCREATORID HMaker,getdate() HMakeDate,a.FAPPROVERID HChecker,a.FAPPROVEDATE HCheckDate,'' HMTONo,a.FID HERPInterID,a.FBILLTYPE HERPBillType
,case when a.FISREWORK=1 then '杩斿伐' else '鏅��' end HBillSubType,o.FNUMBER as HOrganNumber
+,a.FComboXSLX HComboXSLX
from T_PRD_MO a with(nolock)
left join T_ORG_Organizations o with(nolock) on a.FPRDORGID=o.FORGID
Where a.FID={id}
@@ -307,6 +308,7 @@
["model"] = model
};
//string clientUrl = Util.GetConfigKey(AppDomain.CurrentDomain.BaseDirectory + "/Config/kdapi.config", "ClientUrl");//K/3 Cloud 涓氬姟绔欑偣鍦板潃
+ //var client = new RestSharp.RestClient("http://47.96.97.237/api/");
var client = new RestSharp.RestClient(http);
//鏂板
var requestPost = new RestRequest("Sc_ICMOBill/ICMOBillSaveApi", Method.POST);
--
Gitblit v1.9.1