提交WINFORM代码

CarMeterSystem/App.config

@@ -8,7 +8,7 @@
 		<!--<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="icoredbTcp" value="tarantool://guest@192.168.185.222:2101" />
+		<add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
 		<!--SFTP或者vsftp服务端连接及地址-->
 		<add key="fip" value="192.168.185.238" />
 		<add key="fport" value="22" />

CarMeterSystem/Form1.cs

@@ -685,7 +685,7 @@ namespace CarMeterSystem
                         {
                             if (PbCache.monitor == null || string.IsNullOrEmpty(PbCache.monitor.ledWriter))
                             {
-                                PbCache.ledInfo = "写入欢迎使用九钢汽车衡智能计量系统";
+                                PbCache.ledInfo = "欢迎使用酒钢汽车衡智能计量系统";
                             }
                             else
                             {

CarMeterSystem/frmMain.cs

@@ -467,7 +467,7 @@ namespace CarMeterSystem
 
                                 if (string.IsNullOrEmpty(ledTxt))
                                 {
-                                    ledTxt = "欢迎使用九钢汽车衡智能计量系统！";
+                                    ledTxt = "欢迎使用酒钢汽车衡智能计量系统！";
                                 }
                             }
                         }

CarMeterSystem/frmOneYardToEnd.cs

@@ -322,7 +322,7 @@ namespace CarMeterSystem
                                 if (strRm.Data.result) //说明：标识当前跑了一个场景成功了；场景完成后则返回，不再进行下一个场景的执行操作；
                                 {
                                     PbCache.ResultMessage = strRm.Data.resultInfo; //语音提示文件
-                                    return;
+                                    //return;
                                 }
                                 else
                                 {
@@ -445,7 +445,7 @@ namespace CarMeterSystem
 
                     //图片截取
                     // BourneCao暂时注释
-                    //_ = BeginInvoke(new Action(() => { shotImage(); }));
+                    _ = BeginInvoke(new Action(() => { shotImage(); }));
 
                 }
                 catch (Exception ex)

Common/vo/base/MeterBaseCustomerSupplier.cs

@@ -99,6 +99,5 @@ namespace Common
 		/// 审核状态
 		/// <summary>
 		public string checkFlag { get; set; }
-
 	}
 }

FrmStandAloneMetering/FrmStandAloneMetering.cs

@@ -129,20 +129,35 @@ namespace FrmStandAloneMetering
         /// <param name="e"></param>
         private void btnDownloadData_Click(object sender, EventArgs e)
         {
+            
+
+            // 删除CSV文件
+            Utils.FileUtil.DeleteFile(AppDomain.CurrentDomain.BaseDirectory + "baseData\\MeterBaseMatterInfo.csv");
+
             // 获取物料信息
             MeterBaseMatterInfoService meterBaseMatterInfo = new MeterBaseMatterInfoService();//物料服务
             MeterBaseMatterInfo MatterInfo1 = new MeterBaseMatterInfo();
-            
+
             MatterInfo1.validFlag = "1";
             MatterInfo1.pageNum = 1;
             MatterInfo1.pageSize = 9999;
             RESTfulResult<List<MeterBaseMatterInfo>> rmx = meterBaseMatterInfo.doQueryListLike(MatterInfo1);
 
+            // 重新保存CSV文件
+            saveMatterInfo(rmx);
+
             // 删除CSV文件
-            Utils.FileUtil.DeleteFile(AppDomain.CurrentDomain.BaseDirectory + "baseData\\MeterBaseMatterInfo.csv");
+            Utils.FileUtil.DeleteFile(AppDomain.CurrentDomain.BaseDirectory + "baseData\\MeterBaseCustomerSupplier.csv");
+
+            // 获取客商信息
+            MeterBaseCustomerSupplierService service2 = new MeterBaseCustomerSupplierService();//物料服务
+            MeterBaseCustomerSupplier customerInfo1 = new MeterBaseCustomerSupplier();
+
+            customerInfo1.validFlag = "1";
+            RESTfulResult<List<MeterBaseCustomerSupplier>> rmx2 = service2.doQuery(customerInfo1);
 
             // 重新保存CSV文件
-            saveMatterInfo(rmx.Data);
+            saveCustomerInfo(rmx2);
         }
 
         /// <summary>
@@ -629,13 +644,57 @@ namespace FrmStandAloneMetering
             }
         }
 
-        private void saveMatterInfo(List<MeterBaseMatterInfo> list)
+        private void saveMatterInfo(RESTfulResult<List<MeterBaseMatterInfo>> result)
         {
             StringBuilder materInfoHead = new StringBuilder(); // 物料头
             materInfoHead.Append("matterNo,");//若第一行默认为当前时间则第一行多个逗号
             materInfoHead.Append("matterName");
            
             logCsv.WriteBaseData("MeterBaseMatterInfo", materInfoHead.ToString());
+
+            if (result.Succeed)
+            {
+                StringBuilder materInfo = new StringBuilder(); // 物料体
+
+                List<MeterBaseMatterInfo> list = result.Data;
+
+                foreach (MeterBaseMatterInfo info in list)
+                {
+                    materInfo.Clear();
+                    materInfo.Append(info.matterNo + ",");
+                    materInfo.Append(info.matterName + ",");
+
+                    logCsv.WriteBaseData("MeterBaseMatterInfo", materInfo.ToString());
+                }
+            }
+        }
+
+        private void saveCustomerInfo(RESTfulResult<List<MeterBaseCustomerSupplier>> result)
+        {
+            StringBuilder customerInfoHead = new StringBuilder(); // 客商头
+            customerInfoHead.Append("customerSupplierNo,");//若第一行默认为当前时间则第一行多个逗号
+            customerInfoHead.Append("customerSupplierName");
+
+            logCsv.WriteBaseData("MeterBaseCustomerSupplier", customerInfoHead.ToString());
+
+            if (result.Succeed)
+            {
+                StringBuilder customerInfo = new StringBuilder(); // 物料体
+
+                List<MeterBaseCustomerSupplier> list = result.Data;
+
+                if(result.Data != null)
+                {
+                    foreach (MeterBaseCustomerSupplier info in list)
+                    {
+                        customerInfo.Clear();
+                        customerInfo.Append(info.customerSupplierNo + ",");
+                        customerInfo.Append(info.customerSupplierName + ",");
+
+                        logCsv.WriteBaseData("MeterBaseCustomerSupplier", customerInfo.ToString());
+                    }
+                }
+            }
         }
     }
 }

MeterSceneLibrary/JISCO/private/SaveMethod.cs

@@ -21,7 +21,6 @@ namespace MeterSceneLibrary.JISCO
 
         private rtInfo rt = new rtInfo();
 
-
         // 结净最小值，默认取配置文件
         private double diffrentWgt = AppConfigCache.differenceWgt;
 
@@ -146,7 +145,22 @@ namespace MeterSceneLibrary.JISCO
             // 保存结净记录，后续改成统一提交模式  BourneCao
 
             MeterWorkCarActualService actualService = new MeterWorkCarActualService();
-            actualService.doAddNet(actualFirst, actualFirst2, netDb, monitorNote, "0");
+            RESTfulResult<string> rmI = actualService.doAddNet(actualFirst, actualFirst2, netDb, monitorNote, "0");
+
+            if (rmI.Succeed)
+            {
+                rt.result = true;
+                rt.resultInfo = "称重完成";
+                PbCache.actualFirstNo = rmI.Data;
+                PbCache.strQRCode = rmI.Message;
+                PbCache.isTareWeight = false;//毛重
+            }
+            else
+            {
+                rt.result = false;
+                rt.isError = true;
+                rt.resultInfo = "称重数据保存失败";
+            }
 
             return rt;
         }