扫码时添加高度判断。扫码调试

source/ACSingleStore/App.config

@@ -26,15 +26,15 @@
     <!--摄像机名称列表配置，用#分割-->
     <!--摄像机名称列表配置，用#分割-->
     <add key="CameraName" value="codeCamera" />
     <add key="CameraName" value="codeCamera" />
     <!--二维码类型列表配置，用#分割-->
     <!--二维码类型列表配置，用#分割-->
-    <add key="CodeType" value="QR Code" />
+    <add key="CodeType" value="Data Matrix ECC 200" />
     <!--<add key="CodeType" value="Data Matrix ECC 200"/>-->
     <!--<add key="CodeType" value="Data Matrix ECC 200"/>-->
     <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
     <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
-    <add key="CodeParamPath" value="\StoreConfig\AC\" />
+    <add key="CodeParamPath" value="\CodeParam\" />
     <add key ="AI_ConvertPosition" value ="38"/>
     <add key ="AI_ConvertPosition" value ="38"/>
   </appSettings>
   </appSettings>
   <log4net>
   <log4net>
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="logs/BJACStore.log" />
+      <file value="logs/LDACStore.log" />
       <appendToFile value="true" />
       <appendToFile value="true" />
       <rollingStyle value="Date" />
       <rollingStyle value="Date" />
       <datePattern value="yyyy-MM-dd" />
       <datePattern value="yyyy-MM-dd" />

source/ACSingleStore/FrmAxisDebug.Designer.cs

@@ -84,7 +84,7 @@
             this.btnMiddleMove.Name = "btnMiddleMove";
             this.btnMiddleMove.Name = "btnMiddleMove";
             this.btnMiddleMove.Size = new System.Drawing.Size(131, 36);
             this.btnMiddleMove.Size = new System.Drawing.Size(131, 36);
             this.btnMiddleMove.TabIndex = 4;
             this.btnMiddleMove.TabIndex = 4;
-            this.btnMiddleMove.Text = "旋转轴+(逆时针)";
+            this.btnMiddleMove.Text = "旋转轴+(顺时针)";
             this.btnMiddleMove.UseVisualStyleBackColor = true;
             this.btnMiddleMove.UseVisualStyleBackColor = true;
             this.btnMiddleMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseDown);
             this.btnMiddleMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseDown);
             this.btnMiddleMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseUp);
             this.btnMiddleMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseUp);
@@ -160,7 +160,7 @@
             this.btnMiddleMovej.Name = "btnMiddleMovej";
             this.btnMiddleMovej.Name = "btnMiddleMovej";
             this.btnMiddleMovej.Size = new System.Drawing.Size(131, 36);
             this.btnMiddleMovej.Size = new System.Drawing.Size(131, 36);
             this.btnMiddleMovej.TabIndex = 12;
             this.btnMiddleMovej.TabIndex = 12;
-            this.btnMiddleMovej.Text = "旋转轴-(顺时针)";
+            this.btnMiddleMovej.Text = "旋转轴-(逆时针)";
             this.btnMiddleMovej.UseVisualStyleBackColor = true;
             this.btnMiddleMovej.UseVisualStyleBackColor = true;
             this.btnMiddleMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseDown);
             this.btnMiddleMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseDown);
             this.btnMiddleMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseUp);
             this.btnMiddleMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseUp);

source/ACSingleStore/FrmStoreBox.cs

@@ -796,20 +796,20 @@ namespace OnlineStore.ACSingleStore
 
 
         private void btnComP2_Click(object sender, EventArgs e)
         private void btnComP2_Click(object sender, EventArgs e)
         {
         {
-            //int value = FormUtil.GetIntValue(txtComP2);
-            //ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
+            int value = FormUtil.GetIntValue(txtComP2);
+            ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
         }
         }
 
 
         private void btnComP1_Click(object sender, EventArgs e)
         private void btnComP1_Click(object sender, EventArgs e)
         {
         {
-            //int value = FormUtil.GetIntValue(txtComP1);
-            //ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
+            int value = FormUtil.GetIntValue(txtComP1);
+            ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
         }
         }
 
 
         private void btnComP3_Click(object sender, EventArgs e)
         private void btnComP3_Click(object sender, EventArgs e)
         {
         {
-            //int value = FormUtil.GetIntValue(txtComP3);
-            //ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
+            int value = FormUtil.GetIntValue(txtComP3);
+            ShuoKeControls.AbsMove(store.Config.CompressAxis_Slv, value);
         }
         }
         int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度
         int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度
         int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度
         int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度

source/Common/util/HumitureController.cs

@@ -105,7 +105,7 @@ namespace OnlineStore.Common
             sendData[7] = 0x00;
             sendData[7] = 0x00;
             sendData = buildCheckData(sendData, sendData.Length-2);
             sendData = buildCheckData(sendData, sendData.Length-2);
             string str = AcSerialBean.byteToHexStr(sendData);
             string str = AcSerialBean.byteToHexStr(sendData);
-            LogUtil.info("温湿度控制器发送数据：" + str);
+            LogUtil.debug("温湿度控制器发送数据：" + str);
             byte[] reviceData = new byte[9];
             byte[] reviceData = new byte[9];
             bool isOk = false;
             bool isOk = false;
             sb.SendCommand(sendData, ref reviceData, 100, out isOk);
             sb.SendCommand(sendData, ref reviceData, 100, out isOk);

source/DeviceLibrary/KangNaiDe/KNDAIManager.cs

@@ -314,7 +314,7 @@ namespace OnlineStore.DeviceLibrary
                         break;
                         break;
                     }
                     }
                 }
                 }
-                LOGGER.Info("Read data：【" + reviceMsg + "】  ");
+                LOGGER.Debug ("Read data：【" + reviceMsg + "】  ");
                 if (ID == 0xFF)
                 if (ID == 0xFF)
                 {
                 {
                     return;
                     return;

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs

@@ -939,7 +939,7 @@ namespace OnlineStore.DeviceLibrary
                         IO_VALUE checkIO = KNDIOValue(IO_Type.TrayCheck_Door);
                         IO_VALUE checkIO = KNDIOValue(IO_Type.TrayCheck_Door);
 
 
                         //判断料门口是否有料
                         //判断料门口是否有料
-                        if ((checkIO.Equals(IO_VALUE.HIGH)))
+                        if ((checkIO.Equals(IO_VALUE.HIGH))&&GetHeight()>0)
                         {
                         {
                             if (IsScanCode)
                             if (IsScanCode)
                             {
                             {