一些小改动
This commit is contained in:
1 parent
79ff7217d4
commit
e06e5ca428
2 files changed
+14
-11
No files matched your search
@@ -602,7 +602,6 @@ namespace TemuKJD.BLL
|
|||||||
prodInfo.detail.sku = new List<sku_item>();
|
prodInfo.detail.sku = new List<sku_item>();
|
||||||
foreach (JObject jSku in jstGoodsObj["skuInfo"]["goodsSkuDetail"])
|
foreach (JObject jSku in jstGoodsObj["skuInfo"]["goodsSkuDetail"])
|
||||||
{
|
{
|
||||||
var skuStr = jSku.ParseToString();
|
|
||||||
sku_item skuInfo = new sku_item()
|
sku_item skuInfo = new sku_item()
|
||||||
{
|
{
|
||||||
id = 0,
|
id = 0,
|
||||||
@@ -673,6 +672,8 @@ namespace TemuKJD.BLL
|
|||||||
var baseSkuId = jSku["baseSkuId"].ParseToString();
|
var baseSkuId = jSku["baseSkuId"].ParseToString();
|
||||||
// skuCode可能不唯一,使用skuId取加密后的货号
|
// skuCode可能不唯一,使用skuId取加密后的货号
|
||||||
//var skuId = jstSecretCodeLst["skus"].FirstOrDefault(s => s["skuCode"].ParseToString() == itemNo)?["skuId"].ParseToString();
|
//var skuId = jstSecretCodeLst["skus"].FirstOrDefault(s => s["skuCode"].ParseToString() == itemNo)?["skuId"].ParseToString();
|
||||||
|
var skuStr = jSku.ParseToString();
|
||||||
|
var jstSecretCodeLstSkuStr = jstSecretCodeLst["skus"].ParseToString();
|
||||||
var skuId = jstSecretCodeLst["skus"].FirstOrDefault(s => s["warehouseSkuId"].ParseToString() == baseSkuId)?["skuId"].ParseToString();
|
var skuId = jstSecretCodeLst["skus"].FirstOrDefault(s => s["warehouseSkuId"].ParseToString() == baseSkuId)?["skuId"].ParseToString();
|
||||||
if (skuId.IsNullOrEmpty() || string.IsNullOrEmpty(itemNo))
|
if (skuId.IsNullOrEmpty() || string.IsNullOrEmpty(itemNo))
|
||||||
{
|
{
|
||||||
|
|||||||
+12
-10
@@ -223,6 +223,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
// dtpEnd
|
// dtpEnd
|
||||||
//
|
//
|
||||||
this.dtpEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
this.dtpEnd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
|
this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm";
|
||||||
|
this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
|
||||||
this.dtpEnd.Location = new System.Drawing.Point(1040, 87);
|
this.dtpEnd.Location = new System.Drawing.Point(1040, 87);
|
||||||
this.dtpEnd.Name = "dtpEnd";
|
this.dtpEnd.Name = "dtpEnd";
|
||||||
this.dtpEnd.Size = new System.Drawing.Size(110, 23);
|
this.dtpEnd.Size = new System.Drawing.Size(110, 23);
|
||||||
@@ -615,7 +617,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"是",
|
"是",
|
||||||
"否",
|
"否",
|
||||||
"回传未拉回"});
|
"回传未拉回"});
|
||||||
this.cmbHasReturn.Location = new System.Drawing.Point(560, 77);
|
this.cmbHasReturn.Location = new System.Drawing.Point(560, 75);
|
||||||
this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbHasReturn.Name = "cmbHasReturn";
|
this.cmbHasReturn.Name = "cmbHasReturn";
|
||||||
this.cmbHasReturn.Size = new System.Drawing.Size(33, 25);
|
this.cmbHasReturn.Size = new System.Drawing.Size(33, 25);
|
||||||
@@ -646,7 +648,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbCat2.FormattingEnabled = true;
|
this.cmbCat2.FormattingEnabled = true;
|
||||||
this.cmbCat2.Location = new System.Drawing.Point(254, 77);
|
this.cmbCat2.Location = new System.Drawing.Point(254, 75);
|
||||||
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbCat2.Name = "cmbCat2";
|
this.cmbCat2.Name = "cmbCat2";
|
||||||
this.cmbCat2.Size = new System.Drawing.Size(34, 25);
|
this.cmbCat2.Size = new System.Drawing.Size(34, 25);
|
||||||
@@ -729,7 +731,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"机会商品",
|
"机会商品",
|
||||||
"以图搜品",
|
"以图搜品",
|
||||||
"外部数据"});
|
"外部数据"});
|
||||||
this.cmbSourceType.Location = new System.Drawing.Point(254, 42);
|
this.cmbSourceType.Location = new System.Drawing.Point(254, 40);
|
||||||
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbSourceType.Name = "cmbSourceType";
|
this.cmbSourceType.Name = "cmbSourceType";
|
||||||
this.cmbSourceType.Size = new System.Drawing.Size(34, 25);
|
this.cmbSourceType.Size = new System.Drawing.Size(34, 25);
|
||||||
@@ -775,7 +777,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"",
|
"",
|
||||||
"是",
|
"是",
|
||||||
"否"});
|
"否"});
|
||||||
this.cmbWxCat.Location = new System.Drawing.Point(560, 7);
|
this.cmbWxCat.Location = new System.Drawing.Point(560, 5);
|
||||||
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbWxCat.Name = "cmbWxCat";
|
this.cmbWxCat.Name = "cmbWxCat";
|
||||||
this.cmbWxCat.Size = new System.Drawing.Size(33, 25);
|
this.cmbWxCat.Size = new System.Drawing.Size(33, 25);
|
||||||
@@ -797,7 +799,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
this.cmbSort.Items.AddRange(new object[] {
|
this.cmbSort.Items.AddRange(new object[] {
|
||||||
"入库时间",
|
"入库时间",
|
||||||
"认领总数"});
|
"认领总数"});
|
||||||
this.cmbSort.Location = new System.Drawing.Point(345, 42);
|
this.cmbSort.Location = new System.Drawing.Point(345, 40);
|
||||||
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbSort.Name = "cmbSort";
|
this.cmbSort.Name = "cmbSort";
|
||||||
this.cmbSort.Size = new System.Drawing.Size(34, 25);
|
this.cmbSort.Size = new System.Drawing.Size(34, 25);
|
||||||
@@ -886,7 +888,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbGroupFilter.FormattingEnabled = true;
|
this.cmbGroupFilter.FormattingEnabled = true;
|
||||||
this.cmbGroupFilter.Location = new System.Drawing.Point(163, 42);
|
this.cmbGroupFilter.Location = new System.Drawing.Point(163, 40);
|
||||||
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbGroupFilter.Name = "cmbGroupFilter";
|
this.cmbGroupFilter.Name = "cmbGroupFilter";
|
||||||
this.cmbGroupFilter.Size = new System.Drawing.Size(34, 25);
|
this.cmbGroupFilter.Size = new System.Drawing.Size(34, 25);
|
||||||
@@ -926,7 +928,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"是",
|
"是",
|
||||||
"否",
|
"否",
|
||||||
"导出未拉回"});
|
"导出未拉回"});
|
||||||
this.cmbExportToOutServer.Location = new System.Drawing.Point(560, 42);
|
this.cmbExportToOutServer.Location = new System.Drawing.Point(560, 40);
|
||||||
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbExportToOutServer.Name = "cmbExportToOutServer";
|
this.cmbExportToOutServer.Name = "cmbExportToOutServer";
|
||||||
this.cmbExportToOutServer.Size = new System.Drawing.Size(33, 25);
|
this.cmbExportToOutServer.Size = new System.Drawing.Size(33, 25);
|
||||||
@@ -962,7 +964,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
"安全商品",
|
"安全商品",
|
||||||
"违规商品",
|
"违规商品",
|
||||||
"未校验"});
|
"未校验"});
|
||||||
this.cmbWxSafe.Location = new System.Drawing.Point(453, 42);
|
this.cmbWxSafe.Location = new System.Drawing.Point(453, 40);
|
||||||
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbWxSafe.Name = "cmbWxSafe";
|
this.cmbWxSafe.Name = "cmbWxSafe";
|
||||||
this.cmbWxSafe.Size = new System.Drawing.Size(33, 25);
|
this.cmbWxSafe.Size = new System.Drawing.Size(33, 25);
|
||||||
@@ -1004,7 +1006,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbCat1.FormattingEnabled = true;
|
this.cmbCat1.FormattingEnabled = true;
|
||||||
this.cmbCat1.Location = new System.Drawing.Point(163, 77);
|
this.cmbCat1.Location = new System.Drawing.Point(163, 75);
|
||||||
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbCat1.Name = "cmbCat1";
|
this.cmbCat1.Name = "cmbCat1";
|
||||||
this.cmbCat1.Size = new System.Drawing.Size(34, 25);
|
this.cmbCat1.Size = new System.Drawing.Size(34, 25);
|
||||||
@@ -1026,7 +1028,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
|||||||
//
|
//
|
||||||
this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
this.cmbCat3.FormattingEnabled = true;
|
this.cmbCat3.FormattingEnabled = true;
|
||||||
this.cmbCat3.Location = new System.Drawing.Point(345, 77);
|
this.cmbCat3.Location = new System.Drawing.Point(345, 75);
|
||||||
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
|
||||||
this.cmbCat3.Name = "cmbCat3";
|
this.cmbCat3.Name = "cmbCat3";
|
||||||
this.cmbCat3.Size = new System.Drawing.Size(34, 25);
|
this.cmbCat3.Size = new System.Drawing.Size(34, 25);
|
||||||
|
|||||||
Reference in new issue
Block a user