From 274db11b6606fb03bf269c73d9aa1722e92d23a1 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 23 一月 2022 20:33:25 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Models/ClsGy_EquipFileMain.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Models/ClsGy_EquipFileMain.cs b/WebAPI/Models/ClsGy_EquipFileMain.cs
index 6338f00..b751c54 100644
--- a/WebAPI/Models/ClsGy_EquipFileMain.cs
+++ b/WebAPI/Models/ClsGy_EquipFileMain.cs
@@ -14,14 +14,14 @@
public string HModel2; // 鈭� varchar(100) //璁惧鍨嬪彿
public int HMaterID; // 鈭� int //瀵瑰簲鐗╂枡
public int HUnitID; // 鈭� int //鍗曚綅
- public DateTime HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
+ public string HOutComDate; // 鈭� datetime //璁惧鍑哄巶鏃ユ湡
public string HOutComNo; // 鈭� varchar(100) //璁惧鍑哄巶缂栧彿
public int HDeptID; // 鈭� int //浣跨敤閮ㄩ棬锛坓y_Department锛�
public int HUseEmpID; //鈭� int //浣跨敤璐熻矗浜猴紙gy_Employee锛�
public int HRepairEmpID; //鈭� int //缁存姢璐熻矗浜猴紙gy_Employee锛�
public string HAddress; // 鈭� varchar(500) //瀹夎鍦扮偣
- public DateTime HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
- public DateTime HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
+ public string HSetupDate; //鈭� datetime //瀹夎鏃ユ湡
+ public string HStartupDate; //鈭� datetime //杩愯寮�濮嬫棩鏈�
public string HStatus; // 鈭� varchar(20) //褰撳墠鐘舵�侊紙绌洪棽銆佸崰鐢ㄣ�佸姞宸ャ�佸叧鏈恒�佸紓甯稿仠鏈猴級
public int HEquipFileTypeID; //鈭� int //璁惧绫诲埆锛圙y_EquipFileType)
public string HProNum; // 鈭� varchar(100) //宸ョ▼缂栫爜
@@ -30,6 +30,8 @@
public string HLogo; //鈭� varchar(50) //鍝佺墝
public int HSellSupID; // 鈭� int //渚涘簲鍟�(Gy_Supplier)
public int HMakeSupID; // int //鍒堕�犲晢 (Gy_Supplier)
+ public int HEquipDotCheckRuleInterID=0;
+ public int HEquipMaintainRuleInterID=0;
}
}
\ No newline at end of file
--
Gitblit v1.9.1