From 8560519c52cede92c33b89184f39844934c71de4 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 08 八月 2022 15:06:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log | 3 +
.gitignore | 2 +
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 2
WebAPI/Controllers/基础资料/基础资料/Gy_RepairBillController.cs | 13 +-----
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs | 10 ++--
WebAPI/Controllers/WebAPIController.cs | 2
WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log | 3 +
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 2
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 2
WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log | 3 +
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 2
WebAPI/Controllers/基础资料/基础资料/Gy_DotCheckBillController.cs | 24 ++++++------
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 2
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 2
WebAPI/Vlog/webapi20220805.txt | 1
17 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/.gitignore b/.gitignore
index 60fedd0..d02851a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,3 +133,5 @@
/NETERPNoWin/obj/Debug/.NETFramework,Version=v4.0.AssemblyAttributes.cs
/NETERPNoWin/bin/Debug
/NETERPNoWin/obj/Debug
+/WebAPI/Sc_MouldProdInBill/Log
+/WebAPI/Vlog
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index aac2550..9c84d7a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -322,7 +322,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format( $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index 08f4336..fa75bcd 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -323,7 +323,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index 6dd5bbd..45c636a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -321,7 +321,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 4f3054e..a12cc8c 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -634,7 +634,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
DataSet db=oCn.RunProcReturn(sql, "h_p_Sc_MouldChangeFileStatus");
if (db.Tables[0].Rows[0]["issuccess"].ToString()=="0")
{
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index 60c6fa1..28e2ece 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -323,7 +323,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index 1e9d0dd..ce400bd 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -328,7 +328,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index c5f7462..23aa0b5 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4486,7 +4486,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index e053b18..fa1d35a 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -320,7 +320,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ") ;
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
index a90c3b5..be692fd 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController.cs
@@ -3804,7 +3804,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4214,7 +4214,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -4791,9 +4791,9 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldProdBackBillList '{oBill.omodel.HBillNo}' ") ;
oCn.RunProc(sql);
- string sql1 = $"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ";
+ string sql1 =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'in','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql1);
objJsonResult.code = "0";
objJsonResult.count = 1;
@@ -5230,7 +5230,7 @@
}
if (bResult)
{
- string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ";
+ string sql =string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out','{oBill.omodel.HInterID.ToString()}' ");
oCn.RunProc(sql);
objJsonResult.code = "0";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index 241d16b..d9c6515 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -3142,7 +3142,7 @@
{
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
- b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain a
+ b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark,a.HInterID,a.HBillNo from Sb_EquipDotCheckRuleBillMain a
left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
left join Gy_Employee e on e.HItemID=b.HManagerID
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
index 562e9ca..98c9a34 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DotCheckBillController.cs"
@@ -159,7 +159,7 @@
msg2 = "[" + msg2.ToString() + "]";
List<Models.ClsGy_DotCheck> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_DotCheck>>(msg2);
- long HItemID = int.Parse(msg3);
+ long HItemID = int.Parse(msg4);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
string HShortNumber = list[0].HNumber;
@@ -169,7 +169,7 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg4))
+ if (!ClsPub.Security_Log("Gy_DotCheck_Edit", 1, false, msg3))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -188,14 +188,14 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
+ //if (oDept.HavSameNumber(HItemID, HNumber))
+ //{
+ // objJsonResult.code = "0";
+ // objJsonResult.count = 0;
+ // objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ // objJsonResult.data = null;
+ // return objJsonResult;
+ //}
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
@@ -284,9 +284,9 @@
//涓昏〃
oCN.RunProc("Insert into Gy_DotCheck " +
" (HNumber,HName,HHelpCode,HShortNumber" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
- +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs" "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
index 42a43aa..483bbc0 100644
--- "a/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
+++ "b/WebAPI/Controllers/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_RepairBillController.cs"
@@ -186,15 +186,6 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
@@ -282,9 +273,9 @@
//涓昏〃
oCN.RunProc("Insert into Gy_Repair " +
" (HNumber,HName,HHelpCode,HShortNumber" +
- ",HLevel,HEndFlag,HStopflag,HRemark,HMakeTime) " +
+ ",HLevel,HEndFlag,HStopflag,HRemark,HParentID) " +
" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," +
- +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',getdate())", ref DBUtility.ClsPub.sExeReturnInfo);
+ +HLevel + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "',0)", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
//oCN.RunProc("Update Gy_MouldType set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.Commit();
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log b/WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log
new file mode 100644
index 0000000..bfdf9c7
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637953187497864324.log
@@ -0,0 +1,3 @@
+------------------------2022/8/5 17:52:29------------------------------
+鎴愬姛锛�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log b/WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log
new file mode 100644
index 0000000..9379116
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637953187498594383.log
@@ -0,0 +1,3 @@
+------------------------2022/8/5 17:52:29------------------------------
+鏈夋潈闄�
+
diff --git a/WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log b/WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log
new file mode 100644
index 0000000..84df1cf
--- /dev/null
+++ b/WebAPI/Sc_MouldProdInBill/Log/637953187498644386.log
@@ -0,0 +1,3 @@
+------------------------2022/8/5 17:52:29------------------------------
+select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='鎵嬫満浜嬩笟閮�' and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-07-06' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-08-05'order by hmainid desc
+
diff --git a/WebAPI/Vlog/webapi20220805.txt b/WebAPI/Vlog/webapi20220805.txt
new file mode 100644
index 0000000..9186f6f
--- /dev/null
+++ b/WebAPI/Vlog/webapi20220805.txt
@@ -0,0 +1 @@
+2022/8/5 17:52:29 and CONVERT(varchar(100),鏃ユ湡, 23) >= '2022-07-06' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2022-08-05';鎵嬫満浜嬩笟閮�
--
Gitblit v1.9.1