From b822fd7406716e9a8d5ea6c237c51c28d195857e Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 09 一月 2023 17:03:57 +0800
Subject: [PATCH] 工艺路线 转工序 功能维护
---
WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs | 11 ++++++++++-
WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillSController.cs | 2 +-
WebAPI/Controllers/Sc_ProcessMangementController.cs | 2 +-
WebAPI/Models/Gy_RoutingBill.cs | 1 +
WebAPI/WebAPI.csproj | 5 ++---
WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckSBillController.cs | 2 +-
6 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
index bdd8110..16390e8 100644
--- a/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
+++ b/WebAPI/Controllers/JHGL/Gy_RoutingBillController.cs
@@ -120,7 +120,7 @@
string msg3 = sArray[1].ToString();
//int hentryid = int.Parse(sArray[2].ToString());//瀛愯〃鐨勯『搴廼d
- int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼
+ int OperationType = int.Parse(sArray[2].ToString());//鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗
string user = sArray[3].ToString();//鐢ㄦ埛鍚�
try
{
@@ -169,6 +169,7 @@
string HMaterTexture = mainList[0].HMaterTexture;//鏉愯川
string HProductNum = mainList[0].HProductNum;//鎴愬搧缂栧彿
string HVerNum = mainList[0].HVerNum;//鐗堟湰
+ int IsProNo = mainList[0].IsProNo;//鏄惁杞伐搴�
if (OperationType == 2)
{
@@ -227,6 +228,14 @@
objJsonResult.data = null;
return objJsonResult;
}
+
+ if (IsProNo == 1 && OperationType == 1)
+ {
+ //璁剧疆杞伐搴�
+ oCN.RunProc("exec Gy_RoutingBill_LastProNo " + HInterID);
+ }
+
+ //璁剧疆榛樿宸ヨ壓璺嚎
oCN.RunProc("exec h_p_Gy_RoutingBillCheck " + HInterID); //璁剧疆榛樿宸ヨ壓璺嚎
//鍒ゆ柇鏄惁閲嶅宸ュ簭鍙�
ds = oCN.RunProcReturn("exec h_p_Gy_RoutingCtrl " + HInterID, "h_p_Gy_RoutingCtrl");
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillSController.cs
similarity index 99%
rename from WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillController.cs
rename to WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillSController.cs
index bf551ca..3a39f6a 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipStockInCheckBillSController.cs
@@ -11,7 +11,7 @@
namespace WebAPI.Controllers.SBGL
{
- public class Sb_EquipStockInCheckBillController : ApiController
+ public class Sb_EquipStockInCheckBillSController : ApiController
{
private json objJsonResult = new json();
public DataSet ds = new DataSet();
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckBillController.cs b/WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckSBillController.cs
similarity index 99%
rename from WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckBillController.cs
rename to WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckSBillController.cs
index 7a213ad..26bc0f0 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckBillController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipWorkBeforeCheckSBillController.cs
@@ -11,7 +11,7 @@
namespace WebAPI.Controllers.SBGL
{
- public class Sb_EquipWorkBeforeCheckBillController : ApiController
+ public class Sb_EquipWorkBeforeCheckSBillController : ApiController
{
private json objJsonResult = new json();
public DataSet ds = new DataSet();
diff --git a/WebAPI/Controllers/Sc_ProcessMangementController.cs b/WebAPI/Controllers/Sc_ProcessMangementController.cs
index 47f0224..e8d5b10 100644
--- a/WebAPI/Controllers/Sc_ProcessMangementController.cs
+++ b/WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -858,7 +858,7 @@
return objJsonResult;
}
- oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
+ //oCN.RunProc("update Sc_StationOutBillMain set HRelationQty=1 where HBillNo='" + BillNo + "'");
oCN.Commit();
oCN.RunProc("update sc_stationoutbillmain set HBFFlag =1 where HProcExchBillNo = '" + BillNo + "'");
diff --git a/WebAPI/Models/Gy_RoutingBill.cs b/WebAPI/Models/Gy_RoutingBill.cs
index 7564b98..c46ec7e 100644
--- a/WebAPI/Models/Gy_RoutingBill.cs
+++ b/WebAPI/Models/Gy_RoutingBill.cs
@@ -37,6 +37,7 @@
public int HPRDORGID { get; set; }
public int HOrgID { get; set; }
+ public int IsProNo { get; set; }//鏄惁杞伐搴�
}
}
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 89666f3..f632c05 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -402,8 +402,8 @@
<Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />
<Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" />
<Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckBillController.cs" />
- <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
@@ -958,7 +958,6 @@
<Folder Include="Views\Sb_EquipStatusChangeBill\" />
<Folder Include="Views\Sb_EquipStockInCheckBill\" />
<Folder Include="Views\Sb_EquipWorkBeforeCheckBill\" />
- <Folder Include="Views\Sb_EquipStockInCheckBill\" />
<Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
<Folder Include="Views\Sc_ComplementGoodBill\" />
<Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
--
Gitblit v1.9.1