店铺退货包裹读取放到后台
This commit is contained in:
1 parent
4693c42024
commit
2a4a3ef744
13 files changed
+1021
-377
No files matched your search
@@ -12,6 +12,7 @@ using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using TemuKJD.KJDForms.BaseForms;
|
||||
@@ -444,7 +445,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
string headWords = "";
|
||||
if (!string.IsNullOrWhiteSpace(prod.head_words))
|
||||
{
|
||||
var numbers = prod.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ParseToInt()).ToList();
|
||||
var numberRegex = BaseRegex.GetMatchRegex(prod.head_words.Trim(), "\\d{1,9}");
|
||||
var numbers = numberRegex.Cast<Match>().Select(m => m.Value.ParseToInt()).ToList();
|
||||
//var numbers = prod.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries).Select(w => w.ParseToInt()).ToList();
|
||||
int minNum = 5;
|
||||
int maxNum = 19;
|
||||
if (numbers.Count > 0 && numbers[0] > 0)
|
||||
@@ -458,7 +461,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
maxNum = minNum;
|
||||
}
|
||||
headWords += Randomx.GetId(minNum, maxNum + 1) + "个";
|
||||
headWords += Randomx.GetId(minNum, maxNum + 1) + prod.head_words.Trim().Replace(minNum + "-" + maxNum, "");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+45
-45
@@ -30,6 +30,10 @@
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductSelectEditNotesForm));
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.cmbStatus = new System.Windows.Forms.ComboBox();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.txtDraftId = new System.Windows.Forms.TextBox();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.btnFission = new DevComponents.DotNetBar.PanelEx();
|
||||
this.lblTextCount = new System.Windows.Forms.Label();
|
||||
this.txtSkc = new System.Windows.Forms.TextBox();
|
||||
@@ -44,10 +48,6 @@
|
||||
this.label8 = new System.Windows.Forms.Label();
|
||||
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||
this.btnOk = new TemuKJD.UserControls.ButtonEx();
|
||||
this.txtDraftId = new System.Windows.Forms.TextBox();
|
||||
this.label5 = new System.Windows.Forms.Label();
|
||||
this.label6 = new System.Windows.Forms.Label();
|
||||
this.cmbStatus = new System.Windows.Forms.ComboBox();
|
||||
this.panel2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
@@ -79,6 +79,47 @@
|
||||
this.panel2.Size = new System.Drawing.Size(391, 546);
|
||||
this.panel2.TabIndex = 1;
|
||||
//
|
||||
// cmbStatus
|
||||
//
|
||||
this.cmbStatus.Enabled = false;
|
||||
this.cmbStatus.FormattingEnabled = true;
|
||||
this.cmbStatus.Items.AddRange(new object[] {
|
||||
"待上传",
|
||||
"已上传",
|
||||
"草稿箱"});
|
||||
this.cmbStatus.Location = new System.Drawing.Point(252, 397);
|
||||
this.cmbStatus.Name = "cmbStatus";
|
||||
this.cmbStatus.Size = new System.Drawing.Size(101, 25);
|
||||
this.cmbStatus.TabIndex = 442;
|
||||
//
|
||||
// label6
|
||||
//
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Location = new System.Drawing.Point(220, 401);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(32, 17);
|
||||
this.label6.TabIndex = 441;
|
||||
this.label6.Text = "状态";
|
||||
//
|
||||
// txtDraftId
|
||||
//
|
||||
this.txtDraftId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtDraftId.Location = new System.Drawing.Point(88, 398);
|
||||
this.txtDraftId.Name = "txtDraftId";
|
||||
this.txtDraftId.ReadOnly = true;
|
||||
this.txtDraftId.Size = new System.Drawing.Size(106, 23);
|
||||
this.txtDraftId.TabIndex = 440;
|
||||
//
|
||||
// label5
|
||||
//
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(42, 401);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(45, 17);
|
||||
this.label5.TabIndex = 439;
|
||||
this.label5.Text = "上传ID";
|
||||
//
|
||||
// btnFission
|
||||
//
|
||||
this.btnFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
|
||||
@@ -251,47 +292,6 @@
|
||||
this.btnOk.UseVisualStyleBackColor = false;
|
||||
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
|
||||
//
|
||||
// txtDraftId
|
||||
//
|
||||
this.txtDraftId.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtDraftId.Location = new System.Drawing.Point(88, 398);
|
||||
this.txtDraftId.Name = "txtDraftId";
|
||||
this.txtDraftId.ReadOnly = true;
|
||||
this.txtDraftId.Size = new System.Drawing.Size(106, 23);
|
||||
this.txtDraftId.TabIndex = 440;
|
||||
//
|
||||
// label5
|
||||
//
|
||||
this.label5.AutoSize = true;
|
||||
this.label5.Location = new System.Drawing.Point(42, 401);
|
||||
this.label5.Name = "label5";
|
||||
this.label5.Size = new System.Drawing.Size(45, 17);
|
||||
this.label5.TabIndex = 439;
|
||||
this.label5.Text = "上传ID";
|
||||
//
|
||||
// label6
|
||||
//
|
||||
this.label6.AutoSize = true;
|
||||
this.label6.Location = new System.Drawing.Point(220, 401);
|
||||
this.label6.Name = "label6";
|
||||
this.label6.Size = new System.Drawing.Size(32, 17);
|
||||
this.label6.TabIndex = 441;
|
||||
this.label6.Text = "状态";
|
||||
//
|
||||
// cmbStatus
|
||||
//
|
||||
this.cmbStatus.Enabled = false;
|
||||
this.cmbStatus.FormattingEnabled = true;
|
||||
this.cmbStatus.Items.AddRange(new object[] {
|
||||
"待上传",
|
||||
"已上传",
|
||||
"草稿箱"});
|
||||
this.cmbStatus.Location = new System.Drawing.Point(252, 397);
|
||||
this.cmbStatus.Name = "cmbStatus";
|
||||
this.cmbStatus.Size = new System.Drawing.Size(101, 25);
|
||||
this.cmbStatus.TabIndex = 442;
|
||||
//
|
||||
// DbProductSelectEditNotesForm
|
||||
//
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||
|
||||
@@ -23,6 +23,7 @@ using TemuKJD.KJDForms.AdminForms;
|
||||
using TemuKJD.KJDForms.ShopForms;
|
||||
using System.Globalization;
|
||||
using TemuKJD.KJDForms.ToolForms;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
{
|
||||
@@ -863,19 +864,25 @@ namespace TemuKJD.KJDForms.ProductSelectForms
|
||||
// 头词
|
||||
if (chkHeadWords.Checked)
|
||||
{
|
||||
int[] heads = dbProd.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
|
||||
.Select(s => s.ParseToInt()).ToArray();
|
||||
//int[] heads = dbProd.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
|
||||
// .Select(s => s.ParseToInt()).ToArray();
|
||||
string headTemp = dbProd.head_words.Trim();
|
||||
var numberRegex = BaseRegex.GetMatchRegex(headTemp, "\\d{1,9}");
|
||||
int[] heads = numberRegex.Cast<Match>().Select(m => m.Value.ParseToInt()).ToArray();
|
||||
|
||||
if (heads.Length < 2)
|
||||
{
|
||||
if (string.IsNullOrEmpty(GlobalConfig.ProductWords.HeadWords))
|
||||
if (GlobalConfig.ProductWords.HeadWords == null)
|
||||
GlobalConfig.ProductWords.HeadWords = "";
|
||||
heads = GlobalConfig.ProductWords.HeadWords.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
|
||||
.Select(s => s.ParseToInt()).ToArray();
|
||||
//heads = GlobalConfig.ProductWords.HeadWords.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
|
||||
// .Select(s => s.ParseToInt()).ToArray();
|
||||
headTemp = GlobalConfig.ProductWords.HeadWords.Trim();
|
||||
numberRegex = BaseRegex.GetMatchRegex(headTemp, "\\d{1,9}");
|
||||
heads = numberRegex.Cast<Match>().Select(m => m.Value.ParseToInt()).ToArray();
|
||||
}
|
||||
|
||||
if (heads.Length > 1 && heads[1] > heads[0])
|
||||
headWords = Randomx.GetId(heads[0], heads[1]) + "个";
|
||||
headWords = Randomx.GetId(heads[0], heads[1]) + headTemp.Replace(heads[0] + "-" + heads[1], "");
|
||||
}
|
||||
|
||||
// 尾词
|
||||
|
||||
Reference in new issue
Block a user