From 27f65639a1fe594dae5e31c7f90749e9e4b89b95 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 23 11月 2024 13:26:14 +0800
Subject: [PATCH] 2
---
CC/iWareCC_ASRS/FormCC.cs | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index 286fe2c..dae98d6 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -12,6 +12,7 @@
using iWareModel.Entity.AGV;
using iWareSql.DataAccess;
using iWareSql.DBModel;
+using iWareSql.WmsDBModel;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -30,6 +31,12 @@
{
public partial class FormCC : Form
{
+
+ /// <summary>
+ /// 鍏ㄥ眬鈥旀槸鍚﹀彲浠ヨ繍琛屾墽琛屽嚭搴撴ā寮�
+ /// </summary>
+ public static bool IsAllowRunOutMode = false;
+
/// <summary>
/// 1鍙峰爢鍨涙満鍏ュ簱鍙ｆ壂鐮佸己鍒堕獙璇侀�氳繃
/// </summary>
@@ -300,7 +307,7 @@
}
else
{//姝ｅ紡妯″紡
- rgvServiceClient = new RgvServiceClient();
+ stationServiceClient = new StationServiceClient();
}
this.lbl_IsSimulationPLC.BackColor = IsSimulationPLC ? Color.Red : Color.Green;
@@ -1715,7 +1722,7 @@
DialogResult dr = MessageBox.Show("纭畾瑕佸惎鍔ㄣ��" + currentCheckModelText + "銆戞ā寮忓悧?", "鍚姩妯″紡", messButton);
if (dr == DialogResult.OK)//濡傛灉鐐瑰嚮鈥滅‘瀹氣�濇寜閽�
{
- using (DbModel edm = new DbModel())
+ using (WmsDBModel edm = new WmsDBModel())
{
var ccSystem = BasicDataSetHandler.GetCCSystem(edm);
if (ccSystem == null)
@@ -1774,7 +1781,7 @@
/// <returns></returns>
private bool CommonStopService()
{
- using (DbModel edm = new DbModel())
+ using (WmsDBModel edm = new WmsDBModel())
{
var ccSystem = BasicDataSetHandler.GetCCSystem(edm);
if (ccSystem == null)
@@ -1790,7 +1797,7 @@
ccSystem.Machine = string.Empty;
ccSystem.LastMachine = Dns.GetHostName();
ccSystem.LastUnLineTime = DateTime.Now;
- ccSystem.ModifyTime = DateTime.Now;
+ ccSystem.UpdateTime = DateTime.Now;
int i = edm.SaveChanges();
if (i <= 0)
--
Gitblit v1.9.3