From a765da90e5ee63e04d2d8460a5ad1ebd0e8eb4db Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期一, 15 七月 2024 21:43:59 +0800
Subject: [PATCH] 工单处理
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_headRepository.cs | 24 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_detailRepository.cs | 18 +
代码管理/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_detailService.cs | 41 ++
代码管理/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Partial/Idt_mes_detailService.cs | 13
代码管理/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs | 8
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail.cs | 140 +++++-----
代码管理/WMS/WMS_Server/WIDESEA_WCS/Repositories/ToMES/dt_mes_detailRepository.cs | 24 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_detailService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_detailController.cs | 21 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs | 22 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_detailService.cs | 13
代码管理/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs | 2
代码管理/WMS/WMS_Server/WIDESEA_WebApi/WIDESEA_WebApi.csproj | 2
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/ToMES/dt_mes_detailMapConfig.cs | 16 +
代码管理/WMS/WMS_Client/src/views/widesea_wcs/tomes/dt_mes_detail.vue | 64 ++++
代码管理/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/dt_mes_detailService.cs | 27 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_headRepository.cs | 18 +
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_headController.cs | 21 +
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_headController.cs | 33 ++
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs | 9
代码管理/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/widesea_wcs/dt_mes_headMapConfig.cs | 16 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_headService.cs | 27 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_detailRepository.cs | 24 +
代码管理/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs | 10
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_detailController.cs | 33 ++
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs | 4
代码管理/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Idt_mes_detailService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_headService.cs | 12
代码管理/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs | 8
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/ToMES/Partial/Idt_mes_headsService.cs | 13
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_headService.cs | 41 ++
代码管理/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_headService.cs | 13
代码管理/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json | 4
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_detailService.cs | 27 +
代码管理/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_detailService.cs | 41 ++
代码管理/WMS/WMS_Server/WIDESEA_WCS/IRepositories/ToMES/Idt_mes_detailRepository.cs | 18 +
36 files changed, 746 insertions(+), 85 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs"
index c58bcb0..2b8afdb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs"
@@ -223,7 +223,16 @@
/// </summary>
[Display(Name = "閾炬潯鏈�")]
[Column(TypeName = "bit")]
+
[Editable(true)]
public bool skip_op_3 { get; set; }
+
+ /// <summary>
+ ///AGV瀹屾垚鏁伴噺
+ /// </summary>
+ [Display(Name = "AGV瀹屾垚鏁伴噺")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ public int? agv_finishNum { get; set; }
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs"
index 3ca6c7a..985189b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK4Job.cs"
@@ -40,15 +40,17 @@
return;
}
#region 淇℃伅浜や簰
- info_interaction.wheeldata(client);
+ /*info_interaction.wheeldata(client);
info_interaction.scan(client);
- info_interaction.labeller(client);
+ info_interaction.labeller(client);*/
#endregion
#region 杞﹁疆淇℃伅杩芥函
- Wheel_info_trace.Wheel_online(client);
+ /*Wheel_info_trace.Wheel_online(client);
Wheel_info_trace.Wheel_machine(client);
- Wheel_info_trace.Wheel_offline(client);
+ Wheel_info_trace.Wheel_offline(client);*/
#endregion
+
+
#region 淇℃伅閲囬泦
WheelDBItem.VK4WheelDBItem = GetDate.GetWheelDate(client);
VKDBItem.VK4DBItem = GetDate.GetVKDate(client);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs"
index 6e92d6e..01497c6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/VK5Job.cs"
@@ -36,14 +36,14 @@
return;
}
#region 淇℃伅浜や簰
- info_interaction.wheeldata(client);
+ /*info_interaction.wheeldata(client);
info_interaction.scan(client);
- info_interaction.labeller(client);
+ info_interaction.labeller(client);*/
#endregion
#region 杞﹁疆淇℃伅杩芥函
- Wheel_info_trace.Wheel_online(client);
+ /* Wheel_info_trace.Wheel_online(client);
Wheel_info_trace.Wheel_machine(client);
- Wheel_info_trace.Wheel_offline(client);
+ Wheel_info_trace.Wheel_offline(client);*/
#endregion
#region 淇℃伅閲囬泦
WheelDBItem.VK5WheelDBItem = GetDate.GetWheelDate(client);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
index 5b81463..bec1f3e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
@@ -82,11 +82,9 @@
{
foreach (var mes_head in mes_head_jjgs)
{
- var inventorys = inventoryRepository.Find(x => x.jobID == mes_head.jobID).ToList();
- if (inventorys.Count == mes_head.quantity || inventorys.Count==0)
+ if (mes_head.quantity == mes_head.agv_finishNum)
AddHtyMesWork(mes_head, mes_HeadRepository);
}
- var k = "鍔犺浇瀹屾垚";
}
#endregion
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json"
index ef57b3b..c26c087 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WebApi/appsettings.json"
@@ -16,8 +16,8 @@
"Connection": {
"DBType": "MsSql", //MySql/MsSql/PgSql //鏁版嵁搴撶被鍨嬶紝濡傛灉浣跨敤鐨勬槸sqlserver姝ゅ搴旇缃负MsSql
//sqlserver杩炴帴瀛楃涓睵@ssw0rd
- //"DbConnectionString": "Data Source=192.168.12.101;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
- "DbConnectionString": "Data Source=.;Initial Catalog=WIDESEA_DB_TY_TY;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
+ "DbConnectionString": "Data Source=192.168.12.101;Initial Catalog=WIDESEA_DB;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
+ //"DbConnectionString": "Data Source=.;Initial Catalog=WIDESEA_DB_TY_TY;Persist Security Info=True;User ID=sa;Password=123456;Connect Timeout=500;",
//mysql杩炴帴瀛楃涓�(鍗囩骇EFCore3.1鍒版椂宸插皢mysql杩炴帴瀛楃涓蹭慨鏀�,2019-12-20)
// "DbConnectionString": " Data Source=127.0.0.1;Database=netcoredev;AllowLoadLocalInfile=true;User ID=root;Password=123456;allowPublicKeyRetrieval=true;pooling=true;CharSet=utf8;port=3306;sslmode=none;",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wcs/tomes/dt_mes_detail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wcs/tomes/dt_mes_detail.vue"
new file mode 100644
index 0000000..2997a5a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Client/src/views/widesea_wcs/tomes/dt_mes_detail.vue"
@@ -0,0 +1,64 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wcs/tomes/dt_mes_detail.js姝ゅ缂栧啓
+ -->
+<template>
+ <view-grid ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend">
+ </view-grid>
+</template>
+<script>
+ import extend from "@/extension/widesea_wcs/tomes/dt_mes_detail.js";
+ import { ref, defineComponent } from "vue";
+ export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'mes_detail_id',
+ footer: "Foots",
+ cnName: '宸ュ崟瀛愯〃',
+ name: 'tomes/dt_mes_detail',
+ url: "/dt_mes_detail/",
+ sortName: "mes_detail_id"
+ });
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([]);
+ const columns = ref([{field:'mes_detail_id',title:'宸ュ崟鏄庣粏ID',type:'guid',sort:true,width:110,hidden:true,readonly:true,require:true,align:'left'},
+ {field:'jobID',title:'宸ュ崟缂栧彿',type:'string',width:110,align:'left',sort:true},
+ {field:'heatID',title:'鐐変唬鍙�',type:'string',width:110,align:'left'},
+ {field:'billetID',title:'閽㈠澂鍙�',type:'int',width:110,align:'left'},
+ {field:'SN',title:'杞﹁疆SN鍙�',type:'string',width:110,align:'left'},
+ {field:'heatBatchID',title:'鐑鐞嗘壒娆�',type:'string',width:110,align:'left'},
+ {field:'mes_headID',title:'宸ュ崟澶磋〃ID',type:'guid',width:110,align:'left'},
+ {field:'Status',title:'宸ュ崟鐘舵��',type:'string',width:110,align:'left'},
+ {field:'FinishTime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true}]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+ });
+</script>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail.cs"
index e5fe082..e08e7bd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_detail.cs"
@@ -13,86 +13,86 @@
namespace WIDESEA_Entity.DomainModels
{
- [Entity(TableCnName = "宸ュ崟璇︾粏淇℃伅", TableName = "dt_mes_detail")]
- public partial class dt_mes_detail : BaseEntity
+ [Entity(TableCnName = "宸ュ崟瀛愯〃",TableName = "dt_mes_detail")]
+ public partial class dt_mes_detail:BaseEntity
{
/// <summary>
- ///宸ュ崟鏄庣粏ID
- /// </summary>
- [Key]
- [Display(Name = "mes_detail_id")]
- [Column(TypeName = "uniqueidentifier")]
- [Required(AllowEmptyStrings = false)]
- public Guid mes_detail_id { get; set; }
+ ///宸ュ崟鏄庣粏ID
+ /// </summary>
+ [Key]
+ [Display(Name ="宸ュ崟鏄庣粏ID")]
+ [Column(TypeName="uniqueidentifier")]
+ [Editable(true)]
+ [Required(AllowEmptyStrings=false)]
+ public Guid mes_detail_id { get; set; }
- /// <summary>
- ///宸ュ崟澶磋〃ID
- /// </summary>
- [Display(Name = "mes_headID")]
- [Column(TypeName = "uniqueidentifier")]
- [Required(AllowEmptyStrings = false)]
- public Guid mes_headID { get; set; }
+ /// <summary>
+ ///宸ュ崟缂栧彿
+ /// </summary>
+ [Display(Name ="宸ュ崟缂栧彿")]
+ [MaxLength(40)]
+ [Column(TypeName="nvarchar(40)")]
+ [Editable(true)]
+ public string jobID { get; set; }
- /// <summary>
- ///宸ュ崟鍗曞彿
- /// </summary>
- [Display(Name = "jobID")]
- [MaxLength(40)]
- [Column(TypeName = "nvarchar(40)")]
- [Editable(true)]
- public string jobID { get; set; }
+ /// <summary>
+ ///鐐変唬鍙�
+ /// </summary>
+ [Display(Name ="鐐変唬鍙�")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ [Editable(true)]
+ public string heatID { get; set; }
- /// <summary>
- ///鐐変唬鍙�
- /// </summary>
- [Display(Name = "鐐変唬鍙�")]
- [MaxLength(50)]
- [Column(TypeName = "nvarchar(50)")]
- [Editable(true)]
- public string heatID { get; set; }
+ /// <summary>
+ ///閽㈠澂鍙�
+ /// </summary>
+ [Display(Name ="閽㈠澂鍙�")]
+ [Column(TypeName="int")]
+ [Editable(true)]
+ public int? billetID { get; set; }
- /// <summary>
- ///閽㈠澂鍙�
- /// </summary>
- [Display(Name = "閽㈠澂鍙�")]
- [Column(TypeName = "int")]
- [Editable(true)]
- public int? billetID { get; set; }
+ /// <summary>
+ ///杞﹁疆SN鍙�
+ /// </summary>
+ [Display(Name ="杞﹁疆SN鍙�")]
+ [MaxLength(50)]
+ [Column(TypeName="nvarchar(50)")]
+ [Editable(true)]
+ public string SN { get; set; }
- /// <summary>
- ///杞﹁疆SN鍙�
- /// </summary>
- [Display(Name = "杞﹁疆SN鍙�")]
- [MaxLength(50)]
- [Column(TypeName = "nvarchar(50)")]
- [Editable(true)]
- public string SN { get; set; }
+ /// <summary>
+ ///鐑鐞嗘壒娆�
+ /// </summary>
+ [Display(Name ="鐑鐞嗘壒娆�")]
+ [MaxLength(30)]
+ [Column(TypeName="nvarchar(30)")]
+ [Editable(true)]
+ public string heatBatchID { get; set; }
- /// <summary>
- ///鐑鐞嗘壒娆�
- /// </summary>
- [Display(Name = "鐑鐞嗘壒娆�")]
- [MaxLength(30)]
- [Column(TypeName = "varchar(30)")]
- [Editable(true)]
- public string heatBatchID { get; set; }
+ /// <summary>
+ ///宸ュ崟澶磋〃ID
+ /// </summary>
+ [Display(Name ="宸ュ崟澶磋〃ID")]
+ [Column(TypeName="uniqueidentifier")]
+ [Editable(true)]
+ public Guid? mes_headID { get; set; }
- /// <summary>
- ///瀹屾垚鏃堕棿
- /// </summary>
- [Display(Name = "瀹屾垚鏃堕棿")]
- [Column(TypeName = "datetime")]
- [Editable(true)]
- public DateTime? FinishTime { get; set; }
+ /// <summary>
+ ///宸ュ崟鐘舵��
+ /// </summary>
+ [Display(Name ="宸ュ崟鐘舵��")]
+ [MaxLength(20)]
+ [Column(TypeName="nvarchar(20)")]
+ public string Status { get; set; }
- /// <summary>
- ///宸ュ崟鐘舵��
- /// </summary>
- [Display(Name = "宸ュ崟鐘舵��")]
- [MaxLength(20)]
- [Column(TypeName = "nvarchar(20)")]
- [Editable(true)]
- public string Status { get; set; }
+ /// <summary>
+ ///瀹屾垚鏃堕棿
+ /// </summary>
+ [Display(Name ="瀹屾垚鏃堕棿")]
+ [Column(TypeName="datetime")]
+ public DateTime? FinishTime { get; set; }
+
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs"
index c58bcb0..755b76a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/DomainModels/ToMES/dt_mes_head.cs"
@@ -225,5 +225,13 @@
[Column(TypeName = "bit")]
[Editable(true)]
public bool skip_op_3 { get; set; }
+
+ /// <summary>
+ ///AGV瀹屾垚鏁伴噺
+ /// </summary>
+ [Display(Name = "AGV瀹屾垚鏁伴噺")]
+ [Column(TypeName = "int")]
+ [Editable(true)]
+ public int? agv_finishNum { get; set; }
}
}
\ No newline at end of file
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/ToMES/dt_mes_detailMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/ToMES/dt_mes_detailMapConfig.cs"
new file mode 100644
index 0000000..1026a8b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/ToMES/dt_mes_detailMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_mes_detailMapConfig : EntityMappingConfiguration<dt_mes_detail>
+ {
+ public override void Map(EntityTypeBuilder<dt_mes_detail>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/widesea_wcs/dt_mes_headMapConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/widesea_wcs/dt_mes_headMapConfig.cs"
new file mode 100644
index 0000000..da78d46
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_Entity/MappingConfiguration/widesea_wcs/dt_mes_headMapConfig.cs"
@@ -0,0 +1,16 @@
+using WIDESEA_Entity.MappingConfiguration;
+using WIDESEA_Entity.DomainModels;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace WIDESEA_Entity.MappingConfiguration
+{
+ public class dt_mes_headMapConfig : EntityMappingConfiguration<dt_mes_head>
+ {
+ public override void Map(EntityTypeBuilder<dt_mes_head>
+ builderTable)
+ {
+ //b.Property(x => x.StorageName).HasMaxLength(45);
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IRepositories/ToMES/Idt_mes_detailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IRepositories/ToMES/Idt_mes_detailRepository.cs"
new file mode 100644
index 0000000..54a6081
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IRepositories/ToMES/Idt_mes_detailRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_mes_detailRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WCS.IRepositories
+{
+ public partial interface Idt_mes_detailRepository : IDependency,IRepository<dt_mes_detail>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Idt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Idt_mes_detailService.cs"
new file mode 100644
index 0000000..c29cef4
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Idt_mes_detailService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WCS.IServices
+{
+ public partial interface Idt_mes_detailService : IService<dt_mes_detail>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Partial/Idt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Partial/Idt_mes_detailService.cs"
new file mode 100644
index 0000000..8138bff
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/IServices/ToMES/Partial/Idt_mes_detailService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_mes_detail绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WCS.IServices
+{
+ public partial interface Idt_mes_detailService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Repositories/ToMES/dt_mes_detailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Repositories/ToMES/dt_mes_detailRepository.cs"
new file mode 100644
index 0000000..b07c5a8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Repositories/ToMES/dt_mes_detailRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_mes_detailRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WCS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WCS.Repositories
+{
+ public partial class dt_mes_detailRepository : RepositoryBase<dt_mes_detail> , Idt_mes_detailRepository
+ {
+ public dt_mes_detailRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_mes_detailRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_mes_detailRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_detailService.cs"
new file mode 100644
index 0000000..bed465a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/Partial/dt_mes_detailService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_mes_detail绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_mes_detailService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WCS.IRepositories;
+
+namespace WIDESEA_WCS.Services
+{
+ public partial class dt_mes_detailService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_mes_detailRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_mes_detailService(
+ Idt_mes_detailRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/dt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/dt_mes_detailService.cs"
new file mode 100644
index 0000000..7c131a6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WCS/Services/ToMES/dt_mes_detailService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_mes_detailService涓嶪dt_mes_detailService涓紪鍐�
+ */
+using WIDESEA_WCS.IRepositories;
+using WIDESEA_WCS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WCS.Services
+{
+ public partial class dt_mes_detailService : ServiceBase<dt_mes_detail, Idt_mes_detailRepository>
+ , Idt_mes_detailService, IDependency
+ {
+ public dt_mes_detailService(Idt_mes_detailRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_mes_detailService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_mes_detailService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs"
index b062dd8..691465f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/AGVTask/HandleTask.cs"
@@ -12,6 +12,7 @@
using WIDESEA_WMS.IRepositories;
using WIDESEA_WMS.Repositories;
using static FreeSql.Internal.GlobalFilter;
+using static System.Collections.Specialized.BitVector32;
namespace WIDESEA_WMS.Common
{
@@ -28,6 +29,27 @@
VOLContext context = new VOLContext();
Idt_agvtask_htyRepository htyRepository = new dt_agvtask_htyRepository(context);
Idt_agvtaskRepository repository = new dt_agvtaskRepository(context);
+ Idt_mes_headRepository idt_Mes_Head = new dt_mes_headRepository(context);
+ Idt_mes_detailRepository idt_Mes_Detail=new dt_mes_detailRepository(context);
+
+ if (task.agv_worktype == 17)
+ {
+ string[] bindSNs = task.bindSN.Split(",");
+ foreach (var item in bindSNs)
+ {
+ var mes_detail = idt_Mes_Detail.Find(x => x.SN == item).FirstOrDefault();
+ var mes_head= idt_Mes_Head.Find(x=>x.jobID==mes_detail.jobID).FirstOrDefault();
+ if(mes_head != null)
+ {
+
+ mes_head.agv_finishNum = mes_head.agv_finishNum == null ? task.agv_qty : mes_head.agv_finishNum + task.agv_qty;
+ idt_Mes_Head.Update(mes_head, x => new { x.agv_finishNum }, true);
+ break;
+ }
+ }
+
+ }
+
dt_agvtask_hty agvtask_Hty = new dt_agvtask_hty()
{
hty_pkid = Guid.NewGuid(),
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_detailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_detailRepository.cs"
new file mode 100644
index 0000000..df51d86
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_detailRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_mes_detailRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_mes_detailRepository : IDependency,IRepository<dt_mes_detail>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_headRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_headRepository.cs"
new file mode 100644
index 0000000..452d21f
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IRepositories/widesea_wcs/Idt_mes_headRepository.cs"
@@ -0,0 +1,18 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶笽dt_mes_headRepository缂栧啓鎺ュ彛
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Extensions.AutofacManager;
+namespace WIDESEA_WMS.IRepositories
+{
+ public partial interface Idt_mes_headRepository : IDependency,IRepository<dt_mes_head>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/ToMES/Partial/Idt_mes_headsService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/ToMES/Partial/Idt_mes_headsService.cs"
new file mode 100644
index 0000000..2c42f60
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/ToMES/Partial/Idt_mes_headsService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_mes_heads绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_mes_headsService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_detailService.cs"
new file mode 100644
index 0000000..755525a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_detailService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_mes_detailService : IService<dt_mes_detail>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_headService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_headService.cs"
new file mode 100644
index 0000000..4b731d7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Idt_mes_headService.cs"
@@ -0,0 +1,12 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ */
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_mes_headService : IService<dt_mes_head>
+ {
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_detailService.cs"
new file mode 100644
index 0000000..8daea22
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_detailService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_mes_detail绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_mes_detailService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_headService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_headService.cs"
new file mode 100644
index 0000000..ecb5de0
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/IServices/widesea_wcs/Partial/Idt_mes_headService.cs"
@@ -0,0 +1,13 @@
+/*
+*鎵�鏈夊叧浜巇t_mes_head绫荤殑涓氬姟浠ｇ爜鎺ュ彛搴斿湪姝ゅ缂栧啓
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+namespace WIDESEA_WMS.IServices
+{
+ public partial interface Idt_mes_headService
+ {
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_detailRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_detailRepository.cs"
new file mode 100644
index 0000000..d241153
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_detailRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_mes_detailRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_mes_detailRepository : RepositoryBase<dt_mes_detail> , Idt_mes_detailRepository
+ {
+ public dt_mes_detailRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_mes_detailRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_mes_detailRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_headRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_headRepository.cs"
new file mode 100644
index 0000000..14baa0d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Repositories/widesea_wcs/dt_mes_headRepository.cs"
@@ -0,0 +1,24 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *Repository鎻愪緵鏁版嵁搴撴搷浣滐紝濡傛灉瑕佸鍔犳暟鎹簱鎿嶄綔璇峰湪褰撳墠鐩綍涓婸artial鏂囦欢澶筪t_mes_headRepository缂栧啓浠ｇ爜
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Repositories
+{
+ public partial class dt_mes_headRepository : RepositoryBase<dt_mes_head> , Idt_mes_headRepository
+ {
+ public dt_mes_headRepository(VOLContext dbContext)
+ : base(dbContext)
+ {
+
+ }
+ public static Idt_mes_headRepository Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_mes_headRepository>(); } }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_detailService.cs"
new file mode 100644
index 0000000..c10cc7e
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_detailService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_mes_detail绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_mes_detailService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_mes_detailService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_mes_detailRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_mes_detailService(
+ Idt_mes_detailRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_headService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_headService.cs"
new file mode 100644
index 0000000..87cb34d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/Partial/dt_mes_headService.cs"
@@ -0,0 +1,41 @@
+/*
+ *鎵�鏈夊叧浜巇t_mes_head绫荤殑涓氬姟浠ｇ爜搴斿湪姝ゅ缂栧啓
+*鍙娇鐢╮epository.璋冪敤甯哥敤鏂规硶锛岃幏鍙朎F/Dapper绛変俊鎭�
+*濡傛灉闇�瑕佷簨鍔¤浣跨敤repository.DbContextBeginTransaction
+*涔熷彲浣跨敤DBServerProvider.鎵嬪姩鑾峰彇鏁版嵁搴撶浉鍏充俊鎭�
+*鐢ㄦ埛淇℃伅銆佹潈闄愩�佽鑹茬瓑浣跨敤UserContext.Current鎿嶄綔
+*dt_mes_headService瀵瑰銆佸垹銆佹敼鏌ャ�佸鍏ャ�佸鍑恒�佸鏍镐笟鍔′唬鐮佹墿灞曞弬鐓erviceFunFilter
+*/
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+using System.Linq;
+using WIDESEA_Core.Utilities;
+using System.Linq.Expressions;
+using WIDESEA_Core.Extensions;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_WMS.IRepositories;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_mes_headService
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ private readonly Idt_mes_headRepository _repository;//璁块棶鏁版嵁搴�
+
+ [ActivatorUtilitiesConstructor]
+ public dt_mes_headService(
+ Idt_mes_headRepository dbRepository,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(dbRepository)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ _repository = dbRepository;
+ //澶氱鎴蜂細鐢ㄥ埌杩檌nit浠ｇ爜锛屽叾浠栨儏鍐靛彲浠ヤ笉鐢�
+ //base.Init(dbRepository);
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_detailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_detailService.cs"
new file mode 100644
index 0000000..6054f3a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_detailService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_mes_detailService涓嶪dt_mes_detailService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_mes_detailService : ServiceBase<dt_mes_detail, Idt_mes_detailRepository>
+ , Idt_mes_detailService, IDependency
+ {
+ public dt_mes_detailService(Idt_mes_detailRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_mes_detailService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_mes_detailService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_headService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_headService.cs"
new file mode 100644
index 0000000..eda87d5
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Services/widesea_wcs/dt_mes_headService.cs"
@@ -0,0 +1,27 @@
+/*
+ *Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,姝ゅ浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *鎵�鏈変笟鍔＄紪鍐欏叏閮ㄥ簲鍦≒artial鏂囦欢澶逛笅dt_mes_headService涓嶪dt_mes_headService涓紪鍐�
+ */
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.IServices;
+using WIDESEA_Core.BaseProvider;
+using WIDESEA_Core.Extensions.AutofacManager;
+using WIDESEA_Entity.DomainModels;
+
+namespace WIDESEA_WMS.Services
+{
+ public partial class dt_mes_headService : ServiceBase<dt_mes_head, Idt_mes_headRepository>
+ , Idt_mes_headService, IDependency
+ {
+ public dt_mes_headService(Idt_mes_headRepository repository)
+ : base(repository)
+ {
+ Init(repository);
+ }
+ public static Idt_mes_headService Instance
+ {
+ get { return AutofacContainerModule.GetService<Idt_mes_headService>(); } }
+ }
+ }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
index f7996da..8d0aa56 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/ToAGV/ToAGVServer.cs"
@@ -78,7 +78,7 @@
{
remark = remark + "缁堢偣宸插畬鎴�";
task.agv_finishedtime = DateTime.Now;
-
+
HandleTask.Updateinventory(task);
#region 鍚屾MES鍑哄叆搴撲俊鎭�
HandleTask_Mes.UploadMESInfo(task);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_detailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_detailController.cs"
new file mode 100644
index 0000000..3d2d76a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_detailController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_mes_detail",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_mes_detailController
+ {
+ private readonly Idt_mes_detailService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_mes_detailController(
+ Idt_mes_detailService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_headController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_headController.cs"
new file mode 100644
index 0000000..26002e2
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/Partial/dt_mes_headController.cs"
@@ -0,0 +1,33 @@
+/*
+ *鎺ュ彛缂栧啓澶�...
+*濡傛灉鎺ュ彛闇�瑕佸仛Action鐨勬潈闄愰獙璇侊紝璇峰湪Action涓婁娇鐢ㄥ睘鎬�
+*濡�: [ApiActionPermission("dt_mes_head",Enums.ActionPermissionOptions.Search)]
+ */
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.AspNetCore.Http;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IServices;
+
+namespace WIDESEA_WMS.Controllers
+{
+ public partial class dt_mes_headController
+ {
+ private readonly Idt_mes_headService _service;//璁块棶涓氬姟浠ｇ爜
+ private readonly IHttpContextAccessor _httpContextAccessor;
+
+ [ActivatorUtilitiesConstructor]
+ public dt_mes_headController(
+ Idt_mes_headService service,
+ IHttpContextAccessor httpContextAccessor
+ )
+ : base(service)
+ {
+ _service = service;
+ _httpContextAccessor = httpContextAccessor;
+ }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_detailController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_detailController.cs"
new file mode 100644
index 0000000..3ca51ac
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_detailController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_mes_detailController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_mes_detail")]
+ [PermissionTable(Name = "dt_mes_detail")]
+ public partial class dt_mes_detailController : ApiBaseController<Idt_mes_detailService>
+ {
+ public dt_mes_detailController(Idt_mes_detailService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_headController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_headController.cs"
new file mode 100644
index 0000000..96b5a2d
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/WIDESEA_WMS/dt_mes_headController.cs"
@@ -0,0 +1,21 @@
+/*
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *濡傛灉瑕佸鍔犳柟娉曡鍦ㄥ綋鍓嶇洰褰曚笅Partial鏂囦欢澶筪t_mes_headController缂栧啓
+ */
+using Microsoft.AspNetCore.Mvc;
+using WIDESEA_Core.Controllers.Basic;
+using WIDESEA_Entity.AttributeManager;
+using WIDESEA_WMS.IServices;
+namespace WIDESEA_WMS.Controllers
+{
+ [Route("api/dt_mes_head")]
+ [PermissionTable(Name = "dt_mes_head")]
+ public partial class dt_mes_headController : ApiBaseController<Idt_mes_headService>
+ {
+ public dt_mes_headController(Idt_mes_headService service)
+ : base(service)
+ {
+ }
+ }
+}
+
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/WIDESEA_WebApi.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/WIDESEA_WebApi.csproj"
index d997766..a6b525b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/WIDESEA_WebApi.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/WIDESEA_WebApi.csproj"
@@ -37,7 +37,7 @@
</ItemGroup>
<ItemGroup>
- <Folder Include="Controllers\WIDESEA_WCS\Partial\" />
+ <Folder Include="Controllers\WIDESEA_WCS\" />
</ItemGroup>
--
Gitblit v1.9.3