提交当前本机整理版本

插件库/Lskj.PubInvoiceOut/FrmMain.Designer.cs

@@ -42,4 +42,32 @@ namespace Lskj.PubInvoiceOut
             this.progressPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.progressPanel.Location = new System.Drawing.Point(0, 0);
             this.progressPanel.Name = "progressPanel";
-            this.progr
+            this.progressPanel.Size = new System.Drawing.Size(284, 261);
+            this.progressPanel.TabIndex = 6;
+            this.progressPanel.Text = "progressPanel";
+            this.progressPanel.Visible = false;
+            // 
+            // FrmMain
+            // 
+            this.Appearance.BackColor = System.Drawing.SystemColors.Control;
+            this.Appearance.Options.UseBackColor = true;
+            this.Appearance.Options.UseFont = true;
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.ClientSize = new System.Drawing.Size(284, 261);
+            this.Controls.Add(this.progressPanel);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FrmMain";
+            this.Opacity = 0D;
+            this.ShowInTaskbar = false;
+            this.Text = "FrmMain";
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraWaitForm.ProgressPanel progressPanel;
+    }
+}
+

插件库/Lskj.PubInvoiceOut/FrmMain.cs

@@ -1682,4 +1682,32 @@ namespace Lskj.PubInvoiceOut
                         }
                         else if (resultModel.Code.Equals("500"))
                         {
-   
+                            resultModel.Message = resultJObject + "";
+                            isLogin = false;
+                        }
+                        else if (resultModel.Code.Equals("1006") && resultModel.Message.Contains("token已失效"))
+                        {
+                            token = GetToken();
+                            if (isNext)
+                            {
+                                resultModel = new ResultModel();
+                                isLogin = FlushRedInvoice(redReason, ref resultModel, ref token, false);
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    isLogin = false;
+                }
+            }
+            catch (Exception ex)
+            {
+                resultModel.Message = ex.Message;
+                isLogin = false;
+            }
+            WaitForm.HideForm();
+            return isLogin;
+        }
+    }
+}

插件库/Lskj.PubInvoiceOut/FrmQrCode.cs

@@ -134,4 +134,38 @@ namespace Lskj.PubInvoiceOut
                                                this.Close();
                                                this.Dispose();
                                            }
-       
+                                           return;
+                                       }
+                                   }
+                               }
+                           }
+                           else
+                           {
+                               ShowTips(resultEventArgs.Message);
+                           }
+                       }
+                       catch (Exception)
+                       {
+                       }
+                       System.Threading.Thread.Sleep(5000);
+                   }
+               });
+                thread.Start();
+            }
+        }
+        public void ShowTips(string msg)
+        {
+            if (this.InvokeRequired && this.IsHandleCreated)
+            {
+                this.Invoke(new Action(() =>
+                {
+                    this.tipsLabel.Text = msg;
+                }));
+            }
+            else
+            {
+                this.tipsLabel.Text = msg;
+            }
+        }
+    }
+}

插件库/Lskj.PubInvoiceOut/FrmSelectMsg.Designer.cs

@@ -71,4 +71,26 @@ namespace Lskj.PubInvoiceOut
             // 
             // FrmSelectMsg
             // 
-      
+            this.Appearance.BackColor = System.Drawing.SystemColors.Control;
+            this.Appearance.Options.UseBackColor = true;
+            this.Appearance.Options.UseFont = true;
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(321, 59);
+            this.Controls.Add(this.btnBillSave);
+            this.Controls.Add(this.txtEdit);
+            this.Controls.Add(this.codeLabel);
+            this.Name = "FrmSelectMsg";
+            this.Text = "选择红冲原因";
+            ((System.ComponentModel.ISupportInitialize)(this.txtEdit.Properties)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Label codeLabel;
+        private DevExpress.XtraEditors.ComboBoxEdit txtEdit;
+        private DevExpress.XtraEditors.SimpleButton btnBillSave;
+    }
+}

插件库/Lskj.PubInvoiceOut/FrmSelectMsg.cs

@@ -28,4 +28,32 @@ namespace Lskj.PubInvoiceOut
         private void FrmSelectMsg_Load(object sender, EventArgs e)
         {
             txtEdit.Properties.Items.Add(new ComboBoxModel() { ValueMember = "1", DisplayMember = "销货退回" });
-            tx
+            txtEdit.Properties.Items.Add(new ComboBoxModel() { ValueMember = "2", DisplayMember = "开票有误" });
+            txtEdit.Properties.Items.Add(new ComboBoxModel() { ValueMember = "3", DisplayMember = "服务中止" });
+            txtEdit.Properties.Items.Add(new ComboBoxModel() { ValueMember = "4", DisplayMember = "销售折让" });
+            txtEdit.SelectedIndex = 0;
+        }
+
+        private void btnBillSave_Click(object sender, EventArgs e)
+        {
+            if (SelectModel != null && !string.IsNullOrEmpty(SelectModel.ValueMember))
+            {
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+            else
+            {
+                MessageUtil.Show("请选择红冲原因");
+            }
+        }
+    }
+    public class ComboBoxModel
+    {
+        public string ValueMember;
+        public string DisplayMember;
+        public override string ToString()
+        {
+            return DisplayMember;
+        }
+    }
+}

插件库/Lskj.PubInvoiceOut/Lskj.PubInvoiceOut.csproj

@@ -104,7 +104,6 @@
     <EmbeddedResource Include="FrmSendCode.resx">
       <DependentUpon>FrmSendCode.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>