From d55d93edc8ad2f06ec371fdf7098700919298ce3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 19 五月 2023 13:57:15 +0800
Subject: [PATCH] 网页版 条码生成模块： 增加 生产入库、采购入库、销售退货、生产退料、批次调整单 为源单，生成条码， 并 自动产生对应 条码出入库记录 功能；(外网版条码生成已有此功能，自动生成条码出入库记录调相同方法即可)
---
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs b/WebAPI/Controllers/BaseSet/Gy_CustomerController.cs
index 90fb06d..f362ec6 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");
@@ -285,7 +300,7 @@
",HEmpID,HCreditDate,HCreditRatingDate,HMaxCreditRatingDate" +
",HMonthUseQty,HForecastCreditRating,HCreditLevelID,HCountAccrualRating" +
",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +
- ",HCusTypeID) " +
+ ",HCusTypeID,HCREATEORGID,HUSEORGID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID +
", " + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
@@ -295,7 +310,7 @@
"," + HEmpID + "," + HCreditDate + "," + HCreditRatingDate + "," + HMaxCredRatingDate +
"," + HMonthUseQty + "," + HForecastCreditRating + "," + HCreditLevelID + "," + HCountAccrualRating +
"," + HSubsidyAccrualRating + "," + HCreditRating + "," + HMaxCreditRating +
- ", " + HCusTypeID + ")");
+ ", " + HCusTypeID + ","+ HCreateOrgID + ","+ HUseOrgID + ")");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
oCN.RunProc("Update Gy_Customer set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
--
Gitblit v1.9.1