From 19b3a951fef1526ec89bab6c7b45ad0f1a11454f Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 13 四月 2023 15:34:09 +0800
Subject: [PATCH] 新增生产组托单扫码模块所需方法
---
WebAPI/Controllers/Sc_ProcessMangementController.cs | 165 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 110 insertions(+), 55 deletions(-)
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 1c1bcbf..4fc83d5 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -20,7 +20,7 @@
public DBUtility.ClsPub.Enum_BillStatus BillStatus;
private json objJsonResult = new json();
-
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
DataSet ds;
@@ -276,7 +276,6 @@
// model.Add("FBillType", new JObject() { ["Fnumber"] = "SCHBD01_SYS" }); //鍗曟嵁绫诲瀷鐢熶骇姹囨姤鈥淪CHBD02_SYS鈥� 鍏ュ簱姹囨姤SCHBD01_SYS
// model.Add("FPrdOrgId", new JObject() { ["Fnumber"] = dr1["FPrdOrgNUMBER"].ToString() }); //鐢熶骇缁勭粐1
// model.Add("FDate", DateTime.Now.ToString("yyyy-MM-dd")); //鍗曟嵁鏃ユ湡1
- // model.Add("FHZYMESFLAG", "鏄�");// 鏄惁涓篗ES鍚屾
// model.Add("FBillNo", BillNo);
// JArray Fentity = new JArray();
@@ -304,19 +303,15 @@
// FentityModel.Add("FFailQty", item["涓嶈壇鏁伴噺"].ToString());//涓嶅悎鏍兼暟閲�
// FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 鍏ュ簱缁勭粐
// FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 浠撳簱
- // FentityModel.Add("FMOID", dr1["FMOID"].ToString());//
// FentityModel.Add("FMOBILLNO", dr1["FMOBILLNO"].ToString());//
// FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//
- // FentityModel.Add("FMOENTRYSEQ", dr1["FMOENTRYSEQ"].ToString());//
// FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //璐т富绫诲瀷锛欶OwnerTypeId(蹇呭～椤�)
// FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //璐т富锛欶OwnerId(蹇呭～椤�)
- // FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
+ // FentityModel.Add("FBomId", new JObject() { ["F number"] = dr1["FBOMNUM"].ToString() }); //BOM鐗堟湰锛欶BomId(蹇呭～椤�)
// FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
// FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
// FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
- // FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
// FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
- // FentityModel.Add("F_bsv_Text", dr1["宸ュ簭娴佽浆鍗″彿"].ToString()); //娴佽浆鍗″彿
// JArray Fentity2 = new JArray();
// JObject FentityModel2 = new JObject();
// FentityModel2.Add("FEntity_Link_FFlowId", "f6e6eec3-5267-4f02-8593-b633da508a72");
@@ -329,9 +324,6 @@
// FentityModel2.Add("FEntity_Link_FBaseQuaQtyOld", item["鍚堟牸鏁伴噺"].ToString());
// FentityModel2.Add("FEntity_Link_FBaseQuaQty", item["鍚堟牸鏁伴噺"].ToString());
// Fentity2.Add(FentityModel2);
- // FentityModel.Add("FEntity_Link", Fentity2);
- // FentityModel.Add("FBFLowId", new JObject() { ["FID"] = "f6e6eec3-5267-4f02-8593-b633da508a72" }); //
- // Fentity.Add(FentityModel);
// }
// model.Add("FEntity", Fentity); //鏄庣粏淇℃伅
// JObject jsonRoot = new JObject()
@@ -418,6 +410,14 @@
string OrganizationNUM = oCN.RunProcReturn("select HNumber from Xt_ORGANIZATIONS where HItemID=" + OrganizationID, "Xt_ORGANIZATIONS").Tables[0].Rows[0]["HNumber"].ToString();
//鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
+ if(ds.Tables[0].Rows.Count <= 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鐢熸垚鐢熶骇姹囨姤鍗曡繃绋嬩腑娌℃湁鏌ヨ鍒板嚭绔欏崟";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DataRow dr = ds.Tables[0].Rows[0];
//淇濆瓨
@@ -519,7 +519,7 @@
FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 鎴愭湰鏉冮噸
FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 鍊掑啿棰嗘枡
FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
- FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
+ //FentityModel.Add("F_bsv_Base1", new JObject() { ["Fnumber"] = dr1["FPREBDONENUMBER"].ToString() }); //鍖呰鏍囪瘑
FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //鎵瑰彿
FentityModel.Add("F_bsv_Text", dr1["宸ュ簭娴佽浆鍗″彿"].ToString()); //娴佽浆鍗″彿
JArray Fentity2 = new JArray();
@@ -624,6 +624,19 @@
////鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
//DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
//DataRow dr = ds.Tables[0].Rows[0];
+
+ //鍒ゆ柇鍏ュ簱鐨勫悎鏍兼暟閲忔槸鍚︿负0
+ var DTable = oCN.RunProcReturn("select * from Sc_StationOutBillMain where HBillNo='"+ BillNo + "' ", "Sc_StationOutBillMain").Tables[0];
+
+ if (double.Parse(DTable.Rows[0]["HQty"].ToString()) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 2;
+ objJsonResult.Message = "鍚堟牸鏁伴噺涓�0,涓嶉渶瑕佸叆搴擄紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//淇濆瓨
oCN.BeginTran();
//鐢熶骇姹囨姤鍗曚富琛�
@@ -672,7 +685,7 @@
//DataSet ds1 = oCN.RunProcReturn("select * from h_v_TOERPProcduct_LastProc where HLastProc = '鏄�' and hbillno='" + BillNo.ToString() + "'", "h_v_TOERPProcduct_LastProc");
DataSet ds1 = oCN.RunProcReturn("exec h_p_TOERPProcduct_LastProc '" + BillNo + "'", "h_p_TOERPProcduct_LastProc");
DataRow dr1 = ds1.Tables[0].Rows[0];
- if (ds1.Tables[0].Rows.Count <= 0)
+ if (double.Parse(dr1[0].ToString()) <= 0)
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -712,7 +725,21 @@
FentityModel.Add("FBaseRealQty", item["鏁伴噺"].ToString());//
FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//
FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
- FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ヨ壓璺嚎")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumbers"].ToString() }); // 浠撳簱
+ }
+ else if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ュ簭")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ }
+ }
+ }
FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["HBatchNo"].ToString() }); //鎵瑰彿
FentityModel.Add("FISBACKFLUSH", "true");//
FentityModel.Add("FWorkShopId1", new JObject() { ["FNumber"] = item["HWorkShopNumber"].ToString() }); // 鐢熶骇杞﹂棿
@@ -871,6 +898,20 @@
////鏍规嵁宸ュ簭姹囨姤鍗曚富ID鑾峰彇宸ュ簭姹囨姤鍏ュ簱鍗曠殑鏁版嵁
//DataSet ds = oCN.RunProcReturn("select * from h_v_MES_StationOutBillList_LastProc where HInterID=" + InterID, "h_v_MES_StationOutBillList_LastProc");
//DataRow dr = ds.Tables[0].Rows[0];
+
+ //鍒ゆ柇鏈鎶ュ簾鎬绘暟閲忔槸鍚︿负0
+ var DTable = oCN.RunProcReturn("select isnull(sum(HWasterQty),0) HWasterQty from Sc_StationOutBillMain where HProcExchBillNo='"+ BillNo + "' and HBFFlag=0 ", "Sc_StationOutBillMain").Tables[0];
+
+ if (double.Parse(DTable.Rows[0]["HWasterQty"].ToString()) == 0)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 2;
+ objJsonResult.Message = "鎶ュ簾鏁伴噺涓�0,涓嶉渶瑕佸叆搴擄紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+
//淇濆瓨
oCN.BeginTran();
//鐢熶骇姹囨姤鍗曚富琛�
@@ -951,7 +992,21 @@
FentityModel.Add("FBaseRealQty", item["鏁伴噺"].ToString());//
FentityModel.Add("FOwnerTypeId", "BD_OwnerOrg");//
FentityModel.Add("FOwnerId", new JObject() { ["FNumber"] = item["HPrdOrgNumber"].ToString() });//
- FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ string sErr = "";
+ if (oSystemParameter.ShowBill(ref sErr))
+ {
+ if (oSystemParameter.omodel.WMS_CampanyName == "鐟炰笌绁�")
+ {
+ if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ヨ壓璺嚎")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumbers"].ToString() }); // 浠撳簱
+ }
+ else if (oSystemParameter.omodel.MES_StationOutBill_InStockType == "宸ュ簭")
+ {
+ FentityModel.Add("FStockId", new JObject() { ["FNumber"] = item["HStockNumber"].ToString() }); // 浠撳簱
+ }
+ }
+ }
FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["HBatchNo"].ToString() }); //鎵瑰彿
FentityModel.Add("FISBACKFLUSH", "true");//
FentityModel.Add("FWorkShopId1", new JObject() { ["FNumber"] = item["HWorkShopNumber"].ToString() }); // 鐢熶骇杞﹂棿
@@ -1345,49 +1400,49 @@
- /// <summary>
- /// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟
- /// </summary>
- /// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
- /// <returns></returns>
- [Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")]
- [HttpGet]
- public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber,
- double HCheckQty, double HRightQty, double HBadQty,
- string HCheckResult, string HSupNumber,
- string HUseResult, Int64 HSeQ, Int64 HSourceInterID,
- Int64 HSourceEntryID, string HSourceBillNo, string user,
- Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
- Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
- Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID,ref string sErrMsg)
- {
- WebS2.WebService1 oWebs1 = new WebS2.WebService1();
+ ///// <summary>
+ ///// 鐢熸垚閲戣澏浜戞潵鏂欐楠屽崟
+ ///// </summary>
+ ///// <param name="InterID">宸ュ簭姹囨姤鍗曚富ID</param>
+ ///// <returns></returns>
+ //[Route("QCStockInCheckBill/set_SaveQCStockInCheckBill_Json")]
+ //[HttpGet]
+ //public object set_SaveQCStockInCheckBill_Json(string HZJOrgNumber, string HMaterNumber, string HUnitNumber,
+ // double HCheckQty, double HRightQty, double HBadQty,
+ // string HCheckResult, string HSupNumber,
+ // string HUseResult, Int64 HSeQ, Int64 HSourceInterID,
+ // Int64 HSourceEntryID, string HSourceBillNo, string user,
+ // Int64 HWHID, Int64 HSPID, Int64 HSupID, Int64 HKeeperID,
+ // Int64 HMaterID, string HSourceBillType, Int64 HSLInterID,
+ // Int64 HSLEntryID, string HSLBillNo, Int64 HSLSeQ, string HBillNo, Int64 HInterID,ref string sErrMsg)
+ //{
+ // WebS.WebService1 oWebs1 = new WebS.WebService1();
- //oWebs1.Url = "http://localhost:9099/WebService1.asmx";
- //K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
- if (oWebs1.set_SaveQcStockInCheckBill_New(HZJOrgNumber, HMaterNumber, HUnitNumber, HCheckQty, HRightQty, HBadQty
- , HCheckResult, HSupNumber, HUseResult, HSeQ, HSourceInterID
- , HSourceEntryID, HSourceBillNo, user, HWHID, HSPID
- , HSupID, HKeeperID, HMaterID, HSourceBillType, HSLInterID
- , HSLEntryID, HSLBillNo, HSLSeQ, HBillNo, HInterID
- , ref sErrMsg))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 1;
- objJsonResult.Message = "鐢熸垚鍗曟嵁鎴愬姛锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�";
- objJsonResult.data = sErrMsg;
- return objJsonResult;
- }
- }
+ // //oWebs1.Url = "http://localhost:9099/WebService1.asmx";
+ // //K3CloudApiClient client = new K3CloudApiClient("http://192.168.80.90/k3cloud/");
+ // if (oWebs1.set_SaveQcStockInCheckBill_New(HZJOrgNumber, HMaterNumber, HUnitNumber, HCheckQty, HRightQty, HBadQty
+ // , HCheckResult, HSupNumber, HUseResult, HSeQ, HSourceInterID
+ // , HSourceEntryID, HSourceBillNo, user, HWHID, HSPID
+ // , HSupID, HKeeperID, HMaterID, HSourceBillType, HSLInterID
+ // , HSLEntryID, HSLBillNo, HSLSeQ, HBillNo, HInterID
+ // , ref sErrMsg))
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 1;
+ // objJsonResult.Message = "鐢熸垚鍗曟嵁鎴愬姛锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ // }
+ // else
+ // {
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "鐢熸垚鍗曟嵁澶辫触锛�";
+ // objJsonResult.data = sErrMsg;
+ // return objJsonResult;
+ // }
+ //}
#endregion
--
Gitblit v1.9.1