WMSPrjInstance/HH-0103_ShuangQianLunTai.git

			@@ -235,7 +235,8 @@
			CARCODE = cG_Detail.S_CAR_CODE,
			WEIGHT = cG_Detail.F_QTY,
			REMELTTIME = DateTime.Now,
			TASKNO = taskNo
			TASKNO = taskNo,
			SHIFT = model.shift,
			};
			SpecHelper.InsertRemeltDetail(target);
			}
			@@ -254,7 +255,7 @@
			ITEMSTATE = cG_Detail.S_ITEM_STATE,
			ITEMCODE = cG_Detail.S_ITEM_CODE,
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			};
			SpecHelper.InsertInventoryM(target);
			}
			@@ -275,7 +276,7 @@
			catch (Exception ex)
			{
			result.resultCode = -1;
			result.resultMsg = $"发生了异常：{ex.Message}";
			result.resultMsg = $"PDA满托复检判断，发生了异常：{ex.Message}";
			LogHelper.Info(result.resultMsg);
			return result;
			}
			@@ -413,7 +414,8 @@
			SPEC = cgInfo.S_SPE,
			CARCODE = cgInfo.S_CAR_CODE,
			WEIGHT = cgInfo.F_QTY,
			REMELTTIME = DateTime.Now
			REMELTTIME = DateTime.Now,
			SHIFT = model.shift,
			};
			SpecHelper.InsertRemeltDetail(target);
			});
			@@ -464,7 +466,7 @@

			var allCount = allCg.Count;
			var waittime = SpecHelper.GetExportTime(model.Spe);
			var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "合格" && o.T_MODIFY.AddMinutes(waittime) <= System.DateTime.Now);
			var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "合格" && o.T_MODIFY.AddHours(waittime) <= System.DateTime.Now);
			return $"满足{model.Spe}规格的总托盘数量：{allCount}，其中合格且静置时间已过的托盘数量：{okCount}";
			}
			catch (Exception ex)
			@@ -636,6 +638,16 @@
			LogHelper.Info("触发API：PDA满托下线入库" + JsonConvert.SerializeObject(model), "API");
			try
			{
			if( model.RfId.Length < 16)
			{
			result.resultCode = 1;
			result.resultMsg = $"输入的RFID，长度不够，要大于16位";
			LogHelper.Info(result.resultMsg);
			return result;
			}

			model.RfId = WMSHelper.ConvertHexToAscii(model.RfId);

			//该产线的满托下线位置，起点
			var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
			if (startPoint != null)//起点存在
			@@ -775,7 +787,7 @@
			WEIGHT = modelWeight,
			ITEMSTATE = "待检",
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			STARTLOC = startLoc.S_CODE,
			};
			SpecHelper.InsertEquipProDetail(target);
			@@ -791,7 +803,7 @@
			WEIGHT = modelWeight,
			ITEMSTATE = "待检",
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			};
			SpecHelper.InsertInventoryM(target);
			});
			@@ -820,7 +832,7 @@
			}
			else
			{
			result.resultCode = 9;
			result.resultCode = 12;
			result.resultMsg = $"此位置：{startPoint.PointOut}已锁住";
			LogHelper.Info(result.resultMsg);
			return result;
			@@ -1026,6 +1038,7 @@
			WEIGHT = cgInfo.F_QTY,
			SPEC = model.Spe,
			TASKNO = taskNo,
			SHIFT = model.shift,
			};
			SpecHelper.InsertComponentDetail(target);
			});
			@@ -1277,7 +1290,8 @@
			CARCODE = cG_Detail.S_CAR_CODE,
			WEIGHT = cG_Detail.F_QTY,
			REMELTTIME = DateTime.Now,
			TASKNO = taksNo
			TASKNO = taksNo,
			SHIFT = model.shift,
			};
			SpecHelper.InsertSurplusDetail(target);
			});
			@@ -1293,7 +1307,7 @@
			ITEMSTATE = cG_Detail.S_ITEM_STATE,
			ITEMCODE = cG_Detail.S_ITEM_CODE,
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			};
			SpecHelper.InsertInventoryM(target);
			});
			@@ -1677,7 +1691,8 @@
			SPEC = cG_old_Detail.S_SPE,
			CARCODE = cG_old_Detail.S_CAR_CODE,
			WEIGHT = cG_old_Detail.F_QTY,
			REMELTTIME = DateTime.Now
			REMELTTIME = DateTime.Now,
			SHIFT = model.shift,
			};
			SpecHelper.InsertRemeltDetail(target);
			}
			@@ -1693,7 +1708,8 @@
			SPEC = cG_new_Detail_Ins.S_SPE,
			CARCODE = cG_new_Detail_Ins.S_CAR_CODE,
			WEIGHT = cG_new_Detail_Ins.F_QTY,
			REMELTTIME = DateTime.Now
			REMELTTIME = DateTime.Now,
			SHIFT = model.shift,
			};
			SpecHelper.InsertRemeltDetail(target);
			}
			@@ -1712,7 +1728,7 @@
			ITEMSTATE = cG_old_Detail.S_ITEM_STATE,
			ITEMCODE = cG_old_Detail.S_ITEM_CODE,
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			};
			SpecHelper.InsertInventoryM(target);
			}
			@@ -1727,7 +1743,7 @@
			ITEMSTATE = cG_new_Detail_Ins.S_ITEM_STATE,
			ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			};
			SpecHelper.InsertInventoryM(target);
			}
			@@ -1801,10 +1817,12 @@

			if (startLocCnt == null)
			{
			result.resultCode = 3;
			result.resultMsg = $"起始位置{model.startLoc}未绑定容器";
			LogHelper.Info(result.resultMsg);
			return result;
			startLocCnt = new TN_Loc_Container()
			{
			S_LOC_CODE = model.startLoc,
			S_CNTR_CODE = Guid.NewGuid().ToString("D"),
			};
			db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand();
			}

			//创建点对点任务
			@@ -1833,7 +1851,7 @@
			ITEMSTATE = cginfo.S_ITEM_STATE,
			ITEMCODE = cginfo.S_ITEM_CODE,
			LOGINNAME = model.staff,
			SHIFT = "None",
			SHIFT = model.shift,
			};
			SpecHelper.InsertInventoryM(target);
			}