WFormSynchronizeData_SMR/.vs/WFormSynchronizeData_SMR/v16/.suoBinary files differ
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/DesignTimeResolveAssemblyReferences.cacheBinary files differ
WFormSynchronizeData_SMR/EquipmentCollectionForm/obj/Debug/EquipmentCollectionForm.csproj.AssemblyReference.cacheBinary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/ReadCSV.cs
@@ -478,9 +478,9 @@ string HProcID = AllHProcID; string HProName = AllHProName; //第一次流转卡+工序和后面的做对比 如果是同一个流转卡就不进行判断 if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl) { ////第一次流转卡+工序和后面的做对比 如果是同一个流转卡就不进行判断 //if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl) //{ //判断 当前工序 条码 的上一道工序有没有过站 ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + HProcID, "h_v_Gy_QualifiedRecordsList"); @@ -510,7 +510,7 @@ flag_2 = true; return false; } } //} //查询出站数量是否超过流转卡数量 ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK) WFormSynchronizeData_SMR/WFormReadData_SMR/ReadyDataForm.cs
@@ -435,9 +435,9 @@ AllSNBarcodeProcCtrl = HProcExchBillNo + HProcNumber; } //第一次流转卡+工序和后面的做对比 如果是同一个流转卡就不进行判断 if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl) { ////第一次流转卡+工序和后面的做对比 如果是同一个流转卡就不进行判断 //if ((HProcExchBillNo + HProcNumber) == AllSNBarcodeProcCtrl) //{ //过站控制 //判断当前工序对应的条码是否上道工序过站 ds1 = oCN.RunProcReturn("exec h_p_Sc_SNBarcodeProcCtrl_S '" + HBarCode + "'," + AllHProcID, "h_p_Sc_SNBarcodeProcCtrl_S"); @@ -468,7 +468,7 @@ flag_2 = true; return false; } } //} //查询出站数量是否超过流转卡数量 ds1 = oCN.RunProcReturn($@"select ({AllHQty}-sum(isnull(ou.HQty,0))-sum(isnull(ou.HBadCount,0))) HQty from Sc_StationOutBillMain ou WITH(NOLOCK) WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cacheBinary files differ
WFormSynchronizeData_SMR/WFormReadData_SMR/obj/Debug/WFormReadData_SMR.csproj.AssemblyReference.cacheBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/Form1.cs
@@ -404,6 +404,7 @@ CustomWriteLog("条码:" + HBadCodeSN + "工序:" + HProcNumber + ",出站时间:" + HMakeTime, "TM" + DateTime.Now.ToString("yyyy-MM-dd")); //反写工序出站单的合格数量 oCN.RunProc("update Sc_StationOutBillMain set HQty+=1 where HInterID='" + HInterID + "'"); CustomWriteLog("反写合格数量!条码:" + HBadCodeSN + ",工序:" + HProcNumber + ",出站单ID" + HInterID, DateTime.Now.ToString("yyyy-MM-dd")); CustomWriteLog("2.1.12 条码反写 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd")); } else if (HResult == "NG") @@ -425,12 +426,14 @@ if (DateTime.Parse(HBadDate) < DateTime.Parse(HRepairDate)) { //反写工序出站单的不良数量 oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HInterID='" + HInterID + "'"); CustomWriteLog("反写不合格数量!条码:"+ HBadCodeSN+",工序:"+ HProcNumber+",出站单ID"+ HInterID, DateTime.Now.ToString("yyyy-MM-dd")); } } } else { //反写工序出站单的不良数量 oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HInterID='" + HInterID + "'"); CustomWriteLog("反写不合格数量!条码:" + HBadCodeSN + ",工序:" + HProcNumber + ",出站单ID" + HInterID, DateTime.Now.ToString("yyyy-MM-dd")); } CustomWriteLog("2.1.14 不合格反写 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd")); @@ -524,6 +527,8 @@ values('{DateTime.Now.Year}','{DateTime.Now.Month}','3727','3727',{HInterID1},getdate() ,'{HBillNo1}','1','{HMakers}',getdate(),{HProcExchInterID},{HProcExchEntryID},'{HProcExchBillNo}' ,{HICMOInterID},'{HICMOBillNo}','{HBadCodeSN}',{HMaterID},0,'汇报',{HPRDOrgIDs})"; CustomWriteLog("2.1.21 sql语句 :" + sql + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd")); oCN.RunProc(sql); CustomWriteLog("2.1.22 保存主表 :" + HProcNumber + "----" + timer.Elapsed, DateTime.Now.ToString("yyyy-MM-dd")); WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug.rarBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestValue>qqmoxxkJSiYt11EOtxwjCp8UCVICLSHpeYHEJyCvRZ0=</dsig:DigestValue> <dsig:DigestValue>7YYbHJtCID9TX7m/6Vud7eugByVfVvkzp8Gq8YFnEIw=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exeBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -54,14 +54,14 @@ </dependentAssembly> </dependency> <dependency> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="72192"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="72704"> <assemblyIdentity name="WFormSynchronizeData_SMR" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestValue>1tOLZNgSrL6rNHUXRrWcDZVcoiUanJf2ZdQGY2W8+Hs=</dsig:DigestValue> <dsig:DigestValue>oC4ZjHC7dL0ycLoRjteBTr5sLPvGRaeiCqmI749uNZY=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.pdbBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/WFormSynchronizeData_SMR.rarBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/bin/Debug/app.publish/WFormSynchronizeData_SMR.exeBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferences.cacheBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cacheBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.application
@@ -14,7 +14,7 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestValue>qqmoxxkJSiYt11EOtxwjCp8UCVICLSHpeYHEJyCvRZ0=</dsig:DigestValue> <dsig:DigestValue>7YYbHJtCID9TX7m/6Vud7eugByVfVvkzp8Gq8YFnEIw=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.AssemblyReference.cacheBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.csproj.FileListAbsolute.txt
@@ -21,6 +21,7 @@ E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\WFormSynchronizeData_SMR.pdb E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.dll E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\bin\Debug\Newtonsoft.Json.xml E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.FormBack.resources E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Form1.resources E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.Properties.Resources.resources E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.GenerateResource.cache @@ -30,5 +31,3 @@ E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.CopyComplete E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.exe E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.pdb E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.FormBack.resources E:\智云mes\SRM\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\WFormSynchronizeData_SMR\obj\Debug\WFormSynchronizeData_SMR.csproj.AssemblyReference.cache WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exeBinary files differ
WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.exe.manifest
@@ -54,14 +54,14 @@ </dependentAssembly> </dependency> <dependency> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="72192"> <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WFormSynchronizeData_SMR.exe" size="72704"> <assemblyIdentity name="WFormSynchronizeData_SMR" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> <dsig:DigestValue>1tOLZNgSrL6rNHUXRrWcDZVcoiUanJf2ZdQGY2W8+Hs=</dsig:DigestValue> <dsig:DigestValue>oC4ZjHC7dL0ycLoRjteBTr5sLPvGRaeiCqmI749uNZY=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> WFormSynchronizeData_SMR/WFormSynchronizeData_SMR/obj/Debug/WFormSynchronizeData_SMR.pdbBinary files differ
