From 0f50d63f84a04a6eb9cdcc2576e6f55334b230fe Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 04 四月 2023 13:49:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index b811a22..4445410 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
@@ -42,7 +42,22 @@
objJsonResult.data = null;
return objJsonResult;
}
- string sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 缁勭粐鍚嶇О='" + Organization + "'");
+ string sql1 = "";
+ //瀹㈡埛鍒跺畾
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "涔斾竴")
+ {
+ sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 1=1");
+ }
+ else
+ {
+ sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 缁勭粐鍚嶇О='" + Organization + "'");
+ }
+ }
+
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn(sql1 + sWhere + " order by 瀹㈡埛浠ｇ爜 ", "h_v_Gy_CustomerList");
@@ -326,10 +341,12 @@
{
var model = oMain["model"].ToString();
var custLocationModel = oMain["model"]["HCustLocationEntry"].ToString();
+ var custContactModel = oMain["model"]["HCustContactEntry"].ToString();
//鍙嶅簭鍒楀寲
model = "[" + model + "]";
List<Customer> lsmain = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Customer>>(model);
List<Model.ClsGy_CustLocation_Model> custLocationls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CustLocation_Model>>(custLocationModel);
+ List<Model.ClsGy_COMMONCONTACT_Model> custContactls = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_COMMONCONTACT_Model>>(custContactModel);
string sql = string.Empty;
oCN.BeginTran();
sql = $"delete gy_Customer where HItemID = {lsmain[0].HItemID}";
@@ -379,10 +396,30 @@
}
sql = "set identity_insert Gy_CustLocation off";
oCN.RunProc(sql);
+
+ //瀹㈡埛_鏀惰揣鏂硅仈绯讳汉
+ sql = $"delete Gy_COMMONCONTACT where HCUSTID = {lsmain[0].HItemID}";
+ oCN.RunProc(sql);
+ sql = "set identity_insert Gy_COMMONCONTACT on";
+ oCN.RunProc(sql);
+ foreach (var item in custContactls)
+ {
+ sql = $@"insert into Gy_COMMONCONTACT(HItemID,HCUSTID,HNumber,HName,HShortNumber,HParentID,HLevel,HEndFlag,HStopflag,
+ HRemark,HHelpCode,HUseFlag,HMakeTime,HMakeEmp,HCheckEmp,HCheckTime,HModifyEmp,HModifyTime,HStopEmp,HStopTime,
+ HUSEORGID,HCREATEORGID)
+ values({item.HItemID},{item.HCUSTID},'{item.HNumber}','{item.HName}','{item.HShortNumber}',{item.HParentID},{item.HLevel}
+ ,{Convert.ToString(item.HEndFlag ? 1 : 0)},{Convert.ToString(item.HStopflag ? 1 : 0) },'{item.HRemark}','{item.HHelpCode}','{item.HUseFlag}'
+ ,'{item.HMakeTime}','{item.HMakeEmp}','{item.HCheckEmp}','{item.HCheckTime}','{item.HModifyEmp}'
+ ,'{item.HModifyTime}','{item.HStopEmp}','{item.HStopTime}',{item.HUSEORGID},{item.HCREATEORGID})";
+ oCN.RunProc(sql);
+ }
+ sql = "set identity_insert Gy_COMMONCONTACT off";
+ oCN.RunProc(sql);
+
oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鍗曟嵁鎴愬姛锛�";
+ objJsonResult.Message = "鏂板鍩虹璧勬枡鎴愬姛锛�";
//objJsonResult.data = null;
return objJsonResult;
}
--
Gitblit v1.9.1