From 5ef89d0a2eb4d8b0980f07d1a8d8c3111bcf6f45 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 28 六月 2024 18:07:39 +0800
Subject: [PATCH] 1
---
WebAPI/Models/ClsGy_EquipFileBillSub_MaintainRule.cs | 13 +
WebAPI/Models/StationBill.cs | 2
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 153 +++++------
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | 10
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 92 ++++++
WebAPI/Controllers/条码管理/WEBSController.cs | 133 ++++++++++
WebAPI/Models/ClsGy_MouldFileBillSub_DotCheckRule.cs | 13 +
DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | 10
Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs | 3
DAL/车间管理/ClsSc_MaterToSourceBill.cs | 5
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 4
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs | 87 ++++++
WebAPI/Models/ClsGy_MouldFileBillSub_MaintainRule.cs | 13 +
Model/车间管理/ClsSc_MaterToSourceBillMain.cs | 2
WebAPI/Models/ClsGy_EquipFileBillSub_DotCheckRule.cs | 13 +
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml | 2
WebAPI/WebAPI.csproj | 4
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs | 182 ++++++++++++-
Model/生产管理/设备管理/ClsSb_EquipMaintainBillMain.cs | 1
19 files changed, 627 insertions(+), 115 deletions(-)
diff --git "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs" "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
index c16e3e8..83d34f4 100644
--- "a/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
+++ "b/DAL/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBill.cs"
@@ -71,6 +71,7 @@
",HInnerBillNo='" + omodel.HInnerBillNo+"'" +
",HEquipMaintainRuleInterID=" + omodel.HEquipMaintainRuleInterID.ToString()+
",HMaintainLevID=" + omodel.HMaintainLevID +
+ ",HLastResult='" + omodel.HLastResult + "'" +
" where HInterID=" + lngBillKey.ToString());
//鍒犻櫎鍏宠仈
DeleteRelation(ref sReturn, lngBillKey);
@@ -103,13 +104,14 @@
",HMaintainPart,HClaim" +
",HManagerID" +
",HCloseMan,HCloseType,HRemark" +
- ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
+ ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,HMaintainResult" +
") values("
+ omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() +
",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" +
"," + Item.HManagerID.ToString() +
",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" +
- "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() +
+ ",'" + Item.HMaintainResult + "'" +
") ");
}
@@ -174,11 +176,11 @@
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMaker,HMakeDate" +
",HYear,HPeriod,HRemark,HEquipID" +
",HBeginDate,HEndDate,HPlanNo,HExplanation,HInnerBillNo,HEquipMaintainRuleInterID" +
- ",HDeptID,HMaintainLevID" +
+ ",HDeptID,HMaintainLevID,HLastResult" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," +omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() +
- ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID +
+ ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'," +omodel.HEquipMaintainRuleInterID.ToString() + "," + omodel.HDeptID + "," + omodel.HMaintainLevID + ",'" + omodel.HLastResult + "'" +
") ");
//鎻掑叆閰嶄欢瀛愯〃
foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl)
diff --git "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs" "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs"
index 2dfc622..fef4650 100644
--- "a/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs"
+++ "b/DAL/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBill.cs"
@@ -122,6 +122,7 @@
",HWorkerID=" + omodel.HWorkerID.ToString() +
",HWorkerBarCode='" + omodel.HWorkerBarCode + "'" +
",HGroupID=" + omodel.HGroupID.ToString() +
+ ",HProcNo=" + omodel.HProcNo.ToString() +
",HMainSourceInterID='" + omodel.HMainSourceInterID.ToString() + "'" +
",HMainSourceEntryID='" + omodel.HMainSourceEntryID.ToString() + "'" +
",HMainSourceBillNo='" + omodel.HMainSourceBillNo + "'" +
@@ -196,14 +197,14 @@
",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
",HSourceID,HProcID,HMaterID,HSourceBarCode,HEquipID,HWorkerID,HWorkerBarCode" +
- ",HGroupID,HStockOrgID" +
+ ",HGroupID,HProcNo,HStockOrgID" +
") " +
" values('" + this.BillType + "','" + this.HBillSubType + "'," + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + omodel.HDate.ToShortDateString() + "'" +
", " + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "','" + DBUtility.ClsPub.CurUserName + "',getdate()" +
"," + omodel.HMainSourceInterID.ToString() + "," + omodel.HMainSourceEntryID.ToString() + ",'" + omodel.HMainSourceBillNo + "','" + omodel.HMainSourceBillType + "'" +
"," + omodel.HProcExchInterID.ToString() + "," + omodel.HProcExchEntryID.ToString() + ",'" + omodel.HProcExchBillNo + "'," + omodel.HICMOInterID.ToString() + "," + omodel.HICMOEntryID.ToString() + ",'" + omodel.HICMOBillNo + "'" +
"," + omodel.HSourceID.ToString() + "," + omodel.HProcID.ToString() + "," + omodel.HMaterID.ToString() + ",'" + omodel.HSourceBarCode + "'," + omodel.HEquipID.ToString() + "," + omodel.HWorkerID.ToString() + ",'" + omodel.HWorkerBarCode + "'" +
- "," + omodel.HGroupID.ToString() +"," + omodel.HSTOCKORGID.ToString() +
+ "," + omodel.HGroupID.ToString() + "," + omodel.HProcNo.ToString() + "," + omodel.HSTOCKORGID.ToString() +
") ");
//鎻掑叆瀛愯〃
foreach (Model.ClsSc_MaterToSourceBillSub oSub in DetailColl)
diff --git "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs" "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
index 1edef06..8272a5d 100644
--- "a/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
+++ "b/Model/\347\224\237\344\272\247\347\256\241\347\220\206/\350\256\276\345\244\207\347\256\241\347\220\206/ClsSb_EquipMaintainBillMain.cs"
@@ -19,5 +19,6 @@
public int HEquipMaintainPlanEntryID; //设备保养计划单（Sb_EquipMaintainPlanBillSub_Plan）子内码
public Int64 HMaintainLevID; //保养级别（gy_HMaintainLev）
+ public string HLastResult;// 最终结论（OK，NG）
}
}
diff --git "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillMain.cs" "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillMain.cs"
index 249ad47..98e09a2 100644
--- "a/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillMain.cs"
+++ "b/Model/\350\275\246\351\227\264\347\256\241\347\220\206/ClsSc_MaterToSourceBillMain.cs"
@@ -20,7 +20,7 @@
public Int64 HWorkerID;// int --操作工ID
public string HWorkerBarCode;// varchar(50) --操作工条码
public Int64 HGroupID;// int --生产班组ID
-
+ public Int64 HProcNo;// int --流水号（工序号）
public Int64 HProcID;// int --工序ID
public Int64 HMaterID;// int --产品ID
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
index c859e73..b80be6c 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1606,6 +1606,11 @@
{
omodel.MES_StationInBill_ShowUSERProcess = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
+ {
+ omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
@@ -3551,6 +3556,11 @@
{
omodel.MES_StationInBill_PreQtyCtl = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
}
+ //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
+ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationInBill_DefQty")
+ {
+ omodel.MES_StationInBill_DefQty = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]);
+ }
diff --git a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
index 198047d..f331b24 100644
--- a/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
+++ b/Pub_Class/CustomerCls/ClsXt_SystemParameterMain.cs
@@ -508,7 +508,8 @@
public string MES_StationInBill_DeleteRelationCtl; //进站接收单删除时是否进行关联控制
public string MES_StationInBill_PreQtyCtl; //本道进站数量不能大于上道出站合格数量
public string MES_StationInBill_QtyRateCtl; //本道进站数量汇总数不能大于流转卡数量上限
- public string MES_StationInBill_DyCentralInspectionControl; //判断工序进站之前是否做过检验单
+ public string MES_StationInBill_DyCentralInspectionControl; //判断工序进站之前是否做过检验单
+ public string MES_StationInBill_DefQty; //工序进站时默认带入数量（1.流转卡数，2.上道合格数量，3.物料最小包装数量，4.不带入）
//工序出站汇报单
public string MES_StationOutBill_AutoCheck; //保存后是否自动审核
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index f6519ae..5e64423 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -1156,6 +1156,34 @@
}
#endregion
+ #region[鍣ㄥ叿妗ｆ缂栬緫鏃惰幏鍙栧瓙琛ㄦ暟鎹甝
+ [Route("Gy_MouldFileMain/Gy_MouldFileSubDetai")]
+ [HttpGet]
+ public object Gy_MouldFileSubDetai(long HInterID)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_MouldFileSub_MaintainRule AS a left join Sc_MouldMaintainRuleBillMain as b on b.HInterID = a.HMaintainRuleID where a.HInterID = " + HInterID, "Gy_MouldFileBill_MaintainRule");
+ tableList.Add(ds.Tables[0]);
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_MouldFileSub_DotCheckRule AS a left join Sc_MouldDotCheckRuleBillMain as b on b.HInterID = a.HDotCheckRuleID where a.HInterID = " + HInterID, "Gy_MouldFileBill_DotCheckRule");
+ tableList.Add(ds.Tables[0]);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = tableList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
/// <summary>
/// 鏂板妯″叿妗ｆ-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -1185,7 +1213,6 @@
objJsonResult = AddBillMain(msg1);
if (objJsonResult.code == "0")
{
- oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = objJsonResult.Message;
@@ -1206,6 +1233,8 @@
string msg3 = sArray[1].ToString();//妯″潡鏉冮檺
string msg4 = sArray[2].ToString();//褰撳墠浜�
string msg5 = sArray[3].ToString();//瀛愯〃鏁版嵁
+ string msg6 = sArray[4].ToString();//瀛愯〃1鏁版嵁
+ string msg7 = sArray[5].ToString();//瀛愯〃2鏁版嵁
try
{
msg2 = "[" + msg2.ToString() + "]";
@@ -1295,7 +1324,7 @@
",0,0,'','',0,0 " +
") ");
- objJsonResult = AddBillSub(msg5,HInterID, HBillNo);
+ objJsonResult = AddBillSub(msg5,msg6,msg7,HInterID, HBillNo);
if (objJsonResult.code == "0")
{
@@ -1314,6 +1343,7 @@
}
catch (Exception e)
{
+ oCN.RollBack();
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "Exception锛�" + e.ToString();
@@ -1339,6 +1369,8 @@
string msg3 = sArray[1].ToString();//妯″潡鏉冮檺
string msg4 = sArray[2].ToString();//褰撳墠浜�
string msg5 = sArray[3].ToString();//瀛愯〃鏁版嵁
+ string msg6 = sArray[4].ToString();//瀛愯〃2鏁版嵁
+ string msg7 = sArray[5].ToString();//瀛愯〃3鏁版嵁
try
{
if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
@@ -1471,8 +1503,9 @@
// oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
oCN.RunProc("delete from Gy_MouldFileSub_SubMater where HInterID='" + HInterID + "'");
-
- objJsonResult = AddBillSub(msg5, HInterID, HBillNo);
+ oCN.RunProc("delete from Gy_MouldFileSub_MaintainRule where HInterID='" + HInterID + "'");
+ oCN.RunProc("delete from Gy_MouldFileSub_DotCheckRule where HInterID='" + HInterID + "'");
+ objJsonResult = AddBillSub(msg5, msg6, msg7, HInterID, HBillNo);
oCN.Commit();
objJsonResult.code = "1";
@@ -1492,9 +1525,12 @@
}
}
- public json AddBillSub(string msg5, long HInterID, string HBillNo)
+ public json AddBillSub(string msg5, string msg6, string msg7, long HInterID, string HBillNo)
{
List<Gy_MouldFileSub_SubMater> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_MouldFileSub_SubMater>>(msg5);
+ List<ClsGy_MouldFileBillSub_MaintainRule> MaintainRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MouldFileBillSub_MaintainRule>>(msg6);
+
+ List<ClsGy_MouldFileBillSub_DotCheckRule> DotCheckRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_MouldFileBillSub_DotCheckRule>>(msg7);
int i = 0; //浣滀负瀛愯〃鍐呯爜
foreach (Gy_MouldFileSub_SubMater oSub in DetailColl)
{
@@ -1517,6 +1553,50 @@
"')";
oCN.RunProc(sql);
+ }
+ i = 0;
+ //淇濆瓨淇濆吇瑙勬牸
+ foreach (ClsGy_MouldFileBillSub_MaintainRule oSub in MaintainRuleColl)
+ {
+ i++;
+ Int64 NewHEntryID = i;
+ Int64 newHFlag = 1;
+ if (oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_MouldFileSub_MaintainRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HMaintainRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HMaintainRuleID},{newHFlag})");
+ }
+ i = 0;
+ //淇濆瓨鐐规瑙勭▼
+ foreach (ClsGy_MouldFileBillSub_DotCheckRule oSub in DotCheckRuleColl)
+ {
+ i++;
+ Int64 NewHEntryID = i;
+ Int64 newHFlag = 1;
+ if (oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_MouldFileSub_DotCheckRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HDotCheckRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HDotCheckRuleID},{newHFlag})");
}
objJsonResult.code = "1";
@@ -1612,6 +1692,8 @@
}
if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
{
+ oCN.RunProc("Delete From Gy_MouldFileSub_MaintainRule where HInterID=" + hmainid);
+ oCN.RunProc("Delete From Gy_MouldFileSub_DotCheckRule where HInterID=" + hmainid);
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
//鏇存柊涓婄骇涓� 鏈骇
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 8a21ba2..17da314 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -274,7 +274,7 @@
string sql = string.Empty;
//淇濆瓨
oCN.BeginTran();
- sql = $"delete Gy_Supplier where HItemID = {lsmain[0].HItemID}";
+ sql = $"delete from Gy_Supplier where HItemID = {lsmain[0].HItemID}";
oCN.RunProc(sql);
sql = "set identity_insert Gy_Supplier on";
oCN.RunProc(sql);
@@ -290,7 +290,7 @@
",'" + lsmain[0].HShortName + "','" + lsmain[0].HAddress + "','" + lsmain[0].HLinkMan + "','" + lsmain[0].HLinkPhone + "','" + lsmain[0].HMobilePhone + "'" +
",'" + lsmain[0].HFax + "','" + lsmain[0].HPostalCode + "','" + lsmain[0].HEmail + "','" + lsmain[0].HBank + "','" + lsmain[0].HBankAccount + "'" +
",'" + lsmain[0].HTaxNum + "','" + lsmain[0].HTaxRate + "','" + lsmain[0].HCountry + "','" + lsmain[0].HCorMan + "','" + lsmain[0].HEnglishName + "'" +
- ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +","+lsmain[0].HMaterClass+
+ ",'" + lsmain[0].HEnglishAddress + "'," + lsmain[0].HCurID + "," + lsmain[0].HSSID + "," + lsmain[0].HAreaID +",'"+lsmain[0].HMaterClass+ "'" +
") ");
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
sql = "set identity_insert Gy_Supplier off";
diff --git a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
index 8255731..779867e 100644
--- a/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
+++ b/WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -119,6 +119,7 @@
double HPeriod = DateTime.Now.Month;
string HRemark = list[0].HRemark;//澶囨敞
long HICMOInterID = list[0].HICMOInterID;//浠诲姟鍗旾D
+ long HICMOEntryID = list[0].HICMOEntryID;//浠诲姟鍗曞瓙ID
string HICMOBillNo = list[0].HICMOBillNo;//浠诲姟鍗�
long HProcPlanInterID = 0;
long HProcPlanEntryID = 0;
@@ -144,6 +145,8 @@
string HOrderProcNO = list[0].HOrderProcNO;//璁㈠崟璺熻釜鍙�
long HPRDOrgID = list[0].HPRDOrgID;//缁勭粐ID
double HmaterOutqty = list[0].HmaterOutqty;//鐧藉澂鍙戝竷
+ long HMaterToSourceInterID = list[0].HMaterToSourceInterID;//涓婃枡闃查敊鍗旾D
+ string HMaterToSourceBillNo = list[0].HMaterToSourceBillNo;//涓婃枡闃查敊鍗曞崟鎹彿
//鍗曟嵁瀹屾暣鎬у垽鏂�
if (HMaterID <= 0)
{
@@ -260,6 +263,29 @@
",'" + HProcNo + "','" + HOrderProcNO + "','" + HMainInterID + "'," + HPRDOrgID +
","+ HmaterOutqty + ") ");
+ if(HMaterToSourceInterID!=0)
+ {
+ //鐢熸垚涓婃枡闃查敊鍗�
+ //鎻掑叆瀛愯〃
+ oCN.RunProc("EXEC h_p_Sc_MaterToSourceBillSub_Insert " + HMaterToSourceInterID.ToString() + ",'" + HMaterToSourceBillNo + "'");
+ //鎻掑叆涓昏〃
+ oCN.RunProc("Insert Into Sc_MaterToSourceBillMain " +
+ "(HBillType,HBillSubType,HInterID,HBillNo,HDate" +
+ ",HYear,HPeriod,HRemark,HMaker,HMakeDate,HChecker,HCheckDate" +
+ ",HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType" +
+ ",HProcExchInterID,HProcExchEntryID,HProcExchBillNo,HICMOInterID,HICMOEntryID,HICMOBillNo" +
+ ",HSourceID,HProcID,HMaterID,HSourceBarCode,HEquipID,HWorkerID,HWorkerBarCode" +
+ ",HGroupID,HProcNo,HStockOrgID" +
+ ") " +
+ " values('3786','3790'," + HMaterToSourceInterID.ToString() + ",'" + HMaterToSourceBillNo + "',convert(varchar(10),getdate(),120)" +
+ ",year(getdate()),month(getdate()),'宸ュ簭杩涚珯缁戝畾鐢熸垚','" + HMaker + "',getdate(),'" + HMaker + "',getdate()" +
+ "," + HInterID.ToString() + ",0,'" + HBillNo + "','3790'" +
+ "," + HProcExchInterID.ToString() + "," + HProcExchEntryID.ToString() + ",'" + HProcExchBillNo + "'," + HICMOInterID.ToString() + "," + HICMOEntryID.ToString() + ",'" + HICMOBillNo + "'" +
+ "," + HSourceID.ToString() + "," + HProcID.ToString() + "," + HMaterID.ToString() + ",'',0,0,''" +
+ "," + HGroupID.ToString() + "," + HProcNo.ToString() + "," + HPRDOrgID.ToString() +
+ ") ");
+ }
+ //鍐欏叆鏃ュ織
LogService.Write("鐢ㄦ埛:" + user + ",鏃ユ湡:" + DateTime.Now + ",鏂板宸ュ簭杩涚珯鍗曟嵁:" + HBillNo);
oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "鏂板宸ュ簭杩涚珯鍗曟嵁锛�" + HBillNo + "','LMES-宸ュ簭杩涚珯妯″潡','" + DBUtility.ClsPub.IPAddress + "','鏂板鍗曟嵁'", ref DBUtility.ClsPub.sExeReturnInfo);
}
@@ -423,6 +449,67 @@
}
#endregion
+ #region 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅锛屽苟鏍规嵁绯荤粺鍙傛暟鍒ゆ柇杩涚珯鍗曟槸鍚︾粦瀹氶厤浠舵竻鍗� 20240621
+ [Route("Cj_StationInBill/HProcNo_KeyDown")]
+ [HttpGet]
+ public object HProcNo_KeyDown(string HBillNo, string HProcExchBillNo, Int64 HProcNo, string HMaker)
+ {
+ try
+ {
+ if (HProcExchBillNo.Equals(""))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佽浆鍗℃病鏈夋壂鎻忥紝鎴栬�呮病鏈夋寜鍥炶溅閿紝璇锋壂鎻忔祦杞崱鎴栧湪娴佽浆鍗℃枃鏈涓寜鍥炶溅閿紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
+ //鑾峰彇绯荤粺鍙傛暟
+ string sErrMsg = "";
+ if (oSystemParameter.ShowBill(ref sErrMsg) == true)
+ {
+ string MES_StationInBill_LineBindCtl = "N"; //杩涚珯鎺ユ敹鏃舵槸鍚︾粦瀹氳宸ュ簭鐨勯厤浠舵竻鍗曪紙Y鏄渶瑕佺粦瀹氾紝N涓嶉渶瑕佺粦瀹氾級
+ string MES_StationInBill_DefQty = "4"; //宸ュ簭杩涚珯鏃堕粯璁ゅ甫鍏ユ暟閲忥紙1.娴佽浆鍗℃暟锛�2.涓婇亾鍚堟牸鏁伴噺锛�3.鐗╂枡鏈�灏忓寘瑁呮暟閲忥紝4.涓嶅甫鍏ワ級
+ MES_StationInBill_LineBindCtl = oSystemParameter.omodel.MES_StationInBill_LineBindCtl;
+ MES_StationInBill_DefQty = oSystemParameter.omodel.MES_StationInBill_DefQty;
+
+ ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_HProcNo_KeyDown '" + HBillNo + "','" + HProcExchBillNo + "'," + HProcNo.ToString() + ",'" + MES_StationInBill_LineBindCtl + "','" + MES_StationInBill_DefQty + "','" + HMaker + "'", "h_p_MES_StationInBill_HProcNo_KeyDown");
+
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ簭鍙烽敊璇垨鑰呭綋鍓嶅伐搴忓彿涓嶅厑璁歌繘绔欙紝璇烽噸鏂拌緭鍏ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鑾峰彇淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 宸ュ簭杩涚珯鎺ユ敹鍗曟祦姘村彿鍥炶溅鑾峰彇宸ュ簭淇℃伅
[Route("Cj_StationInBill/txtHProcNo_KeyDown")]
[HttpGet]
diff --git a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
index c083f5e..f037983 100644
--- a/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
+++ b/WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -94,6 +94,7 @@
return objJsonResult;
}
DLL.ClsGy_EquipFileMain oBill = new DLL.ClsGy_EquipFileMain();
+ oCN.BeginTran();
ds = oCN.RunProcReturn("select * from Gy_EquipFileBillMain where HInterID=" + HItemID, "Gy_EquipFileBillMain");
if (ds.Tables[0].Rows.Count > 0)
{
@@ -107,6 +108,9 @@
}
oCN.RunProc("Delete From Gy_EquipFileBillMain where HInterID=" + lngBillKey);
+ oCN.RunProc("Delete From Gy_EquipFileBillSub_MaintainRule where HInterID=" + lngBillKey);
+ oCN.RunProc("Delete From Gy_EquipFileBillSub_DotCheckRule where HInterID=" + lngBillKey);
+ oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛";
@@ -121,6 +125,7 @@
objJsonResult.data = null;
return objJsonResult;
}
+
}
#endregion
@@ -151,6 +156,35 @@
}
#endregion
+ #region[璁惧妗ｆ缂栬緫鏃惰幏鍙栧瓙琛ㄦ暟鎹甝
+ [Route("Gy_EquipFileMain/Gy_EquipFileSubDetai")]
+ [HttpGet]
+ public object Gy_EquipFileSubDetai(long HInterID)
+ {
+ try
+ {
+ List<DataTable> tableList = new List<DataTable>();
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_EquipFileBillSub_MaintainRule AS a left join Sb_EquipMaintainRuleBillMain as b on b.HInterID = a.HMaintainRuleID where a.HInterID = " + HInterID, "Gy_EquipFileBillSub_MaintainRule");
+ tableList.Add(ds.Tables[0]);
+ ds = oCN.RunProcReturn("select a.*,b.HBillNo from Gy_EquipFileBillSub_DotCheckRule AS a left join Sb_EquipDotCheckRuleBillMain as b on b.HInterID = a.HDotCheckRuleID where a.HInterID = " + HInterID, "Gy_EquipFileBillSub_DotCheckRule");
+ tableList.Add(ds.Tables[0]);
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "";
+ objJsonResult.data = tableList;
+ return objJsonResult;
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "Exception锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+ #endregion
+
#region 璁惧妗ｆ鏂板淇濆瓨
/// <summary>
/// 妯℃不鍏峰垎绫�-淇濆瓨鎸夐挳
@@ -166,11 +200,12 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1
+ string msg4 = sArray[2].ToString(); //瀛愯〃2
+ string msg5 = sArray[3].ToString(); //鐢ㄦ埛
- if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg5))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -214,7 +249,7 @@
string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //鏄惁涓荤敓浜ц澶�(鍚︼紝鏄�)
string HMacAddress = list[0].HMacAddress; // varchar(50) //鏁伴噰鐗╃悊鍦板潃
int HMainSourceID = list[0].HMainSourceID; //int //鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
- string HMaker = msg4;
+ string HMaker = msg5;
string HMakeDate = DateTime.Now.Date.ToString();
int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
@@ -228,22 +263,30 @@
objJsonResult.data = null;
return objJsonResult;
}
+ DataSet DS = oCN.RunProcReturn("Select * from Gy_EquipFileBillMain Where HEquipFileNumber='" + HEquipFileNumber + "' and HInterID<>" + HInterID, "Gy_EquipFileBillMain", ref Pub_Class.ClsPub.sExeReturnInfo);
+
+ if (DS.Tables[0].Rows.Count != 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "浠ｇ爜閲嶅锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
oCN.RunProc("Insert into Gy_EquipFileBillMain " +
- " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
+ " (HInterID,hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
"HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID,HSourceID,HMainSourceFlag,HMacAddress,HMainSourceID) " +
- " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
+ " Values("+ HInterID+",'" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
"','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
"','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID + ",'3308','" + HDate + "','" + HYear + "','" + HMaker + "','" + HMakeDate + "','" + HEquipMaintainRuleInterID + "','" + HEquipDotCheckRuleInterID +"'," + HSourceID + ",'" + HMainSourceFlag + "','" + HMacAddress + "','" + HMainSourceID + "')", ref DBUtility.ClsPub.sExeReturnInfo);
//淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ objJsonResult = AddBillSub(msg3, msg4, HInterID, hbillno, 1);
oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "鏂板鎴愬姛锛�";
//objJsonResult.data = null;
return objJsonResult;
}
@@ -271,11 +314,12 @@
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
- string msg3 = sArray[1].ToString();
- string msg4 = sArray[2].ToString();
+ string msg2 = sArray[0].ToString(); //涓昏〃鏁版嵁
+ string msg3 = sArray[1].ToString(); //瀛愯〃1
+ string msg4 = sArray[2].ToString(); //瀛愯〃2
+ string msg5 = sArray[3].ToString(); //鐢ㄦ埛
- if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg4))
+ if (!DBUtility.ClsPub.Security_Log("Gy_EquipFile_Edit", 1, false, msg5))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -315,7 +359,7 @@
string HMainSourceFlag = list[0].HMainSourceFlag; //varchar(10) //鏄惁涓荤敓浜ц澶�(鍚︼紝鏄�)
string HMacAddress = list[0].HMacAddress; // varchar(50) //鏁伴噰鐗╃悊鍦板潃
int HMainSourceID = list[0].HMainSourceID; //int //鎵�灞炰富鐢熶骇璁惧锛圙y_EquipFileBillMain锛�
- string HUpDater = msg4;
+ string HUpDater = msg5;
string HUpDateDate = DateTime.Now.Date.ToString();
int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
@@ -382,10 +426,8 @@
//淇敼瀛愰」鐩唬鐮�
//oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
//
+ objJsonResult = AddBillSub(msg3, msg4, HInterID, list[0].HBillNo, 2);
oCN.Commit();
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "淇敼鎴愬姛锛�";
//objJsonResult.data = null;
return objJsonResult;
}
@@ -401,6 +443,110 @@
}
#endregion
+ #region 璁惧妗ｆ淇濆瓨瀛愯〃鏁版嵁
+ /// <summary>
+ /// 瀛愯〃鏁版嵁鏂板鎴栬�呯紪杈�
+ /// </summary>
+ /// <param name="msg3"></param>
+ /// <param name="msg4"></param>
+ /// <param name="HInterID"></param>
+ /// <param name="HBillNo"></param>
+ /// <param name="OperationType">1涓烘坊鍔�2涓虹紪杈�</param>
+ /// <returns></returns>
+ public json AddBillSub(string msg3, string msg4, long HInterID, string HBillNo, int OperationType)
+ {
+ List<ClsGy_EquipFileBillSub_MaintainRule> MaintainRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EquipFileBillSub_MaintainRule>>(msg3);
+
+ List<ClsGy_EquipFileBillSub_DotCheckRule> DotCheckRuleColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_EquipFileBillSub_DotCheckRule>>(msg4);
+ if (OperationType == 2)
+ {
+ //鍒犻櫎瀛愯〃
+ oCN.RunProc("delete from Gy_EquipFileBillSub_MaintainRule where HInterID = " + HInterID );
+ oCN.RunProc("delete from Gy_EquipFileBillSub_DotCheckRule where HInterID = " + HInterID );
+ }
+ int i = 0;
+ //淇濆瓨淇濆吇瑙勬牸
+ foreach (ClsGy_EquipFileBillSub_MaintainRule oSub in MaintainRuleColl)
+ {
+ i++;
+ if (oSub.HMaintainRuleID <= 0 || oSub.HMaintainRuleID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛�,淇濆吇瑙勬牸涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ throw new Exception("淇濆吇瑙勬牸涓嶈兘涓虹┖");
+ }
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Int64 newHFlag = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Gy_EquipFileBillSub_MaintainRule", "Gy_EquipFileBillSub_MaintainRule");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+ if(oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_EquipFileBillSub_MaintainRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HMaintainRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HMaintainRuleID},{newHFlag})");
+ }
+ i = 0;
+ //淇濆瓨鐐规瑙勭▼
+ foreach (ClsGy_EquipFileBillSub_DotCheckRule oSub in DotCheckRuleColl)
+ {
+ i++;
+ if (oSub.HDotCheckRuleID <= 0 || oSub.HDotCheckRuleID == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "绗�" + i + "琛�,鐐规瑙勭▼涓嶈兘涓虹┖";
+ objJsonResult.data = null;
+ throw new Exception("鐐规瑙勭▼涓嶈兘涓虹┖");
+ }
+ DataSet Cs;
+ Int64 NewHEntryID = 1;
+ Int64 newHFlag = 1;
+ Cs = oCN.RunProcReturn("select MAX(HEntryID)HEntryID from Gy_EquipFileBillSub_DotCheckRule", "Gy_EquipFileBillSub_DotCheckRule");
+ if (Cs.Tables[0].Rows.Count != 0 && ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString()) != 0)
+ {
+ NewHEntryID = ClsPub.isLong(Cs.Tables[0].Rows[0]["HEntryID"].ToString());
+ NewHEntryID += 1;
+ }
+ if (oSub.HStdFlag == true)
+ {
+ newHFlag = 1;
+ }
+ else
+ {
+ newHFlag = 0;
+ }
+ oCN.RunProc($@"Insert into Gy_EquipFileBillSub_DotCheckRule
+ (HInterID,HBillNo_bak,HEntryID,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney,
+ HDotCheckRuleID,HStdFlag
+ )
+ values({HInterID},'{HBillNo}',{NewHEntryID},'{oSub.HRemark}',{oSub.HSourceInterID},{oSub.HSourceEntryID},'{oSub.HSourceBillNo}','{oSub.HSourceBillType}',{oSub.HRelationQty},{oSub.HRelationMoney}
+ ,{oSub.HDotCheckRuleID},{newHFlag})");
+ }
+ //淇敼涓婄骇涓洪潪鏈骇浠ｇ爜
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "淇濆瓨瀛愯〃鎴愬姛锛�";
+ //objJsonResult.data = null;
+ return objJsonResult;
+ }
+ #endregion
+
#region[璁惧灞ュ巻(鐐瑰嚮涓昏〃甯﹀嚭浠庤〃)]
[Route("Gy_EquipFileMain/Sb_EquipFileBillResumeDate")]
[HttpGet]
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index e2524f9..b3f7e39 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -987,6 +987,88 @@
#endregion
+ #region 宸ュ簭璧勬枡
+
+ /// <summary>
+ /// 鎵爜杩斿洖宸ュ簭淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetProcess_Json")]
+ [HttpGet]
+ public object GetProcess_Json(string HBarCode, Int64 HStockOrgID)
+ {
+ try
+ {
+ Int64 HProcID = 0;
+ HProcID = DBUtility.ClsPub.isLong(HBarCode);
+ ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Process with(nolock) where HStopflag=0 and HItemID=" + HProcID.ToString() + " and HUSEORGID = " + HStockOrgID.ToString(), "Gy_Process");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍璁板綍锛岃纭鎵�鎵伐搴忔潯鐮佹槸鍚﹀睘浜庤缁勭粐锛屼笖涓洪潪绂佺敤鐘舵�侊紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖宸ュ簭淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ簭鍒楄〃淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/GetProcessList_Json")]
+ [HttpGet]
+ public object GetProcessList_Json(string Process, Int64 HStockOrgID)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("select HItemID,HNumber,HName from Gy_Process with(nolock) where HStopflag=0 and HUSEORGID=" + HStockOrgID.ToString() + " and (HNumber like '%" + Process + "%' or HName like '%" + Process + "%')", "Gy_Process");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁杩斿洖浠讳綍宸ュ簭璁板綍锛�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "杩斿洖宸ュ簭淇℃伅澶辫触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#endregion
@@ -3387,6 +3469,8 @@
BillNew.omodel.HWorkerID = mainList[0].HWorkerID;
BillNew.omodel.HWorkerBarCode = mainList[0].HWorkerBarCode;
BillNew.omodel.HGroupID = mainList[0].HGroupID;
+ BillNew.omodel.HProcID = mainList[0].HProcID;
+ BillNew.omodel.HProcNo = mainList[0].HProcNo;
BillNew.omodel.HMainSourceBillType = mainList[0].HMainSourceBillType;
if (mainList[0].HMainSourceBillType == "3772")
{
@@ -5969,6 +6053,55 @@
#endregion
+ #region 涓婃枡闃查敊鍗曟壂鐮佹ā鍧� 娴佹按鍙峰洖杞﹁皟鐢ㄦ柟娉�
+ /// <summary>
+ /// 娴佹按鍙峰洖杞﹁繑鍥炰俊鎭�
+ /// </summary>
+ /// <returns></returns>
+ [Route("WEBSController/get_ProcNo_MaterToSource_Json")]
+ [HttpGet]
+ public object get_ProcNo_MaterToSource_Json(Int64 HInterID, string HBillNo, string HBillType, string HProcExchBillNo, Int64 HProcNo, string HMaker)
+ {
+ try
+ {
+ ds = oCn.RunProcReturn("exec h_p_WMS_AddProcNo_MaterToSource " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HProcExchBillNo + "'," + HProcNo.ToString() + ",'" + HMaker + "'", "h_p_WMS_AddProcNo_MaterToSource");
+ if (ds == null || ds.Tables[0].Rows.Count == 0)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佹按鍙峰洖杞﹁繑鍥炰俊鎭垽鏂け璐ワ紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HBack"]) == 1)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "鎴愬姛锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ }
+ catch (Exception e)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娴佹按鍙峰洖杞﹁繑鍥炰俊鎭触锛�" + e.ToString();
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ }
+
+ #endregion
+
#region 涓婃枡闃查敊鍗曟壂鐮佹ā鍧� 鎵弿鐗╂枡鏉＄爜璋冪敤鏂规硶
/// <summary>
/// 鎵弿鐗╂枡鏉＄爜
diff --git a/WebAPI/Models/ClsGy_EquipFileBillSub_DotCheckRule.cs b/WebAPI/Models/ClsGy_EquipFileBillSub_DotCheckRule.cs
new file mode 100644
index 0000000..b709a42
--- /dev/null
+++ b/WebAPI/Models/ClsGy_EquipFileBillSub_DotCheckRule.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_EquipFileBillSub_DotCheckRule:DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HDotCheckRuleID;// int 点检规程 --
+ public bool HStdFlag;//默认标记
+
+ }
+}
diff --git a/WebAPI/Models/ClsGy_EquipFileBillSub_MaintainRule.cs b/WebAPI/Models/ClsGy_EquipFileBillSub_MaintainRule.cs
new file mode 100644
index 0000000..6e8542c
--- /dev/null
+++ b/WebAPI/Models/ClsGy_EquipFileBillSub_MaintainRule.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_EquipFileBillSub_MaintainRule : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaintainRuleID;// int 保养规程
+ public bool HStdFlag;//默认标记
+
+ }
+}
diff --git a/WebAPI/Models/ClsGy_MouldFileBillSub_DotCheckRule.cs b/WebAPI/Models/ClsGy_MouldFileBillSub_DotCheckRule.cs
new file mode 100644
index 0000000..2639007
--- /dev/null
+++ b/WebAPI/Models/ClsGy_MouldFileBillSub_DotCheckRule.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_MouldFileBillSub_DotCheckRule:DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HDotCheckRuleID;// int 点检规程 --
+ public bool HStdFlag;//默认标记
+
+ }
+}
diff --git a/WebAPI/Models/ClsGy_MouldFileBillSub_MaintainRule.cs b/WebAPI/Models/ClsGy_MouldFileBillSub_MaintainRule.cs
new file mode 100644
index 0000000..d3c3dfa
--- /dev/null
+++ b/WebAPI/Models/ClsGy_MouldFileBillSub_MaintainRule.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WebAPI.Models
+{
+ public class ClsGy_MouldFileBillSub_MaintainRule : DBUtility.ClsXt_BaseBillSub
+ {
+ public Int64 HMaintainRuleID;// int 保养规程
+ public bool HStdFlag;//默认标记
+
+ }
+}
diff --git a/WebAPI/Models/StationBill.cs b/WebAPI/Models/StationBill.cs
index f8120e6..294d78d 100644
--- a/WebAPI/Models/StationBill.cs
+++ b/WebAPI/Models/StationBill.cs
@@ -88,5 +88,7 @@
public double HToCheckQty { get; set; }
public double HLossQty { get; set; }
public Int64 HShiftsID { get; set; }
+ public long HMaterToSourceInterID { get; set; }
+ public string HMaterToSourceBillNo { get; set; }
}
}
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
index 9250916..2403f43 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>x86</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</PublishUrl>
+ <PublishUrl>G:\issWeb\缃戠珯鍙戝竷\API</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 0a96919..c52e295 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,10 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
- </File>
- <File Include="bin/Aliyun.Credentials.dll">
- <publishTime>12/05/2022 15:40:12</publishTime>
+ <publishTime>04/15/2024 12:55:47</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 16:43:40</publishTime>
@@ -49,12 +46,12 @@
<File Include="bin/DBUtility.dll">
<publishTime>11/02/2022 22:02:56</publishTime>
<publishTime>11/15/2022 13:55:23</publishTime>
- <publishTime>06/25/2024 16:09:04</publishTime>
+ <publishTime>06/27/2024 10:42:29</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>11/09/2022 16:01:58</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>06/25/2024 16:09:04</publishTime>
+ <publishTime>06/27/2024 10:42:29</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -84,7 +81,7 @@
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -110,15 +107,15 @@
<File Include="bin/Model.dll">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>06/25/2024 16:09:04</publishTime>
+ <publishTime>06/27/2024 10:42:29</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>11/09/2022 16:02:01</publishTime>
<publishTime>11/02/2022 22:02:56</publishTime>
- <publishTime>06/25/2024 16:09:04</publishTime>
+ <publishTime>06/27/2024 10:42:29</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>09/07/2014 18:39:38</publishTime>
@@ -150,33 +147,33 @@
<File Include="bin/Pub_Class.dll">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>06/25/2024 16:09:03</publishTime>
+ <publishTime>06/27/2024 10:42:27</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
<publishTime>11/09/2022 16:01:56</publishTime>
<publishTime>11/02/2022 22:02:54</publishTime>
- <publishTime>06/25/2024 16:09:03</publishTime>
+ <publishTime>06/27/2024 10:42:27</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>06/25/2024 16:09:03</publishTime>
+ <publishTime>06/27/2024 10:42:28</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>06/25/2024 16:09:03</publishTime>
+ <publishTime>06/27/2024 10:42:28</publishTime>
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>06/25/2024 16:09:03</publishTime>
+ <publishTime>06/27/2024 10:42:28</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>11/09/2022 16:01:57</publishTime>
<publishTime>11/02/2022 22:02:55</publishTime>
- <publishTime>06/25/2024 16:09:03</publishTime>
+ <publishTime>06/27/2024 10:42:28</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -217,14 +214,8 @@
<File Include="bin/System.Net.Http.dll">
<publishTime>09/26/2012 03:16:08</publishTime>
</File>
- <File Include="bin/System.Net.Http.Extensions.dll">
- <publishTime>02/20/2015 04:10:46</publishTime>
- </File>
<File Include="bin/System.Net.Http.Formatting.dll">
<publishTime>11/28/2018 21:00:36</publishTime>
- </File>
- <File Include="bin/System.Net.Http.Primitives.dll">
- <publishTime>02/20/2015 04:10:46</publishTime>
</File>
<File Include="bin/System.Runtime.CompilerServices.Unsafe.dll">
<publishTime>09/19/2018 03:38:10</publishTime>
@@ -260,7 +251,7 @@
<publishTime>11/28/2018 21:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 12:02:18</publishTime>
@@ -315,58 +306,58 @@
<publishTime>11/29/2018 21:26:30</publishTime>
</File>
<File Include="Config/kdapi.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:43</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:43</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:43</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:43</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:44</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:47</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:47</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="grpc_csharp_ext.x64.dll">
<publishTime>03/22/2022 13:17:22</publishTime>
@@ -375,7 +366,7 @@
<publishTime>03/22/2022 13:17:22</publishTime>
</File>
<File Include="Index.html">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="libgrpc_csharp_ext.x64.dylib">
<publishTime>03/19/2022 07:38:44</publishTime>
@@ -384,121 +375,121 @@
<publishTime>03/19/2022 07:38:42</publishTime>
</File>
<File Include="libman.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:47</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:45</publishTime>
</File>
<File Include="packages.config">
- <publishTime>06/25/2024 09:50:21</publishTime>
+ <publishTime>06/25/2024 12:46:38</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_Mould.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/15/2024 12:55:46</publishTime>
</File>
<File Include="Web References/WebS/Reference.cs">
<publishTime>12/20/2021 13:19:56</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
- <publishTime>05/25/2024 09:46:41</publishTime>
+ <publishTime>04/29/2024 08:30:03</publishTime>
</File>
<File Include="Web References/WebS/WebService1.disco">
<publishTime>12/20/2021 13:19:56</publishTime>
@@ -512,7 +503,7 @@
<File Include="Web.config">
<publishTime>11/14/2022 11:24:08</publishTime>
<publishTime>11/02/2022 22:03:20</publishTime>
- <publishTime>06/25/2024 16:09:09</publishTime>
+ <publishTime>06/27/2024 10:43:49</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2b5caff..29f3c14 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -745,8 +745,12 @@
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
<Compile Include="Log.cs" />
+ <Compile Include="Models\ClsGy_MouldFileBillSub_DotCheckRule.cs" />
+ <Compile Include="Models\ClsGy_MouldFileBillSub_MaintainRule.cs" />
<Compile Include="Models\ClsGy_MateMould.cs" />
<Compile Include="Models\ClsGy_SupMaterial.cs" />
+ <Compile Include="Models\ClsGy_EquipFileBillSub_DotCheckRule.cs" />
+ <Compile Include="Models\ClsGy_EquipFileBillSub_MaintainRule.cs" />
<Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
<Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
<Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
--
Gitblit v1.9.1