From af78744eacb1e41ef2ba7a2e36cde3f915100ba2 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 09 四月 2026 13:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/DLL/ClsSc_MESBeginWorkBill.cs | 2
WebAPI/Controllers/仓存管理/条码生成/Sc_BarCodeController.cs | 7 ++-
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 12 +++++
WebAPI/Models/HSouceOrderList.cs | 1
WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs | 19 +++++++++
WebAPI/Controllers/SBGL/Sb_EquipReportController.cs | 59 +++++++++++++++++++++++++++++
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 2 +
WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs | 4 +
WebAPI/Models/HBarCodeList.cs | 5 ++
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 4 +-
10 files changed, 106 insertions(+), 9 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index 5f73c32..3a9380d 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -2450,8 +2450,18 @@
{
omodel.SB_EquipICMOTechParamBill_Check = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //审核后是否安灯
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_OAErrMsg")
+ {
+ omodel.SB_EquipICMOTechParamBill_OAErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
+ //审核后是否发送NG工艺参数消息
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "SB_EquipICMOTechParamBill_ErrMsg")
+ {
+ omodel.SB_EquipICMOTechParamBill_ErrMsg = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
-
+
//=========工序委外发出单
//自动新增
if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationEntrustInBill_SaveAutoAddnew")
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 4c29ffb..e509041 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -799,6 +799,8 @@
//设备工艺参数订单点检表
public string SB_EquipICMOTechParamBill_MustBeginWorkCtl; //必须开工状态才能保存单据
public string SB_EquipICMOTechParamBill_Check; //保存后是否自动审核
+ public string SB_EquipICMOTechParamBill_OAErrMsg; //审核后是否进行安灯
+ public string SB_EquipICMOTechParamBill_ErrMsg; //审核后是否进行发送NG工艺参数
//工艺路线
public string Gy_RoutingBill_AutoCheck; //保存后是否自动审核
diff --git a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
index f2030dd..2b608f1 100644
--- a/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
+++ b/WebAPI/Controllers/SBGL/SB_EquipICMOTechParamBillController.cs
@@ -334,7 +334,24 @@
return objJsonResult;
}
else
- {
+ {
+ //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ string sReturn = "";
+ if (oSystemParameter.ShowBill(ref sReturn) == true)
+ {
+ // 鎷兼帴涓や釜鍙傛暟锛氬畨鐏�,NG鍙傛暟
+ string oa = oSystemParameter.omodel.SB_EquipICMOTechParamBill_OAErrMsg;//绯荤粺鍙傛暟 鏄惁杩涜瀹夌伅
+ string ng = oSystemParameter.omodel.SB_EquipICMOTechParamBill_ErrMsg;//绯荤粺鍙傛暟 鏄惁鍙戦�丯G宸ヨ壓鍙傛暟淇℃伅
+
+ // 鐢ㄩ�楀彿鎷兼帴锛屽墠绔寜閫楀彿鎷嗗垎
+ objJsonResult.Verify = oa + "," + ng;
+ }
+ else
+ {
+ // 澶辫触鏃剁粰榛樿鍊�
+ objJsonResult.Verify = "N,N";
+ }
+
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "鍗曟嵁鍙凤細"+ oBill.omodel.HBillNo+ " 瀹℃牳鎴愬姛锛�";
diff --git a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
index ba704e4..df0305e 100644
--- a/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
+++ b/WebAPI/Controllers/SBGL/Sb_EquipReportController.cs
@@ -524,6 +524,65 @@
}
#endregion
+ #region 璁惧姣忔棩杩愯鐘舵�佸垎鏋愶紙鍋氬崟鎯呭喌锛�
+ /// <summary>
+ /// 杩斿洖璁惧鐐规浠诲姟
+ ///鍙傛暟锛歴tring sql銆�
+ ///杩斿洖鍊硷細object銆�
+ /// </summary>
+ [Route("Sb_EquipDotCheckTaskReport/Sb_EquipDailyRunStateList")]
+ [HttpGet]
+ public object Sb_EquipDailyRunStateList(string sWhere,string user)
+ {
+ try
+ {
+
+ Dictionary<object, object> dic = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<object, object>>(sWhere);
+
+ string HBeginDate = dic["HBeginDate"].ToString();
+ string HEndDate = dic["HEndDate"].ToString();
+
+ List<object> columnNameList = new List<object>();
+
+ ds = oCN.RunProcReturn("exec h_p_Sb_EquipDailyRunStateReport '" + HBeginDate + "','" + HEndDate + "'", "h_p_Sb_EquipDailyRunStateReport");
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ //娣诲姞鍒楀悕
+ foreach (DataColumn col in ds.Tables[0].Columns)
+ {
+ Type dataType = col.DataType;
+ string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
+ columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞＄殑鍒楀悕
+ }
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds;
+ objJsonResult.list = columnNameList;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
}
}
diff --git a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
index a27b5c3..34ec2f5 100644
--- a/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
+++ b/WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs
@@ -1752,6 +1752,7 @@
string sAutoCheck = oClsXt_SystemParameter.GetSingleSystemParameter("Sc_MESBeginWorkBill_AutoCheck", ref DBUtility.ClsPub.sExeReturnInfo);
if (sAutoCheck == "Y")
{
+ LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...3 " + sAutoCheck);
if (!oBill.CheckBill(long.Parse(RetHInterID), ref DBUtility.ClsPub.sExeReturnInfo))
{
@@ -1767,9 +1768,10 @@
string sReturn = "";
if (oSystemParameter.ShowBill(ref sReturn) == true)
{
+ LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�...4 ");
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
- LogService.Write("鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ oBill.omodel.HInterID);
+ LogService.Write("寮�宸ュ崟鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�..."+ oBill.omodel.HInterID);
//鑷姩鐢熸垚宸ヤ綔鑱旂郴鍗�
ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + oBill.omodel.HInterID + "," + 3787, "h_p_OA_WorkLinkBill_Create");
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
index 1fef2b8..d423f0a 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Sc_BarCodeController.cs"
@@ -1465,6 +1465,7 @@
barcode.JMHSupNumber = ordrlist[j].JMHSupNumber;
barcode.JMHSupName = ordrlist[j].JMHSupName;
barcode.HTH = ordrlist[j].HTH;
+ barcode.HZQty = ordrlist[j].HZQty;
}
barcode.HBarCode2 = TM;
@@ -1593,6 +1594,7 @@
string JMHSupNumber = "";
string JMHSupName = "";
string HTH = "";
+ double HZQty = 0;
try
{
@@ -1619,6 +1621,7 @@
JMHSupNumber = ClsPub.isStrNull(ListRows[i].JMHSupNumber);
JMHSupName = ClsPub.isStrNull(ListRows[i].JMHSupName);
HTH = ClsPub.isStrNull(ListRows[i].HTH);
+ HZQty = ClsPub.isDoule(ListRows[i].HZQty);
}
HMaterID = ClsPub.isLong(ListRows[i].HMaterID2);
@@ -1670,7 +1673,7 @@
",HBarcodeQtys,HBarcodeNo,HDeptID,HWhID,HSPID,HRemark " +
",HCusID,HCusType,HEndDate,HWorkLineName,HBarCodeDate " +
",HSTOCKORGID,HOWNERID,HSeOrderBillNo,HInterID,HEntryID " +
- ",HGiveAwayFlag,JMHSupID,JMHSupNumber,JMHSupName,HTH" +
+ ",HGiveAwayFlag,JMHSupID,JMHSupNumber,JMHSupName,HTH,HZQty" +
",HMaterName,HMaterModel,HPinfan,HAuxPropID,HMTONo,HInnerBillNo" +
",HCoilNO,HFurnaceNO,HFactory,HAuxQty,HheatNO,HProduceDate,HExpiryDate,HEmpID,HCusModel,HCusMaterName,HCheckEmpName,HBarCodeStatus " +
") values ("
@@ -1680,7 +1683,7 @@
+ ", " + HBarcodeQtys.ToString() + "," + HBarcodeNo.ToString() + "," + HDeptID.ToString() + "," + HWhID.ToString() + "," + HSPID.ToString() + ",'" + HRemark + "'"
+ ", " + HCusID.ToString() + ",'" + HCusType + "','" + HEndDate.ToShortDateString() + "','" + HWorkLineName + "','" + sDate + "'"
+ ", " + HOrgID.ToString() + "," + HOrgID.ToString() + ",'" + HSeOrderBillNo + "'," + HInterID.ToString() + "," + HEntryID.ToString() + ""
- + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)+",'"+ JMHSupID.ToString()+"','"+ JMHSupNumber+"','"+ JMHSupName+"','"+ HTH
+ + ", " + DBUtility.ClsPub.BoolToString(HGiveAwayFlag)+",'"+ JMHSupID.ToString()+"','"+ JMHSupNumber+"','"+ JMHSupName+"','"+ HTH + "','" + HZQty
+ "','" + HMaterName + "','" + HMaterModel + "','" + HPinfan + "'," + HAuxPropID.ToString() + ",'" + HMTONo + "','" + HInnerBillNo + "'"
+ ",'" + HCoilNO2 + "','" + HFurnaceNO2 + "','" + HFactory2 + "'," + HAuxQty2 + ",'" + HheatNO2 + "','" + HProduceDate + "','" + HExpiryDate + "'," + HEmpID2.ToString() + ",'" + HCusModel2 + "','" + HCusMaterName2 + "','" + HCheckEmpName2 + "','鍚堟牸'" + ")");
}
diff --git a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
index 43bfc75..c52f32a 100644
--- a/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
+++ b/WebAPI/DLL/ClsSc_MESBeginWorkBill.cs
@@ -76,7 +76,7 @@
}
else
{
- LogService.Write("寮�宸�:2.6.2"+ Ds.Tables[0].Rows[0]["HBack"]);
+ LogService.Write("寮�宸�:2.6.2 "+ Ds.Tables[0].Rows[0]["HBack"]);
if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HBack"]) == 1)
{
LogService.Write("寮�宸�:2.6.3");
diff --git a/WebAPI/Models/HBarCodeList.cs b/WebAPI/Models/HBarCodeList.cs
index 292cf79..bf144f2 100644
--- a/WebAPI/Models/HBarCodeList.cs
+++ b/WebAPI/Models/HBarCodeList.cs
@@ -85,11 +85,14 @@
public int HInspectionCycle { get; set; } //澶嶆鍛ㄦ湡
public string HReInspectionDate { get; set; }//澶嶆鏃ユ湡
public string HPOOrderBillMTO { get; set; }//閲囪喘璺熻釜鍙�
- //鍗庤垷 鑷畾涔�
+
+
+ //鍗庤垷 鑷畾涔�
public string JMHSupID { get; set; } // "閲戦┈渚涘簲鍟咺D";
public string JMHSupNumber { get; set; } // "閲戦┈渚涘簲鍟嗕唬鐮�";
public string JMHSupName { get; set; } // "閲戦┈渚涘簲鍟�";
public string HTH { get; set; } // "鍚堝悓鍙�";
+ public double HZQty { get; set; } // "鍚堝悓鍙�";
}
}
\ No newline at end of file
diff --git a/WebAPI/Models/HSouceOrderList.cs b/WebAPI/Models/HSouceOrderList.cs
index 5c22b7a..3eb84af 100644
--- a/WebAPI/Models/HSouceOrderList.cs
+++ b/WebAPI/Models/HSouceOrderList.cs
@@ -100,5 +100,6 @@
public string JMHSupNumber { get; set; } // "閲戦┈渚涘簲鍟嗕唬鐮�";
public string JMHSupName { get; set; } // "閲戦┈渚涘簲鍟�";
public string HTH { get; set; } // "鍚堝悓鍙�";
+ public double HZQty { get; set; } // "鎬荤鏁�";
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index db9ee08..f2704aa 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -339,10 +339,10 @@
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>04/07/2026 15:38:07</publishTime>
+ <publishTime>04/07/2026 17:46:01</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>04/07/2026 15:38:07</publishTime>
+ <publishTime>04/07/2026 17:46:01</publishTime>
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
--
Gitblit v1.9.1