From 7c63794aa85ab939308d10a9ad5c1a57c46bbf6f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 14 12月 2024 14:01:46 +0800
Subject: [PATCH] 222
---
CC/iWareTestForm/iWareTest/DialogForm/TestBatchForm.cs | 181 --------------------------------------------
1 files changed, 3 insertions(+), 178 deletions(-)
diff --git a/CC/iWareTestForm/iWareTest/DialogForm/TestBatchForm.cs b/CC/iWareTestForm/iWareTest/DialogForm/TestBatchForm.cs
index 79ac2e0..cc4c740 100644
--- a/CC/iWareTestForm/iWareTest/DialogForm/TestBatchForm.cs
+++ b/CC/iWareTestForm/iWareTest/DialogForm/TestBatchForm.cs
@@ -202,7 +202,7 @@
StoreHandler.AddStoreForEmptySalverTransfer(context, remark, toPlace, qty, "浜哄伐鎵嬪姩", ref salver, ref newMaterial);
- SaveLog(MaterialTypeEnum.鎵樼洏, newMaterial, context, tb_SrmNo, remark, qty, salver, toPlace, "", "");
+
context.SaveChanges();//鎻愪氦鏁版嵁
}
@@ -255,7 +255,7 @@
//缁戝畾鎵樼洏鍜岀珯鐐圭殑鍏崇郴
Salver_Station_Handler.CreateCvPRelation(context, "浜哄伐鎵嬪姩", salver, toPlace, Salver_V_Station_StateEnum.鍏ュ簱缁戝畾, remark);
- SaveLog(MaterialTypeEnum.涓�鑸墿鏂�, newMaterial, context, tb_SrmNo, remark, qty, salver, toPlace, SerialNumber, OrderNo);
+
context.SaveChanges();//鎻愪氦鏁版嵁
}
@@ -528,182 +528,7 @@
}
}
- private void SaveLog(MaterialTypeEnum _MaterialTypeEnum, Base_Material newMaterial, DbModel context, string tb_SrmNo, string remark, int qty,
- Base_Salver salver, Base_Station toPlace, string serialNumber, string orderNo)
- {
- //澧炲姞Main琛ㄥ拰Part琛ㄦ暟鎹�
- Task_Main mainTask = new Task_Main();
- mainTask.IsVirtual = false;//闈炶櫄鎷熷叆搴�
- MainTaskTypeEnum _taskType = default(MainTaskTypeEnum);
- DeviceTaskTypeEnum _DeviceTaskTypeEnum = default(DeviceTaskTypeEnum);
- string handlerType = "";
- MaterialTypeEnum _MaterialType = default(MaterialTypeEnum);
- switch (_MaterialTypeEnum)
- {
- case MaterialTypeEnum.鎵樼洏:
- handlerType = "鎵嬪姩娣诲姞鎵樼洏搴撳瓨";
- _DeviceTaskTypeEnum = DeviceTaskTypeEnum.绌烘墭杞繍鍒扮珛浣撳簱;
- mainTask.TaskNo = TaskNoHelper.GenerateTaskNo("IN__SD_TP");
- mainTask.TaskName = "鎵嬪姩娣诲姞鎵樼洏搴撳瓨";
- mainTask.InOutFlag = (int)MainInOutFlagEnum.鍏ュ簱;
- mainTask.InOutFlagName = MainInOutFlagEnum.鍏ュ簱.ToString();
- _taskType = MainTaskTypeEnum.鎵嬪姩鍏ュ簱;
- mainTask.TaskType = Convert.ToInt32(_taskType);
- mainTask.TaskTypeName = _taskType.ToString();
- _MaterialType = MaterialTypeEnum.鎵樼洏;
- break;
- case MaterialTypeEnum.涓�鑸墿鏂�:
- handlerType = "鎵嬪姩娣诲姞鍙戝姩鏈哄簱瀛�";
- _DeviceTaskTypeEnum = DeviceTaskTypeEnum.缁勭洏鍏ュ簱;
-
- mainTask.TaskNo = TaskNoHelper.GenerateTaskNo("IN_SD");
- mainTask.TaskName = "鎵嬪姩鍏ュ簱";
- mainTask.InOutFlag = (int)MainInOutFlagEnum.鍏ュ簱;
- mainTask.InOutFlagName = MainInOutFlagEnum.鍏ュ簱.ToString();
- _taskType = MainTaskTypeEnum.鎵嬪姩鍏ュ簱;
- mainTask.TaskType = Convert.ToInt32(_taskType);
- mainTask.TaskTypeName = _taskType.ToString();
-
- mainTask.SerialNumber = serialNumber;
- mainTask.OrderNo = orderNo;
-
- _MaterialType = MaterialTypeEnum.涓�鑸墿鏂�;
-
-
-
- break;
- }
-
- mainTask.MaterialType = (int)_MaterialType;
- mainTask.MaterialTypeName = _MaterialType.ToString();
-
-
- var _taskState = MainTaskStatusEnum.宸插畬鎴�;
- mainTask.TaskState = Convert.ToInt32(_taskState);
- mainTask.TaskStateName = _taskState.ToString();
- mainTask.IsAllowSimulateExecute = true;
- mainTask.OperationRemark = handlerType;
- mainTask.Qty = qty;
- mainTask.CreateTime = mainTask.ModifyTime = mainTask.StartTime = DateTime.Now;
- mainTask.CreateBy = mainTask.ModifyBy = SysGloble.WCSSystem;
-
- mainTask.MaterialId = newMaterial.Id;
-
- mainTask.FinishTime = DateTime.Now;
-
- mainTask.ToPlace = toPlace.Id;
- mainTask.RealToPlace = toPlace.SrmStationCode;
- //璁板綍鍖哄煙 [EditBy shaocx,2022-05-02]
- EDevice device = BusinessHelper.GetSrmDeviceByPlaceNo(toPlace.SrmStationCode);
- mainTask.Area = ((int)device).ToString();
-
- context.Task_Main.Add(mainTask);
-
-
-
-
-
- EDeviceType deviceType = EDeviceType.鍫嗗灈鏈�;
- var plcTaskNo = BusinessHelper.CreatePlcTaskIdForSrmTask();
- //涓棿鐐�
- var midPlace = StationHandler.GetRgvPlaceBySrmPlaceForInStore(context, toPlace);
- if (midPlace == null)
- {
- throw new Exception("娌℃湁鎵惧埌RGV鍏ュ簱浣嶇疆");
- }
- Task_Part partTask = new Task_Part()
- {
- Id = Guid.NewGuid().ToString(),
-
- InOutFlag = mainTask.InOutFlag,
- InOutFlagName = mainTask.InOutFlagName,
-
- DeviceType = (int)deviceType,
- DeviceTypeName = deviceType.ToString(),
- DeviceId = Convert.ToInt16(device),
- DeviceName = Convert.ToString(device),
-
- IsAllowSimulateExecute = true,
-
- TaskSequence = 1,
- MainTaskSequence = mainTask.TaskSequence,//澧炲姞涓讳换鍔′紭鍏堢骇
- TaskDescribe = handlerType,
- OperationRemark = handlerType,
- MainTaskId = mainTask.Id,
- MainTaskNo = mainTask.TaskNo,
- MaterialId = mainTask.MaterialId,
- Qty = mainTask.Qty,//澧炲姞鏁伴噺 銆怑ditBy shaocx,2022-05-01銆�
-
- //澧炲姞 璁㈣揣鍙峰拰搴忓垪鍙风殑璧嬪�� [Editby shaocx,2022-04-21]
- SerialNumber = mainTask.SerialNumber,
- OrderNo = mainTask.OrderNo,
-
- //ToNumber = toNumber,
- //TaskGuid = taskGuid,
- //MatID = MatID,
- //MatName = MatName,
- //Remark = "鎵嬪姩鍏ュ簱鍒涘缓璁惧浠诲姟" + description,
- //Creator = "鎵嬪姩鍏ュ簱鍒涘缓璁惧浠诲姟" + "," + Dns.GetHostName(),
- //UpdateUser = "鎵嬪姩鍏ュ簱鍒涘缓璁惧浠诲姟" + "," + Dns.GetHostName(),
- CreateTime = DateTime.Now,
- ModifyTime = DateTime.Now,
-
- PlcTaskId = plcTaskNo,
- //ContainerId = ctn.ContainerId,
- SalverId = salver.Id,
- SalverCode = salver.SalverCode,
-
- SourcePlace = midPlace.Id,
- ToPlace = toPlace.Id,
- RealSourcePlace = midPlace.SrmStationCode,
- RealToPlace = toPlace.SrmStationCode,
-
- TaskName = string.Format("(鏉ユ簮:id-{0} no-{1},鐩爣:id-{2} no-{3})", midPlace.Id, midPlace.SrmStationCode,
- toPlace.Id, toPlace.SrmStationCode),
-
- IsReleased = true,
- // IsCurrentTask = 0,
- IsFinished = true,
- //IsLastTask = 0,
- //Void = 0,
- TaskState = (int)DeviceTaskStatusEnum.宸插畬鎴�,
- TaskStateName = DeviceTaskStatusEnum.宸插畬鎴�.ToString(),
-
- TaskType = (int)_DeviceTaskTypeEnum,
- TaskTypeName = _DeviceTaskTypeEnum.ToString(),
-
- MaterialType = (int)_MaterialType,
- MaterialTypeName = _MaterialType.ToString(),
-
- IssueTime = DateTime.Now,
- FinishTime = DateTime.Now
-
- };
- context.Task_Part.Add(partTask);
-
-
- //淇濆瓨浜哄伐澶勭悊鏃ュ織 [EditBy shaocx,2022-05-01]
- Base_PersonHandlerRecord record = new Base_PersonHandlerRecord()
- {
- MainTaskNo = mainTask.TaskNo,
- HandlerType = handlerType,
- PartTaskId = partTask.Id,
- PlcTaskId = partTask.PlcTaskId,
- RealSourcePlace = tb_SrmNo,
- RealToPlace = tb_SrmNo,
- SalverCode = salver.SalverCode,
- SerialNumber = serialNumber,
- OrderNo = orderNo,
- TaskTypeName = partTask.TaskTypeName,
- Qty = qty,
-
- ManualHandlerRemark = remark,
- OperationRemark = remark
-
- };
- PersonHandlerRecordHandler.SavePersonHandlerRecord(context, record);
-
- }
+
private void TestBatchForm_Load(object sender, EventArgs e)
{
--
Gitblit v1.9.3