From ceb82ce60d984e2a9457502e74ec12b6800d26ef Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 五月 2024 08:21:24 +0800
Subject: [PATCH] 托盘数量可修改
---
代码管理/PCS/WCS_Client/src/api/http.js | 2
代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs | 55 -------------
代码管理/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs | 3
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue | 2
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue | 27 +++---
代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs | 79 ++-----------------
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Mes_Workinfo.cs | 2
代码管理/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Workinfo_hty.cs | 8 +
代码管理/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue | 5
9 files changed, 41 insertions(+), 142 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js"
index 8ecd457..f6b7a14 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/api/http.js"
@@ -12,7 +12,7 @@
let loadingInstance;
let loadingStatus = false;
if (process.env.NODE_ENV == 'development') {
- axios.defaults.baseURL = 'http://127.0.0.1:8099/';
+ axios.defaults.baseURL = 'http://192.168.12.101:8099/';
}
else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'http://192.168.12.101:8099/';
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue"
index f387f15..650b9c6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo.vue"
@@ -27,7 +27,7 @@
cnName: '宸ュ崟淇℃伅',
name: 'tomes/VV_Workinfo',
url: "/VV_Workinfo/",
- sortName: "workOrder"
+ sortName: "CreateTime"
});
const editFormFields = ref({"stackNoRange":""});
const editFormOptions = ref([[{"title":"鎵撳寘鏁伴噺","field":"stackNoRange","type":"number"}]]);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue"
index 4c1f0da..2843e41 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/VV_Workinfo_hty.vue"
@@ -27,12 +27,12 @@
cnName: '宸ュ崟鍘嗗彶淇℃伅',
name: 'tomes/VV_Workinfo_hty',
url: "/VV_Workinfo_hty/",
- sortName: "FinishTime"
+ sortName: "completedate"
});
const editFormFields = ref({});
const editFormOptions = ref([]);
const searchFormFields = ref({"workOrder":"","jobID":"","drawingNo":"","productName":"","heatID":"","billetID":"","SN":"","processCode":"","CreateTime":"","FinishTime":"","operatetype":"","productDesc":""});
- const searchFormOptions = ref([[{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"宸ヤ綔浠ゅ彿","field":"workOrder","type":"like"},{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"}],[{"title":"浜у搧鍚嶇О","field":"productName","type":"like"},{"title":"鐐変唬鍙�","field":"heatID","type":"like"},{"title":"閽㈠澂鍙�","field":"billetID","type":"like"}],[{"title":"杞﹁疆SN鍙�","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"operatetype","type":"select"}],[{"title":"鍒涘缓鏃堕棿","field":"CreateTime","type":"date"},{"title":"瀹屾垚鏃堕棿","field":"FinishTime","type":"date"},{"title":"浜у搧鎻忚堪","field":"productDesc","type":"like"}]]);
+ const searchFormOptions = ref([[{"title":"鍥惧彿","field":"drawingNo","type":"like"},{"title":"宸ヤ綔浠ゅ彿","field":"workOrder","type":"like"},{"title":"宸ュ崟缂栧彿","field":"jobID","type":"like"}],[{"title":"浜у搧鍚嶇О","field":"productName","type":"like"},{"title":"鐐変唬鍙�","field":"heatID","type":"like"},{"title":"閽㈠澂鍙�","field":"billetID","type":"like"}],[{"title":"杞﹁疆SN鍙�","field":"SN","type":"like"},{"dataKey":"WorkTypes","data":[],"title":"宸ュ崟绫诲瀷","field":"processCode","type":"select"},{"dataKey":"WorkOperateTypes","data":[],"title":"鎿嶄綔绫诲瀷","field":"operatetype","type":"select"}],[{"title":"鍒涘缓鏃堕棿","field":"CreateTime","type":"date"},{"title":"鎿嶄綔鏃堕棿","field":"completedate","type":"date"},{"title":"浜у搧鎻忚堪","field":"productDesc","type":"like"}]]);
const columns = ref([{field:'mes_id',title:'宸ュ崟澶磋〃ID',hidden:true,type:'guid',width:110,require:true,align:'left',sort:true},
{field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',sort:true,width:110,align:'left'},
{field:'jobID',title:'宸ュ崟缂栧彿',type:'string',sort:true,width:110,align:'left'},
@@ -60,6 +60,7 @@
{field:'heatBatchID',title:'鐑鐞嗘壒娆�',hidden:true,type:'string',width:110,align:'left'},
{field:'Status',title:'宸ュ崟鐘舵��',type:'string',width:110,align:'left'},
{field:'FinishTime',title:'瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
+ {field:'completedate',title:'鎿嶄綔鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'operatetype',title:'鎿嶄綔绫诲瀷',type:'string',bind:{ key:'WorkOperateTypes',data:[]},width:110,align:'left'},
{field:'compeletor',title:'鎿嶄綔鑰�',type:'string',width:110,align:'left'},
{field:'productDesc',title:'浜у搧鎻忚堪',type:'string',width:180,align:'left'}]);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue"
index 79fcd81..698401c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Client/src/views/widesea_wcs/tomes/dt_mes_head.vue"
@@ -27,13 +27,14 @@
cnName: '宸ュ崟澶磋〃',
name: 'tomes/dt_mes_head',
url: "/dt_mes_head/",
- sortName: "ID"
+ sortName: "CreateTime"
});
- const editFormFields = ref({"skip_op_1":"","skip_op_2":"","skip_op_3":""});
+ const editFormFields = ref({"stackNoRange":"","skip_op_1":"","skip_op_2":"","skip_op_3":""});
const editFormOptions = ref([
- [{ "dataKey": "skip_op_Status", "data": [], "title": "瑙嗚妫�娴�1", "required": true, "field": "skip_op_1", "type": "radio" }],
- [{ "dataKey": "skip_op_Status", "data": [], "title": "瑙嗚妫�娴�2", "required": true, "field": "skip_op_2", "type": "radio" }],
- [{ "dataKey": "skip_op_Status", "data": [], "title": "鍠烽槻閿堟恫", "required": true, "field": "skip_op_3", "type": "radio" }],
+ [{"title":"鎵撳寘鏁伴噺","field":"stackNoRange","type":"number"}],
+ [{ "dataKey": "skip_op_Status", "data": [], "title": "瑙嗚妫�娴�1", "required": true, "field": "skip_op_1", "type": "select" }],
+ [{ "dataKey": "skip_op_Status", "data": [], "title": "瑙嗚妫�娴�2", "required": true, "field": "skip_op_2", "type": "select" }],
+ [{ "dataKey": "skip_op_Status", "data": [], "title": "鍠烽槻閿堟恫", "required": true, "field": "skip_op_3", "type": "select" }],
// [{
// title: "鎸囧畾搴撳尯", field: "area",
// data: [
@@ -54,22 +55,22 @@
const columns = ref([{field:'mes_id',title:'mes_id',type:'guid',width:110,hidden:true,readonly:true,require:true,align:'left'},
{field:'workOrder',title:'宸ヤ綔浠ゅ彿',type:'string',width:110,align:'left',sort:true},
{field:'jobID',title:'宸ュ崟缂栧彿',type:'string',width:110,align:'left'},
- {field:'reqID',title:'闇�姹傚崟鍙�',type:'string',width:110,align:'left'},
- {field:'reqIDLineNo',title:'闇�姹傚崟鍙疯鍙�',type:'string',width:110,align:'left'},
- {field:'materialCode',title:'鐗╂枡缂栫爜',type:'string',width:110,align:'left'},
+ // {field:'reqID',title:'闇�姹傚崟鍙�',type:'string',width:110,align:'left'},
+ // {field:'reqIDLineNo',title:'闇�姹傚崟鍙疯鍙�',type:'string',width:110,align:'left'},
+ // {field:'materialCode',title:'鐗╂枡缂栫爜',type:'string',width:110,align:'left'},
{field:'drawingNo',title:'鍥惧彿',type:'string',width:110,align:'left'},
{field:'drawingNoVer',title:'鎶�鏈姸鎬�',type:'string',width:110,align:'left'},
- {field:'productName',title:'浜у搧鍚嶇О',type:'string',width:110,align:'left'},
+ // {field:'productName',title:'浜у搧鍚嶇О',type:'string',width:110,align:'left'},
{field:'processCode',title:'宸ュ崟绫诲瀷',bind: { key: 'WorkTypes' },type:'string',width:110,align:'left'},
{field:'quantity',title:'璁″垝鏁伴噺',type:'int',width:110,align:'left'},
{field:'finishNum',title:'瀹屾垚鏁伴噺',type:'int',width:110,align:'left'},
+ {field:'area',title:'鎸囧畾搴撳尯',type:'string',width:110,align:'left'},
+ // {field:'typeID',title:'杞瀷浠ｇ爜',type:'string',width:110,align:'left'},
+ {field:'stackNoRange',title:'鎵撳寘鏁伴噺',type:'int',width:110,align:'left',sort:true},
{field:'skip_op_1',title:'瑙嗚妫�娴�1',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
{field:'skip_op_2',title:'瑙嗚妫�娴�2',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
{field:'skip_op_3',title:'鍠烽槻閿堟恫',type:'bool',bind:{ key:'skip_op_Status',data:[]},width:110,require:true,align:'left'},
- {field:'area',title:'鎸囧畾搴撳尯',type:'string',width:110,align:'left'},
- {field:'typeID',title:'杞瀷浠ｇ爜',type:'string',width:110,align:'left'},
- {field:'stackNoRange',title:'鎵撳寘鏁伴噺',type:'int',width:110,align:'left'},
- {field:'maxDiameterDiff',title:'杞緞鍋忓樊',type:'decimal',width:110,align:'left'},
+ // {field:'maxDiameterDiff',title:'杞緞鍋忓樊',type:'decimal',width:110,align:'left'},
{field:'expectedStartTime',title:'璁″垝寮�濮嬫椂闂�',type:'datetime',width:150,align:'left',sort:true},
{field:'expectedFinishTime',title:'璁″垝瀹屾垚鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
{field:'CreateTime',title:'鍒涘缓鏃堕棿',type:'datetime',width:150,align:'left',sort:true},
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Mes_Workinfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Mes_Workinfo.cs"
index 6cbd09d..dda1b9e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Mes_Workinfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Mes_Workinfo.cs"
@@ -149,7 +149,7 @@
public string typeID { get; set; }
/// <summary>
- ///
+ ///鎵撳寘鏁伴噺
/// </summary>
[Key]
[Display(Name = "stackNoRange")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Workinfo_hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Workinfo_hty.cs"
index 94888fc..690579c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Workinfo_hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Entity/DomainModels/ToMES/VV_Workinfo_hty.cs"
@@ -276,6 +276,12 @@
[Editable(true)]
public string productDesc { get; set; }
-
+ /// <summary>
+ ///鎿嶄綔鏃堕棿
+ /// </summary>
+ [Display(Name = "鎿嶄綔鏃堕棿")]
+ [Column(TypeName = "datetime")]
+ [Editable(true)]
+ public DateTime? completedate { 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/Common/Gantry.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
index 9ad8b37..714b1d9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
@@ -496,7 +496,8 @@
var station = stationinfoRepository.Find(x => x.area == areaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString()).FirstOrDefault();
if (station != null)
{
- if (station.quantity >= 5)
+ if (station.quantity >= Mes_Work.stackNoRange)
+ //if (station.quantity >= 5)
{
Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", Wheel_SN, "杞﹁疆鏁伴噺宸叉弧锛�", $"鍖哄煙鍙凤細{AreaNr}锛沑n杞﹁疆鏁帮細{station.quantity}\n閿欒淇℃伅锛氬尯鍩熷彿杞﹁疆鏁伴噺宸叉弧锛�");
@@ -657,7 +658,8 @@
.Where(x => x.enable
&& x.stationCode != NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
- && x.quantity < 5
+ && x.quantity < Work.stackNoRange
+ //&& x.quantity < 5
&& x.stationType == Work.drawingNo
&& x.Number == Work.workOrder
&& x.heatNumber == Work.heatID)
@@ -670,7 +672,8 @@
.Where(x => x.enable
&& x.stationCode != NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
- && x.quantity < 5
+ && x.quantity < Work.stackNoRange
+ //&& x.quantity < 5
&& x.stationType == Work.drawingNo
&& x.Number == Work.workOrder)
.OrderByDescending(x => x.quantity)
@@ -699,7 +702,8 @@
#endregion
#region 鎵樼洏杞﹁疆鍫嗗灈绗洓涓椂涓嬪彂鍙﹀涓�涓倝鍙风殑鍏ュ簱浠诲姟
- if (Stationinfo.quantity + 1 >= 4)
+ //if (Stationinfo.quantity + 1 >= 4)
+ if (Stationinfo.quantity + 1 >= Work.stackNoRange - 1)
{
var stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.stationCode != Stationinfo.stationCode && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
if (stationinfo != null)
@@ -798,7 +802,8 @@
dt_stationinfo Stationinfo = Stations.Where(x => x.enable
&& x.stationCode == NGStation
&& x.location_state == LocationStateEnum.Stroge.ToString()
- && x.quantity < 5
+ && x.quantity < Work.stackNoRange
+ //&& x.quantity < 5
&& x.stationType == Work.drawingNo).FirstOrDefault();
if (Stationinfo == null)
@@ -912,70 +917,6 @@
tasktype = "TaskType_OutsourceInbound";
AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, stationinfo, tasktype, Work);
}
-
- #region MyRegion
- /// <summary>
- /// AGV浠诲姟
- /// </summary>
- //public void agvtask(Idt_stationinfoRepository stationinfoRepository, dt_stationinfo stationinfo, VV_Mes_Workinfo Work, string tasktype)
- //{
- // VOLContext Context = new VOLContext();
- // Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);
- // Idt_mes_headRepository mes_HeadRepository = new dt_mes_headRepository(Context);
-
- // var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();
- // if (task != null) return;
- // //var mes_Head = mes_HeadRepository.Find(x => x.jobID == Work.jobID).FirstOrDefault();
- // //if (mes_Head == null)
- // //{
- // // stationinfo.remark = "瑙﹀彂鍏ュ簱浠诲姟,浣嗘湭鎵惧埌宸ュ崟澶磋〃锛�";
- // // stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
- // // stationinfoRepository.Update(stationinfo, true);
- // // return;
- // //}
-
- // dt_stationinfo TargetLocation = null;
- // //int CompeletedNum = Convert.ToInt32(mes_Head.quantity) - Convert.ToInt32(mes_Head.finishNum);
- // //if (mes_Head.quantity <= 50) tasktype = "TaskType_OutsourceInbound";
-
- // if (tasktype == "TaskType_OutsourceInbound" || !string.IsNullOrEmpty(Work.area))
- // TargetLocation = StationTask.GetEmptyLocation(stationinfoRepository);
- // else if (tasktype == "TaskType_Inbound")
- // TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, Work, stationinfo);
- // //TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, mes_Head, stationinfo);
- // if (TargetLocation != null)
- // {
- // dt_agvtask agvtask = new dt_agvtask()
- // {
- // agv_fromaddress = stationinfo.stationCode,
- // agv_id = Guid.NewGuid(),
- // agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- // agv_grade = 1,
- // agv_createtime = DateTime.Now,
- // agv_taskstate = "Create",
- // agv_materielid = stationinfo.stationType,
- // agv_qty = stationinfo.quantity,
- // agv_tasktype = tasktype,
- // agv_toaddress = TargetLocation.stationCode,
- // agv_userid = "绯荤粺",
- // bindSN = stationinfo.bindSN,
- // agv_worktype = Convert.ToInt32(Work.processCode),
- // agv_materbarcode = Work.materialCode,
- // agv_Traytype = stationinfo.tray_type,
- // jobID = stationinfo.Number,
- // agv_TrayStatus = stationinfo.tray_status
- // };
- // agvtaskRepository.Add(agvtask, true);
- // stationinfo.location_state = LocationStateEnum.InBusy.ToString();
- // stationinfoRepository.Update(stationinfo, true);
- // TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
- // TargetLocation.stationType = agvtask.agv_materielid;
- // TargetLocation.heatNumber = stationinfo.heatNumber;
- // TargetLocation.Number = agvtask.jobID;
- // stationinfoRepository.Update(TargetLocation, true);
- // }
- //}
- #endregion
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
index 141e4f6..14a2b4f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/StationTask.cs"
@@ -66,7 +66,8 @@
dt_stationinfo TargetLocation = null;
string tasktype = "";
- if (item.quantity == 5)
+ //if (item.quantity == 5)
+ if (item.quantity == work.stackNoRange)
{
if (!string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
tasktype = "TaskType_OutsourceInbound";
@@ -74,58 +75,6 @@
tasktype = "TaskType_Inbound";
AGVTask.AddQueueTask(stationinfoRepository, agvtaskRepository, item, tasktype, work);
-
- #region MyRegion
- //if (/*(mesinfo.quantity <= 50 &&*/ !string.IsNullOrEmpty(work.area) || item.stationCode.Contains("3"))
- //{
- // //todo 瀵绘壘鍙斁璐у鍗忔斁璐у彴
- // tasktype = "TaskType_OutsourceInbound";
- // TargetLocation = GetEmptyLocation(stationinfoRepository);
-
- //}
- //else
- //{
- // //todo: 璋冪敤WMS鎺ュ彛鍒涘缓浠诲姟
- // tasktype = "TaskType_Inbound";
- // TargetLocation = GetLocation.GetEmptyLocation(stationinfoRepository, work, item);
- //}
- //if (TargetLocation != null)
- //{
- // dt_agvtask agvtask = new dt_agvtask()
- // {
- // agv_fromaddress = item.stationCode,
- // agv_id = Guid.NewGuid(),
- // agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
- // agv_grade = 1,
- // agv_createtime = DateTime.Now,
- // agv_taskstate = "Create",
- // agv_materielid = item.stationType,
- // agv_qty = item.quantity,
- // agv_tasktype = tasktype,
- // agv_toaddress = TargetLocation.stationCode,
- // agv_userid = "绯荤粺",
- // bindSN = item.bindSN,
- // agv_worktype = Convert.ToInt32(work.processCode),
- // agv_materbarcode = work.materialCode,
- // agv_Traytype = item.tray_type,
- // jobID = item.Number,
- // agv_TrayStatus = item.tray_status
- // };
- // agvtaskRepository.Add(agvtask, true);
-
- // item.location_state = LocationStateEnum.InBusy.ToString();
- // stationinfoRepository.Update(item, true);
-
- // TargetLocation.location_state = LocationStateEnum.InBusy.ToString();
- // TargetLocation.stationType = agvtask.agv_materielid;
- // TargetLocation.heatNumber = item.heatNumber;
- // TargetLocation.billetID = item.billetID;
- // TargetLocation.Number = agvtask.jobID;
- // stationinfoRepository.Update(TargetLocation, true);
- // WriteDBLog.Success("鍒涘缓鍏ュ簱浠诲姟", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
- //}
- #endregion
-
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs"
index 627403c..b71b7aa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/ToMES/ToMesServer.cs"
@@ -87,7 +87,8 @@
quantity = workInfo.quantity,
reqID = workInfo.reqID,
reqIDLineNo = workInfo.reqIDLineNo,
- stackNoRange = workInfo.stackNoRange,
+ stackNoRange = 5,
+ //stackNoRange = workInfo.stackNoRange,
typeID = workInfo.typeID,
workOrder = workInfo.workOrder,
processCode = workInfo.processCode,
--
Gitblit v1.9.3