winfrom提交

CarMeterSystem/App.config

@@ -7,10 +7,12 @@
 		<!--<add key="ServiceUrl" value="http://127.0.0.1:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://10.104.4.105:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://192.168.216.143:9004/v1" />-->
+    <!--<add key="ServiceUrl" value="http://192.168.137.136:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://10.104.0.1:9004/v1" />-->
-		<!--<add key="ServiceUrl" value="http://192.168.107.60:8888/icore.icp.winform/pass/jlcar"/>-->
+    <!--<add key="ServiceUrl" value="http://192.168.107.60:8888/icore.icp.winform/pass/jlcar"/>-->
     <!--<add key="ServiceUrl" value="http://192.168.185.29/icore.icp.winform/pass/jlcar"/>-->
-    <add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>
+    <add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>
+    <!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
     <!--<add key="ServiceUrl" value="http://10.130.1.2/icore.icp.web/pass/systemBase/v1"/>-->
     <!--实时库地址-->
     <add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
@@ -21,7 +23,7 @@
 		<add key="fuid" value="jgjlftp" />
 		<add key="fpwd" value="xxzx2021" />
 		<!-- /jldate/ftppicture/ -->
-		<add key="fpath" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/file/upload/" />
+		<add key="fpath" value="http://10.99.81.20/icore.icp.web/pass/file/upload/" />
 		<!--0使用sftp，1使用vsftp-->
 		<add key="ftpType" value="1" />
 		<!--图片压缩-->
@@ -30,7 +32,7 @@
 		<!--毛皮差值验证(单位kg)-->
 		<add key="differenceWgt" value="400" />
 		<!--进入测试界面还是正式界面 0测试，1正式,2一码到底测试,3判稳测试工具-->
-		<add key="productType" value="0" />
+		<add key="productType" value="1" />
 		<!--联达比较重量-->
 		<add key="lianDaWgt" value="200" />
 		<!--联达计量点编号-->

CarMeterSystem/Form1.cs

@@ -307,6 +307,8 @@ namespace CarMeterSystem
         private string editCarNo = "";
         private string preCarNo = "";
 
+        public bool sss = false;
+
         MeterWorkCarActualFirstService mwcfs = new MeterWorkCarActualFirstService();
         RESTfulResult<string> rmsSweepCodeClass = new RESTfulResult<string>();
 
@@ -429,7 +431,10 @@ namespace CarMeterSystem
                 {
                     sCarNo = testCarNo;
                     //PbCache.collect.carno = testCarNo;
-                    PbCache.collect.weight = testWgt;
+                    if (!sss)
+                    {
+                        PbCache.collect.weight = testWgt;
+                    }
                     PbCache.collect.weightStatus = 0;
                     PbCache.monitorResult.valid_park_status = true;
                     PbCache.collect.parkStatus = 0;
@@ -437,6 +442,7 @@ namespace CarMeterSystem
                         e.weight = PbCache.collect.weight;
                     PbCache.strCode = testPlanNo;
                     e.carno = testCarNo;
+                    sss = true;
                     //PbCache.strQRCode = testCode;
                 }
                 else
@@ -578,7 +584,7 @@ namespace CarMeterSystem
                         //e.RfidNos = "0003";
                         if (!string.IsNullOrEmpty(e.RfidNos))
                         {
-                            string sqls = @"SELECT RFID_ID id,CAR_NO text FROM METER_BASE_RFID_INFO where RFID_CODE = '" + e.RfidNos + "'";
+                            string sqls = @"SELECT RFID_ID id,CAR_NO text FROM METER_BASE_RFID_INFO where RFID_CODE = '" + e.RfidNos + "' and valueFlag = '0'";
 
                             PbModelDbService<List<PbModelDb>> pbp = new PbModelDbService<List<PbModelDb>>();
                             RESTfulResult<List<PbModelDb>> rmT = pbp.executeSqlDataWf(sqls);
@@ -1181,21 +1187,19 @@ namespace CarMeterSystem
         /// <param name="e"></param>
         private void timer1_Tick(object sender, EventArgs e)
         {
-            
             if (!isOpened && PbCache.collect?.weight > 500)
             {
                 isOpened = true;
                 isOpenMeter = true;
                 PbCache.bussinessTypeName = "";
                 PbCache.bussinessTypeCode = "";
-               
-                if(fcc.Visible == false)
+
+                if (fcc.Visible == false)
                 {
                     fcc.ShowDialog();
                     fcc.init();
                 }
                 
-                
             }
         }
 
@@ -1404,6 +1408,7 @@ namespace CarMeterSystem
         {
             isOpened = false;
             testFlag = true;
+            sss = false;
             PbCache.isTest= true;
             testWgt = (int)numericUpDown1.Value;
             //CollectModel model = new CollectModel();

CarMeterSystem/frmMain.cs

@@ -476,8 +476,6 @@ namespace CarMeterSystem
                 //}
 
                 // 司机扫码为空，取工控机二维码
-                l.WriteLog(99, "sweepCodeClass2的扫码值：" + sweepCodeClass2.StrCode);
-                l.WriteLog(99, "sweepCodeClass的扫码值：" + sweepCodeClass.StrCode);
                 if (string.IsNullOrEmpty(sweepCodeClass2.StrCode))
                 {
                     if (string.IsNullOrEmpty(sweepCodeClass.StrCode))
@@ -732,6 +730,7 @@ namespace CarMeterSystem
                         #region RFID识别车号信息
                         mwUpdate.rfidCar = "";
                         mwUpdate.photoCar = e.vdioCarNos;
+                        mwUpdate.scanCar = "";
                         if (codeFlag)
                         {
                             mwUpdate.scanCar = PbCache.collect.carno;
@@ -896,6 +895,7 @@ namespace CarMeterSystem
 
                     PbCache.isOvertimeAlarm = false; //是否超时报警
                     PbCache.strCode = "";
+                    PbCache.strState = "";
                     PbCache.ResultMessage = "";
                     PbCache.resultMsgAll = "";
                     PbCache.resultCarNo = "";

CarMeterSystem/frmMatMsgInfo.Designer.cs

@@ -36,7 +36,7 @@ namespace CarMeterSystem
             Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn1 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("predictionNo");
             Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn2 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("matterName");
             Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn3 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("forwardingUnitName");
-            Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn4 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("receivingUintName", -1, null, 0, Infragistics.Win.UltraWinGrid.SortIndicator.Ascending, false);
+            Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn4 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("receivingUintName");
             Infragistics.Win.UltraWinGrid.UltraGridColumn ultraGridColumn5 = new Infragistics.Win.UltraWinGrid.UltraGridColumn("trustDateTime");
             Infragistics.Win.Appearance appearance2 = new Infragistics.Win.Appearance();
             Infragistics.Win.Appearance appearance3 = new Infragistics.Win.Appearance();
@@ -92,7 +92,7 @@ namespace CarMeterSystem
             this.btnSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("btnSave.BackgroundImage")));
             this.btnSave.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.btnSave.ForeColor = System.Drawing.Color.White;
-            this.btnSave.Location = new System.Drawing.Point(322, 692);
+            this.btnSave.Location = new System.Drawing.Point(289, 692);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(122, 61);
             this.btnSave.TabIndex = 9;
@@ -121,11 +121,11 @@ namespace CarMeterSystem
             // btnTare
             // 
             this.btnTare.BackColor = System.Drawing.Color.Gray;
-            this.btnTare.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnTare.Font = new System.Drawing.Font("宋体", 40F);
             this.btnTare.ForeColor = System.Drawing.Color.White;
-            this.btnTare.Location = new System.Drawing.Point(291, 53);
+            this.btnTare.Location = new System.Drawing.Point(158, 53);
             this.btnTare.Name = "btnTare";
-            this.btnTare.Size = new System.Drawing.Size(121, 48);
+            this.btnTare.Size = new System.Drawing.Size(296, 100);
             this.btnTare.TabIndex = 12;
             this.btnTare.Text = "毛重";
             this.btnTare.UseVisualStyleBackColor = false;
@@ -134,11 +134,11 @@ namespace CarMeterSystem
             // btnGross
             // 
             this.btnGross.BackColor = System.Drawing.Color.Gray;
-            this.btnGross.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnGross.Font = new System.Drawing.Font("宋体", 40F);
             this.btnGross.ForeColor = System.Drawing.Color.White;
-            this.btnGross.Location = new System.Drawing.Point(689, 53);
+            this.btnGross.Location = new System.Drawing.Point(688, 53);
             this.btnGross.Name = "btnGross";
-            this.btnGross.Size = new System.Drawing.Size(121, 48);
+            this.btnGross.Size = new System.Drawing.Size(307, 100);
             this.btnGross.TabIndex = 12;
             this.btnGross.Text = "皮重";
             this.btnGross.UseVisualStyleBackColor = false;
@@ -247,9 +247,9 @@ namespace CarMeterSystem
             this.ultraGrid1.DisplayLayout.ScrollBounds = Infragistics.Win.UltraWinGrid.ScrollBounds.ScrollToFill;
             this.ultraGrid1.DisplayLayout.ScrollStyle = Infragistics.Win.UltraWinGrid.ScrollStyle.Immediate;
             this.ultraGrid1.Font = new System.Drawing.Font("宋体", 20F);
-            this.ultraGrid1.Location = new System.Drawing.Point(-3, 122);
+            this.ultraGrid1.Location = new System.Drawing.Point(-3, 167);
             this.ultraGrid1.Name = "ultraGrid1";
-            this.ultraGrid1.Size = new System.Drawing.Size(1137, 564);
+            this.ultraGrid1.Size = new System.Drawing.Size(1146, 519);
             this.ultraGrid1.TabIndex = 13;
             this.ultraGrid1.Text = "ultraGrid1";
             // 

CarMeterSystem/frmMatMsgInfo.cs

@@ -68,7 +68,6 @@ namespace CarMeterSystem
                 string res = add(weightTypes, preTrackScaleNo, carNo);
                 if (res == "")
                 {
-                    MessageBox.Show("新增成功");
                     this.DialogResult = DialogResult.OK;
                     btnSave.Enabled = false;
                     btnCancel.Enabled = false;

CarMeterSystem/frmMatMsgInfo.resx

@@ -241,4 +241,7 @@
   <metadata name="ultraDataSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>107, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>69</value>
+  </metadata>
 </root>

CarMeterSystem/frmOneYardToEnd.cs

@@ -2326,6 +2326,7 @@ namespace CarMeterSystem
 
                 led_controler.setStaticLineMsgOut(PbCache.sportInfo.ledIp, "关闭远光灯，上秤计量");
 
+
                 RESTfulResult<string> rms = monitor.doUpdateWf(new MeterWorkMonitor
                 {
                     pointNo = PbCache.sportInfo.baseSpotNo,
@@ -2380,6 +2381,7 @@ namespace CarMeterSystem
                 PbCache.ResultMessage = "";
                 PbCache.voiceType = 0;  // 清除语音
                 btnSave.Enabled = true;
+                btnSelPreType.Visible = false;
             }
             catch (Exception ex)
             {

Common/DbOption/base/MeterBaseUnitInfoService.cs

@@ -12,7 +12,7 @@ namespace Common
         public RESTfulResult<List<MeterBaseUnitInfo>> doQueryWf(MeterBaseUnitInfo info)
         {
             DbHelper db = new DbHelper();
-            RESTfulResult<PageList<List<MeterBaseUnitInfo>>> rm = db.doOption<PageList<List<MeterBaseUnitInfo>>>("meterbaseunitinfos", "/", new object[] { info }, 0);
+            RESTfulResult<List<MeterBaseUnitInfo>> rm = db.doOption<List<MeterBaseUnitInfo>>("meterbaseunitinfos", "/getUnitInfo", new object[] { info }, 1);
 
             RESTfulResult<List<MeterBaseUnitInfo>> result = new RESTfulResult<List<MeterBaseUnitInfo>>();
             result.Succeed = rm.Succeed;
@@ -20,9 +20,9 @@ namespace Common
             result.Message = rm.Message;
             result.ResultMessage = rm.ResultMessage;
             result.Code = rm.Code;
-            if (rm.Data != null && rm.Data.list != null && rm.Data.list.Count > 0)
+            if (rm.Data != null && rm.Data != null && rm.Data.Count > 0)
             {
-                result.Data = rm.Data.list;
+                result.Data = rm.Data;
             }
             return result;
         }

Common/vo/base/MeterBaseUnitInfo.cs

@@ -47,7 +47,7 @@ namespace Common
 		/// <summary>
 		/// 车号
 		/// <summary>
-		public string caoNo { get; set; }
+		public string carNo { get; set; }
 
 		/// <summary>
 		/// 是否允许使用期限皮重(0不可，1可以)

MeterSceneLibrary/JISCO/private/SaveMethod.cs

@@ -892,7 +892,7 @@ namespace MeterSceneLibrary.JISCO
             return rt;
         }
 
-        public rtInfo doTermTareNet(PreTrackScale scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActualFirst actualFirst1)
+        public rtInfo doTermTareNet(PreTrackScale scale, MeterWorkCarActualFirst actualFirst, MeterWorkCarActualFirst actualFirst1,string flag)
         {
             //期限皮重数据保存
             MeterWorkCarActualService actualService = new MeterWorkCarActualService();
@@ -904,7 +904,14 @@ namespace MeterSceneLibrary.JISCO
                 rt.resultInfo = "计量完成";
                 PbCache.actualFirstNo = rmI.Data;
                 PbCache.strQRCode = rmI.Message;
-                PbCache.isTareWeight = true;//皮重
+                if (flag == "1")
+                {
+                    PbCache.isTareWeight = true;//皮重
+                }
+                else
+                {
+                    PbCache.isTareWeight = false;//毛重
+                }
             }
             else
             {