HanDianWMSWEBS.git

			@@ -12616,6 +12616,9 @@
			var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
			new object[] { "PRD_PickMtrl", sJson });

			////生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildMateOut '" + oMain.HBillNo + "'");

			if (oSystemParameterMain.Kf_MateOutBill_AutoCheck == "Y") //系统参数自动审核
			{
			string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			@@ -12640,9 +12643,6 @@
			}
			else
			{
			////生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildMateOut '" + oMain.HBillNo + "'");

			oCn.Commit();
			return true;
			}
			@@ -17585,6 +17585,9 @@
			var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.BatchSave",
			new object[] { "PRD_INSTOCK", sJson }); //调用保存方式

			////生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn_MulICMO '" + oMain.HBillNo + "'");

			if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //系统参数自动审核
			{
			string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[" + HBillNo_PL + "]}";
			@@ -18293,7 +18296,7 @@
			}
			if (oSystemParameter.omodel.Kf_ProductInBill_ERPMode.ToUpper() == "CLOUD") //判断同步模式是金蝶CLOUD
			{
			if (oSystemParameter.omodel.WMS_CampanyName == "卓力" \|\| oSystemParameter.omodel.WMS_CampanyName == "韩电") //系统参数客户定制化名称空白为通用
			if (oSystemParameter.omodel.WMS_CampanyName == "卓力") //系统参数客户定制化名称空白为通用
			{
			if (set_SaveProductInBill_CLD(oMain, sHSourceType, oSystemParameter.omodel, ref sErrMsg) == true)
			{
			@@ -18491,6 +18494,21 @@
			[WebMethod]
			public bool set_SaveProductInBill_CLD_New(Model.ClsKf_ProductInBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
			{
			//上传前判断是否存在相同条码
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			}
			else
			{
			if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
			{
			sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
			return false;
			}
			}

			if (sHSourceType == "3710") //生产订单
			{
			if (SaveProductInBill_ICMO_CLD(oMain, sHSourceType, oSystemParameterMain, ref sErrMsg))
			@@ -18615,7 +18633,6 @@
			}
			string sJson_BatchNo = "";
			string sJson_StockPlace = "";
			string sJson_Custom = ""; //卓力
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //是否启用批次管理
			{
			sJson_BatchNo = " \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"}, \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\" , ";
			@@ -18624,16 +18641,7 @@
			{
			sJson_BatchNo = "";
			}

			if (oSystemParameterMain.WMS_CampanyName == "卓力") //系统参数客户定制化名称空白为通用仓位
			{
			sJson_StockPlace = "\"FStockLocId\":{\"FSTOCKLOCID__FF100002\":{\"FNUMBER\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
			sJson_Custom = " \"F_ZBH\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_ZBH"]) + "\" , " + //栈板数
			" \"F_QIMB_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QIMB_TEXT"]) + "\" , " + //需求单号
			" \"F_DDQTY\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_DDQTY"]) + "\", "; //订单数量
			}
			else
			{
			//仓位
			if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) == "")
			{
			sJson_StockPlace = "";
			@@ -18642,8 +18650,6 @@
			{
			sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
			}
			}

			//
			sJson_Entry = sJson_Entry + " {" +
			//\"FEntryID\":\"0\",
			@@ -18752,6 +18758,9 @@
			{
			var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
			new object[] { "PRD_INSTOCK", sJson }); //调用保存方式

			//生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn_ICMO '" + oMain.HBillNo + "'");

			if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //系统参数自动审核
			{
			@@ -19022,6 +19031,9 @@
			var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
			new object[] { "PRD_INSTOCK", sJson }); //调用保存方式

			////生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn '" + oMain.HBillNo + "'");

			if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //系统参数自动审核
			{
			string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
			@@ -19046,9 +19058,6 @@
			}
			else
			{
			////生成单据后更新自定义字段
			oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn '" + oMain.HBillNo + "'");

			oCn.Commit();
			return true;
			}