ARSRM-API.git - Gitblit

parent: 10257764 | 补丁 | 提交 | ignore whitespace

王垚

2022-01-03 d4742224ea65141baf32fe8860e87e9b6e11e780

nothing

3个文件已修改

	WebAPI/Controllers/BarCodeController.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/POInStockController.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebAPI/Controllers/WebAPIController.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebAPI/Controllers/BarCodeController.cs

@@ -575,7 +575,7 @@
                LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
                foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
                {
                    LogService.Write("model初始化：" + oItemSub.HKFDate);
                    //LogService.Write("model初始化：" + oItemSub.HKFDate);
                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
                    {
                        HNumber = oItemSub.HMaterID.ToString();
@@ -660,7 +660,7 @@
                }
                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
                {
                    LogService.Write("循环第一次:" + oItemSub2.HSupID);
                    //LogService.Write("循环第一次:" + oItemSub2.HSupID);
                    if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
                    {
                        long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
@@ -738,7 +738,7 @@
                            bar2.HEndQty = WeiShu1;
                            bar2.HMTONO = oItemSub2.HMTONO;
                            ls3.Add(bar2);
                            LogService.Write("测试加+++" + oItemSub2.HSupID);
                            //LogService.Write("测试加+++" + oItemSub2.HSupID);
                        }
                    }
                }
@@ -763,7 +763,7 @@
                oCn.BeginTran();
                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)
                {
                    LogService.Write("循环第二次:" + oItemSub.HSupID);
                    //LogService.Write("循环第二次:" + oItemSub.HSupID);
                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
                    {
                        HBarCode = oItemSub.HBarCode.ToString();
@@ -774,7 +774,7 @@
                        HQty2 = ClsPub.isDoule(oItemSub.HQty);
                        HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
                        HSupID = oItemSub.HSupID;
                        LogService.Write("HSupID:" + oItemSub.HSupID);
                        //LogService.Write("HSupID:" + oItemSub.HSupID);
                        HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
                        HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
                        HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
@@ -790,7 +790,7 @@
                                    + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
                        LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                        //LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
                                    ") values ("
@@ -802,7 +802,7 @@
                }
                foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
                {
                    LogService.Write("循环第三次:" + oItemSub.HSupID);
                    //LogService.Write("循环第三次:" + oItemSub.HSupID);
                    if (ClsPub.isLong(oItemSub.HMaterID) != 0)
                    {
                        HBarCode = oItemSub.HBarCode.ToString();
@@ -1561,7 +1561,7 @@
                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
                        oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
                        LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                        //LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
                                    ") values ("
@@ -1597,7 +1597,7 @@
                                    + linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
                                    + "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
                                    + "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
                        LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                        //LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
                                    ",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
                                    ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
                                    ") values ("

 WebAPI/Controllers/POInStockController.cs

@@ -717,7 +717,7 @@
                        };
                        LogService.Write(JsonConvert.SerializeObject(jsonRoot));
                        var loginRet = InvokeHelper.Login();
                        LogService.Write("loginRet:" + loginRet);
                        //LogService.Write("loginRet:" + loginRet);
                        var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
                        if (isSuccess == 0)
                        {
@@ -727,9 +727,9 @@
                            objjson.data = null;
                            return objjson;
                        }
                        LogService.Write(jsonRoot.ToString());
                        //LogService.Write(jsonRoot.ToString());
                        var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
                        LogService.Write(result);
                        //LogService.Write(result);
                        if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
                        {
                            //更新送货单 主表 ERP单据号 以及 ERP主内玛
@@ -878,9 +878,9 @@
                        objjson.data = null;
                        return objjson;
                    }
                    LogService.Write("");
                    //LogService.Write("");
                    var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
                    LogService.Write(result);
                    LogService.Write("api结果删除：" + result);
                    if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
                    {
                        objjson.code = "0";

 WebAPI/Controllers/WebAPIController.cs

@@ -184,7 +184,7 @@
                //LogService.Write("测试1："+ DBUtility.ClsPub.sExeReturnInfo);
                string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
                //LogService.Write("测试2：" + DBUtility.ClsPub.sExeReturnInfo);
                LogService.Write(FCusName);
                //LogService.Write(FCusName);
                if (FCusName == "夏宝电器")
                    ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
                else
@@ -241,7 +241,7 @@
                    return objJsonResult; ;
                }
                //===========
                LogService.Write("select Czmm from  Gy_Czygl where Czymc='" + UserName + "' and  Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
                //LogService.Write("select Czmm from  Gy_Czygl where Czymc='" + UserName + "' and  Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
                oDs = oCn.RunProcReturn("select Czmm from  Gy_Czygl where Czymc='" + UserName + "' and  Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'", "Gy_Czygl");
                if (oDs == null || oDs.Tables[0].Rows.Count == 0)
                {

			@@ -575,7 +575,7 @@
			LSH = ClsPub.isInt(Ds.Tables[0].Rows[0][0]);
			foreach (Model.ClsGy_MaterialList_WMS_Model oItemSub in ls)
			{
			LogService.Write("model初始化：" + oItemSub.HKFDate);
			//LogService.Write("model初始化：" + oItemSub.HKFDate);
			if (ClsPub.isLong(oItemSub.HMaterID) != 0)
			{
			HNumber = oItemSub.HMaterID.ToString();
			@@ -660,7 +660,7 @@
			}
			foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub2 in ls2)
			{
			LogService.Write("循环第一次:" + oItemSub2.HSupID);
			//LogService.Write("循环第一次:" + oItemSub2.HSupID);
			if (ClsPub.isLong(oItemSub2.HMaterID) != 0)
			{
			long sMaterID = ClsPub.isLong(oItemSub2.HMaterID);
			@@ -738,7 +738,7 @@
			bar2.HEndQty = WeiShu1;
			bar2.HMTONO = oItemSub2.HMTONO;
			ls3.Add(bar2);
			LogService.Write("测试加+++" + oItemSub2.HSupID);
			//LogService.Write("测试加+++" + oItemSub2.HSupID);
			}
			}
			}
			@@ -763,7 +763,7 @@
			oCn.BeginTran();
			foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls2)
			{
			LogService.Write("循环第二次:" + oItemSub.HSupID);
			//LogService.Write("循环第二次:" + oItemSub.HSupID);
			if (ClsPub.isLong(oItemSub.HMaterID) != 0)
			{
			HBarCode = oItemSub.HBarCode.ToString();
			@@ -774,7 +774,7 @@
			HQty2 = ClsPub.isDoule(oItemSub.HQty);
			HBatchNo = ClsPub.isStrNull(oItemSub.HBatchNo);
			HSupID = oItemSub.HSupID;
			LogService.Write("HSupID:" + oItemSub.HSupID);
			//LogService.Write("HSupID:" + oItemSub.HSupID);
			HKFPeriod = ClsPub.isInt(oItemSub.HKFPeriod);
			HKFDate = ClsPub.isStrNull(oItemSub.HKFDate);
			HKFDQDate = ClsPub.isStrNull(oItemSub.HKFDQDate);
			@@ -790,7 +790,7 @@
			+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
			+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
			+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
			LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
			//LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
			") values ("
			@@ -802,7 +802,7 @@
			}
			foreach (Model.ClsGy_BarCodeBill_WMS_Model oItemSub in ls3)
			{
			LogService.Write("循环第三次:" + oItemSub.HSupID);
			//LogService.Write("循环第三次:" + oItemSub.HSupID);
			if (ClsPub.isLong(oItemSub.HMaterID) != 0)
			{
			HBarCode = oItemSub.HBarCode.ToString();
			@@ -1561,7 +1561,7 @@
			+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
			+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
			oCn.RunProc("exec setLSH '" + DateTime.Today + "'");
			LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
			//LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
			") values ("
			@@ -1597,7 +1597,7 @@
			+ linterid.ToString() + ",'" + HBarCode + "','" + HBarCodeType + "'," + HMaterID + "," + HUnitID + "," + HQty2 + ",'" + HKFDate + "'," + HKFPeriod + ",'" + HKFDQDate
			+ "','" + HBatchNo + "'," + HSupID + "," + HGroupID + ",'" + ClsPub.CurUserName + "','" + DateTime.Today + "'," + HPrintQty + ",'" + HWei + "',1"
			+ "," + HSourceInterID + "," + HSourceEntryID + ",'" + HSourceBillNo + "','" + HSourceBillType + "','" + HMTONO + "')");
			LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
			//LogService.Write("insert into Gy_BarCodeBill (HInterID,HBarCode,HBarCodeType,HMaterID,HUnitID,HQty,HKFDate,HKFPeriod,HKFDQDate" +
			",HBatchNo,HSupID,HGroupID,HMaker,HMakeDate,HPrintQty,HEndQty,HSupflag" +
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HMTONO " +
			") values ("

			@@ -717,7 +717,7 @@
			};
			LogService.Write(JsonConvert.SerializeObject(jsonRoot));
			var loginRet = InvokeHelper.Login();
			LogService.Write("loginRet:" + loginRet);
			//LogService.Write("loginRet:" + loginRet);
			var isSuccess = JObject.Parse(loginRet)["LoginResultType"].Value<int>();
			if (isSuccess == 0)
			{
			@@ -727,9 +727,9 @@
			objjson.data = null;
			return objjson;
			}
			LogService.Write(jsonRoot.ToString());
			//LogService.Write(jsonRoot.ToString());
			var result = InvokeHelper.Save("PUR_ReceiveBill", jsonRoot.ToString());
			LogService.Write(result);
			//LogService.Write(result);
			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() == "TRUE")
			{
			//更新送货单主表 ERP单据号以及 ERP主内玛
			@@ -878,9 +878,9 @@
			objjson.data = null;
			return objjson;
			}
			LogService.Write("");
			//LogService.Write("");
			var result = InvokeHelper.Delete("PUR_ReceiveBill", JsonConvert.SerializeObject(sJson));
			LogService.Write(result);
			LogService.Write("api结果删除：" + result);
			if (JObject.Parse(result)["Result"]["ResponseStatus"]["IsSuccess"].ToString().ToUpper() != "TRUE")
			{
			objjson.code = "0";

			@@ -184,7 +184,7 @@
			//LogService.Write("测试1："+ DBUtility.ClsPub.sExeReturnInfo);
			string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref DBUtility.ClsPub.sExeReturnInfo);
			//LogService.Write("测试2：" + DBUtility.ClsPub.sExeReturnInfo);
			LogService.Write(FCusName);
			//LogService.Write(FCusName);
			if (FCusName == "夏宝电器")
			ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
			else
			@@ -241,7 +241,7 @@
			return objJsonResult; ;
			}
			//===========
			LogService.Write("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
			//LogService.Write("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'");
			oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czymc='" + UserName + "' and Czmm = '" + DBUtility.ClsPub.StrToPsd(oldPassword.Trim()) + "'", "Gy_Czygl");
			if (oDs == null \|\| oDs.Tables[0].Rows.Count == 0)
			{