Commit fc1540554973918ed1ef66816a0503eee80c753c

Authored by 赖素文
1 parent 47209e9f

wms推送sn 页面列表展示、常规导出功能实现

删除多余的文件类
Showing 128 changed files with 514 additions and 10856 deletions

Too many changes to show.

To preserve performance only 54 of 128 files are displayed.

Hh.Mes.T4/ControllerTemplate.cs
... ... @@ -90,6 +90,7 @@ namespace Hh.Mes.T4
90 90 this.Write(@"Service service) : base(authUtil)
91 91 {
92 92 _service = service;
  93 + if (_loginInfo != null)_service.sysWebUser = _loginInfo;
93 94 }
94 95  
95 96 #region 视图功能
... ... @@ -102,7 +103,6 @@ namespace Hh.Mes.T4
102 103 public ActionResult Index()
103 104 {
104 105 if (_loginInfo == null) return RedirectToAction(""Login"", ""Index"");
105   - _service.sysWebUser = _loginInfo.Account;
106 106 return View();
107 107 }
108 108 #endregion
... ...
Hh.Mes.T4/ControllerTemplate.tt
... ... @@ -26,6 +26,7 @@ namespace WebMvc.Areas.<#=Area #>.Controllers
26 26 public <#=TitleName #>Controller(IAuth authUtil, <#=TitleName #>Service service) : base(authUtil)
27 27 {
28 28 _service = service;
  29 + if (_loginInfo != null)_service.sysWebUser = _loginInfo;
29 30 }
30 31  
31 32 #region 视图功能
... ... @@ -38,7 +39,6 @@ namespace WebMvc.Areas.&lt;#=Area #&gt;.Controllers
38 39 public ActionResult Index()
39 40 {
40 41 if (_loginInfo == null) return RedirectToAction("Login", "Index");
41   - _service.sysWebUser = _loginInfo.Account;
42 42 return View();
43 43 }
44 44 #endregion
... ...
Hh.Mes.T4/JavaScriptTemplate.cs
... ... @@ -16,7 +16,7 @@ namespace Hh.Mes.T4
16 16 /// Class to produce the template output
17 17 /// </summary>
18 18  
19   - #line 1 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  19 + #line 1 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
20 20 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
21 21 public partial class JavaScriptTemplate : JavaScriptTemplateBase
22 22 {
... ... @@ -41,21 +41,21 @@ layui.config({
41 41 sendDataDescWhere = null,
42 42 areaName = """);
43 43  
44   - #line 15 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  44 + #line 15 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
45 45 this.Write(this.ToStringHelper.ToStringWithCulture(AreaName));
46 46  
47 47 #line default
48 48 #line hidden
49 49 this.Write("\",\r\n controllerName = \"");
50 50  
51   - #line 16 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  51 + #line 16 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
52 52 this.Write(this.ToStringHelper.ToStringWithCulture(ControllerName));
53 53  
54 54 #line default
55 55 #line hidden
56 56 this.Write("\",\r\n app = null;\r\n\r\n action = {\r\n addOptions");
57 57  
58   - #line 20 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  58 + #line 20 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
59 59 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
60 60  
61 61 #line default
... ... @@ -63,14 +63,14 @@ layui.config({
63 63 this.Write(": function () {\r\n var options = {\r\n fromId: \"#modifyFor" +
64 64 "m");
65 65  
66   - #line 22 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  66 + #line 22 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
67 67 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
68 68  
69 69 #line default
70 70 #line hidden
71 71 this.Write(" form\",\r\n url: `/${areaName}/${controllerName}/Ins");
72 72  
73   - #line 23 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  73 + #line 23 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
74 74 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
75 75  
76 76 #line default
... ... @@ -79,7 +79,7 @@ layui.config({
79 79 "arbitrarily\",\r\n //mainTable: app.data.tableIns,\r\n " +
80 80 "submit: \"submit(fromAdd");
81 81  
82   - #line 27 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  82 + #line 27 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
83 83 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
84 84  
85 85 #line default
... ... @@ -87,7 +87,7 @@ layui.config({
87 87 this.Write(")\"\r\n }\r\n return options;\r\n },\r\n\r\n editOptions" +
88 88 "");
89 89  
90   - #line 32 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  90 + #line 32 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
91 91 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
92 92  
93 93 #line default
... ... @@ -95,21 +95,21 @@ layui.config({
95 95 this.Write(": function () {\r\n var options = {\r\n fromId: \"#modifyFor" +
96 96 "m");
97 97  
98   - #line 34 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  98 + #line 34 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
99 99 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
100 100  
101 101 #line default
102 102 #line hidden
103 103 this.Write(" form\",\r\n url: `/${areaName}/${controllerName}/Upd");
104 104  
105   - #line 35 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  105 + #line 35 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
106 106 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
107 107  
108 108 #line default
109 109 #line hidden
110 110 this.Write("`,\r\n submit: \"submit(fromUpdate");
111 111  
112   - #line 36 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  112 + #line 36 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
113 113 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
114 114  
115 115 #line default
... ... @@ -117,7 +117,7 @@ layui.config({
117 117 this.Write(")\"\r\n }\r\n return options;\r\n },\r\n\r\n deleteOptio" +
118 118 "ns");
119 119  
120   - #line 41 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  120 + #line 41 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
121 121 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
122 122  
123 123 #line default
... ... @@ -125,7 +125,7 @@ layui.config({
125 125 this.Write(": function () {\r\n var options = {\r\n url: `/${areaName}/" +
126 126 "${controllerName}/DelByIds");
127 127  
128   - #line 43 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  128 + #line 43 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
129 129 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
130 130  
131 131 #line default
... ... @@ -134,7 +134,7 @@ layui.config({
134 134 " },\r\n\r\n //导出方法\r\n exportOptions: function () {\r\n var " +
135 135 "options = {\r\n fromId: \"listForm");
136 136  
137   - #line 52 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  137 + #line 52 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
138 138 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
139 139  
140 140 #line default
... ... @@ -154,7 +154,7 @@ layui.config({
154 154  
155 155 queryOptions");
156 156  
157   - #line 65 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  157 + #line 65 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
158 158 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
159 159  
160 160 #line default
... ... @@ -162,14 +162,14 @@ layui.config({
162 162 this.Write(": function () {\r\n var options = {\r\n resetFrom: \"form[la" +
163 163 "y-filter=listForm");
164 164  
165   - #line 67 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  165 + #line 67 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
166 166 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
167 167  
168 168 #line default
169 169 #line hidden
170 170 this.Write("]\",\r\n fromId: \"listForm");
171 171  
172   - #line 68 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  172 + #line 68 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
173 173 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
174 174  
175 175 #line default
... ... @@ -177,7 +177,7 @@ layui.config({
177 177 this.Write("\",\r\n urlExport: `/${areaName}/${controllerName}/Export`,\r\n " +
178 178 " urlQuery: `/${areaName}/${controllerName}/Load");
179 179  
180   - #line 70 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  180 + #line 70 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
181 181 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
182 182  
183 183 #line default
... ... @@ -185,7 +185,7 @@ layui.config({
185 185 this.Write("`,\r\n sendDataWhere:{},\r\n mainTable: app.data.tableI" +
186 186 "ns");
187 187  
188   - #line 72 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  188 + #line 72 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
189 189 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
190 190  
191 191 #line default
... ... @@ -216,7 +216,7 @@ layui.config({
216 216 },
217 217 addBefore");
218 218  
219   - #line 96 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  219 + #line 96 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
220 220 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
221 221  
222 222 #line default
... ... @@ -225,7 +225,7 @@ layui.config({
225 225 " if (callBack != null) callBack();\r\n },\r\n\r\n addSaveBefore" +
226 226 "");
227 227  
228   - #line 101 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  228 + #line 101 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
229 229 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
230 230  
231 231 #line default
... ... @@ -233,7 +233,7 @@ layui.config({
233 233 this.Write(": function (data, callBack) {\r\n if (callBack != null) callBack();\r\n " +
234 234 " },\r\n editBefore");
235 235  
236   - #line 104 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  236 + #line 104 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
237 237 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
238 238  
239 239 #line default
... ... @@ -242,174 +242,164 @@ layui.config({
242 242 ";\r\n form.val(\"modifyForm\", data);\r\n if (callBack != null) " +
243 243 "callBack();\r\n },\r\n editSaveBefore");
244 244  
245   - #line 109 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  245 + #line 109 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
246 246 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
247 247  
248 248 #line default
249 249 #line hidden
250   - this.Write(@": function (data, callBack) {
251   - if (callBack != null) callBack();
252   - },
253   -
254   - checkboxMethod: function (obj) {
255   - var page = """".GetUrlParam(""page""),
256   - xxx = """".GetUrlParam(""xxx"");
257   - if (page == ""xxx"") {
258   - var sendData = {
259   -
260   - };
261   - var ajaxConfig = {
262   - data: sendData,
263   - url: `${areaName}/${controllerName}/xxx`,
264   - success: function (result) {
265   - if (sysU.successBefore(result)) return false;
266   - layer.msg(result.Message);
267   - }
268   - };
269   - sysU.ajax(ajaxConfig);
270   - }
271   - },
272   - //所有动作成功之后
273   - actionSuccess: (flag) => {
274   - var data = null;
275   - if (flag.includes(""Desc"")) {
276   - data = sendDataDescWhere;
277   - }
278   - sysU.refreshTable(app, sysU, data, flag);
279   - },
280   - closeAfter: function (callBack) {
281   - if (callBack != null) callBack();
282   - }
283   - }
284   -
285   - app = {
286   - data: {
287   - cols");
288   -
289   - #line 146 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  250 + this.Write(": function (data, callBack) {\r\n if (callBack != null) callBack();\r\n " +
  251 + " },\r\n\r\n checkboxMethod: function (obj) {\r\n var page = \"\".G" +
  252 + "etUrlParam(\"page\"),\r\n xxx = \"\".GetUrlParam(\"xxx\");\r\n i" +
  253 + "f (page == \"xxx\") {\r\n var sendData = {\r\n \r\n " +
  254 + " };\r\n var ajaxConfig = {\r\n data: s" +
  255 + "endData,\r\n url: `${areaName}/${controllerName}/xxx`,\r\n " +
  256 + " success: function (result) {\r\n if (sysU.succ" +
  257 + "essBefore(result)) return false;\r\n layer.msg(result.Messa" +
  258 + "ge);\r\n }\r\n };\r\n sysU.ajax(ajaxC" +
  259 + "onfig);\r\n }\r\n },\r\n radioMethod: function (obj) {\r\n " +
  260 + " if (!sysU.SetTableRadioCheckBefore()) return;\r\n\r\n if (false) {" +
  261 + "\r\n var sendData = {\r\n xyz: \"xx\",\r\n " +
  262 + " checkeds: obj.checked,\r\n keys: obj.data.keys,\r\n " +
  263 + " };\r\n if (sendData.keys == null || sendData.keys == \"\") " +
  264 + "{\r\n layer.alert(\"tableRowOneClick:项目角色标识【keys】为空,请重新关闭后再操作,反复" +
  265 + "出现请联系管理员\", { icon: 2, shadeClose: true, title: \"提示\" });\r\n ret" +
  266 + "urn false;\r\n }\r\n var ajaxConfig = {\r\n " +
  267 + " data: sendData,\r\n url: \"/base/xxx/xxx\",\r\n " +
  268 + " success: function (result) {\r\n if (sysU.successBef" +
  269 + "ore(result)) return false;\r\n layer.msg(result.Message);\r\n" +
  270 + " sysU.refreshTable(app, sysU, null, \"main\");\r\n " +
  271 + " }\r\n };\r\n sysU.ajax(ajaxConfig);\r\n " +
  272 + " }\r\n },\r\n\r\n //所有动作成功之后\r\n actionSuccess: (flag) => {\r\n " +
  273 + " var data = null;\r\n if (flag.includes(\"Desc\")) {\r\n " +
  274 + " data = sendDataDescWhere;\r\n }\r\n sysU.refreshTable(app, sy" +
  275 + "sU, data, flag);\r\n },\r\n closeAfter: function (callBack) {\r\n " +
  276 + " if (callBack != null) callBack();\r\n }\r\n }\r\n\r\n app = {\r\n " +
  277 + " data: {\r\n cols");
  278 +
  279 + #line 172 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
290 280 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
291 281  
292 282 #line default
293 283 #line hidden
294 284 this.Write(": [[\r\n { checkbox: true, fixed: true },\r\n");
295 285  
296   - #line 148 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  286 + #line 174 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
297 287 if(Data.Any(x => x.Key.Equals("id", StringComparison.OrdinalIgnoreCase)))
298 288  
299 289 #line default
300 290 #line hidden
301 291  
302   - #line 149 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  292 + #line 175 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
303 293 {
304 294  
305 295 #line default
306 296 #line hidden
307 297 this.Write(" { field: \"id\", width: 80, hide: true, title: \"Id\" },\r\n");
308 298  
309   - #line 151 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  299 + #line 177 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
310 300 }
311 301  
312 302 #line default
313 303 #line hidden
314 304  
315   - #line 152 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  305 + #line 178 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
316 306 if(Data.Any(x => x.Key.Equals("keys", StringComparison.OrdinalIgnoreCase)))
317 307  
318 308 #line default
319 309 #line hidden
320 310  
321   - #line 153 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  311 + #line 179 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
322 312 {
323 313  
324 314 #line default
325 315 #line hidden
326 316 this.Write(" { field: \"keys\", width: 80, hide: true, title: \"Keys\" },\r\n");
327 317  
328   - #line 155 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  318 + #line 181 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
329 319 }
330 320  
331 321 #line default
332 322 #line hidden
333 323  
334   - #line 156 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  324 + #line 182 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
335 325 foreach(var item in Data)
336 326  
337 327 #line default
338 328 #line hidden
339 329  
340   - #line 157 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  330 + #line 183 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
341 331 {
342 332  
343 333 #line default
344 334 #line hidden
345 335  
346   - #line 158 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  336 + #line 184 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
347 337 if (item.Key.Equals("Id", StringComparison.OrdinalIgnoreCase) || item.Key.Equals("Keys", StringComparison.OrdinalIgnoreCase))
348 338  
349 339 #line default
350 340 #line hidden
351 341  
352   - #line 159 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  342 + #line 185 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
353 343 { continue; }
354 344  
355 345 #line default
356 346 #line hidden
357 347  
358   - #line 160 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  348 + #line 186 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
359 349 if(!string.IsNullOrWhiteSpace(item.Value))
360 350  
361 351 #line default
362 352 #line hidden
363 353  
364   - #line 161 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  354 + #line 187 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
365 355 {
366 356  
367 357 #line default
368 358 #line hidden
369 359 this.Write(" { field: \"");
370 360  
371   - #line 162 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  361 + #line 188 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
372 362 this.Write(this.ToStringHelper.ToStringWithCulture(item.Key));
373 363  
374 364 #line default
375 365 #line hidden
376 366 this.Write("\", width: 150, title: \"");
377 367  
378   - #line 162 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  368 + #line 188 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
379 369 this.Write(this.ToStringHelper.ToStringWithCulture(item.Value));
380 370  
381 371 #line default
382 372 #line hidden
383 373 this.Write("\" },\r\n");
384 374  
385   - #line 163 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  375 + #line 189 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
386 376 }else{
387 377  
388 378 #line default
389 379 #line hidden
390 380 this.Write(" { field: \"");
391 381  
392   - #line 164 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  382 + #line 190 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
393 383 this.Write(this.ToStringHelper.ToStringWithCulture(item.Key));
394 384  
395 385 #line default
396 386 #line hidden
397 387 this.Write("\", width: 150, title: \"");
398 388  
399   - #line 164 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  389 + #line 190 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
400 390 this.Write(this.ToStringHelper.ToStringWithCulture(item.Key));
401 391  
402 392 #line default
403 393 #line hidden
404 394 this.Write("\" },\r\n");
405 395  
406   - #line 165 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  396 + #line 191 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
407 397 }
408 398  
409 399 #line default
410 400 #line hidden
411 401  
412   - #line 166 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  402 + #line 192 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
413 403 }
414 404  
415 405 #line default
... ... @@ -453,7 +443,7 @@ layui.config({
453 443 methods: {
454 444 initTable");
455 445  
456   - #line 204 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  446 + #line 230 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
457 447 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
458 448  
459 449 #line default
... ... @@ -462,28 +452,28 @@ layui.config({
462 452 "undefined) $.extend(config, opt);\r\n let options = {\r\n " +
463 453 " elem: \"#\" + app.data.tableElem");
464 454  
465   - #line 208 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  455 + #line 234 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
466 456 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
467 457  
468 458 #line default
469 459 #line hidden
470 460 this.Write(",\r\n url: `/${areaName}/${controllerName}/Load");
471 461  
472   - #line 209 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  462 + #line 235 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
473 463 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
474 464  
475 465 #line default
476 466 #line hidden
477 467 this.Write("`,\r\n cols: sysU.columnRecord(app.data.tableElem");
478 468  
479   - #line 210 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  469 + #line 236 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
480 470 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
481 471  
482 472 #line default
483 473 #line hidden
484 474 this.Write(", app.data.cols");
485 475  
486   - #line 210 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  476 + #line 236 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
487 477 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
488 478  
489 479 #line default
... ... @@ -527,14 +517,14 @@ layui.config({
527 517 app.methods.initFrom();
528 518 //var sendDataWhere = form.val(""listForm");
529 519  
530   - #line 247 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  520 + #line 273 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
531 521 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
532 522  
533 523 #line default
534 524 #line hidden
535 525 this.Write("\")\r\n app.methods.initTable");
536 526  
537   - #line 248 "D:\CSHHProjects\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
  527 + #line 274 "E:\project\mes\IOT\Hh.Mes.T4\JavaScriptTemplate.tt"
538 528 this.Write(this.ToStringHelper.ToStringWithCulture(IsDetail ? "Desc" : ""));
539 529  
540 530 #line default
... ...
Hh.Mes.T4/JavaScriptTemplate.tt
... ... @@ -128,6 +128,32 @@ layui.config({
128 128 sysU.ajax(ajaxConfig);
129 129 }
130 130 },
  131 + radioMethod: function (obj) {
  132 + if (!sysU.SetTableRadioCheckBefore()) return;
  133 +
  134 + if (false) {
  135 + var sendData = {
  136 + xyz: "xx",
  137 + checkeds: obj.checked,
  138 + keys: obj.data.keys,
  139 + };
  140 + if (sendData.keys == null || sendData.keys == "") {
  141 + layer.alert("tableRowOneClick:项目角色标识【keys】为空,请重新关闭后再操作,反复出现请联系管理员", { icon: 2, shadeClose: true, title: "提示" });
  142 + return false;
  143 + }
  144 + var ajaxConfig = {
  145 + data: sendData,
  146 + url: "/base/xxx/xxx",
  147 + success: function (result) {
  148 + if (sysU.successBefore(result)) return false;
  149 + layer.msg(result.Message);
  150 + sysU.refreshTable(app, sysU, null, "main");
  151 + }
  152 + };
  153 + sysU.ajax(ajaxConfig);
  154 + }
  155 + },
  156 +
131 157 //所有动作成功之后
132 158 actionSuccess: (flag) => {
133 159 var data = null;
... ...
sys/Hh.Mes.Common/Encryption/Encryption.cs
... ... @@ -146,8 +146,8 @@ namespace Hh.Mes.Common
146 146 }
147 147 }
148 148  
149   - private static string ENCRY_ALGORITHM = "AES";
150   - private static string CIPHER_MODE = "AES/ECB/PKCS5Padding";
  149 + //private static string ENCRY_ALGORITHM = "AES";
  150 + //private static string CIPHER_MODE = "AES/ECB/PKCS5Padding";
151 151  
152 152 /// <summary>
153 153 /// AES解密OA
... ...
sys/Hh.Mes.POJO/ApiEntity/AndonUpMomEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - /// <summary>
8   - /// ANDON报警实体
9   - /// </summary>
10   - public class AndonUpMomEntity
11   - {
12   - /// <summary>
13   - /// 数据列表
14   - /// </summary>
15   - public List<AndonUpMomDetail> andon_list { get; set; } = new List<AndonUpMomDetail>();
16   - }
17   -
18   - /// <summary>
19   - /// ANDON报警子项
20   - /// </summary>
21   - public class AndonUpMomDetail
22   - {
23   - /// <summary>
24   - /// 唯一标识ID
25   - /// </summary>
26   - public string id { get; set; }
27   - /// <summary>
28   - /// 生产线编码
29   - /// </summary>
30   - public string line_code { get; set; }
31   - /// <summary>
32   - /// 设备信息
33   - /// </summary>
34   - public string device_information { get; set; }
35   - /// <summary>
36   - /// 设备故障类型
37   - /// </summary>
38   - public string device_fault_type { get; set; }
39   - /// <summary>
40   - /// 设备故障描述
41   - /// </summary>
42   - public string device_fault_description { get; set; }
43   - /// <summary>
44   - /// 设备状态
45   - /// </summary>
46   - public string device_status { get; set; }
47   - /// <summary>
48   - /// 开始时间
49   - /// </summary>
50   - public string start_time { get; set; }
51   - /// <summary>
52   - /// 结束时间
53   - /// </summary>
54   - public string end_time { get; set; }
55   - /// <summary>
56   - /// 预留字段1
57   - /// </summary>
58   - public string ylzd1 { get; set; }
59   - /// <summary>
60   - /// 数据传输类型
61   - /// </summary>
62   - public string type { get; set; }
63   - }
64   -}
sys/Hh.Mes.POJO/ApiEntity/CalendarEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - public class CalendarEntity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - public string plmeid { get; set; }
13   - /// <summary>
14   - ///
15   - /// </summary>
16   - public string work_code { get; set; }
17   - /// <summary>
18   - ///
19   - /// </summary>
20   - public string current_date { get; set; }
21   - /// <summary>
22   - ///
23   - /// </summary>
24   - public string shift { get; set; }
25   - /// <summary>
26   - ///
27   - /// </summary>
28   - public DateTime start_time { get; set; }
29   - /// <summary>
30   - ///
31   - /// </summary>
32   - public DateTime end_time { get; set; }
33   - /// <summary>
34   - ///
35   - /// </summary>
36   - public int time { get; set; }
37   - /// <summary>
38   - ///
39   - /// </summary>
40   - public string ylzd1 { get; set; }
41   - /// <summary>
42   - ///
43   - /// </summary>
44   - public string ylzd2 { get; set; }
45   - /// <summary>
46   - ///
47   - /// </summary>
48   - public string type { get; set; }
49   - }
50   -}
sys/Hh.Mes.POJO/ApiEntity/EquipmentAlarmCountTimeEntity.cs
... ... @@ -5,6 +5,9 @@ using System.Text;
5 5  
6 6 namespace Hh.Mes.POJO.ApiEntity
7 7 {
  8 + /// <summary>
  9 + /// 项目月 四周 故障次数&时间
  10 + /// </summary>
8 11 public class EquipmentAlarmCountTimeEntity
9 12 {
10 13 /// <summary>
... ...
sys/Hh.Mes.POJO/ApiEntity/EquipmentAlarmEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - public class EquipmentAlarmEntity
8   - {
9   - public string plmeid { get; set; }
10   -
11   - public string factory_code { get; set; }
12   -
13   - public string equipment_code { get; set; }
14   -
15   - public string equipment_name { get; set; }
16   -
17   - public int alarm_type { get; set; }
18   -
19   - public string alarm_content { get; set; }
20   -
21   - public DateTime? start_time { get; set; }
22   -
23   - public DateTime? end_time { get; set; }
24   -
25   - public string faulthandle_info { get; set; }
26   -
27   - public string handle_user { get; set; }
28   -
29   - public string type { get; set; }
30   - }
31   -}
sys/Hh.Mes.POJO/ApiEntity/EquipmentEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Security.Policy;
4   -using System.Text;
5   -
6   -namespace Hh.Mes.POJO.ApiEntity
7   -{
8   - /// <summary>
9   - /// 设备基础信息
10   - /// </summary>
11   - public class EquipmentEntity
12   - {
13   - public string plmeid { get; set; }
14   -
15   - public string factory_code { get; set; }
16   -
17   - public string equipment_code { get; set; }
18   -
19   - public string equipment_name { get; set; }
20   -
21   - public string equipmentType_code { get; set; }
22   -
23   - public string equipmentType_Name { get; set; }
24   -
25   - public string ip { get; set; }
26   -
27   - public string destination_area { get; set; }
28   -
29   - public string remark { get; set; }
30   -
31   - public bool isEnable { get; set; }
32   -
33   -
34   - /// <summary>
35   - /// 数据传输类型:增/删/改
36   - /// </summary>
37   - public string type { get; set; }
38   -
39   - }
40   -}
sys/Hh.Mes.POJO/ApiEntity/EquipmentStatusRequestEntity.cs deleted
1   -using System.Collections.Generic;
2   -
3   -namespace Hh.Mes.POJO.ApiEntity
4   -{
5   - /// <summary>
6   - /// 设备信息
7   - /// </summary>
8   - public class EquipmentStatusRequestEntity
9   - {
10   - /// <summary>
11   - /// 当天设备
12   - /// </summary>
13   - public EqInfo eqInfoDay { get; set; }
14   -
15   - /// <summary>
16   - /// 当月设备
17   - /// </summary>
18   - public EqInfo eqInfoMonth { get; set; }
19   -
20   - /// <summary>
21   - /// 当天生产量
22   - /// </summary>
23   - public EqCount eqCountDay { get; set; }
24   -
25   - /// <summary>
26   - /// 当月生产量
27   - /// </summary>
28   - public EqCount eqCountMonth { get; set; }
29   -
30   - /// <summary>
31   - /// 设备状态
32   - /// </summary>
33   - public List<EqStatusInfoList> eqStatusInfoList { get; set; } = new List<EqStatusInfoList>();
34   -
35   - /// <summary>
36   - /// 设备报警信息
37   - /// </summary>
38   - public List<EqAlarmInfoList> eqAlarmInfoList { get; set; } = new List<EqAlarmInfoList>();
39   -
40   - /// <summary>
41   - /// 生产信息
42   - /// </summary>
43   - public List<EquipmentOrderlist> orderList { get; set; } = new List<EquipmentOrderlist>();
44   -
45   - /// <summary>
46   - /// 设备参数
47   - /// </summary>
48   - public Eqparametercount eqParameterCount { get; set; }
49   - }
50   -
51   - public class EqInfo
52   - {
53   - /// <summary>
54   - /// 停机
55   - /// </summary>
56   - public int stop { get; set; }
57   -
58   - /// <summary>
59   - /// 故障
60   - /// </summary>
61   - public int fault { get; set; }
62   -
63   - /// <summary>
64   - /// 待机
65   - /// </summary>
66   - public int standby { get; set; }
67   -
68   - /// <summary>
69   - /// 运行/加工
70   - /// </summary>
71   - public int run { get; set; }
72   -
73   - /// <summary>
74   - /// 在线/自动
75   - /// </summary>
76   - public int Online { get; set; }
77   -
78   - /// <summary>
79   - /// 手动
80   - /// </summary>
81   - public int manual { get; set; }
82   -
83   - /// <summary>
84   - /// 总数
85   - /// </summary>
86   - public int eqCount => stop + fault + standby + run + Online + manual;
87   - }
88   -
89   - /// <summary>
90   - /// 生产量
91   - /// </summary>
92   - public class EqCount
93   - {
94   - /// <summary>
95   - /// 计划
96   - /// </summary>
97   - public int plan { get; set; }
98   -
99   - /// <summary>
100   - /// 实际
101   - /// </summary>
102   - public int actual { get; set; }
103   -
104   - /// <summary>
105   - /// 百分比
106   - /// </summary>
107   - public string rate => $"{actual * 100 / plan * 0.01}";
108   - }
109   -
110   - public class Eqparametercount
111   - {
112   - /// <summary>
113   - /// 设备名称
114   - /// </summary>
115   - public List<string> equipmentName { get; set; }
116   -
117   - /// <summary>
118   - /// 焊接电压
119   - /// </summary>
120   - public List<int> weldingVoltage { get; set; }
121   -
122   - /// <summary>
123   - /// 焊接电流
124   - /// </summary>
125   - public List<int> weldingCurrent { get; set; }
126   -
127   - /// <summary>
128   - /// 送丝速度
129   - /// </summary>
130   - public List<int> wireFeedingSpeed { get; set; }
131   - public List<string> legenData { get; set; }
132   - public object xAxisData { get; set; }
133   - public object seriesDataDianYa { get; set; }
134   - public object seriesDataDianLiu { get; set; }
135   - public object seriesDataSudu { get; set; }
136   - }
137   -
138   - /// <summary>
139   - /// 设备状态信息
140   - /// </summary>
141   - public class EqStatusInfoList
142   - {
143   - /// <summary>
144   - /// 设备名称
145   - /// </summary>
146   - public string equipmentName { get; set; }
147   -
148   - /// <summary>
149   - /// 开机时间
150   - /// </summary>
151   - public string startupTime { get; set; }
152   -
153   - /// <summary>
154   - /// 停机时间
155   - /// </summary>
156   - public string downtime { get; set; }
157   -
158   - /// <summary>
159   - /// 故障时间
160   - /// </summary>
161   - public string failureTime { get; set; }
162   -
163   - /// <summary>
164   - /// 待机时间
165   - /// </summary>
166   - public string standbyTime { get; set; }
167   -
168   - /// <summary>
169   - /// 运行时间
170   - /// </summary>
171   - public string runTime { get; set; }
172   - /// <summary>
173   - /// 启停状态
174   - /// </summary>
175   - public string startAndStopStatus { get; set; }
176   - /// <summary>
177   - /// 急停状态
178   - /// </summary>
179   - public string emergencyStopStatus { get; set; }
180   - /// <summary>
181   - /// 操作模式
182   - /// </summary>
183   - public string operationMode { get; set; }
184   - }
185   -
186   - /// <summary>
187   - /// 报警信息
188   - /// </summary>
189   - public class EqAlarmInfoList
190   - {
191   - /// <summary>
192   - /// 工位
193   - /// </summary>
194   - public string station { get; set; }
195   -
196   - /// <summary>
197   - /// 设备
198   - /// </summary>
199   - public string equipment { get; set; }
200   -
201   - /// <summary>
202   - /// 故障时间
203   - /// </summary>
204   - public string failureTime { get; set; }
205   - /// <summary>
206   - /// 故障描述
207   - /// </summary>
208   - public string faultDescription { get; set; }
209   - /// <summary>
210   - /// 故障编码
211   - /// </summary>
212   - public string faultCode { get; set; }
213   - /// <summary>
214   - /// 故障类型
215   - /// </summary>
216   - public string faultType { get; set; }
217   - }
218   -
219   - /// <summary>
220   - /// 生产信息
221   - /// </summary>
222   - public class EquipmentOrderlist
223   - {
224   - /// <summary>
225   - /// 设备名称
226   - /// </summary>
227   - public string equipmentName { get; set; }
228   - /// <summary>
229   - /// 产量
230   - /// </summary>
231   - public int orderCount { get; set; }
232   - /// <summary>
233   - /// 工件
234   - /// </summary>
235   - public string productName { get; set; }
236   - /// <summary>
237   - /// 工位
238   - /// </summary>
239   - public string stationName { get; set; }
240   -
241   - /// <summary>
242   - /// 工位运行速度
243   - /// </summary>
244   - public string stationRunSpeed { get; set; }
245   -
246   - /// <summary>
247   - /// 电压
248   - /// </summary>
249   - public string voltage { get; set; }
250   -
251   - /// <summary>
252   - /// 电流
253   - /// </summary>
254   - public string current { get; set; }
255   -
256   - /// <summary>
257   - /// 送丝速度
258   - /// </summary>
259   - public string wireFeedingSpeed { get; set; }
260   - }
261   -}
sys/Hh.Mes.POJO/ApiEntity/MaterialEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - /// <summary>
8   - /// 物料接收实体 物料主数据 MOM_HH_001
9   - /// </summary>
10   - public class MaterialEntity
11   - {
12   - /// <summary>
13   - ///
14   - /// </summary>
15   - public string plmeid { get; set; }
16   -
17   - public string factory_code { get; set; }
18   -
19   - public string mater_code { get; set; }
20   - public string mater_name { get; set; }
21   - public string unit_code { get; set; }
22   -
23   - public string crux { get; set; }
24   -
25   - public string format { get; set; }
26   -
27   - public string weight { get; set; }
28   -
29   - public string type { get; set; }
30   -
31   - /// <summary>
32   - /// 生协/采购属性
33   - /// <code>
34   - /// F:采购
35   - /// E:自制
36   - /// 自制/采购:E/F
37   - /// 虚拟件:X
38   - /// 非库存:N
39   - /// 外协:W
40   - /// </code>
41   - /// </summary>
42   - public string procurement_attribute { get; set; }
43   -
44   - public string mt_classify { get; set; }
45   -
46   - public string mt_classify_name { get; set; }
47   -
48   - public string diameter { get; set; }
49   -
50   - public string types { get; set;}
51   -
52   - public string thickness { get; set; }
53   -
54   - /// <summary>
55   - /// 1可以0禁用
56   - /// </summary>
57   - public string activeFlag { get; set; }
58   -
59   - /// <summary>
60   - /// 物料类型
61   - /// </summary>
62   - public string materialType { get; set; }
63   -
64   - /// <summary>
65   - /// 规格
66   - /// </summary>
67   - public string specifications { get; set; }
68   -
69   - }
70   -}
sys/Hh.Mes.POJO/ApiEntity/MaterialUpCictEntity.cs deleted
1   -using Hh.Mes.POJO.Entity;
2   -using System;
3   -using System.Collections.Generic;
4   -using System.Text;
5   -
6   -namespace Hh.Mes.POJO.ApiEntity
7   -{
8   -
9   - public class MaterialUpCictEntity
10   - {
11   - /// <summary>
12   - /// 200 成功
13   - /// </summary>
14   - public int code { get; set; }
15   - /// <summary>
16   - ///
17   - /// </summary>
18   - public Data data { get; set; }
19   -
20   -
21   - public string msg { get; set; }
22   - }
23   -
24   -
25   - public class Data
26   - {
27   - /// <summary>
28   - ///
29   - /// </summary>
30   - public List<ListItem> list { get; set; }
31   - /// <summary>
32   - ///
33   - /// </summary>
34   - public string total { get; set; }
35   - }
36   -
37   -
38   - public class ListItem
39   - {
40   - /// <summary>
41   - /// SAP编码
42   - /// </summary>
43   - public string sapCode { get; set; }
44   -
45   - /// <summary>
46   - /// 物料名称
47   - /// </summary>
48   - public string materialName { get; set; }
49   -
50   - /// <summary>
51   - /// 规格
52   - /// </summary>
53   - public string spec { get; set; }
54   -
55   - /// <summary>
56   - /// 产品型号
57   - /// </summary>
58   - public string productModel { get; set; }
59   -
60   - /// <summary>
61   - /// 物料类型
62   - /// </summary>
63   - public int materialType { get; set; }
64   -
65   - /// <summary>
66   - /// 物料单位
67   - /// </summary>
68   - public string materialUnit { get; set; }
69   -
70   - /// <summary>
71   - /// 分类编码
72   - /// </summary>
73   - public string categoryCode { get; set; }
74   -
75   - /// <summary>
76   - /// 保质期
77   - /// </summary>
78   - public int qualityGuaranteePeriod { get; set; }
79   -
80   - /// <summary>
81   - /// 安全库存
82   - /// </summary>
83   - public string safetyStock { get; set; }
84   -
85   - /// <summary>
86   - /// 状态
87   - /// </summary>
88   - public string state { get; set; }
89   -
90   - /// <summary>
91   - ///
92   - /// </summary>
93   - public string createByName { get; set; }
94   -
95   - /// <summary>
96   - /// 备注
97   - /// </summary>
98   - public string memo { get; set; }
99   - }
100   -
101   -}
sys/Hh.Mes.POJO/ApiEntity/MomProcessRouteHeadEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - /// <summary>
8   - /// 工艺路线
9   - /// </summary>
10   - public class MomProcessRouteHeadEntity
11   - {
12   - /// <summary>
13   - ///
14   - /// </summary>
15   - public string product_code { get; set; }
16   - /// <summary>
17   - /// 搅拌车罐体
18   - /// </summary>
19   - public string product_name { get; set; }
20   - /// <summary>
21   - ///
22   - /// </summary>
23   - public string work_code { get; set; }
24   - /// <summary>
25   - /// 涂装部
26   - /// </summary>
27   - public string work_name { get; set; }
28   - /// <summary>
29   - ///
30   - /// </summary>
31   - public string line_code { get; set; }
32   - /// <summary>
33   - /// 环卫涂装线
34   - /// </summary>
35   - public string line_name { get; set; }
36   - /// <summary>
37   - ///
38   - /// </summary>
39   - public decimal edition { get; set; }
40   - /// <summary>
41   - ///
42   - /// </summary>
43   - public string type { get; set; }
44   - /// <summary>
45   - ///
46   - /// </summary>
47   - public string send_user { get; set; }
48   - /// <summary>
49   - ///
50   - /// </summary>
51   - public string send_user_name { get; set; }
52   - /// <summary>
53   - ///
54   - /// </summary>
55   - public DateTime? send_time { get; set; }
56   - /// <summary>
57   - ///
58   - /// </summary>
59   - public string system_code { get; set; }
60   - /// <summary>
61   - ///
62   - /// </summary>
63   - public int send_flag { get; set; }
64   - /// <summary>
65   - ///
66   - /// </summary>
67   - public string temp_code { get; set; }
68   - /// <summary>
69   - ///
70   - /// </summary>
71   - public string send_msg { get; set; }
72   - /// <summary>
73   - ///
74   - /// </summary>
75   - public string plmeid { get; set; }
76   - /// <summary>
77   - ///
78   - /// </summary>
79   - public List<MomProcessRouteDetail> details { get; set; } = new List<MomProcessRouteDetail>();
80   - }
81   -
82   - public class MomProcessRouteDetail
83   - {
84   - ///
85   - /// </summary>
86   - public string proced_code { get; set; }
87   - /// <summary>
88   - /// 工序01
89   - /// </summary>
90   - public string proced_name { get; set; }
91   - /// <summary>
92   - ///
93   - /// </summary>
94   - public int proced_num { get; set; }
95   - /// <summary>
96   - ///
97   - /// </summary>
98   - public string workcenter_code { get; set; }
99   -
100   - /// <summary>
101   - ///
102   - /// </summary>
103   - public string workcenter_name { get; set; }
104   -
105   - public decimal? oprsequenceTime { get; set; }
106   -
107   - /// <summary>
108   - /// 描述
109   - /// </summary>
110   - public string remark { get; set; }
111   - }
112   -}
sys/Hh.Mes.POJO/ApiEntity/MomWorkOrder.cs deleted
1   -using SqlSugar;
2   -using System;
3   -using System.Collections.Generic;
4   -using System.Text;
5   -
6   -namespace Hh.Mes.POJO.ApiEntity
7   -{
8   - /// <summary>
9   - /// Mom工单
10   - /// </summary>
11   - public class MomWorkOrder
12   - {
13   - /// <summary>
14   - /// 唯一标识ID
15   - /// </summary>
16   - public string plmeid { get; set; }
17   - /// <summary>
18   - /// 生产订单号
19   - /// </summary>
20   - public string pro_order_code { get; set; }
21   - /// <summary>
22   - /// 生产计划号  唯一
23   - /// </summary>
24   - public string plan_code { get; set; }
25   - /// <summary>
26   - /// 产品编码
27   - /// </summary>
28   - public string product_code { get; set; }
29   - /// <summary>
30   - /// 产品名称
31   - /// </summary>
32   - public string product_name { get; set; }
33   -
34   -
35   - /// <summary>
36   - /// 工厂
37   - /// </summary>
38   - public string factory_code { get; set; }
39   - /// <summary>
40   - /// 产线编码
41   - /// </summary>
42   - public string line_code { get; set; }
43   - /// <summary>
44   - /// 订单类型
45   - /// </summary>
46   - public string order_type { get; set; }
47   - /// <summary>
48   - /// 工艺路线版本
49   - /// </summary>
50   - public decimal edition { get; set; }
51   -
52   -
53   - /// <summary>
54   - /// 项目编码
55   - /// </summary>
56   - public string project_code { get; set; }
57   - /// <summary>
58   - /// 项目名称
59   - /// </summary>
60   - public string project_name { get; set; }
61   - /// <summary>
62   - /// 管线号/单管号
63   - /// </summary>
64   - public string line_no { get; set; }
65   -
66   - /// <summary>
67   - /// 计划开始日期
68   - /// </summary>
69   - public DateTime oprplan_start_time { get; set; }
70   - /// <summary>
71   - /// 计划结束日期
72   - /// </summary>
73   - public DateTime oprplan_end_time { get; set; }
74   -
75   -
76   - /// <summary>
77   - /// 预留字段1
78   - /// </summary>
79   - public string extend1 { get; set; }
80   - /// <summary>
81   - /// 预留字段2
82   - /// </summary>
83   - public string extend2 { get; set; }
84   - /// <summary>
85   - /// 预留字段3
86   - /// </summary>
87   - public string extend3 { get; set; }
88   - /// <summary>
89   - /// 预留字段4
90   - /// </summary>
91   - public string extend4 { get; set; }
92   -
93   -
94   -
95   - /// <summary>
96   - /// 更新标识 "I:新增 U:修改 D:删除"
97   - /// </summary>
98   - public string type { get; set; }
99   -
100   -
101   - /// <summary>
102   - /// 子表明细
103   - /// </summary>
104   - public List<MomWorkOrderDetail> details = new List<MomWorkOrderDetail>();
105   - }
106   -
107   - /// <summary>
108   - /// 子表明细
109   - /// </summary>
110   - public class MomWorkOrderDetail
111   - {
112   - /// <summary>
113   - /// 工序编码
114   - /// </summary>
115   - public string proced_code { get; set; }
116   -
117   -
118   - /// <summary>
119   - /// 工作中心编码
120   - /// </summary>
121   - public string workcenter_code { get; set; }
122   -
123   -
124   - /// <summary>
125   - /// 工序耗时(分)
126   - /// </summary>
127   - public decimal oprsequence_time { get; set; }
128   -
129   -
130   - /// <summary>
131   - /// 备注
132   - /// </summary>
133   - public string remark { get; set; }
134   -
135   - /// <summary>
136   - /// 计划开始日期
137   - /// </summary>
138   - public DateTime oprplan_start_time { get; set; }
139   - /// <summary>
140   - /// 计划结束日期
141   - /// </summary>
142   - public DateTime oprplan_end_time { get; set; }
143   -
144   -
145   - /// <summary>
146   - /// 是否成品管0:否,1:是
147   - /// </summary>
148   - public int isend_product { get; set; }
149   -
150   - /// <summary>
151   - /// 预留字段1
152   - /// </summary>
153   - public string extend1 { get; set; }
154   - /// <summary>
155   - /// 预留字段1
156   - /// </summary>
157   - public string extend2 { get; set; }
158   -
159   - /// <summary>
160   - /// 组件列表
161   - /// </summary>
162   - public List<componentDetails> componentDetails { get; set; }
163   - }
164   -
165   - /// <summary>
166   - /// 组件列表
167   - /// </summary>
168   - public class componentDetails
169   - {
170   - /// <summary>
171   - /// 图纸URL
172   - /// </summary>
173   - public string design_url { get; set; }
174   - /// <summary>
175   - /// 图纸页码
176   - /// </summary>
177   - public string design_no { get; set; }
178   -
179   - /// <summary>
180   - /// 切割工序 管段物料编码
181   - /// </summary>
182   - public string cut_mater_code { get; set; }
183   - /// <summary>
184   - /// 切割工序 管段切割长度
185   - /// </summary>
186   - public double cutting_len { get; set; }
187   -
188   - /// <summary>
189   - /// 管段号
190   - /// </summary>
191   - public string part_code { get; set; }
192   -
193   - /// <summary>
194   - /// 焊接工序 焊口形式 对焊BW/插焊SW/支架角焊缝FW
195   - /// </summary>
196   - public string weld_type { get; set; }
197   - /// <summary>
198   - /// 焊接工序焊口号 焊口1,焊口2,焊口3...
199   - /// </summary>
200   - public string weld_no { get; set; }
201   - /// <summary>
202   - /// 焊接工序 焊口物料 焊口使用物料1,焊口使用物料2,焊口使用物料3... 和焊口号 一一对应
203   - /// </summary>
204   - public string weld_mater_code { get; set; }
205   -
206   - /// <summary>
207   - /// 预留字段1
208   - /// </summary>
209   - public string extend1 { get; set; }
210   - /// <summary>
211   - /// 预留字段2
212   - /// </summary>
213   - public string extend2 { get; set; }
214   -
215   -
216   -
217   - public string extendComp1 { get; set; }
218   - public string extendComp2{ get; set; }
219   -
220   - public string extendComp3 { get; set; }
221   -
222   - public string extendComp4 { get; set;}
223   -
224   - }
225   -}
sys/Hh.Mes.POJO/ApiEntity/OrderRequestEntity.cs deleted
1   -using System.Collections.Generic;
2   -
3   -
4   -namespace Hh.Mes.POJO.ApiEntity
5   -{
6   - public class OrderCoutDay
7   - {
8   - /// <summary>
9   - ///
10   - /// </summary>
11   - public int receive { get; set; }
12   - /// <summary>
13   - ///
14   - /// </summary>
15   - public int receiveComplete { get; set; }
16   - /// <summary>
17   - ///
18   - /// </summary>
19   - public string rate { get; set; }
20   - }
21   -
22   - public class OrderCoutMonth
23   - {
24   - /// <summary>
25   - ///
26   - /// </summary>
27   - public int receive { get; set; }
28   - /// <summary>
29   - ///
30   - /// </summary>
31   - public int receiveComplete { get; set; }
32   - /// <summary>
33   - ///
34   - /// </summary>
35   - public string rate { get; set; }
36   - }
37   -
38   - public class LineWorkReportMonth
39   - {
40   - /// <summary>
41   - ///
42   - /// </summary>
43   - public List<string> xAxisData { get; set; }
44   - /// <summary>
45   - ///
46   - /// </summary>
47   - public List<int> yAxisQty { get; set; }
48   - /// <summary>
49   - ///
50   - /// </summary>
51   - public int yAxisQtyCount { get; set; }
52   - }
53   -
54   - public class ProductWorkReportMonth
55   - {
56   - /// <summary>
57   - ///
58   - /// </summary>
59   - public List<string> xAxisData { get; set; }
60   - /// <summary>
61   - ///
62   - /// </summary>
63   - public List<int> yAxisQty { get; set; }
64   - /// <summary>
65   - ///
66   - /// </summary>
67   - public int yAxisQtyCount { get; set; }
68   - }
69   -
70   - public class OrderRequestEntity
71   - {
72   - /// <summary>
73   - ///
74   - /// </summary>
75   - public OrderCoutDay orderCoutDay { get; set; }
76   - /// <summary>
77   - ///
78   - /// </summary>
79   - public OrderCoutMonth orderCoutMonth { get; set; }
80   - /// <summary>
81   - ///
82   - /// </summary>
83   - public LineWorkReportMonth lineWorkReportMonth { get; set; }
84   - /// <summary>
85   - ///
86   - /// </summary>
87   - public ProductWorkReportMonth productWorkReportMonth { get; set; }
88   - /// <summary>
89   - ///
90   - /// </summary>
91   - public List<string> orderList { get; set; }
92   - /// <summary>
93   - ///
94   - /// </summary>
95   - public List<string> orderUseLogList { get; set; }
96   - }
97   -}
98   -
sys/Hh.Mes.POJO/ApiEntity/ProcessRouteUpMomEntity.cs deleted
1   -using System.Collections.Generic;
2   -using Hh.Mes.POJO.EnumEntitys;
3   -
4   -namespace Hh.Mes.POJO.ApiEntity
5   -{
6   - /// <summary>
7   - /// 产线中控将工序执行信息反馈MOM实体
8   - /// </summary>
9   - public class ProcessRouteUpMomEntity
10   - {
11   - /// <summary>
12   - /// 唯一标识ID
13   - /// </summary>
14   - public string plmeid { get; set; }
15   - /// <summary>
16   - /// 生产订单号
17   - /// </summary>
18   - public string pro_order_code { get; set; }
19   - /// <summary>
20   - /// 生产计划号
21   - /// </summary>
22   - public string plan_code { get; set; }
23   - /// <summary>
24   - /// 数量
25   - /// </summary>
26   - public int num { get; set; }
27   - public string line_code { get; set; }
28   - /// <summary>
29   - /// 工序编码,MOM那边要求“工序编码”改为“工序顺序号”
30   - /// </summary>
31   - public string proced_code => proced_num;
32   - /// <summary>
33   - /// 工序顺序号,固定四位:0010、0020
34   - /// </summary>
35   - public string proced_num { get; set; }
36   - /// <summary>
37   - /// 工序开始时间
38   - /// </summary>
39   - public string proced_start_time { get; set; }
40   - /// <summary>
41   - /// 工序结束时间
42   - /// </summary>
43   - public string proced_end_time { get; set; }
44   - /// <summary>
45   - /// 实际工时
46   - /// </summary>
47   - public decimal proced_work_time { get; set; }
48   - /// <summary>
49   - /// 状态 0:开工 、1:完工
50   - /// </summary>
51   - public string state { get; set; }
52   - /// <summary>
53   - /// 操作人
54   - /// </summary>
55   - public string @operator { get; set; }
56   -
57   - /// <summary>
58   - /// 数据传输类型<see cref="EnumAction"/>
59   - /// </summary>
60   - public string type { get; set; }
61   - /// <summary>
62   - /// 关键执行工艺
63   - /// </summary>
64   - public List<Processes> processes { get; set; } = new List<Processes>();
65   - /// <summary>
66   - /// 精确追溯件
67   - /// </summary>
68   - public List<Maters> maters { get; set; } = new List<Maters>();
69   - }
70   -
71   - /// <summary>
72   - /// 关键执行工艺参数
73   - /// </summary>
74   - public class Processes
75   - {
76   - /// <summary>
77   - /// 设备编码
78   - /// </summary>
79   - public string device_code { get; set; }
80   - /// <summary>
81   - /// 设备信息
82   - /// </summary>
83   - public string device_information { get; set; }
84   - /// <summary>
85   - /// 加工步骤
86   - /// </summary>
87   - public string processing_steps { get; set; }
88   - /// <summary>
89   - /// 加工参数名称
90   - /// </summary>
91   - public string processing_parameters { get; set; }
92   - /// <summary>
93   - /// 加工参数执行结果
94   - /// </summary>
95   - public string processing_results { get; set; }
96   - }
97   -
98   - /// <summary>
99   - /// 精确追溯件
100   - /// </summary>
101   - public class Maters
102   - {
103   - /// <summary>
104   - /// 物料号
105   - /// </summary>
106   - public string maters_code { get; set; }
107   - /// <summary>
108   - /// 追溯码
109   - /// </summary>
110   - public string review_code { get; set; }
111   - /// <summary>
112   - /// 供应商码
113   - /// </summary>
114   - public string supplier_code { get; set; }
115   - /// <summary>
116   - /// 条码信息
117   - /// </summary>
118   - public string bar_code { get; set; }
119   - /// <summary>
120   - /// 扫描工位
121   - /// </summary>
122   - public string scan_station { get; set; }
123   - /// <summary>
124   - /// 扫描人
125   - /// </summary>
126   - public string scanner { get; set; }
127   - /// <summary>
128   - /// 扫描类型 0:正常、1:补扫、2:替扫
129   - /// </summary>
130   - public string code_type { get; set; }
131   - }
132   -}
sys/Hh.Mes.POJO/ApiEntity/ProductionPlanEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Linq;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - /// <summary>
8   - /// 生产订单 报工/计划
9   - /// </summary>
10   - public class ProductionPlanEntity
11   - {
12   - /// <summary>
13   - /// 当天生产量
14   - /// </summary>
15   - public OrderCount orderCountDay { get; set; }
16   -
17   - /// <summary>
18   - /// 当月生产量
19   - /// </summary>
20   - public OrderCount orderCountMonth { get; set; }
21   -
22   - /// <summary>
23   - /// 订单产品
24   - /// </summary>
25   - public Chart productWorkReportMonth { get; set; }
26   -
27   - /// <summary>
28   - /// 线体产品
29   - /// </summary>
30   - public Chart lineWorkReportMonth { get; set; }
31   -
32   - /// <summary>
33   - /// 生产订单
34   - /// </summary>
35   - public List<OrderList> orderList { get; set; } = new List<OrderList>();
36   -
37   - /// <summary>
38   - /// 订单物料消耗
39   - /// </summary>
40   - public List<OrderUseLoglist> orderUseLogList { get; set; } = new List<OrderUseLoglist>();
41   - }
42   -
43   - /// <summary>
44   - /// 生产量
45   - /// </summary>
46   - public class OrderCount
47   - {
48   - /// <summary>
49   - /// 接收
50   - /// </summary>
51   - public int receive { get; set; }
52   -
53   - /// <summary>
54   - /// 已报
55   - /// </summary>
56   - public int receiveComplete { get; set; }
57   -
58   - /// <summary>
59   - /// 百分比
60   - /// </summary>
61   - public string rate => receive == 0 ? "0" : $"{receiveComplete * 100 / receive}";
62   - }
63   -
64   - public class Chart
65   - {
66   - /// <summary>
67   - /// X轴名称集合
68   - /// </summary>
69   - public List<string> xAxisData { get; set; } = new List<string>();
70   -
71   - /// <summary>
72   - /// Y轴数值集合
73   - /// </summary>
74   - public List<int> yAxisQty { get; set; } = new List<int>();
75   -
76   - /// <summary>
77   - /// 总计
78   - /// </summary>
79   - public int yAxisQtyCount => yAxisQty.Sum();
80   - }
81   -
82   - /// <summary>
83   - /// 生产订单
84   - /// </summary>
85   - public class OrderList
86   - {
87   - public string workOrderCode { get; set; }
88   - public string lineName { get; set; }
89   - public string nowOprSequenceCode { get; set; }
90   - public string nowStationName { get; set; }
91   - public string state { get; set; }
92   -
93   - /// <summary>
94   - /// 计划/实际 开始时间
95   - /// </summary>
96   - public DateTime? startTime { get; set; }
97   -
98   - /// <summary>
99   - /// 计划/时间 结束时间
100   - /// </summary>
101   - public DateTime? endTime { get; set; }
102   -
103   - /// <summary>
104   - /// 订单创建时间
105   - /// </summary>
106   - public DateTime? createTime { get; set; }
107   - }
108   -
109   - /// <summary>
110   - /// 订单物料消耗
111   - /// </summary>
112   - public class OrderUseLoglist
113   - {
114   - public string workOrderCode { get; set; }
115   - public string lineName { get; set; }
116   - public string nowOprSequenceCode { get; set; }
117   - public string nowStationName { get; set; }
118   - public string productName { get; set; }
119   - public string materialCode { get; set; }
120   - public string materialName { get; set; }
121   - public string state { get; set; }
122   - public decimal? specifications { get; set; }
123   - public string unit { get; set; }
124   - }
125   -}
sys/Hh.Mes.POJO/ApiEntity/QualityFeedbackEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - /// <summary>
8   - /// MOM质量问题状态反馈,接收参数
9   - /// </summary>
10   - public class QualityFeedbackEntity
11   - {
12   - /// <summary>
13   - ///
14   - /// </summary>
15   - public string plmeid { get; set; }
16   - /// <summary>
17   - ///
18   - /// </summary>
19   - public string pro_order_code { get; set; }
20   - /// <summary>
21   - ///
22   - /// </summary>
23   - public string job_code { get; set; }
24   - /// <summary>
25   - ///
26   - /// </summary>
27   - public string shift { get; set; }
28   - /// <summary>
29   - ///
30   - /// </summary>
31   - public string type { get; set; }
32   - }
33   -}
sys/Hh.Mes.POJO/ApiEntity/SupplierEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - /// <summary>
8   - /// 供应商信息 MOM_HH_004
9   - /// </summary>
10   - public class SupplierEntity
11   - {
12   - /// <summary>
13   - /// 标识Id
14   - /// </summary>
15   - public string plmeid { get; set; }
16   - /// <summary>
17   - /// 工厂
18   - /// </summary>
19   - public string factory { get; set; }
20   - /// <summary>
21   - /// 供应商编码
22   - /// </summary>
23   - public string supplier_code { get; set; }
24   - /// <summary>
25   - /// 供应商名称
26   - /// </summary>
27   - public string supplier_name { get; set; }
28   - /// <summary>
29   - /// 联系电话
30   - /// </summary>
31   - public string tele_phone { get; set; }
32   - /// <summary>
33   - /// 地址
34   - /// </summary>
35   - public string address { get; set; }
36   - /// <summary>
37   - /// 数据传输类型
38   - /// </summary>
39   - public string type { get; set; }
40   - }
41   -}
sys/Hh.Mes.POJO/ApiEntity/SysUserEntity.cs deleted
1   -using System;
2   -using System.Collections.Generic;
3   -using System.Text;
4   -
5   -namespace Hh.Mes.POJO.ApiEntity
6   -{
7   - public class SysUserEntity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - public string plmeid { get; set; }
13   - /// <summary>
14   - ///
15   - /// </summary>
16   - public string code { get; set; }
17   - /// <summary>
18   - ///
19   - /// </summary>
20   - public string name { get; set; }
21   - /// <summary>
22   - ///
23   - /// </summary>
24   - public string gender { get; set; }
25   - /// <summary>
26   - ///
27   - /// </summary>
28   - public string tel { get; set; }
29   - /// <summary>
30   - ///
31   - /// </summary>
32   - public string remarks { get; set; }
33   - /// <summary>
34   - ///
35   - /// </summary>
36   - public string type { get; set; }
37   -
38   -
39   - }
40   -}
sys/Hh.Mes.POJO/Hh.Mes.POJO.csproj
... ... @@ -25,7 +25,7 @@
25 25  
26 26 <ItemGroup>
27 27 <Folder Include="Core\" />
28   - <Folder Include="WebEntity\configure\" />
  28 + <Folder Include="WebEntity\view\" />
29 29 </ItemGroup>
30 30  
31 31 <ItemGroup>
... ...
sys/Hh.Mes.POJO/SystemVariable.cs
... ... @@ -53,14 +53,9 @@ namespace Hh.Mes.Pojo.System
53 53 /// 服务器业务数据处理成功
54 54 /// </summary>
55 55 public static string dataActionOk = "服务器业务数据处理成功!";
56   -
57   - /// <summary>
58   - /// ECS提交的PLC检测无料框的料点编码
59   - /// </summary>
60   - public static Tuple<DateTime, List<string>> noneGoodsLocationCodes = new Tuple<DateTime, List<string>>(DateTime.Now, new List<string>());
  56 +
61 57 public static DateTime StartTime;
62 58  
63   -
64 59 /// <summary>
65 60 /// iot需要排除 设备类型
66 61 /// </summary>
... ... @@ -73,11 +68,7 @@ namespace Hh.Mes.Pojo.System
73 68 private static List<string> AGVEquipmentTypeList = new List<string> { "AGVForklift" };
74 69 public static string IotAGVContainDevice = string.Join("','", AGVEquipmentTypeList);
75 70  
76   - /// <summary>
77   - /// 料点字典集合
78   - /// </summary>
79   - public static List<base_location> locationList = new List<base_location>();
80   -
  71 +
81 72 /// <summary>
82 73 /// false 不写入数据库日志
83 74 /// </summary>
... ...
sys/Hh.Mes.POJO/WebEntity/Material/bus_cutplan_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -
4   -namespace Hh.Mes.POJO.Entity
5   -{
6   - [SugarTable("bus_cutplan_detail")]
7   - public partial class bus_cutplan_detail
8   - {
9   - /// <summary>
10   - /// 主键
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// headkey
17   - /// </summary>
18   - [SugarColumn(ColumnDescription = "headkey", IsNullable = true)]
19   - public Guid headKeys { get; set; }
20   -
21   - /// <summary>
22   - /// 工单号
23   - /// </summary>
24   - [SugarColumn(Length = 255, ColumnDescription = "工单号", IsNullable = true)]
25   - public string iwpNo { get; set; }
26   -
27   - /// <summary>
28   - /// 追踪码
29   - /// </summary>
30   - [SugarColumn(Length = 255, ColumnDescription = "追踪码", IsNullable = true)]
31   - public string barCode { get; set; }
32   -
33   - /// <summary>
34   - /// 切割长度
35   - /// </summary>
36   - [SugarColumn(ColumnDescription = "切割长度", IsNullable = true)]
37   - public decimal cuttingLength { get; set; }
38   -
39   - /// <summary>
40   - /// 切割余量
41   - /// </summary>
42   - [SugarColumn(ColumnDescription = "切割余量", IsNullable = true)]
43   - public decimal cutFlanConfig { get; set; }
44   -
45   - /// <summary>
46   - /// 状态(0:初始,10:激光打标,20:开始切割,30:切割完成)
47   - /// </summary>
48   - [SugarColumn(ColumnDescription = "状态(0:初始,10:激光打标,20:开始切割,30:切割完成)", IsNullable = true)]
49   - public int cutState { get; set; }
50   -
51   - /// <summary>
52   - /// 切割开始时间
53   - /// </summary>
54   - [SugarColumn(ColumnDescription = "切割开始时间", IsNullable = true)]
55   - public string cutStartTime { get; set; }
56   -
57   - /// <summary>
58   - /// 切割完成时间
59   - /// </summary>
60   - [SugarColumn(ColumnDescription = "切割完成时间", IsNullable = true)]
61   - public string cutEndTime { get; set; }
62   -
63   - /// <summary>
64   - /// 切割优先级
65   - /// </summary>
66   - [SugarColumn(ColumnDescription = "切割优先级", IsNullable = true)]
67   - public int cutLevel { get; set; }
68   -
69   - /// <summary>
70   - /// 预留字段1
71   - /// </summary>
72   - [SugarColumn(Length = 255, ColumnDescription = "预留字段1", IsNullable = true)]
73   - public string extend1 { get; set; }
74   -
75   - /// <summary>
76   - /// 预留字段2
77   - /// </summary>
78   - [SugarColumn(Length = 255, ColumnDescription = "预留字段2", IsNullable = true)]
79   - public string extend2 { get; set; }
80   -
81   - /// <summary>
82   - /// 预留字段3
83   - /// </summary>
84   - [SugarColumn(Length = 255, ColumnDescription = "预留字段3", IsNullable = true)]
85   - public string extend3 { get; set; }
86   -
87   - /// <summary>
88   - /// 预留字段4
89   - /// </summary>
90   - [SugarColumn(Length = 255, ColumnDescription = "预留字段4", IsNullable = true)]
91   - public string extend4 { get; set; }
92   -
93   - /// <summary>
94   - /// createTime
95   - /// </summary>
96   - [SugarColumn(ColumnDescription = "createTime", IsNullable = true)]
97   - public DateTime createTime { get; set; }
98   -
99   - /// <summary>
100   - /// createBy
101   - /// </summary>
102   - [SugarColumn(Length = 255, ColumnDescription = "createBy", IsNullable = true)]
103   - public string createBy { get; set; }
104   -
105   - /// <summary>
106   - /// updateTime
107   - /// </summary>
108   - [SugarColumn(ColumnDescription = "updateTime", IsNullable = true)]
109   - public string updateTime { get; set; }
110   -
111   - /// <summary>
112   - /// updateBy
113   - /// </summary>
114   - [SugarColumn(Length = 255, ColumnDescription = "updateBy", IsNullable = true)]
115   - public string updateBy { get; set; }
116   -
117   - /// <summary>
118   - /// 是否成品管 0:否 1:是
119   - /// </summary>
120   - [SugarColumn(ColumnDescription = "是否成品管 0:否 1:是", IsNullable = true)]
121   - public int isendproduct { get; set; }
122   -
123   - /// <summary>
124   - /// 工单头表key
125   - /// </summary>
126   - [SugarColumn(ColumnDescription = "工单头表key", IsNullable = true)]
127   - public Guid workOrderHeadKeys { get; set; }
128   -
129   - /// <summary>
130   - /// 工单明细key
131   - /// </summary>
132   - [SugarColumn(ColumnDescription = "工单明细key", IsNullable = true)]
133   - public Guid workOrderDetailKeys { get; set; }
134   -
135   - /// <summary>
136   - /// key
137   - /// </summary>
138   - [SugarColumn(ColumnDescription = "key", IsNullable = true)]
139   - public Guid bodyKeys { get; set; }
140   -
141   - }
142   -}
143 0 \ No newline at end of file
sys/Hh.Mes.POJO/WebEntity/Material/bus_cutplan_head.cs deleted
1   -using System;
2   -using SqlSugar;
3   -
4   -namespace Hh.Mes.POJO.Entity
5   -{
6   - [SugarTable("bus_cutplan_head")]
7   - public partial class bus_cutplan_head
8   - {
9   - /// <summary>
10   - /// 主键
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// key
17   - /// </summary>
18   - [SugarColumn(ColumnDescription = "key", IsNullable = true)]
19   - public Guid keys { get; set; }
20   -
21   - /// <summary>
22   - /// 批次码
23   - /// </summary>
24   - [SugarColumn(Length = 255, ColumnDescription = "批次码", IsNullable = true)]
25   - public string lotNo { get; set; }
26   -
27   - /// <summary>
28   - /// 物料编码
29   - /// </summary>
30   - [SugarColumn(Length = 255, ColumnDescription = "物料编码", IsNullable = true)]
31   - public string materialCode { get; set; }
32   -
33   - /// <summary>
34   - /// 管材长度
35   - /// </summary>
36   - [SugarColumn(ColumnDescription = "管材长度", IsNullable = true)]
37   - public decimal pipeLength { get; set; }
38   -
39   - /// <summary>
40   - /// 总损耗率
41   - /// </summary>
42   - [SugarColumn(ColumnDescription = "总损耗率", IsNullable = true)]
43   - public decimal lossCount { get; set; }
44   -
45   - /// <summary>
46   - /// 余料编码
47   - /// </summary>
48   - [SugarColumn(Length = 255, ColumnDescription = "余料编码", IsNullable = true)]
49   - public string oddmentsCode { get; set; }
50   -
51   - /// <summary>
52   - /// 余料长度
53   - /// </summary>
54   - [SugarColumn(ColumnDescription = "余料长度", IsNullable = true)]
55   - public decimal oddmentsLength { get; set; }
56   -
57   - /// <summary>
58   - /// 线体
59   - /// </summary>
60   - [SugarColumn(Length = 255, ColumnDescription = "线体", IsNullable = true)]
61   - public string lineCode { get; set; }
62   -
63   - /// <summary>
64   - /// 计划生产日期
65   - /// </summary>
66   - [SugarColumn(ColumnDescription = "计划生产日期", IsNullable = true)]
67   - public string planStartTime { get; set; }
68   -
69   - /// <summary>
70   - /// 生产优先级
71   - /// </summary>
72   - [SugarColumn(ColumnDescription = "生产优先级", IsNullable = true)]
73   - public int level { get; set; }
74   -
75   - /// <summary>
76   - /// 状态:0:初始,10:下料开始,20:下料完成,30:切割开始,40:切割完成,60:手动完成,70:手动取消,80:接口冻结
77   - /// </summary>
78   - [SugarColumn(ColumnDescription = "状态:1:初始,10:下料开始,20:下料完成,30:切割开始,40:切割完成,60:手动完成,70:手动取消,80:接口冻结", IsNullable = true)]
79   - public int state { get; set; }
80   -
81   - /// <summary>
82   - /// 生产实际开始时间
83   - /// </summary>
84   - [SugarColumn(ColumnDescription = "生产实际开始时间", IsNullable = true)]
85   - public string actualStartTime { get; set; }
86   -
87   - /// <summary>
88   - /// 生产实际完成时间
89   - /// </summary>
90   - [SugarColumn(ColumnDescription = "生产实际完成时间", IsNullable = true)]
91   - public string actualEndTime { get; set; }
92   -
93   - /// <summary>
94   - /// 下料开始时间
95   - /// </summary>
96   - [SugarColumn(ColumnDescription = "下料开始时间", IsNullable = true)]
97   - public string dischargeStartTime { get; set; }
98   -
99   - /// <summary>
100   - /// 下料完成时间
101   - /// </summary>
102   - [SugarColumn(ColumnDescription = "下料完成时间", IsNullable = true)]
103   - public string dischargeEndTime { get; set; }
104   -
105   - /// <summary>
106   - /// 切割开始时间
107   - /// </summary>
108   - [SugarColumn(ColumnDescription = "切割开始时间", IsNullable = true)]
109   - public string cutStartTime { get; set; }
110   -
111   - /// <summary>
112   - /// 切割完成时间
113   - /// </summary>
114   - [SugarColumn(ColumnDescription = "切割完成时间", IsNullable = true)]
115   - public string cutEndTime { get; set; }
116   -
117   - /// <summary>
118   - /// 预留字段1
119   - /// </summary>
120   - [SugarColumn(Length = 255, ColumnDescription = "预留字段1", IsNullable = true)]
121   - public string extend1 { get; set; }
122   -
123   - /// <summary>
124   - /// 预留字段2
125   - /// </summary>
126   - [SugarColumn(Length = 255, ColumnDescription = "预留字段2", IsNullable = true)]
127   - public string extend2 { get; set; }
128   -
129   - /// <summary>
130   - /// 预留字段3
131   - /// </summary>
132   - [SugarColumn(Length = 255, ColumnDescription = "预留字段3", IsNullable = true)]
133   - public string extend3 { get; set; }
134   -
135   - /// <summary>
136   - /// 预留字段4
137   - /// </summary>
138   - [SugarColumn(Length = 255, ColumnDescription = "预留字段4", IsNullable = true)]
139   - public string extend4 { get; set; }
140   -
141   - /// <summary>
142   - /// createTime
143   - /// </summary>
144   - [SugarColumn(ColumnDescription = "createTime", IsNullable = true)]
145   - public string createTime { get; set; }
146   -
147   - /// <summary>
148   - /// createBy
149   - /// </summary>
150   - [SugarColumn(Length = 255, ColumnDescription = "createBy", IsNullable = true)]
151   - public string createBy { get; set; }
152   -
153   - /// <summary>
154   - /// updateTime
155   - /// </summary>
156   - [SugarColumn(ColumnDescription = "updateTime", IsNullable = true)]
157   - public string updateTime { get; set; }
158   -
159   - /// <summary>
160   - /// updateBy
161   - /// </summary>
162   - [SugarColumn(Length = 255, ColumnDescription = "updateBy", IsNullable = true)]
163   - public string updateBy { get; set; }
164   -
165   - }
166   -}
167 0 \ No newline at end of file
sys/Hh.Mes.POJO/WebEntity/api/api_order_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class api_order_detail
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - public DateTime CreateTime { get; set; }
16   -
17   - /// <summary>
18   - ///
19   - /// </summary>
20   - public decimal? Quantity { get; set; }
21   -
22   -
23   - /// <summary>
24   - ///
25   - /// </summary>
26   - public string paramRsrv4 { get; set; }
27   -
28   - /// <summary>
29   - ///
30   - /// </summary>
31   - public string paramRsrv5 { get; set; }
32   -
33   - /// <summary>
34   - ///
35   - /// </summary>
36   - public string CreateBy { get; set; }
37   -
38   - /// <summary>
39   - ///
40   - /// </summary>
41   - public string WorkStation { get; set; }
42   -
43   - /// <summary>
44   - ///
45   - /// </summary>
46   - public string WorkStationName { get; set; }
47   -
48   - /// <summary>
49   - ///
50   - /// </summary>
51   - public string ProgressStatus { get; set; }
52   -
53   - /// <summary>
54   - ///
55   - /// </summary>
56   - public string paramRsrv1 { get; set; }
57   -
58   - /// <summary>
59   - ///
60   - /// </summary>
61   - public string paramRsrv2 { get; set; }
62   -
63   - /// <summary>
64   - ///
65   - /// </summary>
66   - public string paramRsrv3 { get; set; }
67   -
68   - /// <summary>
69   - ///
70   - /// </summary>
71   - public Guid headKeys { get; set; }
72   -
73   - /// <summary>
74   - /// 工序号
75   - /// </summary>
76   - public string OprSequenceNo { get; set; }
77   -
78   - /// <summary>
79   - /// 顺序号,用于区分并行工序,如总装000000和部装000001
80   - /// </summary>
81   - public string SequenceNo { get; set; }
82   -
83   - /// <summary>
84   - /// 工序名称
85   - /// </summary>
86   - public string OprSequenceName { get; set; }
87   -
88   - /// <summary>
89   - /// 工序类型,自制/外协
90   - /// </summary>
91   - public string OprSequenceType { get; set; }
92   -
93   - /// <summary>
94   - /// 计划开始时间
95   - /// </summary>
96   - public DateTime? ScheduledStartDate { get; set; }
97   -
98   - /// <summary>
99   - /// 计划结束时间
100   - /// </summary>
101   - public DateTime? ScheduledCompleteDate { get; set; }
102   -
103   - /// <summary>
104   - /// 工作中心
105   - /// </summary>
106   - public string WorkCenter { get; set; }
107   -
108   - /// <summary>
109   - /// 工作中心描述
110   - /// </summary>
111   - public string WorkCenterName { get; set; }
112   -
113   - }
114   -}
sys/Hh.Mes.POJO/WebEntity/api/api_order_head.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -using System.Collections.Generic;
5   -
6   -namespace Hh.Mes.POJO.Entity
7   -{
8   - public partial class api_order_head
9   - {
10   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
11   - public int id { get; set; }
12   -
13   - public Guid keys { get; set; }
14   -
15   - /// <summary>
16   - /// 订单号
17   - /// </summary>
18   - public string WipOrderNo { get; set; }
19   -
20   - /// <summary>
21   - /// 订单类型; 1:正常订单;2:返工返修订单
22   - /// </summary>
23   - public string WipOrderType { get; set; }
24   -
25   - /// <summary>
26   - /// 工厂?
27   - /// </summary>
28   - public string Facility { get; set; }
29   -
30   - /// <summary>
31   - /// 产线
32   - /// </summary>
33   - public string ProductionLine { get; set; }
34   -
35   - /// <summary>
36   - /// 工作中心
37   - /// </summary>
38   - public string WorkCenter { get; set; }
39   -
40   - /// <summary>
41   - /// 组?
42   - /// </summary>
43   - public string WipOrderGroup { get; set; }
44   -
45   - /// <summary>
46   - /// 组计数器?
47   - /// </summary>
48   - public string GroupCount { get; set; }
49   -
50   - /// <summary>
51   - /// 订单物料
52   - /// </summary>
53   - public string ProductNo { get; set; }
54   -
55   - /// <summary>
56   - /// 订单物料描述
57   - /// </summary>
58   - public string ProductName { get; set; }
59   -
60   - /// <summary>
61   - /// 订单物料简码
62   - /// </summary>
63   - public string ProductAlias { get; set; }
64   -
65   - /// <summary>
66   - /// 序列号
67   - /// </summary>
68   - //public string SerialNo { get; set; }
69   -
70   - /// <summary>
71   - /// 数量
72   - /// </summary>
73   - public decimal? Quantity { get; set; }
74   -
75   - /// <summary>
76   - /// 计划开始时间
77   - /// </summary>
78   - public string ScheduledStartDate { get; set; }
79   -
80   - /// <summary>
81   - /// 计划结束时间
82   - /// </summary>
83   - public string ScheduledCompleteDate { get; set; }
84   -
85   - /// <summary>
86   - /// 订单状态
87   - /// </summary>
88   - public string ProgressStatus { get; set; }
89   -
90   - /// <summary>
91   - ///
92   - /// </summary>
93   - public string paramRsrv5 { get; set; }
94   -
95   - /// <summary>
96   - ///
97   - /// </summary>
98   - public string CreateBy { get; set; }
99   -
100   - /// <summary>
101   - ///
102   - /// </summary>
103   - public string paramRsrv1 { get; set; }
104   -
105   - /// <summary>
106   - ///
107   - /// </summary>
108   - public string paramRsrv2 { get; set; }
109   -
110   - /// <summary>
111   - ///
112   - /// </summary>
113   - public string paramRsrv3 { get; set; }
114   -
115   - /// <summary>
116   - ///
117   - /// </summary>
118   - public string paramRsrv4 { get; set; }
119   -
120   - /// <summary>
121   - ///
122   - /// </summary>
123   - public DateTime CreateTime { get; set; }
124   -
125   -
126   - [SugarColumn(IsIgnore = true)]
127   - public List<api_order_detail> OprSequenceList { get; set; }
128   -
129   - }
130   -}
sys/Hh.Mes.POJO/WebEntity/base/base_calendar.cs deleted
1   -using System;
2   -using SqlSugar;
3   -
4   -namespace Hh.Mes.POJO.Entity
5   -{
6   - public partial class base_calendar : base_Entity
7   - {
8   - /// <summary>
9   - ///
10   - /// </summary>
11   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
12   - public int id { get; set; }
13   -
14   - /// <summary>
15   - ///
16   - /// </summary>
17   - public Guid keys { get; set; }
18   -
19   - /// <summary>
20   - ///
21   - /// </summary>
22   - public string workShopCode { get; set; }
23   -
24   - /// <summary>
25   - /// 唯一标识ID
26   - /// </summary>
27   - public string plmeId { get; set; }
28   -
29   - /// <summary>
30   - /// 日期
31   - /// </summary>
32   - public string currentDate { get; set; }
33   -
34   - /// <summary>
35   - /// 班次
36   - /// </summary>
37   - public string shift { get; set; }
38   -
39   - /// <summary>
40   - /// 开始时间
41   - /// </summary>
42   - public DateTime? startTime { get; set; }
43   -
44   - /// <summary>
45   - /// 结束时间
46   - /// </summary>
47   - public DateTime? endTime { get; set; }
48   -
49   - /// <summary>
50   - /// 时间类型1:工作 0:休息
51   - /// </summary>
52   - public int? timeFlag { get; set; }
53   -
54   - public int? isDelete { get; set; }
55   -
56   - /// <summary>
57   - /// createTime
58   - /// </summary>
59   - public DateTime? createTime { get; set; }
60   -
61   - /// <summary>
62   - /// createBy
63   - /// </summary>
64   - public string createBy { get; set; }
65   -
66   - /// <summary>
67   - /// updateTime
68   - /// </summary>
69   - public DateTime? updateTime { get; set; }
70   -
71   - /// <summary>
72   - /// updateBy
73   - /// </summary>
74   - public string updateBy { get; set; }
75   -
76   - }
77   -}
sys/Hh.Mes.POJO/WebEntity/base/base_container.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_container:base_Entity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   - public Guid keys { get; set; }
15   -
16   - /// <summary>
17   - ///
18   - /// </summary>
19   - public int IsLock { get; set; }
20   -
21   - /// <summary>
22   - /// 容器编码(料框)
23   - /// </summary>
24   - public string containerCode { get; set; }
25   -
26   - /// <summary>
27   - /// 容器类型
28   - /// </summary>
29   - public string containerType { get; set; }
30   -
31   - /// <summary>
32   - /// 仓库编码
33   - /// </summary>
34   - public string warehouseCode { get; set; }
35   -
36   - /// <summary>
37   - /// 库位编码
38   - /// </summary>
39   - public string locationCode { get; set; }
40   -
41   - /// <summary>
42   - /// 油漆系统
43   - /// </summary>
44   - public string paintCode { get; set; }
45   -
46   - /// <summary>
47   - /// 状态
48   - /// </summary>
49   - public string status { get; set; }
50   -
51   - /// <summary>
52   - /// 打印次数
53   - /// </summary>
54   - public int? printCount { get; set; }
55   -
56   - /// <summary>
57   - /// 创建时间
58   - /// </summary>
59   - public DateTime? createTime { get; set; }
60   -
61   - /// <summary>
62   - /// 创建用户
63   - /// </summary>
64   - public string createBy { get; set; }
65   -
66   - /// <summary>
67   - /// 更新时间
68   - /// </summary>
69   - public DateTime? updateTime { get; set; }
70   -
71   - /// <summary>
72   - /// 更新用户
73   - /// </summary>
74   - public string updateBy { get; set; }
75   -
76   - }
77   -}
sys/Hh.Mes.POJO/WebEntity/base/base_ebom_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_ebom_detail
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 主表ID
17   - /// </summary>
18   - public int? bomHeaderId { get; set; }
19   -
20   - /// <summary>
21   - /// 物料编码
22   - /// </summary>
23   - public string materialCode { get; set; }
24   -
25   - /// <summary>
26   - /// 物料名称
27   - /// </summary>
28   - public string materialName { get; set; }
29   -
30   - /// <summary>
31   - /// 品名规格
32   - /// </summary>
33   - public string materialSpec { get; set; }
34   -
35   - /// <summary>
36   - /// 单位
37   - /// </summary>
38   - public string unit { get; set; }
39   -
40   - /// <summary>
41   - /// 数量
42   - /// </summary>
43   - public decimal? qty { get; set; }
44   -
45   - /// <summary>
46   - /// 建立时间
47   - /// </summary>
48   - public DateTime? createTime { get; set; }
49   -
50   - /// <summary>
51   - /// 建立者
52   - /// </summary>
53   - public string createBy { get; set; }
54   -
55   - /// <summary>
56   - /// 更新时间
57   - /// </summary>
58   - public DateTime? updateTime { get; set; }
59   -
60   - /// <summary>
61   - /// 更新者
62   - /// </summary>
63   - public string updateBy { get; set; }
64   -
65   - }
66   -}
sys/Hh.Mes.POJO/WebEntity/base/base_ebom_header.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_ebom_header
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 产品代号
17   - /// </summary>
18   - public string itemCode { get; set; }
19   -
20   - /// <summary>
21   - /// 子料
22   - /// </summary>
23   - public string children { get; set; }
24   -
25   - /// <summary>
26   - /// 建立时间
27   - /// </summary>
28   - public DateTime? createTime { get; set; }
29   -
30   - /// <summary>
31   - /// 建立者
32   - /// </summary>
33   - public string createBy { get; set; }
34   -
35   - /// <summary>
36   - /// 更新时间
37   - /// </summary>
38   - public DateTime? updateTime { get; set; }
39   -
40   - /// <summary>
41   - /// 更新者
42   - /// </summary>
43   - public string updateBy { get; set; }
44   -
45   - }
46   -}
sys/Hh.Mes.POJO/WebEntity/base/base_equipment_alarm_text.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_equipment_alarm_string
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 设备编号
17   - /// </summary>
18   - public int equipmentId { get; set; }
19   -
20   - /// <summary>
21   - /// 警示代号
22   - /// </summary>
23   - public string code { get; set; }
24   -
25   - /// <summary>
26   - /// 警示语句
27   - /// </summary>
28   - //public string string { get; set; }
29   -
30   - /// <summary>
31   - /// 建立时间
32   - /// </summary>
33   - public DateTime? createTime { get; set; }
34   -
35   - /// <summary>
36   - /// 建立者
37   - /// </summary>
38   - public string createBy { get; set; }
39   -
40   - /// <summary>
41   - /// 更新时间
42   - /// </summary>
43   - public DateTime? updateTime { get; set; }
44   -
45   - /// <summary>
46   - /// 更新者
47   - /// </summary>
48   - public string updateBy { get; set; }
49   -
50   - }
51   -}
sys/Hh.Mes.POJO/WebEntity/base/base_equipment_item.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_equipment_item
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 设备部件编号
17   - /// </summary>
18   - public string code { get; set; }
19   -
20   - /// <summary>
21   - /// 部件名称
22   - /// </summary>
23   - public string name { get; set; }
24   -
25   - /// <summary>
26   - /// 设备
27   - /// </summary>
28   - public int? equipmentId { get; set; }
29   -
30   - /// <summary>
31   - /// 描述
32   - /// </summary>
33   - public string description { get; set; }
34   -
35   - /// <summary>
36   - /// 保养注意事项
37   - /// </summary>
38   - public string maintainTips { get; set; }
39   -
40   - /// <summary>
41   - /// 保养需要的工具
42   - /// </summary>
43   - public string maintainTools { get; set; }
44   -
45   - /// <summary>
46   - /// 链接的保养说明书
47   - /// </summary>
48   - public string linkMaintainSop { get; set; }
49   -
50   - /// <summary>
51   - /// 上次保养时间
52   - /// </summary>
53   - public int? lastMaintainTime { get; set; }
54   -
55   - /// <summary>
56   - /// 上次保养距离
57   - /// </summary>
58   - public int? lastMaintainDistance { get; set; }
59   -
60   - /// <summary>
61   - /// 上次保养次数
62   - /// </summary>
63   - public int? lastMaintainFrequence { get; set; }
64   -
65   - /// <summary>
66   - /// 下次保养时间
67   - /// </summary>
68   - public int? nextMaintainTime { get; set; }
69   -
70   - /// <summary>
71   - /// 下次保养距离
72   - /// </summary>
73   - public int? nextMaintainDistance { get; set; }
74   -
75   - /// <summary>
76   - /// 下次保养次数
77   - /// </summary>
78   - public int? nextMaintainFrequence { get; set; }
79   -
80   - /// <summary>
81   - /// 当前保养时间
82   - /// </summary>
83   - public int? currentMaintainTime { get; set; }
84   -
85   - /// <summary>
86   - /// 当前保养距离
87   - /// </summary>
88   - public int? currentManitainDistance { get; set; }
89   -
90   - /// <summary>
91   - /// 当前保养次数
92   - /// </summary>
93   - public int? currentMaintainFrequence { get; set; }
94   -
95   - /// <summary>
96   - /// 建立时间
97   - /// </summary>
98   - public DateTime? createTime { get; set; }
99   -
100   - /// <summary>
101   - /// 建立者
102   - /// </summary>
103   - public string createBy { get; set; }
104   -
105   - /// <summary>
106   - /// 更新时间
107   - /// </summary>
108   - public DateTime? updateTime { get; set; }
109   -
110   - /// <summary>
111   - /// 更新者
112   - /// </summary>
113   - public string updateBy { get; set; }
114   -
115   - }
116   -}
sys/Hh.Mes.POJO/WebEntity/base/base_equipment_maintain_log.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_equipment_maintain_log
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 设备部件编号
17   - /// </summary>
18   - public int equipmentItemId { get; set; }
19   -
20   - /// <summary>
21   - /// 保养人员
22   - /// </summary>
23   - public string userCode { get; set; }
24   -
25   - /// <summary>
26   - /// 开始时间
27   - /// </summary>
28   - public DateTime? startTime { get; set; }
29   -
30   - /// <summary>
31   - /// 结束时间
32   - /// </summary>
33   - public DateTime? endTime { get; set; }
34   -
35   - /// <summary>
36   - /// 备注
37   - /// </summary>
38   - public string remark { get; set; }
39   -
40   - /// <summary>
41   - /// 建立时间
42   - /// </summary>
43   - public DateTime? createTime { get; set; }
44   -
45   - /// <summary>
46   - /// 建立者
47   - /// </summary>
48   - public string createBy { get; set; }
49   -
50   - /// <summary>
51   - /// 更新时间
52   - /// </summary>
53   - public DateTime? updateTime { get; set; }
54   -
55   - /// <summary>
56   - /// 更新者
57   - /// </summary>
58   - public string updateBy { get; set; }
59   -
60   - }
61   -}
sys/Hh.Mes.POJO/WebEntity/base/base_equipment_maintain_rule.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_equipment_maintain_rule
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 设备部件编号
17   - /// </summary>
18   - public int equipmentItemId { get; set; }
19   -
20   - /// <summary>
21   - /// 时间(天)
22   - /// </summary>
23   - public int? times { get; set; }
24   -
25   - /// <summary>
26   - /// 距离(km)
27   - /// </summary>
28   - public int? distance { get; set; }
29   -
30   - /// <summary>
31   - /// 次数(千次)
32   - /// </summary>
33   - public int? frequence { get; set; }
34   -
35   - /// <summary>
36   - /// 建立时间
37   - /// </summary>
38   - public DateTime? createTime { get; set; }
39   -
40   - /// <summary>
41   - /// 建立者
42   - /// </summary>
43   - public string createBy { get; set; }
44   -
45   - /// <summary>
46   - /// 更新时间
47   - /// </summary>
48   - public DateTime? updateTime { get; set; }
49   -
50   - /// <summary>
51   - /// 更新者
52   - /// </summary>
53   - public string updateBy { get; set; }
54   -
55   - }
56   -}
sys/Hh.Mes.POJO/WebEntity/base/base_factory_calendar.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_factory_calendar
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - ///
17   - /// </summary>
18   - public DateTime? createTime { get; set; }
19   -
20   - /// <summary>
21   - ///
22   - /// </summary>
23   - public DateTime? updateTime { get; set; }
24   -
25   - /// <summary>
26   - ///
27   - /// </summary>
28   - public string createBy { get; set; }
29   -
30   - /// <summary>
31   - ///
32   - /// </summary>
33   - public string updateBy { get; set; }
34   -
35   - /// <summary>
36   - /// 工厂日期(年月日)
37   - /// </summary>
38   - public DateTime? CalendarDay { get; set; }
39   -
40   - /// <summary>
41   - /// 是否工作
42   - /// </summary>
43   - public bool? Weekday { get; set; }
44   -
45   - /// <summary>
46   - /// 线体编码
47   - /// </summary>
48   - public string LineCode { get; set; }
49   -
50   - }
51   -}
sys/Hh.Mes.POJO/WebEntity/base/base_inventory.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -using Hh.Mes.POJO.EnumEntitys;
5   -
6   -namespace Hh.Mes.POJO.Entity
7   -{
8   - public partial class base_inventory : base_Entity
9   - {
10   - /// <summary>
11   - ///
12   - /// </summary>
13   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
14   - public int id { get; set; }
15   -
16   -
17   -
18   - /// <summary>
19   - ///
20   - /// </summary>
21   - public string factoryCode { get; set; }
22   -
23   - /// <summary>
24   - ///
25   - /// </summary>
26   - public string lineCode { get; set; }
27   -
28   -
29   - /// <summary>
30   - /// 仓库类型
31   - /// </summary>
32   - public string warehouseCode { get; set; }
33   -
34   - /// <summary>
35   - /// 区域编码
36   - /// </summary>
37   - public string zoneCode { get; set; }
38   -
39   - /// <summary>
40   - /// 库位id
41   - /// </summary>
42   - public int? locationId { get; set; }
43   -
44   - /// <summary>
45   - /// 库位编号
46   - /// </summary>
47   - public string locationCode { get; set; }
48   -
49   - /// <summary>
50   - /// 容器编码
51   - /// </summary>
52   - public string containerCode { get; set; }
53   -
54   - /// <summary>
55   - /// 上游系统单号
56   - /// </summary>
57   - public string sourceCode { get; set; }
58   -
59   - /// <summary>
60   - /// 物料类型
61   - /// </summary>
62   - public string materialType { get; set; }
63   -
64   -
65   - /// <summary>
66   - /// 物料编码
67   - /// </summary>
68   - public string materialCode { get; set; }
69   -
70   - /// <summary>
71   - /// 批号
72   - /// </summary>
73   - public string lot { get; set; }
74   -
75   - /// <summary>
76   - /// 炉批号
77   - /// </summary>
78   - public string batchNo { get; set; }
79   -
80   - /// <summary>
81   - /// 管材或余料的SN码
82   - /// </summary>
83   - public string pipeSN { get; set; }
84   -
85   - /// <summary>
86   - /// 余料切割之前的管材SN码
87   - /// </summary>
88   - public string oldSN { get; set; }
89   -
90   - /// <summary>
91   - /// 图号
92   - /// </summary>
93   - public string drawingCode { get; set; }
94   -
95   - /// <summary>
96   - /// 生产日期
97   - /// </summary>
98   - public DateTime? manufactureDate { get; set; }
99   -
100   - /// <summary>
101   - /// 失效日期
102   - /// </summary>
103   - public DateTime? expirationDate { get; set; }
104   -
105   - /// <summary>
106   - /// 库存状态
107   - /// </summary>
108   - public string status { get; set; }
109   -
110   - /// <summary>
111   - /// 管材长度
112   - /// </summary>
113   - public decimal? pipeLength { get; set; }
114   -
115   - /// <summary>
116   - /// 使用状态 和 库存状态区分 ECS操作使用状态
117   - /// </summary>
118   - public int useState { get; set; }
119   -
120   - /// <summary>
121   - /// 数量
122   - /// </summary>
123   - public decimal qty { get; set; }
124   -
125   - /// <summary>
126   - /// 工单code/生产订单号
127   - /// <see cref="bus_workOrder_head"/>
128   - /// </summary>
129   - public string workOrderCode { get; set; }
130   -
131   - /// <summary>
132   - /// 工序code
133   - /// <see cref="bus_workOrder_detail"/>
134   - /// </summary>
135   - public string oprSequenceCode { get; set; }
136   -
137   - /// <summary>
138   - /// 物料名称
139   - /// </summary>
140   - [SugarColumn(IsIgnore = true)]
141   - [NotMapped]
142   - public string materialName { get; set; }
143   -
144   - /// <summary>
145   - /// 单位名称
146   - /// </summary>
147   - public string whCode { get; set; }
148   -
149   - /// <summary>
150   - /// 工序任务头表
151   - /// <see cref="bus_workOrder_head"/>
152   - /// </summary>
153   - public Guid? headKey { get; set; }
154   -
155   - /// <summary>
156   - /// 消耗数量
157   - /// </summary>
158   - public int consumedQuantity { get; set; }
159   -
160   - /// <summary>
161   - /// 需求数量
162   - /// </summary>
163   - public decimal quantityRequired { get; set; }
164   -
165   - /// <summary>
166   - /// 收货数量
167   - /// </summary>
168   - public int quantityReceived { get; set; }
169   -
170   - /// <summary>
171   - /// 创建时间
172   - /// </summary>
173   - public DateTime? createTime { get; set; }
174   -
175   - /// <summary>
176   - /// 创建用户
177   - /// </summary>
178   - public string createBy { get; set; }
179   -
180   - /// <summary>
181   - /// 更新时间
182   - /// </summary>
183   - public DateTime? updateTime { get; set; }
184   -
185   - /// <summary>
186   - /// 更新用户
187   - /// </summary>
188   - public string updateBy { get; set; }
189   -
190   - }
191   -}
sys/Hh.Mes.POJO/WebEntity/base/base_inventory_Alert.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_inventory_Alert
8   - {
9   - /// <summary>
10   - /// 唯一编号
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 物料编码
17   - /// </summary>
18   - public string materialCode { get; set; }
19   -
20   - /// <summary>
21   - /// 物料类型
22   - /// </summary>
23   - public string type { get; set; }
24   -
25   - /// <summary>
26   - /// 物料名称
27   - /// </summary>
28   - public string materialName { get; set; }
29   -
30   - /// <summary>
31   - /// 库存数量
32   - /// </summary>
33   - public int? inventoryNum { get; set; }
34   -
35   - /// <summary>
36   - /// 预警数量
37   - /// </summary>
38   - public int? alertNum { get; set; }
39   -
40   - /// <summary>
41   - /// 创建时间
42   - /// </summary>
43   - public DateTime? createTime { get; set; }
44   -
45   - /// <summary>
46   - /// 创建用户
47   - /// </summary>
48   - public string createBy { get; set; }
49   -
50   - /// <summary>
51   - /// 更新时间
52   - /// </summary>
53   - public DateTime? updateTime { get; set; }
54   -
55   - /// <summary>
56   - /// 更新用户
57   - /// </summary>
58   - public string updateBy { get; set; }
59   -
60   - }
61   -}
sys/Hh.Mes.POJO/WebEntity/base/base_line.cs deleted
1   -using System;
2   -using SqlSugar;
3   -
4   -namespace Hh.Mes.POJO.Entity
5   -{
6   - public partial class base_line : base_Entity
7   - {
8   - /// <summary>
9   - ///
10   - /// </summary>
11   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
12   - public int id { get; set; }
13   -
14   -
15   - /// <summary>
16   - ///
17   - /// </summary>
18   - public Guid lineKey { get; set; }
19   -
20   - /// <summary>
21   - ///
22   - /// </summary>
23   - public Guid workshopKey { get; set; }
24   -
25   - /// <summary>
26   - /// 车间代号
27   - /// </summary>
28   - public string workshopCode { get; set; }
29   -
30   - /// <summary>
31   - /// 线体代号
32   - /// </summary>
33   - public string lineCode { get; set; }
34   -
35   - /// <summary>
36   - /// 线体名称
37   - /// </summary>
38   - public string lineName { get; set; }
39   -
40   - /// <summary>
41   - /// 外部编码
42   - /// </summary>
43   - public string otherCode { get; set; }
44   -
45   - /// <summary>
46   - /// 建立时间
47   - /// </summary>
48   - public DateTime? createTime { get; set; }
49   -
50   - /// <summary>
51   - /// 建立者
52   - /// </summary>
53   - public string createBy { get; set; }
54   -
55   - /// <summary>
56   - /// 更新时间
57   - /// </summary>
58   - public DateTime? updateTime { get; set; }
59   -
60   - /// <summary>
61   - /// 更新者
62   - /// </summary>
63   - public string updateBy { get; set; }
64   -
65   - }
66   -}
sys/Hh.Mes.POJO/WebEntity/base/base_location.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_location : base_Entity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - ///
17   - /// </summary>
18   - public Guid keys { get; set; }
19   -
20   - /// <summary>
21   - ///
22   - /// </summary>
23   - public string extensionField2 { get; set; }
24   -
25   - /// <summary>
26   - ///
27   - /// </summary>
28   - public string extensionField3 { get; set; }
29   -
30   - /// <summary>
31   - ///
32   - /// </summary>
33   - public string extensionField1 { get; set; }
34   -
35   - /// <summary>
36   - /// 料点编码(库位)
37   - /// </summary>
38   - public string locationCode { get; set; }
39   -
40   - /// <summary>
41   - /// 料点名称(库位)
42   - /// </summary>
43   - public string locationName { get; set; }
44   -
45   - /// <summary>
46   - /// 工位编码
47   - /// </summary>
48   - public string stationCode { get; set; }
49   -
50   - /// <summary>
51   - /// 线体
52   - /// </summary>
53   - public string lineCode { get; set; }
54   -
55   - /// <summary>
56   - /// 组队上料区域号(agv下发条件)
57   - /// </summary>
58   - public string fitupArea { get; set; }
59   -
60   - /// <summary>
61   - /// 库位类型
62   - /// </summary>
63   - public string locationType { get; set; }
64   -
65   - /// <summary>
66   - /// 容器编码
67   - /// </summary>
68   - public string containerCode { get; set; }
69   -
70   - /// <summary>
71   - /// 料点状态
72   - /// </summary>
73   - public int locationStatus { get; set; }
74   -
75   - /// <summary>
76   - /// 区域编码
77   - /// </summary>
78   - public int zoneCode { get; set; }
79   -
80   - /// <summary>
81   - /// 仓库编码
82   - /// </summary>
83   - public string warehouseCode { get; set; }
84   -
85   - /// <summary>
86   - /// 创建时间
87   - /// </summary>
88   - public DateTime? createTime { get; set; }
89   -
90   - /// <summary>
91   - /// 创建用户
92   - /// </summary>
93   - public string createBy { get; set; }
94   -
95   - /// <summary>
96   - /// 更新时间
97   - /// </summary>
98   - public DateTime updateTime { get; set; }
99   -
100   - /// <summary>
101   - /// 更新用户
102   - /// </summary>
103   - public string updateBy { get; set; }
104   -
105   - /// <summary>
106   - /// 是否有光栅
107   - /// </summary>
108   - public bool? isLightFence { get; set; }
109   -
110   - /// <summary>
111   - /// 叫料分组编码(来源于字典)
112   - /// </summary>
113   - public string feedGroupCode { get; set; }
114   -
115   - /// <summary>
116   - /// 装料分组编码
117   - /// </summary>
118   - public string loadGroupCode { get; set; }
119   -
120   - /// <summary>
121   - /// 是否工装
122   - /// </summary>
123   - public int isWorkClothes { get; set; }
124   -
125   - }
126   -}
127   -
sys/Hh.Mes.POJO/WebEntity/base/base_location_rel.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_location_rel
8   - {
9   -
10   -
11   - /// <summary>
12   - ///
13   - /// </summary>
14   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
15   - public int id { get; set; }
16   -
17   - /// <summary>
18   - ///
19   - /// </summary>
20   - public Guid keys { get; set; }
21   -
22   - /// <summary>
23   - /// 上料点编码
24   - /// </summary>
25   - public string endPositionCode { get; set; }
26   -
27   - /// <summary>
28   - /// 装料点编码
29   - /// </summary>
30   - public string startPositionCode { get; set; }
31   -
32   - /// <summary>
33   - /// 创建时间
34   - /// </summary>
35   - public DateTime? createTime { get; set; }
36   -
37   - /// <summary>
38   - /// 创建用户
39   - /// </summary>
40   - public string createBy { get; set; }
41   -
42   - /// <summary>
43   - /// 更新时间
44   - /// </summary>
45   - public DateTime? updateTime { get; set; }
46   -
47   - /// <summary>
48   - /// 更新用户
49   - /// </summary>
50   - public string updateBy { get; set; }
51   -
52   - /// <summary>
53   - /// 任务起点工位
54   - /// </summary>
55   - public string startStationCode { get; set; }
56   -
57   - /// <summary>
58   - /// 任务终点工位
59   - /// </summary>
60   - public string endStationCode { get; set; }
61   -
62   - /// <summary>
63   - /// 料点关系类型,取起点
64   - /// </summary>
65   - public int startZoneCode { get; set; }
66   -
67   -
68   - /// <summary>
69   - /// 料点关系类型,取终点
70   - /// </summary>
71   - public int endZoneCode { get; set; }
72   - }
73   -}
sys/Hh.Mes.POJO/WebEntity/base/base_mbom_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_mbom_detail
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 主表标识
17   - /// </summary>
18   - public int? mbomHeaderId { get; set; }
19   -
20   - /// <summary>
21   - /// 产品代号
22   - /// </summary>
23   - public string productCode { get; set; }
24   -
25   - /// <summary>
26   - /// 工序标识
27   - /// </summary>
28   - public int? stepId { get; set; }
29   -
30   - /// <summary>
31   - /// 物料
32   - /// </summary>
33   - public string materialCode { get; set; }
34   -
35   - /// <summary>
36   - /// 图号
37   - /// </summary>
38   - public string drawingNumber { get; set; }
39   -
40   - /// <summary>
41   - /// 基数数量
42   - /// </summary>
43   - public decimal? baseQty { get; set; }
44   -
45   - /// <summary>
46   - /// 需要质检
47   - /// </summary>
48   - public bool? isCheck { get; set; }
49   -
50   - /// <summary>
51   - /// 建立时间
52   - /// </summary>
53   - public DateTime? createTime { get; set; }
54   -
55   - /// <summary>
56   - /// 建立者
57   - /// </summary>
58   - public string createBy { get; set; }
59   -
60   - /// <summary>
61   - /// 更新时间
62   - /// </summary>
63   - public DateTime? updateTime { get; set; }
64   -
65   - /// <summary>
66   - /// 更新者
67   - /// </summary>
68   - public string updateBy { get; set; }
69   -
70   - /// <summary>
71   - /// 工序代号
72   - /// </summary>
73   - public string stepCode { get; set; }
74   -
75   - }
76   -}
sys/Hh.Mes.POJO/WebEntity/base/base_mbom_header.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_mbom_header
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   -
16   - /// <summary>
17   - ///
18   - /// </summary>
19   - public int effectiveFlag { get; set; }
20   -
21   - /// <summary>
22   - ///
23   - /// </summary>
24   - public string PLPO_VORNR { get; set; }
25   -
26   - /// <summary>
27   - /// 产品标识
28   - /// </summary>
29   - public int productId { get; set; }
30   -
31   - /// <summary>
32   - /// 产品代号
33   - /// </summary>
34   - public string productCode { get; set; }
35   -
36   - /// <summary>
37   - /// 生产线标识
38   - /// </summary>
39   - public int? lineId { get; set; }
40   -
41   - /// <summary>
42   - /// 图号
43   - /// </summary>
44   - public string drawingNumber { get; set; }
45   -
46   - /// <summary>
47   - /// 变更单号
48   - /// </summary>
49   - public string changeOrder { get; set; }
50   -
51   - /// <summary>
52   - /// 版本
53   - /// </summary>
54   - public string version { get; set; }
55   -
56   - /// <summary>
57   - /// 审核员
58   - /// </summary>
59   - public string verifyer { get; set; }
60   -
61   - /// <summary>
62   - /// 建立时间
63   - /// </summary>
64   - public DateTime? createTime { get; set; }
65   -
66   - /// <summary>
67   - /// 建立者
68   - /// </summary>
69   - public string createBy { get; set; }
70   -
71   - /// <summary>
72   - /// 更新时间
73   - /// </summary>
74   - public DateTime? updateTime { get; set; }
75   -
76   - /// <summary>
77   - /// 更新者
78   - /// </summary>
79   - public string updateBy { get; set; }
80   -
81   - }
82   -}
sys/Hh.Mes.POJO/WebEntity/base/base_pbom_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_pbom_detail
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 工序标识
17   - /// </summary>
18   - public int? stepId { get; set; }
19   -
20   - /// <summary>
21   - /// 工位标识
22   - /// </summary>
23   - public int? stationId { get; set; }
24   -
25   - /// <summary>
26   - /// 父料号
27   - /// </summary>
28   - public string parentMaterialCode { get; set; }
29   -
30   - /// <summary>
31   - /// 子料号
32   - /// </summary>
33   - public string childMaterialCode { get; set; }
34   -
35   - /// <summary>
36   - /// 是否替代料
37   - /// </summary>
38   - public bool? isReplace { get; set; }
39   -
40   - /// <summary>
41   - /// 倍用量
42   - /// </summary>
43   - //public decimal? double { get; set; }
44   -
45   - /// <summary>
46   - /// 图号
47   - /// </summary>
48   - public string drawingNumber { get; set; }
49   -
50   - /// <summary>
51   - /// 工时
52   - /// </summary>
53   - //public decimal? man-hours { get; set; }
54   -
55   - /// <summary>
56   - /// 装配
57   - /// </summary>
58   - public string assembleTips { get; set; }
59   -
60   - /// <summary>
61   - /// 建立时间
62   - /// </summary>
63   - public DateTime? createTime { get; set; }
64   -
65   - /// <summary>
66   - /// 建立者
67   - /// </summary>
68   - public string createBy { get; set; }
69   -
70   - /// <summary>
71   - /// 更新时间
72   - /// </summary>
73   - public DateTime? updateTime { get; set; }
74   -
75   - /// <summary>
76   - /// 更新者
77   - /// </summary>
78   - public string updateBy { get; set; }
79   -
80   - }
81   -}
sys/Hh.Mes.POJO/WebEntity/base/base_pbom_header.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_pbom_header
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 物料编码
17   - /// </summary>
18   - public string materialCode { get; set; }
19   -
20   - /// <summary>
21   - /// 类型
22   - /// </summary>
23   - public string type { get; set; }
24   -
25   - /// <summary>
26   - /// 建立时间
27   - /// </summary>
28   - public DateTime? createTime { get; set; }
29   -
30   - /// <summary>
31   - /// 建立者
32   - /// </summary>
33   - public string createBy { get; set; }
34   -
35   - /// <summary>
36   - /// 更新时间
37   - /// </summary>
38   - public DateTime? updateTime { get; set; }
39   -
40   - /// <summary>
41   - /// 更新者
42   - /// </summary>
43   - public string updateBy { get; set; }
44   -
45   - }
46   -}
sys/Hh.Mes.POJO/WebEntity/base/base_process_product_rel.cs deleted
1   -
2   -using System;
3   -using SqlSugar;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - [SugarTable("base_process_product_rel")]
8   - public partial class base_process_product_rel
9   - {
10   - /// <summary>
11   - /// 主键
12   - /// </summary>
13   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
14   - public int id { get; set; }
15   -
16   - [SugarColumn(IsNullable = true)]
17   - public Guid keys { get; set; }
18   -
19   -
20   - /// <summary>
21   - /// 工艺路线Keys
22   - /// </summary>
23   - public Guid processHeadKeys { get; set; }
24   -
25   -
26   -
27   - /// <summary>
28   - /// 线体
29   - /// </summary>
30   - public string lineCode { get; set; }
31   -
32   -
33   - /// <summary>
34   - /// 工艺路线编码
35   - /// </summary>
36   - [SugarColumn(Length = 50, ColumnDescription = "工艺路线编码", IsNullable = true)]
37   - public string processCode { get; set; }
38   -
39   - /// <summary>
40   - /// 工艺路线名称
41   - /// </summary>
42   - [SugarColumn(Length = 50, ColumnDescription = "工艺路线名称", IsNullable = true)]
43   - public string processName { get; set; }
44   -
45   - /// <summary>
46   - /// 产品编码
47   - /// </summary>
48   - [SugarColumn(Length = 50, ColumnDescription = "产品编码", IsNullable = true)]
49   - public string productCode { get; set; }
50   -
51   - [SugarColumn(Length = 1000, IsNullable = true)]
52   - public string remarks { get; set; }
53   -
54   - /// <summary>
55   - /// 建立时间
56   - /// </summary>
57   - [SugarColumn(ColumnDescription = "建立时间", IsNullable = true)]
58   - public DateTime createTime { get; set; }
59   -
60   - /// <summary>
61   - /// 建立者
62   - /// </summary>
63   - [SugarColumn(Length = 16, ColumnDescription = "建立者", IsNullable = true)]
64   - public string createBy { get; set; }
65   -
66   - /// <summary>
67   - /// 更新时间
68   - /// </summary>
69   - [SugarColumn(ColumnDescription = "更新时间", IsNullable = true)]
70   - public DateTime updateTime { get; set; }
71   -
72   - /// <summary>
73   - /// 更新者
74   - /// </summary>
75   - [SugarColumn(Length = 16, ColumnDescription = "更新者", IsNullable = true)]
76   - public string updateBy { get; set; }
77   -
78   - }
79   -}
80 0 \ No newline at end of file
sys/Hh.Mes.POJO/WebEntity/base/base_process_route_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_process_route_detail
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - public Guid bodyKeys { get; set; }
16   -
17   - /// <summary>
18   - ///
19   - /// </summary>
20   - public Guid? headkeys { get; set; }
21   -
22   - //public string plmeid { get; set; }
23   -
24   - /// <summary>
25   - /// 工序编码
26   - /// </summary>
27   - public string oprSequenceCode { get; set; }
28   -
29   - /// <summary>
30   - /// 工序名称
31   - /// </summary>
32   - public string oprSequenceName { get; set; }
33   -
34   - /// <summary>
35   - /// 工作中心
36   - /// </summary>
37   - public string workCenterCode { get; set; }
38   -
39   - /// <summary>
40   - /// 工作中心名称
41   - /// </summary>
42   - public string workCenterName { get; set; }
43   -
44   - /// <summary>
45   - /// 工序计划开始时间
46   - /// </summary>
47   - public DateTime? oprPlanStartTime { get; set; }
48   -
49   - /// <summary>
50   - /// 工序计划结束时间
51   - /// </summary>
52   - public DateTime? oprPlanEndTime { get; set; }
53   -
54   - /// <summary>
55   - /// 工序顺序
56   - /// </summary>
57   - public int oprSequence { get; set; }
58   -
59   - /// <summary>
60   - /// 工序比例
61   - /// </summary>
62   - public string opeRatio { get; set; }
63   -
64   -
65   - /// <summary>
66   - /// 是否启用 启用=1 不启用=0
67   - /// </summary>
68   - public int isDelete { get; set; }
69   -
70   - /// <summary>
71   - /// 报检设置
72   - /// </summary>
73   - public int inspectionFlag { get; set; }
74   -
75   - /// <summary>
76   - ///
77   - /// </summary>
78   - public string remarks { get; set; }
79   -
80   - /// <summary>
81   - /// 建立时间
82   - /// </summary>
83   - public DateTime? createTime { get; set; }
84   -
85   - /// <summary>
86   - /// 建立者
87   - /// </summary>
88   - public string createBy { get; set; }
89   -
90   - public string plmeid { get; set; }
91   -
92   - /// <summary>
93   - /// 更新时间
94   - /// </summary>
95   - public DateTime? updateTime { get; set; }
96   -
97   - /// <summary>
98   - /// 更新者
99   - /// </summary>
100   - public string updateBy { get; set; }
101   -
102   - /// <summary>
103   - /// 工序耗时
104   - /// </summary>
105   - public decimal? oprsequenceTime { get; set; }
106   - }
107   -}
sys/Hh.Mes.POJO/WebEntity/base/base_process_route_head.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_process_route_head: base_Entity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   - public Guid keys { get; set; }
15   -
16   - public string processName { get; set; }
17   -
18   - /// <summary>
19   - /// 唯一标识ID
20   - /// </summary>
21   - public string plmeid { get; set; }
22   -
23   - public decimal edition { get; set; }
24   -
25   -
26   - /// <summary>
27   - /// 工艺路线编码
28   - /// </summary>
29   - public string processCode { get; set; }
30   -
31   -
32   -
33   - /// <summary>
34   - /// 产线编码
35   - /// </summary>
36   - public string lineCode { get; set; }
37   -
38   - /// <summary>
39   - /// 外部关联code
40   - /// </summary>
41   - public string otherCode { get; set; }
42   -
43   - /// <summary>
44   - /// 是否有效 是否启用 1 启用 0 不启用
45   - /// </summary>
46   - public int? isDelete { get; set; }
47   -
48   -
49   - /// <summary>
50   - ///
51   - /// </summary>
52   - public string remarks { get; set; }
53   -
54   -
55   - /// <summary>
56   - /// 建立时间
57   - /// </summary>
58   - public DateTime? createTime { get; set; }
59   -
60   - /// <summary>
61   - /// 建立者
62   - /// </summary>
63   - public string createBy { get; set; }
64   -
65   - /// <summary>
66   - /// 更新时间
67   - /// </summary>
68   - public DateTime? updateTime { get; set; }
69   -
70   - /// <summary>
71   - /// 更新者
72   - /// </summary>
73   - public string updateBy { get; set; }
74   -
75   - }
76   -}
sys/Hh.Mes.POJO/WebEntity/base/base_process_route_station.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_process_route_station : base_Entity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// keys
17   - /// </summary>
18   - public Guid oprStationKeys { get; set; }
19   -
20   - /// <summary>
21   - /// 工序keys
22   - /// </summary>
23   - public Guid? bodyKeys { get; set; }
24   -
25   - /// <summary>
26   - /// 工艺路线keys
27   - /// </summary>
28   - public Guid? headKeys { get; set; }
29   -
30   - /// <summary>
31   - /// 工位编码
32   - /// </summary>
33   - public string workStationCode { get; set; }
34   -
35   - /// <summary>
36   - /// 建立时间
37   - /// </summary>
38   - public DateTime? createTime { get; set; }
39   -
40   - /// <summary>
41   - /// 建立者
42   - /// </summary>
43   - public string createBy { get; set; }
44   -
45   - /// <summary>
46   - /// 更新时间
47   - /// </summary>
48   - public DateTime? updateTime { get; set; }
49   -
50   - /// <summary>
51   - /// 更新者
52   - /// </summary>
53   - public string updateBy { get; set; }
54   -
55   - /// <summary>
56   - /// 产品编码
57   - /// </summary>
58   - public string productCode { get; set; }
59   -
60   - }
61   -}
sys/Hh.Mes.POJO/WebEntity/base/base_product_detail.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_product_detail:base_Entity
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - ///
17   - /// </summary>
18   - public Guid headKeys { get; set; }
19   -
20   - /// <summary>
21   - /// materialCode
22   - /// </summary>
23   - public string materialCode { get; set; }
24   -
25   - /// <summary>
26   - /// 建立时间
27   - /// </summary>
28   - public DateTime? createTime { get; set; }
29   -
30   - /// <summary>
31   - /// 建立者
32   - /// </summary>
33   - public string createBy { get; set; }
34   -
35   - /// <summary>
36   - /// 更新时间
37   - /// </summary>
38   - public DateTime? updateTime { get; set; }
39   -
40   - /// <summary>
41   - /// 更新者
42   - /// </summary>
43   - public string updateBy { get; set; }
44   -
45   - }
46   -}
sys/Hh.Mes.POJO/WebEntity/base/base_product_header.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_product_header: base_Entity
8   - {
9   -
10   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
11   - public int id { get; set; }
12   -
13   - public Guid keys { get; set; }
14   -
15   - /// <summary>
16   - /// 产品代号
17   - /// </summary>
18   - public string productCode { get; set; }
19   -
20   - /// <summary>
21   - /// 产品名称
22   - /// </summary>
23   - public string productName { get; set; }
24   -
25   - /// <summary>
26   - /// 工艺路线编码
27   - /// </summary>
28   - public string processCode { get; set; }
29   -
30   - /// <summary>
31   - /// 类别
32   - /// </summary>
33   - public string type { get; set; }
34   -
35   - /// <summary>
36   - /// 图号
37   - /// </summary>
38   - public string drawingNumber { get; set; }
39   -
40   - /// <summary>
41   - /// 外形尺寸
42   - /// </summary>
43   - public string specification { get; set; }
44   -
45   - /// <summary>
46   - /// 重量
47   - /// </summary>
48   - public decimal? weight { get; set; }
49   -
50   - /// <summary>
51   - /// 机型
52   - /// </summary>
53   - public string machineType { get; set; }
54   -
55   - /// <summary>
56   - /// 生产工厂
57   - /// </summary>
58   - public string workShop { get; set; }
59   -
60   - /// <summary>
61   - /// WCS工件类型
62   - /// </summary>
63   - public int wcsProductType { get; set; }
64   -
65   -
66   - /// <summary>
67   - ///
68   - /// </summary>
69   - public int putType { get; set; }
70   -
71   - /// <summary>
72   - ///
73   - /// </summary>
74   - public int putNumber { get; set; }
75   -
76   - /// <summary>
77   - ///
78   - /// </summary>
79   - public int putLine { get; set; }
80   -
81   - /// <summary>
82   - ///
83   - /// </summary>
84   - public int putLayer { get; set; }
85   -
86   - /// <summary>
87   - ///
88   - /// </summary>
89   - public int effectiveFlag { get; set; }
90   -
91   - /// <summary>
92   - ///
93   - /// </summary>
94   - public string otherCode { get; set; }
95   -
96   -
97   - /// <summary>
98   - /// 建立时间
99   - /// </summary>
100   - public DateTime? createTime { get; set; }
101   -
102   - /// <summary>
103   - /// 建立者
104   - /// </summary>
105   - public string createBy { get; set; }
106   -
107   - /// <summary>
108   - /// 更新时间
109   - /// </summary>
110   - public DateTime? updateTime { get; set; }
111   -
112   - /// <summary>
113   - /// 更新者
114   - /// </summary>
115   - public string updateBy { get; set; }
116   -
117   - public int isDelete { get; set; }
118   -
119   - /// <summary>
120   - /// 工艺路线key
121   - /// </summary>
122   - public Guid processHeadKeys { get; set; }
123   -
124   - }
125   -}
sys/Hh.Mes.POJO/WebEntity/base/base_station_cache.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_station_cache
8   - {
9   - /// <summary>
10   - ///
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   - public string lineCode { get; set; }
15   -
16   - /// <summary>
17   - /// id
18   - /// </summary>
19   -
20   -
21   - /// <summary>
22   - /// 缓存编码
23   - /// </summary>
24   - public string code { get; set; }
25   -
26   - /// <summary>
27   - /// 工位编码
28   - /// </summary>
29   - public string stationCode { get; set; }
30   -
31   - /// <summary>
32   - /// 顺序
33   - /// </summary>
34   - public int? sequence { get; set; }
35   -
36   - /// <summary>
37   - /// PLC位置码
38   - /// </summary>
39   - public string plcAddress { get; set; }
40   -
41   - /// <summary>
42   - /// 工序跟踪标识
43   - /// </summary>
44   - public int? stepTraceId { get; set; }
45   -
46   - /// <summary>
47   - /// 物料编码
48   - /// </summary>
49   - public string materialCode { get; set; }
50   -
51   - /// <summary>
52   - /// 管材SN 每根管子一个,不重复,如果有SN码,那么qty就是1
53   - /// </summary>
54   - public string pipeSN { get; set; }
55   -
56   - /// <summary>
57   - /// createTime
58   - /// </summary>
59   - public DateTime? createTime { get; set; }
60   -
61   - /// <summary>
62   - /// createBy
63   - /// </summary>
64   - public string createBy { get; set; }
65   -
66   - /// <summary>
67   - /// updateTime
68   - /// </summary>
69   - public DateTime? updateTime { get; set; }
70   -
71   - /// <summary>
72   - /// updateBy
73   - /// </summary>
74   - public string updateBy { get; set; }
75   -
76   - }
77   -}
sys/Hh.Mes.POJO/WebEntity/base/base_station_equipment_rel.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_station_equipment_rel
8   - {
9   - /// <summary>
10   - /// id
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 工位
17   - /// </summary>
18   - public int stationId { get; set; }
19   -
20   - /// <summary>
21   - /// 设备id
22   - /// </summary>
23   - public int equipmentId { get; set; }
24   -
25   - /// <summary>
26   - /// code
27   - /// </summary>
28   - public string code { get; set; }
29   -
30   - /// <summary>
31   - /// 名称
32   - /// </summary>
33   - public string name { get; set; }
34   -
35   - /// <summary>
36   - /// 外部编码
37   - /// </summary>
38   - public string externalCode { get; set; }
39   -
40   - /// <summary>
41   - /// 备注
42   - /// </summary>
43   - public string remarks { get; set; }
44   -
45   - /// <summary>
46   - /// createTime
47   - /// </summary>
48   - public DateTime? createTime { get; set; }
49   -
50   - /// <summary>
51   - /// createBy
52   - /// </summary>
53   - public string createBy { get; set; }
54   -
55   - /// <summary>
56   - /// updateTime
57   - /// </summary>
58   - public DateTime? updateTime { get; set; }
59   -
60   - /// <summary>
61   - /// updateBy
62   - /// </summary>
63   - public string updateBy { get; set; }
64   -
65   - }
66   -}
sys/Hh.Mes.POJO/WebEntity/base/base_station_user_rel.cs deleted
1   -using System;
2   -using SqlSugar;
3   -using System.ComponentModel.DataAnnotations.Schema;
4   -
5   -namespace Hh.Mes.POJO.Entity
6   -{
7   - public partial class base_station_user_rel: base_Entity
8   - {
9   - /// <summary>
10   - /// id
11   - /// </summary>
12   - [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
13   - public int id { get; set; }
14   -
15   - /// <summary>
16   - /// 工位
17   - /// </summary>
18   - public int stationId { get; set; }
19   -
20   - /// <summary>
21   - /// 用户
22   - /// </summary>
23   - public int userId { get; set; }
24   -
25   - /// <summary>
26   - /// code
27   - /// </summary>
28   - public string code { get; set; }
29   -
30   - /// <summary>
31   - /// 名称
32   - /// </summary>
33   - public string name { get; set; }
34   -
35   - /// <summary>
36   - /// 外部编码
37   - /// </summary>
38   - public string externalCode { get; set; }
39   -
40   - /// <summary>
41   - /// 备注
42   - /// </summary>
43   - public string remarks { get; set; }
44   -
45   - /// <summary>
46   - /// createTime
47   - /// </summary>
48   - public DateTime? createTime { get; set; }
49   -
50   - /// <summary>
51   - /// createBy
52   - /// </summary>
53   - public string createBy { get; set; }
54   -
55   - /// <summary>
56   - /// updateTime
57   - /// </summary>
58   - public DateTime? updateTime { get; set; }
59   -
60   - /// <summary>
61   - /// updateBy
62   - /// </summary>
63   - public string updateBy { get; set; }
64   -
65   - }
66   -}