jit推单功能除统计外完成
This commit is contained in:
1 parent
b05de6797e
commit
bbbc12148b
25 files changed
+3129
-1141
No files matched your search
@@ -27,7 +27,7 @@ namespace AllBase
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 版本ID
|
/// 版本ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static int VersionCount = 709;
|
public static int VersionCount = 711;
|
||||||
//public static int VersionCount = 613;
|
//public static int VersionCount = 613;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ using System.Collections.Generic;
|
|||||||
using System.Data;
|
using System.Data;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
|
using System.Web.Security;
|
||||||
|
|
||||||
namespace KJD_Web.BLL
|
namespace KJD_Web.BLL
|
||||||
{
|
{
|
||||||
@@ -98,6 +99,8 @@ namespace KJD_Web.BLL
|
|||||||
var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'");
|
var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'");
|
||||||
if (string.IsNullOrEmpty(shop_id))
|
if (string.IsNullOrEmpty(shop_id))
|
||||||
return "{\"code\":500,\"msg\":\"请输入查询店铺\",\"data\":[],\"count\":" + 0 + "}";
|
return "{\"code\":500,\"msg\":\"请输入查询店铺\",\"data\":[],\"count\":" + 0 + "}";
|
||||||
|
|
||||||
|
var upload_order_status = RegexUtils.GetStringQuery(ref inputData, "upload_order_status")?.Replace("'", "\\'");
|
||||||
//var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time")?.Replace("'", "\\'");
|
//var start_time = RegexUtils.GetStringQuery(ref inputData, "start_time")?.Replace("'", "\\'");
|
||||||
var start_time = TimeUtils.DateTimeToTimestampMilliseconds(DateTime.Now.Date.AddDays(-45));
|
var start_time = TimeUtils.DateTimeToTimestampMilliseconds(DateTime.Now.Date.AddDays(-45));
|
||||||
|
|
||||||
@@ -115,6 +118,8 @@ namespace KJD_Web.BLL
|
|||||||
where += " and o.purchaseTime > " + start_time;
|
where += " and o.purchaseTime > " + start_time;
|
||||||
if (!string.IsNullOrWhiteSpace(shop_id))
|
if (!string.IsNullOrWhiteSpace(shop_id))
|
||||||
where += " and o.supplierId = '" + shop_id + "'";
|
where += " and o.supplierId = '" + shop_id + "'";
|
||||||
|
if (!string.IsNullOrEmpty(upload_order_status))
|
||||||
|
where += " and upLoadStatus = " + upload_order_status;
|
||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var count = mySql.ExecuteRowCount(sql);
|
var count = mySql.ExecuteRowCount(sql);
|
||||||
@@ -149,7 +154,7 @@ namespace KJD_Web.BLL
|
|||||||
id = Convert.ToInt32(row["id"]),
|
id = Convert.ToInt32(row["id"]),
|
||||||
add_time = Convert.ToDateTime(row["add_time"]),
|
add_time = Convert.ToDateTime(row["add_time"]),
|
||||||
mdy_time = Convert.ToDateTime(row["mdy_time"]),
|
mdy_time = Convert.ToDateTime(row["mdy_time"]),
|
||||||
notes = row["notes"].ToString(),
|
notes = row["notes"].ParseToString(),
|
||||||
availableSaleDays = row["availableSaleDays"].ParseToNullableDecimal(),
|
availableSaleDays = row["availableSaleDays"].ParseToNullableDecimal(),
|
||||||
barCodeMd5 = row["barCodeMd5"].ParseToString(),
|
barCodeMd5 = row["barCodeMd5"].ParseToString(),
|
||||||
category = row["category"].ParseToString(),
|
category = row["category"].ParseToString(),
|
||||||
@@ -243,6 +248,7 @@ namespace KJD_Web.BLL
|
|||||||
sql += where;
|
sql += where;
|
||||||
|
|
||||||
var rst = mySql.ExecuteNonQuery(sql);
|
var rst = mySql.ExecuteNonQuery(sql);
|
||||||
|
mySql.Close();
|
||||||
|
|
||||||
if (rst)
|
if (rst)
|
||||||
{
|
{
|
||||||
@@ -255,5 +261,229 @@ namespace KJD_Web.BLL
|
|||||||
}
|
}
|
||||||
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string AddOrderCodeFile(string inputData)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
|
{
|
||||||
|
var time = 0;
|
||||||
|
int.TryParse(RegexUtils.GetStringQuery(ref inputData, "time"), out time);
|
||||||
|
string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
|
||||||
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name");
|
||||||
|
if (string.IsNullOrEmpty(user_name))
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"没有用户名\"}";
|
||||||
|
}
|
||||||
|
var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(shop_id))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入店铺\"}";
|
||||||
|
|
||||||
|
string file_md5 = RegexUtils.GetStringQuery(ref inputData, "file_md5")?.Replace("'", "\\'");
|
||||||
|
string file_base64 = RegexUtils.GetStringQuery(ref inputData, "file_base64")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(file_md5) || string.IsNullOrEmpty(file_base64))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入文件信息\"}";
|
||||||
|
|
||||||
|
long table_id = shop_id.ParseToLong() % 128;
|
||||||
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
string sql = "";
|
||||||
|
|
||||||
|
sql = "select count(fileCodeMd5) from kjd_order.order_code_" + table_id + " where fileCodeMd5='" + file_md5 + "';";
|
||||||
|
var rowCount = mySql.ExecuteRowCount(sql);
|
||||||
|
if (!string.IsNullOrEmpty(mySql.Message))
|
||||||
|
{
|
||||||
|
mySql.Close();
|
||||||
|
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
|
||||||
|
}
|
||||||
|
else if (rowCount > 0)
|
||||||
|
{
|
||||||
|
mySql.Close();
|
||||||
|
return "{\"code\":200,\"msg\":\"success\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
sql = "insert into kjd_order.order_code_" + table_id + " (supplierId,fileCodeMd5,fileCodeBase64)";
|
||||||
|
sql += " values ('" + shop_id + "','" + file_md5 + "','" + file_base64 + "')";
|
||||||
|
|
||||||
|
var rst = mySql.ExecuteNonQuery(sql);
|
||||||
|
mySql.Close();
|
||||||
|
if (!rst)
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
return "{\"code\":200,\"msg\":\"success\"}";
|
||||||
|
}
|
||||||
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string SaveOrderCodeFileLink(string inputData)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
|
{
|
||||||
|
var time = 0;
|
||||||
|
int.TryParse(RegexUtils.GetStringQuery(ref inputData, "time"), out time);
|
||||||
|
string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
|
||||||
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name");
|
||||||
|
if (string.IsNullOrEmpty(user_name))
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"没有用户名\"}";
|
||||||
|
}
|
||||||
|
var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(shop_id))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入店铺\"}";
|
||||||
|
var sub_order_sn = RegexUtils.GetStringQuery(ref inputData, "sub_order_sn")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(sub_order_sn))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入子单号\"}";
|
||||||
|
|
||||||
|
string jia_tong_code = RegexUtils.GetStringQuery(ref inputData, "jia_tong_code")?.Replace("'", "\\'"); // 佳同码
|
||||||
|
string bar_code_md5 = RegexUtils.GetStringQuery(ref inputData, "bar_code_md5")?.Replace("'", "\\'"); // 商品条码md5
|
||||||
|
string shipping_mark_md5 = RegexUtils.GetStringQuery(ref inputData, "shipping_mark_md5")?.Replace("'", "\\'"); // 箱唛md5
|
||||||
|
if (string.IsNullOrEmpty(jia_tong_code) && string.IsNullOrEmpty(bar_code_md5) && string.IsNullOrEmpty(shipping_mark_md5))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入文件信息\"}";
|
||||||
|
|
||||||
|
long table_id = shop_id.ParseToLong() % 128;
|
||||||
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
string sql = "";
|
||||||
|
|
||||||
|
sql = "update kjd_order.order_" + table_id;
|
||||||
|
sql += " set";
|
||||||
|
if (jia_tong_code != null)
|
||||||
|
sql += " jiaTongCode='" + jia_tong_code + "',";
|
||||||
|
if (bar_code_md5 != null)
|
||||||
|
sql += " barCodeMd5='" + bar_code_md5 + "',";
|
||||||
|
if (shipping_mark_md5 != null)
|
||||||
|
sql += " shippingMarkMd5='" + shipping_mark_md5 + "',";
|
||||||
|
sql = sql.TrimEnd(',');
|
||||||
|
sql += " where subPurchaseOrderSn='" + sub_order_sn + "';";
|
||||||
|
var rst = mySql.ExecuteNonQuery(sql);
|
||||||
|
mySql.Close();
|
||||||
|
if (rst)
|
||||||
|
{
|
||||||
|
return "{\"code\":200,\"msg\":\"success\"}";
|
||||||
|
}
|
||||||
|
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
|
||||||
|
}
|
||||||
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public string getOrderCodeFile(string inputData)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
|
{
|
||||||
|
var time = 0;
|
||||||
|
int.TryParse(RegexUtils.GetStringQuery(ref inputData, "time"), out time);
|
||||||
|
string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
|
||||||
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name");
|
||||||
|
if (string.IsNullOrEmpty(user_name))
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"没有用户名\"}";
|
||||||
|
}
|
||||||
|
var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(shop_id))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入店铺\"}";
|
||||||
|
|
||||||
|
string file_md5 = RegexUtils.GetStringQuery(ref inputData, "file_md5")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(file_md5))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入文件信息\"}";
|
||||||
|
|
||||||
|
long table_id = shop_id.ParseToLong() % 128;
|
||||||
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
string sql = "";
|
||||||
|
|
||||||
|
sql = "select fileCodeMd5,fileCodeBase64 from kjd_order.order_code_" + table_id + " where fileCodeMd5='" + file_md5 + "';";
|
||||||
|
|
||||||
|
var dt = mySql.ExecuteDataTable(sql);
|
||||||
|
mySql.Close();
|
||||||
|
if (!string.IsNullOrEmpty(mySql.Message))
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
string file_md5_rst = "";
|
||||||
|
string file_base64_rst = "";
|
||||||
|
if (dt.Rows.Count > 0)
|
||||||
|
{
|
||||||
|
file_md5_rst = dt.Rows[0]["fileCodeMd5"].ParseToString();
|
||||||
|
file_base64_rst = dt.Rows[0]["fileCodeBase64"].ParseToString();
|
||||||
|
}
|
||||||
|
return "{\"code\":200,\"msg\":\"success\",\"data\":\"{\"file_md5\":\"" + file_md5_rst + "\",\"file_base64\":\"" + file_base64_rst + "\"}\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
|
}
|
||||||
|
|
||||||
|
public string UploadOrder(string inputData)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(inputData))
|
||||||
|
{
|
||||||
|
var time = 0;
|
||||||
|
int.TryParse(RegexUtils.GetStringQuery(ref inputData, "time"), out time);
|
||||||
|
string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
|
||||||
|
if (time1 != EncrypUtil.Encryption(time))
|
||||||
|
return "{\"code\":50000,\"msg\":\"校验失败\"}";
|
||||||
|
|
||||||
|
string user_name = RegexUtils.GetStringQuery(ref inputData, "user_name");
|
||||||
|
if (string.IsNullOrEmpty(user_name))
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"没有用户名\"}";
|
||||||
|
}
|
||||||
|
var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(shop_id))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入店铺\"}";
|
||||||
|
|
||||||
|
string subPurchaseOrderSn = RegexUtils.GetStringQuery(ref inputData, "subPurchaseOrderSn")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(subPurchaseOrderSn))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入订单编号\"}";
|
||||||
|
|
||||||
|
string feeStr = RegexUtils.GetStringQuery(ref inputData, "fee")?.Replace("'", "\\'");
|
||||||
|
if (string.IsNullOrEmpty(feeStr))
|
||||||
|
return "{\"code\":500,\"msg\":\"请输入费用\"}";
|
||||||
|
decimal fee = feeStr.ParseToDecimal();
|
||||||
|
|
||||||
|
|
||||||
|
long table_id = shop_id.ParseToLong() % 128;
|
||||||
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
|
string sql = "";
|
||||||
|
|
||||||
|
sql = "update kjd_order.order_" + table_id + " set upLoadStatus=2 where upLoadStatus < 2 and subPurchaseOrderSn in('" + subPurchaseOrderSn + "');";
|
||||||
|
var rst = mySql.ExecuteRecordsRows(sql);
|
||||||
|
if (!string.IsNullOrEmpty(mySql.Message))
|
||||||
|
{
|
||||||
|
mySql.Close();
|
||||||
|
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
|
||||||
|
}
|
||||||
|
if (rst > 0)
|
||||||
|
{
|
||||||
|
sql = "update kjd.user set authorized_amount=authorized_amount-" + fee + " where user_name='" + user_name + "';";
|
||||||
|
rst = mySql.ExecuteRecordsRows(sql);
|
||||||
|
}
|
||||||
|
mySql.Close();
|
||||||
|
if (!string.IsNullOrEmpty(mySql.Message))
|
||||||
|
{
|
||||||
|
return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return "{\"code\":200,\"msg\":\"success\"}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return "{\"code\":19999,\"msg\":\"输入为空\"}";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -85,67 +85,68 @@ namespace KJD_Web.BLL
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||||
// MysqlUtils mySql = new MysqlUtils(conn);
|
MysqlUtils mySql = new MysqlUtils(conn);
|
||||||
// string sql = "";
|
string sql = "";
|
||||||
// for (int i = 0; i < 128; i++)
|
for (int i = 0; i < 128; i++)
|
||||||
// {
|
{
|
||||||
// //sql = @"drop table if exists kjd_map.spu_map_" + i + ";\r\n";
|
//sql = @"drop table if exists kjd_map.spu_map_" + i + ";\r\n";
|
||||||
// sql = @"CREATE TABLE IF NOT EXISTS kjd_order.order_" + i + @" (
|
sql = @"CREATE TABLE IF NOT EXISTS kjd_order.order_" + i + @" (
|
||||||
// `id` int NOT NULL AUTO_INCREMENT,
|
`id` int NOT NULL AUTO_INCREMENT,
|
||||||
// `supplierId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '店铺Id',
|
`supplierId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '店铺Id',
|
||||||
// `originalPurchaseOrderSn` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '备货单号',
|
`originalPurchaseOrderSn` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '备货单号',
|
||||||
// `subPurchaseOrderSn` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '备货母单号',
|
`subPurchaseOrderSn` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '备货母单号',
|
||||||
// `productName` varchar(1000) COLLATE utf8mb4_general_ci NOT NULL,
|
`productName` varchar(1000) COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
// `category` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
|
`category` varchar(50) COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
// `productId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品编号',
|
`productId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品编号',
|
||||||
// `productSkcId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL,
|
`productSkcId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
// `productSkcPicture` varchar(250) COLLATE utf8mb4_general_ci NOT NULL COMMENT '主图',
|
`productSkcPicture` varchar(250) COLLATE utf8mb4_general_ci NOT NULL COMMENT '主图',
|
||||||
// `productSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '货号',
|
`productSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '货号',
|
||||||
// `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废',
|
`status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废',
|
||||||
// `productSkuId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL,
|
`productSkuId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
// `className` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'sku规格',
|
`className` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'sku规格',
|
||||||
// `currencyType` varchar(10) COLLATE utf8mb4_general_ci NOT NULL,
|
`currencyType` varchar(10) COLLATE utf8mb4_general_ci NOT NULL,
|
||||||
// `supplierPrice` int NOT NULL COMMENT '申报价格',
|
`supplierPrice` int NOT NULL COMMENT '申报价格',
|
||||||
// `purchaseQuantity` int NOT NULL COMMENT '备货件数',
|
`purchaseQuantity` int NOT NULL COMMENT '备货件数',
|
||||||
// `deliverQuantity` int NOT NULL COMMENT '送货件数',
|
`deliverQuantity` int NOT NULL COMMENT '送货件数',
|
||||||
// `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数',
|
`realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数',
|
||||||
// `availableSaleDays` decimal(10, 0) NOT NULL COMMENT '可售天数',
|
`availableSaleDays` decimal(10, 0) NOT NULL COMMENT '可售天数',
|
||||||
// `qcResult` int DEFAULT NULL COMMENT '抽检结果 1合格 2不合格',
|
`qcResult` int DEFAULT NULL COMMENT '抽检结果 1合格 2不合格',
|
||||||
// `thumbUrlList` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'sku图片',
|
`thumbUrlList` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'sku图片',
|
||||||
// `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间',
|
`purchaseTime` bigint NOT NULL COMMENT '备货单创建时间',
|
||||||
// `deliverTime` bigint DEFAULT NULL COMMENT '发货时间',
|
`deliverTime` bigint DEFAULT NULL COMMENT '发货时间',
|
||||||
// `receiveTime` bigint DEFAULT NULL COMMENT '收货时间',
|
`receiveTime` bigint DEFAULT NULL COMMENT '收货时间',
|
||||||
// `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间',
|
`expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间',
|
||||||
// `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间',
|
`expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间',
|
||||||
// `deliveryOrderSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货单号',
|
`deliveryOrderSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货单号',
|
||||||
// `receiveWarehouseId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库Id',
|
`receiveWarehouseId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库Id',
|
||||||
// `receiveWarehouseName` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库',
|
`receiveWarehouseName` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库',
|
||||||
// `warehouseGroupId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '仓组Id',
|
`warehouseGroupId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '仓组Id',
|
||||||
// `jiaTongCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '佳同码',
|
`jiaTongCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '佳同码',
|
||||||
// `barCodeMd5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品条码MD5',
|
`barCodeMd5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品条码MD5',
|
||||||
// `shippingMarkMd5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '箱唛文件MD5',
|
`shippingMarkMd5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '箱唛文件MD5',
|
||||||
// `notes` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
|
`notes` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注',
|
||||||
// `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
`add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
// `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
`mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
||||||
// PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
// UNIQUE KEY `index_subPurchaseOrderSn` (`subPurchaseOrderSn`) USING BTREE
|
UNIQUE KEY `index_subPurchaseOrderSn` (`subPurchaseOrderSn`) USING BTREE
|
||||||
//) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单推送表'";
|
) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单推送表'";
|
||||||
|
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT 0 COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)',\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT 0 COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)',\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号',\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NOT NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号',\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NOT NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号'\r\nAFTER\r\n `productSkuId`,\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NOT NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号'\r\nAFTER\r\n `productSkuId`,\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NOT NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `costPrice` int NULL COMMENT '成本价',\r\nADD\r\n COLUMN `deliveryFee` int NULL COMMENT '车队费',\r\nADD\r\n COLUMN `markFee` int NULL COMMENT '贴标费',\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `markFee`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NOT NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `costPrice` int NULL COMMENT '成本价',\r\nADD\r\n COLUMN `deliveryFee` int NULL COMMENT '车队费',\r\nADD\r\n COLUMN `markFee` int NULL COMMENT '贴标费',\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `markFee`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NOT NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `originalPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备母货单号'\r\nAFTER\r\n `supplierId`,\r\nMODIFY\r\n COLUMN `subPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备货单号'\r\nAFTER\r\n `originalPurchaseOrderSn`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `originalPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备母货单号'\r\nAFTER\r\n `supplierId`,\r\nMODIFY\r\n COLUMN `subPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备货单号'\r\nAFTER\r\n `originalPurchaseOrderSn`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `upProductId` varchar (25) NOT NULL COMMENT '上家编号',\r\nMODIFY\r\n COLUMN `productSkcId` varchar (25) NOT NULL\r\nAFTER\r\n `upProductId`,\r\nMODIFY\r\n COLUMN `productSkcPicture` varchar (250) NOT NULL COMMENT '主图'\r\nAFTER\r\n `productSkcId`,\r\nMODIFY\r\n COLUMN `productSn` varchar (50) NULL COMMENT '货号'\r\nAFTER\r\n `productSkcPicture`,\r\nMODIFY\r\n COLUMN `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废'\r\nAFTER\r\n `productSn`,\r\nMODIFY\r\n COLUMN `productSkuId` varchar (25) NOT NULL\r\nAFTER\r\n `status`,\r\nMODIFY\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号'\r\nAFTER\r\n `productSkuId`,\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `costPrice` int NULL COMMENT '成本价'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliveryFee` int NULL COMMENT '车队费'\r\nAFTER\r\n `costPrice`,\r\nMODIFY\r\n COLUMN `markFee` int NULL COMMENT '贴标费'\r\nAFTER\r\n `deliveryFee`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `markFee`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `upProductId` varchar (25) NOT NULL COMMENT '上家编号',\r\nMODIFY\r\n COLUMN `productSkcId` varchar (25) NOT NULL\r\nAFTER\r\n `upProductId`,\r\nMODIFY\r\n COLUMN `productSkcPicture` varchar (250) NOT NULL COMMENT '主图'\r\nAFTER\r\n `productSkcId`,\r\nMODIFY\r\n COLUMN `productSn` varchar (50) NULL COMMENT '货号'\r\nAFTER\r\n `productSkcPicture`,\r\nMODIFY\r\n COLUMN `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废'\r\nAFTER\r\n `productSn`,\r\nMODIFY\r\n COLUMN `productSkuId` varchar (25) NOT NULL\r\nAFTER\r\n `status`,\r\nMODIFY\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号'\r\nAFTER\r\n `productSkuId`,\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `costPrice` int NULL COMMENT '成本价'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliveryFee` int NULL COMMENT '车队费'\r\nAFTER\r\n `costPrice`,\r\nMODIFY\r\n COLUMN `markFee` int NULL COMMENT '贴标费'\r\nAFTER\r\n `deliveryFee`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `markFee`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `upProductId` varchar (25) NULL COMMENT '上家编号'\r\nAFTER\r\n `productId`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nMODIFY\r\n COLUMN `upProductId` varchar (25) NULL COMMENT '上家编号'\r\nAFTER\r\n `productId`";
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `supplierName` varchar (50) NOT NULL COMMENT '店铺名称',\r\nMODIFY\r\n COLUMN `originalPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备母货单号'\r\nAFTER\r\n `supplierName`,\r\nMODIFY\r\n COLUMN `subPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备货单号'\r\nAFTER\r\n `originalPurchaseOrderSn`,\r\nMODIFY\r\n COLUMN `productName` varchar (1000) NOT NULL\r\nAFTER\r\n `subPurchaseOrderSn`,\r\nMODIFY\r\n COLUMN `category` varchar (50) NOT NULL\r\nAFTER\r\n `productName`,\r\nMODIFY\r\n COLUMN `productId` varchar (25) NOT NULL COMMENT '商品编号'\r\nAFTER\r\n `category`,\r\nMODIFY\r\n COLUMN `upProductId` varchar (25) NULL COMMENT '上家编号'\r\nAFTER\r\n `productId`,\r\nMODIFY\r\n COLUMN `productSkcId` varchar (25) NOT NULL\r\nAFTER\r\n `upProductId`,\r\nMODIFY\r\n COLUMN `productSkcPicture` varchar (250) NOT NULL COMMENT '主图'\r\nAFTER\r\n `productSkcId`,\r\nMODIFY\r\n COLUMN `productSn` varchar (50) NULL COMMENT '货号'\r\nAFTER\r\n `productSkcPicture`,\r\nMODIFY\r\n COLUMN `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废'\r\nAFTER\r\n `productSn`,\r\nMODIFY\r\n COLUMN `productSkuId` varchar (25) NOT NULL\r\nAFTER\r\n `status`,\r\nMODIFY\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号'\r\nAFTER\r\n `productSkuId`,\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `costPrice` int NULL COMMENT '成本价'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliveryFee` int NULL COMMENT '车队费'\r\nAFTER\r\n `costPrice`,\r\nMODIFY\r\n COLUMN `markFee` int NULL COMMENT '贴标费'\r\nAFTER\r\n `deliveryFee`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `markFee`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + "\r\nADD\r\n COLUMN `supplierName` varchar (50) NOT NULL COMMENT '店铺名称',\r\nMODIFY\r\n COLUMN `originalPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备母货单号'\r\nAFTER\r\n `supplierName`,\r\nMODIFY\r\n COLUMN `subPurchaseOrderSn` varchar (25) NOT NULL COMMENT '备货单号'\r\nAFTER\r\n `originalPurchaseOrderSn`,\r\nMODIFY\r\n COLUMN `productName` varchar (1000) NOT NULL\r\nAFTER\r\n `subPurchaseOrderSn`,\r\nMODIFY\r\n COLUMN `category` varchar (50) NOT NULL\r\nAFTER\r\n `productName`,\r\nMODIFY\r\n COLUMN `productId` varchar (25) NOT NULL COMMENT '商品编号'\r\nAFTER\r\n `category`,\r\nMODIFY\r\n COLUMN `upProductId` varchar (25) NULL COMMENT '上家编号'\r\nAFTER\r\n `productId`,\r\nMODIFY\r\n COLUMN `productSkcId` varchar (25) NOT NULL\r\nAFTER\r\n `upProductId`,\r\nMODIFY\r\n COLUMN `productSkcPicture` varchar (250) NOT NULL COMMENT '主图'\r\nAFTER\r\n `productSkcId`,\r\nMODIFY\r\n COLUMN `productSn` varchar (50) NULL COMMENT '货号'\r\nAFTER\r\n `productSkcPicture`,\r\nMODIFY\r\n COLUMN `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废'\r\nAFTER\r\n `productSn`,\r\nMODIFY\r\n COLUMN `productSkuId` varchar (25) NOT NULL\r\nAFTER\r\n `status`,\r\nMODIFY\r\n COLUMN `extCode` varchar (50) NOT NULL COMMENT 'sku货号'\r\nAFTER\r\n `productSkuId`,\r\nMODIFY\r\n COLUMN `className` varchar (100) NOT NULL COMMENT 'sku规格'\r\nAFTER\r\n `extCode`,\r\nMODIFY\r\n COLUMN `currencyType` varchar (10) NOT NULL\r\nAFTER\r\n `className`,\r\nMODIFY\r\n COLUMN `supplierPrice` int NOT NULL COMMENT '申报价格'\r\nAFTER\r\n `currencyType`,\r\nMODIFY\r\n COLUMN `costPrice` int NULL COMMENT '成本价'\r\nAFTER\r\n `supplierPrice`,\r\nMODIFY\r\n COLUMN `deliveryFee` int NULL COMMENT '车队费'\r\nAFTER\r\n `costPrice`,\r\nMODIFY\r\n COLUMN `markFee` int NULL COMMENT '贴标费'\r\nAFTER\r\n `deliveryFee`,\r\nMODIFY\r\n COLUMN `purchaseQuantity` int NOT NULL COMMENT '备货件数'\r\nAFTER\r\n `markFee`,\r\nMODIFY\r\n COLUMN `deliverQuantity` int NOT NULL COMMENT '送货件数'\r\nAFTER\r\n `purchaseQuantity`,\r\nMODIFY\r\n COLUMN `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数'\r\nAFTER\r\n `deliverQuantity`,\r\nMODIFY\r\n COLUMN `availableSaleDays` decimal (10, 0) NULL COMMENT '可售天数'\r\nAFTER\r\n `realReceiveAuthenticQuantity`,\r\nMODIFY\r\n COLUMN `qcResult` int NULL COMMENT '抽检结果 1合格 2不合格'\r\nAFTER\r\n `availableSaleDays`,\r\nMODIFY\r\n COLUMN `thumbUrlList` varchar (500) NULL COMMENT 'sku图片'\r\nAFTER\r\n `qcResult`,\r\nMODIFY\r\n COLUMN `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间'\r\nAFTER\r\n `thumbUrlList`,\r\nMODIFY\r\n COLUMN `deliverTime` bigint NULL COMMENT '发货时间'\r\nAFTER\r\n `purchaseTime`,\r\nMODIFY\r\n COLUMN `receiveTime` bigint NULL COMMENT '收货时间'\r\nAFTER\r\n `deliverTime`,\r\nMODIFY\r\n COLUMN `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间'\r\nAFTER\r\n `receiveTime`,\r\nMODIFY\r\n COLUMN `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间'\r\nAFTER\r\n `expectLatestDeliverTimeOrDefault`,\r\nMODIFY\r\n COLUMN `deliveryOrderSn` varchar (50) NULL COMMENT '发货单号'\r\nAFTER\r\n `expectLatestArrivalTimeOrDefault`,\r\nMODIFY\r\n COLUMN `receiveWarehouseId` varchar (25) NULL COMMENT '实际收货仓库Id'\r\nAFTER\r\n `deliveryOrderSn`,\r\nMODIFY\r\n COLUMN `receiveWarehouseName` varchar (50) NULL COMMENT '实际收货仓库'\r\nAFTER\r\n `receiveWarehouseId`,\r\nMODIFY\r\n COLUMN `warehouseGroupId` varchar (25) NULL COMMENT '仓组Id'\r\nAFTER\r\n `receiveWarehouseName`,\r\nMODIFY\r\n COLUMN `jiaTongCode` varchar (50) NULL COMMENT '佳同码'\r\nAFTER\r\n `warehouseGroupId`,\r\nMODIFY\r\n COLUMN `barCodeMd5` varchar (32) NULL COMMENT '商品条码MD5'\r\nAFTER\r\n `jiaTongCode`,\r\nMODIFY\r\n COLUMN `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMarkMd5`,\r\nMODIFY\r\n COLUMN `upLoadStatus` int NOT NULL DEFAULT '0' COMMENT '是否上传订单(上传后扣除用户授权金额,产生扣费记录)'\r\nAFTER\r\n `notes`,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `upLoadStatus`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`";
|
||||||
|
|
||||||
// sql = "ALTER TABLE\r\n kjd_order.order_" + i + " CHANGE COLUMN `shippingMarkMd5` `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'";
|
sql = "ALTER TABLE\r\n kjd_order.order_" + i + " CHANGE COLUMN `shippingMarkMd5` `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'";
|
||||||
// var rst = mySql.ExecuteNonQuery(sql);
|
sql = "ALTER TABLE\r\n kjd_order.order_code_" + i + " DROP COLUMN `subPurchaseOrderSn`,\r\n DROP COLUMN `jiaTongCode`,\r\n DROP COLUMN `shippingMarkMd5`,\r\n DROP COLUMN `shippingMarkBase64`,\r\n CHANGE COLUMN `barCodeMd5` `fileCodeMd5` varchar (32) NOT NULL,\r\n CHANGE COLUMN `barCodeBase64` `fileCodeBase64` longtext NOT NULL,\r\nMODIFY\r\n COLUMN `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP\r\nAFTER\r\n `fileCodeBase64`,\r\nMODIFY\r\n COLUMN `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP\r\nAFTER\r\n `add_time`,\r\n DROP INDEX `index_subPurchaseOrderSn`,\r\nADD\r\n UNIQUE `index_fileCodeMd5` USING btree (`fileCodeMd5`)";
|
||||||
// }
|
var rst = mySql.ExecuteNonQuery(sql);
|
||||||
// mySql.Close();
|
}
|
||||||
|
mySql.Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -46,7 +46,7 @@ namespace KJD_Web.BLL
|
|||||||
company_name = row["company_name"].ToString(),
|
company_name = row["company_name"].ToString(),
|
||||||
is_sa = row.Table.Columns.Contains("is_sa") ? row["is_sa"].ParseToInt() : 0,
|
is_sa = row.Table.Columns.Contains("is_sa") ? row["is_sa"].ParseToInt() : 0,
|
||||||
sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
|
sa_level = row.Table.Columns.Contains("sa_level") ? row["sa_level"].ParseToInt() : 0,
|
||||||
authorized_amount = row.Table.Columns.Contains("authorized_amount") ? row["sa_level"].ParseToInt() : 0,
|
authorized_amount = row.Table.Columns.Contains("authorized_amount") ? row["authorized_amount"].ParseToInt() : 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(user.company_name))
|
if (string.IsNullOrEmpty(user.company_name))
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<IISExpressWindowsAuthentication />
|
<IISExpressWindowsAuthentication />
|
||||||
<IISExpressUseClassicPipelineMode />
|
<IISExpressUseClassicPipelineMode />
|
||||||
<UseGlobalApplicationHostFile />
|
<UseGlobalApplicationHostFile />
|
||||||
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
|
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
|
||||||
<ProjectView>ShowAllFiles</ProjectView>
|
<ProjectView>ShowAllFiles</ProjectView>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ProjectExtensions>
|
<ProjectExtensions>
|
||||||
|
|||||||
@@ -83,6 +83,57 @@ namespace KJD_Web
|
|||||||
var result = jsontext;
|
var result = jsontext;
|
||||||
result = new OrderManage().UpdateOrderStatus1(jsontext);
|
result = new OrderManage().UpdateOrderStatus1(jsontext);
|
||||||
|
|
||||||
|
Context.Response.Write(result);
|
||||||
|
Context.Response.End();
|
||||||
|
}
|
||||||
|
//AddOrderCodeFile
|
||||||
|
[WebMethod]
|
||||||
|
public void add_order_code_file()
|
||||||
|
{
|
||||||
|
string jsontext = GetRequestJsonString();
|
||||||
|
|
||||||
|
var result = jsontext;
|
||||||
|
result = new OrderManage().AddOrderCodeFile(jsontext);
|
||||||
|
|
||||||
|
Context.Response.Write(result);
|
||||||
|
Context.Response.End();
|
||||||
|
}
|
||||||
|
|
||||||
|
//SaveOrderCodeFileLink
|
||||||
|
[WebMethod]
|
||||||
|
public void save_order_code_file_link()
|
||||||
|
{
|
||||||
|
string jsontext = GetRequestJsonString();
|
||||||
|
|
||||||
|
var result = jsontext;
|
||||||
|
result = new OrderManage().SaveOrderCodeFileLink(jsontext);
|
||||||
|
|
||||||
|
Context.Response.Write(result);
|
||||||
|
Context.Response.End();
|
||||||
|
}
|
||||||
|
|
||||||
|
//getOrderCodeFile
|
||||||
|
[WebMethod]
|
||||||
|
public void get_order_code_file()
|
||||||
|
{
|
||||||
|
string jsontext = GetRequestJsonString();
|
||||||
|
|
||||||
|
var result = jsontext;
|
||||||
|
result = new OrderManage().getOrderCodeFile(jsontext);
|
||||||
|
|
||||||
|
Context.Response.Write(result);
|
||||||
|
Context.Response.End();
|
||||||
|
}
|
||||||
|
|
||||||
|
//UploadOrder
|
||||||
|
[WebMethod]
|
||||||
|
public void upload_order()
|
||||||
|
{
|
||||||
|
string jsontext = GetRequestJsonString();
|
||||||
|
|
||||||
|
var result = jsontext;
|
||||||
|
result = new OrderManage().UploadOrder(jsontext);
|
||||||
|
|
||||||
Context.Response.Write(result);
|
Context.Response.Write(result);
|
||||||
Context.Response.End();
|
Context.Response.End();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,12 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
|
using System.Data.SqlTypes;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Web;
|
using System.Web;
|
||||||
|
using System.Web.UI.WebControls.WebParts;
|
||||||
|
|
||||||
namespace KJD_Web.Utils
|
namespace KJD_Web.Utils
|
||||||
{
|
{
|
||||||
@@ -379,6 +381,55 @@ namespace KJD_Web.Utils
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int ExecuteRecordsRows(string SqlString)
|
||||||
|
{
|
||||||
|
return ExecuteRecordsRows(SqlString, null);
|
||||||
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 返回更改、插入或删除的行数
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="SqlString"></param>
|
||||||
|
/// <param name="parms"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public int ExecuteRecordsRows(string SqlString, MySqlParameter[] parms)
|
||||||
|
{
|
||||||
|
SleepOrGo();
|
||||||
|
bool frist = true;
|
||||||
|
Retry:
|
||||||
|
if (Conn == null || Conn.State != ConnectionState.Open)
|
||||||
|
ConnTo();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CmdIni();
|
||||||
|
cmd.CommandText = SqlString;
|
||||||
|
if (parms != null)
|
||||||
|
foreach (MySqlParameter pram in parms)
|
||||||
|
cmd.Parameters.Add(pram);
|
||||||
|
reader = cmd.ExecuteReader();
|
||||||
|
if (reader.Read())
|
||||||
|
return reader.RecordsAffected;
|
||||||
|
return reader.RecordsAffected;
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (e.Message.Contains("Illegal mix of collations"))
|
||||||
|
return 0;
|
||||||
|
if (frist)
|
||||||
|
{
|
||||||
|
frist = false;
|
||||||
|
ErrorDoing(e.Message);
|
||||||
|
goto Retry;
|
||||||
|
}
|
||||||
|
AddError(e.Message, SqlString);
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
CloseReader();
|
||||||
|
IsRunning = false;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 返回插入ID
|
/// 返回插入ID
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -534,6 +534,205 @@ namespace TemuKJD.Extension
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void AddVerticalMergeCell(this DataGridView dgv, ConcurrentList<DataGridViewCell> cellLst, bool drawRightBorder = true, Color? VerGridColor = null, Color? VerGridSelectColor = null)
|
||||||
|
{
|
||||||
|
int nHeight = 0;
|
||||||
|
int nLeft = 0;
|
||||||
|
int nTop = 0;
|
||||||
|
int nWidth = 0;
|
||||||
|
|
||||||
|
dgv.RowHeightChanged += (s, e) =>
|
||||||
|
{
|
||||||
|
bool has = false;
|
||||||
|
foreach (var cell in cellLst)
|
||||||
|
{
|
||||||
|
if (cell.RowIndex == e.Row.Index)
|
||||||
|
{
|
||||||
|
dgv.InvalidateCell(cell);
|
||||||
|
has = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (has)
|
||||||
|
dgv.Update();
|
||||||
|
};
|
||||||
|
//合并列中某一列的列宽变化时,强制重绘
|
||||||
|
dgv.ColumnWidthChanged += (s, e) =>
|
||||||
|
{
|
||||||
|
bool has = false;
|
||||||
|
foreach (var cell in cellLst)
|
||||||
|
{
|
||||||
|
if (cell.ColumnIndex == e.Column.Index)
|
||||||
|
{
|
||||||
|
dgv.InvalidateCell(cell);
|
||||||
|
has = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (has)
|
||||||
|
dgv.Update();
|
||||||
|
};
|
||||||
|
dgv.SelectionChanged += (s, e) =>
|
||||||
|
{
|
||||||
|
bool has = false;
|
||||||
|
foreach (var cell in cellLst)
|
||||||
|
{
|
||||||
|
if (cell.Displayed)
|
||||||
|
{
|
||||||
|
dgv.InvalidateCell(cell);
|
||||||
|
has = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (has)
|
||||||
|
dgv.Update();
|
||||||
|
};
|
||||||
|
dgv.Scroll += (s, e) =>
|
||||||
|
{
|
||||||
|
bool has = false;
|
||||||
|
foreach (DataGridViewCell cell in cellLst)
|
||||||
|
{
|
||||||
|
if (cell.Displayed)
|
||||||
|
{
|
||||||
|
dgv.InvalidateCell(cell);
|
||||||
|
has = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (has)
|
||||||
|
dgv.Update();
|
||||||
|
};
|
||||||
|
//处理重绘事件
|
||||||
|
dgv.CellPainting += (s, e) =>
|
||||||
|
{
|
||||||
|
if (e.RowIndex >= 0 && e.ColumnIndex >= 0) // 重绘单元格
|
||||||
|
{
|
||||||
|
foreach(DataGridViewCell cell in cellLst)
|
||||||
|
{
|
||||||
|
if (cell.RowIndex == e.RowIndex && cell.ColumnIndex == e.ColumnIndex)
|
||||||
|
{
|
||||||
|
nTop = e.CellBounds.Top;
|
||||||
|
nLeft = e.CellBounds.Left;
|
||||||
|
nWidth = e.CellBounds.Width;
|
||||||
|
nHeight = 0;
|
||||||
|
foreach (DataGridViewCell c in cellLst)
|
||||||
|
{
|
||||||
|
nHeight += dgv.Rows[c.RowIndex].Height;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < cellLst.IndexOf(cell); i++)
|
||||||
|
{
|
||||||
|
nTop -= dgv.Rows[cellLst[i].RowIndex].Height;
|
||||||
|
}
|
||||||
|
var rect = new Rectangle(nLeft, nTop, nWidth - 1, nHeight - 1);
|
||||||
|
if (!drawRightBorder)
|
||||||
|
rect = new Rectangle(nLeft, nTop, nWidth, nHeight - 1);
|
||||||
|
|
||||||
|
e.PaintBackground(e.CellBounds, true); // false不绘制单元格背景
|
||||||
|
//e.PaintContent(e.CellBounds); // 绘制单元格内容,此处根据需要决定是否绘制内容
|
||||||
|
|
||||||
|
Brush brush;
|
||||||
|
Pen pen;
|
||||||
|
//if (cellLst.IndexOf(cell) < cellLst.Count - 1)
|
||||||
|
{
|
||||||
|
var color = VerGridColor;
|
||||||
|
// 分隔线
|
||||||
|
if (color == null)
|
||||||
|
{
|
||||||
|
//VerGridColor = Color.FromArgb(229, 229, 229);
|
||||||
|
color = e.RowIndex % 2 == 0 ? dgv.DefaultCellStyle.BackColor : dgv.AlternatingRowsDefaultCellStyle.BackColor;
|
||||||
|
color = e.CellStyle.BackColor;
|
||||||
|
}
|
||||||
|
var selectColor = VerGridSelectColor;
|
||||||
|
if (selectColor == null)
|
||||||
|
//VerGridColorSelect = Color.FromArgb(129, 129, 129);
|
||||||
|
selectColor = dgv.DefaultCellStyle.SelectionBackColor;
|
||||||
|
//if ((dgv.Rows[e.RowIndex].Cells[e.ColumnIndex]).Selected)
|
||||||
|
if (cellLst.Any(c =>c.Selected))
|
||||||
|
{
|
||||||
|
//using (pen = new Pen(selectColor.Value))
|
||||||
|
//{
|
||||||
|
// var rtBounds = e.CellBounds;
|
||||||
|
// //e.Graphics.DrawLine(pen, rtBounds.Right - 1, rtBounds.Top, rtBounds.Right - 1, rtBounds.Bottom - 2); // 右竖线
|
||||||
|
// e.Graphics.DrawLine(pen, rtBounds.Left, rtBounds.Bottom - 1, rtBounds.Right - 2, rtBounds.Bottom - 1); // 下横线
|
||||||
|
//}
|
||||||
|
using (brush = new SolidBrush(selectColor.Value))
|
||||||
|
{
|
||||||
|
e.Graphics.FillRectangle(brush, rect);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//using (pen = new Pen(color.Value))
|
||||||
|
//{
|
||||||
|
// var rtBounds = e.CellBounds;
|
||||||
|
// //e.Graphics.DrawLine(pen, rtBounds.Right - 1, rtBounds.Top, rtBounds.Right - 1, rtBounds.Bottom - 2); // 右竖线
|
||||||
|
// e.Graphics.DrawLine(pen, rtBounds.Left, rtBounds.Bottom - 1, rtBounds.Right - 2, rtBounds.Bottom - 1); // 下横线
|
||||||
|
//}
|
||||||
|
using (brush = new SolidBrush(color.Value))
|
||||||
|
{
|
||||||
|
e.Graphics.FillRectangle(brush, rect);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//if (cellLst.IndexOf(cell) == cellLst.Count - 1)
|
||||||
|
if (cell is DataGridViewImageCell == false)
|
||||||
|
{
|
||||||
|
var color = e.CellStyle.ForeColor;
|
||||||
|
if (cellLst.Any(c => c.Selected))
|
||||||
|
{
|
||||||
|
color = e.CellStyle.SelectionForeColor;
|
||||||
|
}
|
||||||
|
using (brush = new SolidBrush(color))
|
||||||
|
{
|
||||||
|
//StringFormat stringFormat = new StringFormat();
|
||||||
|
//stringFormat.Alignment = StringAlignment.Near;
|
||||||
|
//stringFormat.LineAlignment = StringAlignment.Near;
|
||||||
|
//stringFormat.FormatFlags = StringFormatFlags.MeasureTrailingSpaces; // 确保尾部空格被计算在内
|
||||||
|
//stringFormat.Trimming = StringTrimming.Character; // 处理超出宽度的字符
|
||||||
|
//stringFormat.SetMeasurableCharacterRanges(new CharacterRange[] { new CharacterRange(0, cell.Value.ParseToString().Length) }); // 设置测量范围
|
||||||
|
|
||||||
|
SizeF textSize = TextRenderer.MeasureText(cell.Value.ParseToString(), e.CellStyle.Font, new Size(nWidth - 10, nHeight), TextFormatFlags.WordBreak);
|
||||||
|
//单元列移出可见范围后将不再移动,需要强制改变绘制文字的位置
|
||||||
|
if (nLeft < 0)
|
||||||
|
nLeft = e.CellBounds.Right - nWidth;
|
||||||
|
PointF point = new PointF(nLeft + 1, nTop + (nHeight - textSize.Height) / 2);
|
||||||
|
if (e.CellStyle.Alignment.ToString().Contains("Center"))
|
||||||
|
point.X = nLeft + (nWidth - textSize.Width) / 2;
|
||||||
|
else if (e.CellStyle.Alignment.ToString().Contains("Right"))
|
||||||
|
point.X = nLeft + nWidth - textSize.Width - 1;
|
||||||
|
if (e.CellStyle.Alignment.ToString().Contains("Top"))
|
||||||
|
point.Y = nTop + 4;
|
||||||
|
else if (e.CellStyle.Alignment.ToString().Contains("Bottom"))
|
||||||
|
point.Y = nTop + nHeight - textSize.Height - 4;
|
||||||
|
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.ClearTypeGridFit;
|
||||||
|
RectangleF rectF = new RectangleF(point.X, point.Y, nWidth - 10, nHeight - 10);
|
||||||
|
//e.Graphics.DrawString(cell.Value.ParseToString(), e.CellStyle.Font, brush, point);
|
||||||
|
e.Graphics.DrawString(cell.Value.ParseToString(), e.CellStyle.Font, brush, rectF);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var img = cell.Value as Image;
|
||||||
|
|
||||||
|
PointF point = new PointF(nLeft, nTop + (nHeight - img.Height) / 2);
|
||||||
|
if (e.CellStyle.Alignment.ToString().Contains("Center"))
|
||||||
|
point.X = nLeft + (nWidth - img.Width) / 2;
|
||||||
|
else if (e.CellStyle.Alignment.ToString().Contains("Right"))
|
||||||
|
point.X = nLeft + nWidth - img.Width - 1;
|
||||||
|
if (e.CellStyle.Alignment.ToString().Contains("Top"))
|
||||||
|
point.Y = nTop + 4;
|
||||||
|
else if (e.CellStyle.Alignment.ToString().Contains("Bottom"))
|
||||||
|
point.Y = nTop + nHeight - img.Height;
|
||||||
|
e.Graphics.DrawImage(img, point);
|
||||||
|
//RectangleF rectF = new RectangleF(point.X, point.Y, nWidth - 10, nHeight - 10);
|
||||||
|
//e.Graphics.DrawString(cell.Value.ParseToString(), e.CellStyle.Font, brush, point);
|
||||||
|
//e.Graphics.DrawString(cell.Value.ParseToString(), e.CellStyle.Font, brush, rectF);
|
||||||
|
}
|
||||||
|
e.Handled = true; // 告知系统不再处理单元格绘制事件
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public static void AddImgColumn(this DataGridView dgv, string imgColumn, string imgPathColumn, bool isSetHttpsHttp = true)
|
public static void AddImgColumn(this DataGridView dgv, string imgColumn, string imgPathColumn, bool isSetHttpsHttp = true)
|
||||||
{
|
{
|
||||||
dgv.Scroll += (s, e) =>
|
dgv.Scroll += (s, e) =>
|
||||||
|
|||||||
@@ -160,6 +160,12 @@
|
|||||||
<Compile Include="KJDForms\JITForms\JITForm.Designer.cs">
|
<Compile Include="KJDForms\JITForms\JITForm.Designer.cs">
|
||||||
<DependentUpon>JITForm.cs</DependentUpon>
|
<DependentUpon>JITForm.cs</DependentUpon>
|
||||||
</Compile>
|
</Compile>
|
||||||
|
<Compile Include="KJDForms\JITForms\JitOrderUploadFileForm.cs">
|
||||||
|
<SubType>Form</SubType>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="KJDForms\JITForms\JitOrderUploadFileForm.Designer.cs">
|
||||||
|
<DependentUpon>JitOrderUploadFileForm.cs</DependentUpon>
|
||||||
|
</Compile>
|
||||||
<Compile Include="KJDForms\JITForms\JitPushOrder.cs">
|
<Compile Include="KJDForms\JITForms\JitPushOrder.cs">
|
||||||
<SubType>Form</SubType>
|
<SubType>Form</SubType>
|
||||||
</Compile>
|
</Compile>
|
||||||
@@ -919,6 +925,9 @@
|
|||||||
<EmbeddedResource Include="KJDForms\JITForms\JITForm.resx">
|
<EmbeddedResource Include="KJDForms\JITForms\JITForm.resx">
|
||||||
<DependentUpon>JITForm.cs</DependentUpon>
|
<DependentUpon>JITForm.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
|
<EmbeddedResource Include="KJDForms\JITForms\JitOrderUploadFileForm.resx">
|
||||||
|
<DependentUpon>JitOrderUploadFileForm.cs</DependentUpon>
|
||||||
|
</EmbeddedResource>
|
||||||
<EmbeddedResource Include="KJDForms\JITForms\JitPushOrder.resx">
|
<EmbeddedResource Include="KJDForms\JITForms\JitPushOrder.resx">
|
||||||
<DependentUpon>JitPushOrder.cs</DependentUpon>
|
<DependentUpon>JitPushOrder.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
@@ -1285,6 +1294,7 @@
|
|||||||
<Content Include="Resources\main_form_logo_pdd.png" />
|
<Content Include="Resources\main_form_logo_pdd.png" />
|
||||||
<None Include="Resources\main_menu_jit.png" />
|
<None Include="Resources\main_menu_jit.png" />
|
||||||
<None Include="Resources\main_menu_jit_select.png" />
|
<None Include="Resources\main_menu_jit_select.png" />
|
||||||
|
<Content Include="Resources\pdf.png" />
|
||||||
<Content Include="Static\base.css" />
|
<Content Include="Static\base.css" />
|
||||||
<Content Include="Static\DyCategorys.txt" />
|
<Content Include="Static\DyCategorys.txt" />
|
||||||
<Content Include="Static\js\jquery.dad.min.js" />
|
<Content Include="Static\js\jquery.dad.min.js" />
|
||||||
|
|||||||
+9
-5
@@ -38,7 +38,8 @@
|
|||||||
System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("开通JIT");
|
System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("开通JIT");
|
||||||
System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("JIT卡密管理");
|
System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("JIT卡密管理");
|
||||||
System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("加入发货台");
|
System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("加入发货台");
|
||||||
System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
|
System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("JIT订单扣费");
|
||||||
|
System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
|
||||||
treeNode1,
|
treeNode1,
|
||||||
treeNode2,
|
treeNode2,
|
||||||
treeNode3,
|
treeNode3,
|
||||||
@@ -48,7 +49,8 @@
|
|||||||
treeNode7,
|
treeNode7,
|
||||||
treeNode8,
|
treeNode8,
|
||||||
treeNode9,
|
treeNode9,
|
||||||
treeNode10});
|
treeNode10,
|
||||||
|
treeNode11});
|
||||||
this.panel1 = new System.Windows.Forms.Panel();
|
this.panel1 = new System.Windows.Forms.Panel();
|
||||||
this.panel3 = new System.Windows.Forms.Panel();
|
this.panel3 = new System.Windows.Forms.Panel();
|
||||||
this.panel2 = new System.Windows.Forms.Panel();
|
this.panel2 = new System.Windows.Forms.Panel();
|
||||||
@@ -159,10 +161,12 @@
|
|||||||
treeNode9.Text = "JIT卡密管理";
|
treeNode9.Text = "JIT卡密管理";
|
||||||
treeNode10.Name = "加入发货台";
|
treeNode10.Name = "加入发货台";
|
||||||
treeNode10.Text = "加入发货台";
|
treeNode10.Text = "加入发货台";
|
||||||
treeNode11.Name = "超级权限管理";
|
treeNode11.Name = "JIT订单扣费";
|
||||||
treeNode11.Text = "超级权限管理";
|
treeNode11.Text = "JIT订单扣费";
|
||||||
|
treeNode12.Name = "超级权限管理";
|
||||||
|
treeNode12.Text = "超级权限管理";
|
||||||
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
|
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
|
||||||
treeNode11});
|
treeNode12});
|
||||||
this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
|
this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235)))));
|
||||||
this.tv.Size = new System.Drawing.Size(140, 446);
|
this.tv.Size = new System.Drawing.Size(140, 446);
|
||||||
this.tv.TabIndex = 1;
|
this.tv.TabIndex = 1;
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ using TemuKJD.BaseForms;
|
|||||||
using TemuKJD.KJDForms.ProductSelectForms;
|
using TemuKJD.KJDForms.ProductSelectForms;
|
||||||
using TemuKJD.KJDForms.ProductThirdSelectForms;
|
using TemuKJD.KJDForms.ProductThirdSelectForms;
|
||||||
using TemuKJD.KJDForms.ProductForms;
|
using TemuKJD.KJDForms.ProductForms;
|
||||||
|
using TemuKJD.KJDForms.JITForms;
|
||||||
|
|
||||||
namespace TemuKJD.KJDForms.AdminForms
|
namespace TemuKJD.KJDForms.AdminForms
|
||||||
{
|
{
|
||||||
@@ -29,6 +30,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
public Lazy<JoinDeliveryForm> joinDeliveryFrom = new Lazy<JoinDeliveryForm>();
|
public Lazy<JoinDeliveryForm> joinDeliveryFrom = new Lazy<JoinDeliveryForm>();
|
||||||
public Lazy<TemuJitForm> jitForm = new Lazy<TemuJitForm>();
|
public Lazy<TemuJitForm> jitForm = new Lazy<TemuJitForm>();
|
||||||
public Lazy<AdminCardCodeForm> adminCardCodeFrom = new Lazy<AdminCardCodeForm>();
|
public Lazy<AdminCardCodeForm> adminCardCodeFrom = new Lazy<AdminCardCodeForm>();
|
||||||
|
public Lazy<JitPushOrder> jitPushOrder = new Lazy<JitPushOrder>();
|
||||||
|
|
||||||
public AdminForm()
|
public AdminForm()
|
||||||
{
|
{
|
||||||
@@ -40,7 +42,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
tv.ExpandGroup(tv.Nodes[0].Name);
|
tv.ExpandGroup(tv.Nodes[0].Name);
|
||||||
|
|
||||||
List<string> hideName = new List<string>() { "超级用户管理", "超级店铺管理", "选品数据库", "选品加价管理", "认领待上传", "库存上传", "商品核价",
|
List<string> hideName = new List<string>() { "超级用户管理", "超级店铺管理", "选品数据库", "选品加价管理", "认领待上传", "库存上传", "商品核价",
|
||||||
"加入发货台", "开通JIT", "JIT卡密管理" };
|
"加入发货台", "开通JIT", "JIT卡密管理", "JIT订单扣费" };
|
||||||
|
|
||||||
if (BaseClass.GroupId == 3)
|
if (BaseClass.GroupId == 3)
|
||||||
{
|
{
|
||||||
@@ -57,6 +59,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
hideName.Remove("加入发货台");
|
hideName.Remove("加入发货台");
|
||||||
if (MainForm.instance.pnlJit.Visible == true)
|
if (MainForm.instance.pnlJit.Visible == true)
|
||||||
hideName.Remove("JIT卡密管理");
|
hideName.Remove("JIT卡密管理");
|
||||||
|
hideName.Remove("JIT订单扣费");
|
||||||
hideName.Remove("开通JIT");
|
hideName.Remove("开通JIT");
|
||||||
}
|
}
|
||||||
if (BaseClass.SaLevel==2)
|
if (BaseClass.SaLevel==2)
|
||||||
@@ -127,6 +130,10 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
case "JIT卡密管理":
|
case "JIT卡密管理":
|
||||||
SetForm(adminCardCodeFrom.Value);
|
SetForm(adminCardCodeFrom.Value);
|
||||||
break;
|
break;
|
||||||
|
case "JIT订单扣费":
|
||||||
|
jitPushOrder.Value.IsClientJit = false;
|
||||||
|
SetForm(jitPushOrder.Value);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
}).Start();
|
}).Start();
|
||||||
|
|||||||
+76
-62
@@ -30,15 +30,15 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
this.components = new System.ComponentModel.Container();
|
this.components = new System.ComponentModel.Container();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
|
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
|
||||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||||
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||||
this.btnSearchPrice3 = new DevComponents.DotNetBar.PanelEx();
|
this.btnSearchPrice3 = new DevComponents.DotNetBar.PanelEx();
|
||||||
@@ -96,7 +96,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
this.pnlRestoreSizeAndNumber = new System.Windows.Forms.Panel();
|
this.pnlRestoreSizeAndNumber = new System.Windows.Forms.Panel();
|
||||||
this.numPieces = new System.Windows.Forms.NumericUpDown();
|
this.numPieces = new System.Windows.Forms.NumericUpDown();
|
||||||
this.label11 = new System.Windows.Forms.Label();
|
|
||||||
this.label17 = new System.Windows.Forms.Label();
|
this.label17 = new System.Windows.Forms.Label();
|
||||||
this.numHeight2 = new System.Windows.Forms.NumericUpDown();
|
this.numHeight2 = new System.Windows.Forms.NumericUpDown();
|
||||||
this.numHeight1 = new System.Windows.Forms.NumericUpDown();
|
this.numHeight1 = new System.Windows.Forms.NumericUpDown();
|
||||||
@@ -110,6 +109,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.label18 = new System.Windows.Forms.Label();
|
this.label18 = new System.Windows.Forms.Label();
|
||||||
this.label19 = new System.Windows.Forms.Label();
|
this.label19 = new System.Windows.Forms.Label();
|
||||||
this.label20 = new System.Windows.Forms.Label();
|
this.label20 = new System.Windows.Forms.Label();
|
||||||
|
this.label11 = new System.Windows.Forms.Label();
|
||||||
|
this.chkLessThan = new TemuKJD.UserComponent.UcCheckBox(this.components);
|
||||||
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
|
||||||
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
|
||||||
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
this.pbShopLoading = new System.Windows.Forms.PictureBox();
|
||||||
@@ -496,22 +497,22 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//
|
//
|
||||||
this.dgvExtCode.AllowUserToAddRows = false;
|
this.dgvExtCode.AllowUserToAddRows = false;
|
||||||
this.dgvExtCode.AllowUserToDeleteRows = false;
|
this.dgvExtCode.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
|
dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
|
||||||
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
|
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
|
||||||
this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
|
||||||
| System.Windows.Forms.AnchorStyles.Left)));
|
| System.Windows.Forms.AnchorStyles.Left)));
|
||||||
this.dgvExtCode.AutoRowNumber = false;
|
this.dgvExtCode.AutoRowNumber = false;
|
||||||
this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
|
||||||
this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
|
this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||||
this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
|
this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
|
||||||
this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.colSelectExtCode,
|
this.colSelectExtCode,
|
||||||
this.colFilterExtCode,
|
this.colFilterExtCode,
|
||||||
@@ -1045,7 +1046,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
// pnlRestoreSizeAndNumber
|
// pnlRestoreSizeAndNumber
|
||||||
//
|
//
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.numPieces);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.numPieces);
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.label11);
|
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.label17);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.label17);
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.numHeight2);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.numHeight2);
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.numHeight1);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.numHeight1);
|
||||||
@@ -1059,6 +1059,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.label18);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.label18);
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.label19);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.label19);
|
||||||
this.pnlRestoreSizeAndNumber.Controls.Add(this.label20);
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.label20);
|
||||||
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.label11);
|
||||||
|
this.pnlRestoreSizeAndNumber.Controls.Add(this.chkLessThan);
|
||||||
this.pnlRestoreSizeAndNumber.Location = new System.Drawing.Point(920, 76);
|
this.pnlRestoreSizeAndNumber.Location = new System.Drawing.Point(920, 76);
|
||||||
this.pnlRestoreSizeAndNumber.Name = "pnlRestoreSizeAndNumber";
|
this.pnlRestoreSizeAndNumber.Name = "pnlRestoreSizeAndNumber";
|
||||||
this.pnlRestoreSizeAndNumber.Size = new System.Drawing.Size(278, 58);
|
this.pnlRestoreSizeAndNumber.Size = new System.Drawing.Size(278, 58);
|
||||||
@@ -1067,7 +1069,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
// numPieces
|
// numPieces
|
||||||
//
|
//
|
||||||
this.numPieces.Enabled = false;
|
this.numPieces.Enabled = false;
|
||||||
this.numPieces.Location = new System.Drawing.Point(108, 3);
|
this.numPieces.Location = new System.Drawing.Point(125, 3);
|
||||||
this.numPieces.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
this.numPieces.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
|
||||||
this.numPieces.Maximum = new decimal(new int[] {
|
this.numPieces.Maximum = new decimal(new int[] {
|
||||||
99999,
|
99999,
|
||||||
@@ -1076,7 +1078,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
0});
|
0});
|
||||||
this.numPieces.Name = "numPieces";
|
this.numPieces.Name = "numPieces";
|
||||||
this.numPieces.ReadOnly = true;
|
this.numPieces.ReadOnly = true;
|
||||||
this.numPieces.Size = new System.Drawing.Size(41, 23);
|
this.numPieces.Size = new System.Drawing.Size(31, 23);
|
||||||
this.numPieces.TabIndex = 1158;
|
this.numPieces.TabIndex = 1158;
|
||||||
this.numPieces.Value = new decimal(new int[] {
|
this.numPieces.Value = new decimal(new int[] {
|
||||||
1,
|
1,
|
||||||
@@ -1084,25 +1086,15 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
0,
|
0,
|
||||||
0});
|
0});
|
||||||
//
|
//
|
||||||
// label11
|
|
||||||
//
|
|
||||||
this.label11.AutoSize = true;
|
|
||||||
this.label11.Location = new System.Drawing.Point(3, 6);
|
|
||||||
this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
|
||||||
this.label11.Name = "label11";
|
|
||||||
this.label11.Size = new System.Drawing.Size(80, 17);
|
|
||||||
this.label11.TabIndex = 1118;
|
|
||||||
this.label11.Text = "还原参数值:";
|
|
||||||
//
|
|
||||||
// label17
|
// label17
|
||||||
//
|
//
|
||||||
this.label17.AutoSize = true;
|
this.label17.AutoSize = true;
|
||||||
this.label17.Location = new System.Drawing.Point(80, 6);
|
this.label17.Location = new System.Drawing.Point(109, 6);
|
||||||
this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||||
this.label17.Name = "label17";
|
this.label17.Name = "label17";
|
||||||
this.label17.Size = new System.Drawing.Size(32, 17);
|
this.label17.Size = new System.Drawing.Size(20, 17);
|
||||||
this.label17.TabIndex = 1159;
|
this.label17.TabIndex = 1159;
|
||||||
this.label17.Text = "数量";
|
this.label17.Text = "量";
|
||||||
//
|
//
|
||||||
// numHeight2
|
// numHeight2
|
||||||
//
|
//
|
||||||
@@ -1288,6 +1280,27 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.label20.TabIndex = 684;
|
this.label20.TabIndex = 684;
|
||||||
this.label20.Text = "重";
|
this.label20.Text = "重";
|
||||||
//
|
//
|
||||||
|
// label11
|
||||||
|
//
|
||||||
|
this.label11.AutoSize = true;
|
||||||
|
this.label11.Location = new System.Drawing.Point(77, 6);
|
||||||
|
this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
|
||||||
|
this.label11.Name = "label11";
|
||||||
|
this.label11.Size = new System.Drawing.Size(44, 17);
|
||||||
|
this.label11.TabIndex = 1118;
|
||||||
|
this.label11.Text = "参数:";
|
||||||
|
//
|
||||||
|
// chkLessThan
|
||||||
|
//
|
||||||
|
this.chkLessThan.AutoSize = true;
|
||||||
|
this.chkLessThan.Location = new System.Drawing.Point(7, 4);
|
||||||
|
this.chkLessThan.Name = "chkLessThan";
|
||||||
|
this.chkLessThan.Size = new System.Drawing.Size(75, 21);
|
||||||
|
this.chkLessThan.TabIndex = 1160;
|
||||||
|
this.chkLessThan.Text = "反转符号";
|
||||||
|
this.chkLessThan.UseVisualStyleBackColor = true;
|
||||||
|
this.chkLessThan.CheckedChanged += new System.EventHandler(this.chkLessThan_CheckedChanged);
|
||||||
|
//
|
||||||
// splitContainer3
|
// splitContainer3
|
||||||
//
|
//
|
||||||
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
|
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
@@ -1348,19 +1361,19 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//
|
//
|
||||||
this.dgvShop.AllowUserToAddRows = false;
|
this.dgvShop.AllowUserToAddRows = false;
|
||||||
this.dgvShop.AllowUserToDeleteRows = false;
|
this.dgvShop.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle12.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle21.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12;
|
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
|
||||||
this.dgvShop.AutoRowNumber = true;
|
this.dgvShop.AutoRowNumber = true;
|
||||||
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13;
|
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
|
||||||
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||||
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.colSelect,
|
this.colSelect,
|
||||||
@@ -1579,19 +1592,19 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//
|
//
|
||||||
this.dgvPriceCheck.AllowUserToAddRows = false;
|
this.dgvPriceCheck.AllowUserToAddRows = false;
|
||||||
this.dgvPriceCheck.AllowUserToDeleteRows = false;
|
this.dgvPriceCheck.AllowUserToDeleteRows = false;
|
||||||
dataGridViewCellStyle14.BackColor = System.Drawing.Color.WhiteSmoke;
|
dataGridViewCellStyle23.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||||
this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
|
this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle23;
|
||||||
this.dgvPriceCheck.AutoRowNumber = true;
|
this.dgvPriceCheck.AutoRowNumber = true;
|
||||||
this.dgvPriceCheck.BackgroundColor = System.Drawing.Color.White;
|
this.dgvPriceCheck.BackgroundColor = System.Drawing.Color.White;
|
||||||
this.dgvPriceCheck.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
this.dgvPriceCheck.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||||
dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
|
dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control;
|
||||||
dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
|
dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||||
dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||||
dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||||
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||||
this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
|
this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24;
|
||||||
this.dgvPriceCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
this.dgvPriceCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||||
this.dgvPriceCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
this.dgvPriceCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||||
this.colCheck,
|
this.colCheck,
|
||||||
@@ -1704,8 +1717,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//
|
//
|
||||||
// colProdName
|
// colProdName
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colProdName.DefaultCellStyle = dataGridViewCellStyle16;
|
this.colProdName.DefaultCellStyle = dataGridViewCellStyle25;
|
||||||
this.colProdName.HeaderText = "标题";
|
this.colProdName.HeaderText = "标题";
|
||||||
this.colProdName.Name = "colProdName";
|
this.colProdName.Name = "colProdName";
|
||||||
this.colProdName.ReadOnly = true;
|
this.colProdName.ReadOnly = true;
|
||||||
@@ -1713,8 +1726,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//
|
//
|
||||||
// colSkuName
|
// colSkuName
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle17;
|
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle26;
|
||||||
this.colSkuName.HeaderText = "规格名称";
|
this.colSkuName.HeaderText = "规格名称";
|
||||||
this.colSkuName.Name = "colSkuName";
|
this.colSkuName.Name = "colSkuName";
|
||||||
this.colSkuName.ReadOnly = true;
|
this.colSkuName.ReadOnly = true;
|
||||||
@@ -1764,8 +1777,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//
|
//
|
||||||
// colCreatTime
|
// colCreatTime
|
||||||
//
|
//
|
||||||
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||||
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle18;
|
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle27;
|
||||||
this.colCreatTime.HeaderText = "创建时间";
|
this.colCreatTime.HeaderText = "创建时间";
|
||||||
this.colCreatTime.Name = "colCreatTime";
|
this.colCreatTime.Name = "colCreatTime";
|
||||||
this.colCreatTime.ReadOnly = true;
|
this.colCreatTime.ReadOnly = true;
|
||||||
@@ -2025,5 +2038,6 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
private System.Windows.Forms.Label label17;
|
private System.Windows.Forms.Label label17;
|
||||||
private System.Windows.Forms.Panel pnlRestoreSizeAndNumber;
|
private System.Windows.Forms.Panel pnlRestoreSizeAndNumber;
|
||||||
private DevComponents.DotNetBar.PanelEx btnSearchPrice3;
|
private DevComponents.DotNetBar.PanelEx btnSearchPrice3;
|
||||||
|
private UserComponent.UcCheckBox chkLessThan;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -30,7 +30,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
public bool IsClientJit { get; set; } = false;
|
public bool IsClientJit { get; set; } = false;
|
||||||
CheckBox chkSelectAll;
|
CheckBox chkSelectAll;
|
||||||
PriceCheckConfig priceCheckConfig = null;
|
PriceCheckConfig priceCheckConfig = null;
|
||||||
List<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
|
ConcurrentList<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new ConcurrentList<PriceCheckFilterConfig>();
|
||||||
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
|
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
|
||||||
public ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
public ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
|
||||||
public ConcurrentList<TemuForChainProductInfo> lstCheckPriceInfo = new ConcurrentList<TemuForChainProductInfo>();
|
public ConcurrentList<TemuForChainProductInfo> lstCheckPriceInfo = new ConcurrentList<TemuForChainProductInfo>();
|
||||||
@@ -43,9 +43,9 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
|
|
||||||
private void AdminProductPriceCheckForm_Load(object sender, EventArgs e)
|
private void AdminProductPriceCheckForm_Load(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<PriceCheckFilterConfig>>("price_check_filter_config");
|
lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<ConcurrentList<PriceCheckFilterConfig>>("price_check_filter_config");
|
||||||
if (lstPriceCheckFilterConfig == null)
|
if (lstPriceCheckFilterConfig == null)
|
||||||
lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
|
lstPriceCheckFilterConfig = new ConcurrentList<PriceCheckFilterConfig>();
|
||||||
|
|
||||||
//this.dgvShop.AddSelectorColumn("colSelect");
|
//this.dgvShop.AddSelectorColumn("colSelect");
|
||||||
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false, null, true);
|
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false, null, true);
|
||||||
@@ -93,6 +93,8 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
this.numWeight2.Value = 200;
|
this.numWeight2.Value = 200;
|
||||||
|
|
||||||
btnSearchPrice3.Visible = false;
|
btnSearchPrice3.Visible = false;
|
||||||
|
btnStop.Location = btnSearchPrice3.Location;
|
||||||
|
btnStop.Size = btnSearchPrice3.Size;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsClientJit)
|
if (IsClientJit)
|
||||||
@@ -127,7 +129,7 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
{
|
{
|
||||||
var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList();
|
var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList();
|
||||||
if (IsClientJit)
|
if (IsClientJit)
|
||||||
list = list.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList();
|
list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList();
|
||||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||||
{
|
{
|
||||||
if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString()))
|
if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString()))
|
||||||
@@ -2171,7 +2173,12 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
//长宽高超50且重量大于1000克认为是有意改大了参数需要还原
|
//长宽高超50且重量大于1000克认为是有意改大了参数需要还原
|
||||||
//if (skc.skuList.Any(s => (s.len >= 45 * 10 || s.width >= 45 * 10 || s.height >= 45 * 10) && s.weight >= 1000 * 1000))
|
//if (skc.skuList.Any(s => (s.len >= 45 * 10 || s.width >= 45 * 10 || s.height >= 45 * 10) && s.weight >= 1000 * 1000))
|
||||||
// return true;
|
// return true;
|
||||||
if (skc.skuList.Any(s => (s.len >= numJudgeLen.Value * 10 || s.width >= numJudgeLen.Value * 10 || s.height >= numJudgeLen.Value * 10) && s.weight >= numJudgeWeight.Value * 1000))
|
|
||||||
|
bool isRevers = false;
|
||||||
|
Invoke(new Action(() => { isRevers = chkLessThan.Checked; }));
|
||||||
|
if (!isRevers && skc.skuList.Any(s => (s.len >= numJudgeLen.Value * 10 || s.width >= numJudgeLen.Value * 10 || s.height >= numJudgeLen.Value * 10) && s.weight >= numJudgeWeight.Value * 1000))
|
||||||
|
return true;
|
||||||
|
else if (isRevers && skc.skuList.Any(s => (s.len < numJudgeLen.Value * 10 || s.width < numJudgeLen.Value * 10 || s.height < numJudgeLen.Value * 10) && s.weight < numJudgeWeight.Value * 1000))
|
||||||
return true;
|
return true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -2449,6 +2456,22 @@ namespace TemuKJD.KJDForms.AdminForms
|
|||||||
{
|
{
|
||||||
chkFilterSize.Checked = !chkFilterSize.Checked;
|
chkFilterSize.Checked = !chkFilterSize.Checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void chkLessThan_CheckedChanged(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
if(chkLessThan.Checked)
|
||||||
|
{
|
||||||
|
lblJudgeLen.Text = "长<";
|
||||||
|
lblJudgeWeight.Text = "且重<";
|
||||||
|
lblJudgeLen.ForeColor = lblJudgeWeight.ForeColor = Color.Red;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
lblJudgeLen.Text = "长≥";
|
||||||
|
lblJudgeWeight.Text = "且重≥";
|
||||||
|
lblJudgeLen.ForeColor = lblJudgeWeight.ForeColor = Color.Black;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class PriceCheckConfig
|
public class PriceCheckConfig
|
||||||
|
|||||||
@@ -31,7 +31,10 @@ namespace TemuKJD.KJDForms.JITForms
|
|||||||
tv.SelectedNode = tv.Nodes[0].Nodes[0];
|
tv.SelectedNode = tv.Nodes[0].Nodes[0];
|
||||||
tv.ExpandGroup(tv.Nodes[0].Name);
|
tv.ExpandGroup(tv.Nodes[0].Name);
|
||||||
|
|
||||||
List<string> hideName = new List<string>() { "请在列表中填写要隐藏的Tab页面", "JIT推单" };
|
List<string> hideName = new List<string>() { "请在列表中填写要隐藏的Tab页面", /*"JIT推单"*/ };
|
||||||
|
#if DEBUG
|
||||||
|
hideName.Remove("JIT推单");
|
||||||
|
#endif
|
||||||
|
|
||||||
foreach (var item in hideName)
|
foreach (var item in hideName)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,334 @@
|
|||||||
|
|
||||||
|
namespace TemuKJD.KJDForms.JITForms
|
||||||
|
{
|
||||||
|
partial class JitOrderUploadFileForm
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Required designer variable.
|
||||||
|
/// </summary>
|
||||||
|
private System.ComponentModel.IContainer components = null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Clean up any resources being used.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||||
|
protected override void Dispose(bool disposing)
|
||||||
|
{
|
||||||
|
if (disposing && (components != null))
|
||||||
|
{
|
||||||
|
components.Dispose();
|
||||||
|
}
|
||||||
|
base.Dispose(disposing);
|
||||||
|
}
|
||||||
|
|
||||||
|
#region Windows Form Designer generated code
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Required method for Designer support - do not modify
|
||||||
|
/// the contents of this method with the code editor.
|
||||||
|
/// </summary>
|
||||||
|
private void InitializeComponent()
|
||||||
|
{
|
||||||
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(JitOrderUploadFileForm));
|
||||||
|
this.panel2 = new System.Windows.Forms.Panel();
|
||||||
|
this.lblShippingMark = new System.Windows.Forms.Label();
|
||||||
|
this.lblBarCode = new System.Windows.Forms.Label();
|
||||||
|
this.btnSet1 = new DevComponents.DotNetBar.PanelEx();
|
||||||
|
this.label3 = new System.Windows.Forms.Label();
|
||||||
|
this.label2 = new System.Windows.Forms.Label();
|
||||||
|
this.label1 = new System.Windows.Forms.Label();
|
||||||
|
this.btnUpload2 = new DevComponents.DotNetBar.PanelEx();
|
||||||
|
this.pbShippingMark = new System.Windows.Forms.PictureBox();
|
||||||
|
this.btnUpload1 = new DevComponents.DotNetBar.PanelEx();
|
||||||
|
this.btnOk = new DevComponents.DotNetBar.PanelEx();
|
||||||
|
this.txtJiaTongCode = new System.Windows.Forms.TextBox();
|
||||||
|
this.pbBarCode = new System.Windows.Forms.PictureBox();
|
||||||
|
this.lblBarCodeShow = new System.Windows.Forms.Label();
|
||||||
|
this.lblShippingMarkShow = new System.Windows.Forms.Label();
|
||||||
|
this.btnClose = new DevComponents.DotNetBar.PanelEx();
|
||||||
|
this.panel2.SuspendLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.pbShippingMark)).BeginInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.pbBarCode)).BeginInit();
|
||||||
|
this.SuspendLayout();
|
||||||
|
//
|
||||||
|
// panel2
|
||||||
|
//
|
||||||
|
this.panel2.BackColor = System.Drawing.Color.White;
|
||||||
|
this.panel2.Controls.Add(this.btnClose);
|
||||||
|
this.panel2.Controls.Add(this.lblShippingMarkShow);
|
||||||
|
this.panel2.Controls.Add(this.lblBarCodeShow);
|
||||||
|
this.panel2.Controls.Add(this.lblShippingMark);
|
||||||
|
this.panel2.Controls.Add(this.lblBarCode);
|
||||||
|
this.panel2.Controls.Add(this.btnSet1);
|
||||||
|
this.panel2.Controls.Add(this.label3);
|
||||||
|
this.panel2.Controls.Add(this.label2);
|
||||||
|
this.panel2.Controls.Add(this.label1);
|
||||||
|
this.panel2.Controls.Add(this.btnUpload2);
|
||||||
|
this.panel2.Controls.Add(this.pbShippingMark);
|
||||||
|
this.panel2.Controls.Add(this.btnUpload1);
|
||||||
|
this.panel2.Controls.Add(this.btnOk);
|
||||||
|
this.panel2.Controls.Add(this.txtJiaTongCode);
|
||||||
|
this.panel2.Controls.Add(this.pbBarCode);
|
||||||
|
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||||
|
this.panel2.Location = new System.Drawing.Point(1, 33);
|
||||||
|
this.panel2.Name = "panel2";
|
||||||
|
this.panel2.Size = new System.Drawing.Size(425, 497);
|
||||||
|
this.panel2.TabIndex = 1;
|
||||||
|
//
|
||||||
|
// lblShippingMark
|
||||||
|
//
|
||||||
|
this.lblShippingMark.AutoSize = true;
|
||||||
|
this.lblShippingMark.Location = new System.Drawing.Point(275, 295);
|
||||||
|
this.lblShippingMark.Name = "lblShippingMark";
|
||||||
|
this.lblShippingMark.Size = new System.Drawing.Size(89, 17);
|
||||||
|
this.lblShippingMark.TabIndex = 495;
|
||||||
|
this.lblShippingMark.Text = "shippingMark";
|
||||||
|
this.lblShippingMark.Visible = false;
|
||||||
|
//
|
||||||
|
// lblBarCode
|
||||||
|
//
|
||||||
|
this.lblBarCode.AutoSize = true;
|
||||||
|
this.lblBarCode.Location = new System.Drawing.Point(275, 123);
|
||||||
|
this.lblBarCode.Name = "lblBarCode";
|
||||||
|
this.lblBarCode.Size = new System.Drawing.Size(59, 17);
|
||||||
|
this.lblBarCode.TabIndex = 494;
|
||||||
|
this.lblBarCode.Text = "barCode";
|
||||||
|
this.lblBarCode.Visible = false;
|
||||||
|
//
|
||||||
|
// btnSet1
|
||||||
|
//
|
||||||
|
this.btnSet1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnSet1.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnSet1.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnSet1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnSet1.Location = new System.Drawing.Point(334, 34);
|
||||||
|
this.btnSet1.Name = "btnSet1";
|
||||||
|
this.btnSet1.Size = new System.Drawing.Size(55, 23);
|
||||||
|
this.btnSet1.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnSet1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnSet1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnSet1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||||
|
this.btnSet1.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||||
|
this.btnSet1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||||
|
this.btnSet1.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnSet1.Style.GradientAngle = 90;
|
||||||
|
this.btnSet1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnSet1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnSet1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnSet1.TabIndex = 481;
|
||||||
|
this.btnSet1.Text = "设置";
|
||||||
|
this.btnSet1.Visible = false;
|
||||||
|
this.btnSet1.Click += new System.EventHandler(this.btnSet1_Click);
|
||||||
|
//
|
||||||
|
// label3
|
||||||
|
//
|
||||||
|
this.label3.AutoSize = true;
|
||||||
|
this.label3.Location = new System.Drawing.Point(97, 262);
|
||||||
|
this.label3.Name = "label3";
|
||||||
|
this.label3.Size = new System.Drawing.Size(32, 17);
|
||||||
|
this.label3.TabIndex = 477;
|
||||||
|
this.label3.Text = "箱唛";
|
||||||
|
//
|
||||||
|
// label2
|
||||||
|
//
|
||||||
|
this.label2.AutoSize = true;
|
||||||
|
this.label2.Location = new System.Drawing.Point(73, 91);
|
||||||
|
this.label2.Name = "label2";
|
||||||
|
this.label2.Size = new System.Drawing.Size(56, 17);
|
||||||
|
this.label2.TabIndex = 476;
|
||||||
|
this.label2.Text = "商品条码";
|
||||||
|
//
|
||||||
|
// label1
|
||||||
|
//
|
||||||
|
this.label1.AutoSize = true;
|
||||||
|
this.label1.Location = new System.Drawing.Point(84, 37);
|
||||||
|
this.label1.Name = "label1";
|
||||||
|
this.label1.Size = new System.Drawing.Size(44, 17);
|
||||||
|
this.label1.TabIndex = 475;
|
||||||
|
this.label1.Text = "佳同码";
|
||||||
|
//
|
||||||
|
// btnUpload2
|
||||||
|
//
|
||||||
|
this.btnUpload2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnUpload2.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnUpload2.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnUpload2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnUpload2.Location = new System.Drawing.Point(275, 260);
|
||||||
|
this.btnUpload2.Name = "btnUpload2";
|
||||||
|
this.btnUpload2.Size = new System.Drawing.Size(55, 23);
|
||||||
|
this.btnUpload2.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnUpload2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload2.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||||
|
this.btnUpload2.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||||
|
this.btnUpload2.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||||
|
this.btnUpload2.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnUpload2.Style.GradientAngle = 90;
|
||||||
|
this.btnUpload2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnUpload2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload2.TabIndex = 474;
|
||||||
|
this.btnUpload2.Text = "上传";
|
||||||
|
this.btnUpload2.Click += new System.EventHandler(this.btnUpload2_Click);
|
||||||
|
//
|
||||||
|
// pbShippingMark
|
||||||
|
//
|
||||||
|
this.pbShippingMark.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||||
|
this.pbShippingMark.Location = new System.Drawing.Point(133, 260);
|
||||||
|
this.pbShippingMark.Name = "pbShippingMark";
|
||||||
|
this.pbShippingMark.Size = new System.Drawing.Size(136, 136);
|
||||||
|
this.pbShippingMark.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||||
|
this.pbShippingMark.TabIndex = 473;
|
||||||
|
this.pbShippingMark.TabStop = false;
|
||||||
|
this.pbShippingMark.Click += new System.EventHandler(this.pbShippingMark_Click);
|
||||||
|
//
|
||||||
|
// btnUpload1
|
||||||
|
//
|
||||||
|
this.btnUpload1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnUpload1.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnUpload1.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnUpload1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnUpload1.Location = new System.Drawing.Point(275, 88);
|
||||||
|
this.btnUpload1.Name = "btnUpload1";
|
||||||
|
this.btnUpload1.Size = new System.Drawing.Size(55, 23);
|
||||||
|
this.btnUpload1.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnUpload1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||||
|
this.btnUpload1.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||||
|
this.btnUpload1.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||||
|
this.btnUpload1.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnUpload1.Style.GradientAngle = 90;
|
||||||
|
this.btnUpload1.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnUpload1.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload1.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnUpload1.TabIndex = 469;
|
||||||
|
this.btnUpload1.Text = "上传";
|
||||||
|
this.btnUpload1.Click += new System.EventHandler(this.btnUpload1_Click);
|
||||||
|
//
|
||||||
|
// btnOk
|
||||||
|
//
|
||||||
|
this.btnOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnOk.Cursor = System.Windows.Forms.Cursors.Hand;
|
||||||
|
this.btnOk.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.btnOk.Location = new System.Drawing.Point(334, 439);
|
||||||
|
this.btnOk.Name = "btnOk";
|
||||||
|
this.btnOk.Size = new System.Drawing.Size(55, 26);
|
||||||
|
this.btnOk.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
|
||||||
|
this.btnOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
|
||||||
|
this.btnOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
|
||||||
|
this.btnOk.Style.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnOk.Style.GradientAngle = 90;
|
||||||
|
this.btnOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnOk.TabIndex = 465;
|
||||||
|
this.btnOk.Text = "保存";
|
||||||
|
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
|
||||||
|
//
|
||||||
|
// txtJiaTongCode
|
||||||
|
//
|
||||||
|
this.txtJiaTongCode.Location = new System.Drawing.Point(133, 34);
|
||||||
|
this.txtJiaTongCode.Name = "txtJiaTongCode";
|
||||||
|
this.txtJiaTongCode.Size = new System.Drawing.Size(197, 23);
|
||||||
|
this.txtJiaTongCode.TabIndex = 464;
|
||||||
|
//
|
||||||
|
// pbBarCode
|
||||||
|
//
|
||||||
|
this.pbBarCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||||
|
this.pbBarCode.Location = new System.Drawing.Point(133, 88);
|
||||||
|
this.pbBarCode.Name = "pbBarCode";
|
||||||
|
this.pbBarCode.Size = new System.Drawing.Size(136, 136);
|
||||||
|
this.pbBarCode.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||||
|
this.pbBarCode.TabIndex = 463;
|
||||||
|
this.pbBarCode.TabStop = false;
|
||||||
|
this.pbBarCode.Click += new System.EventHandler(this.pbBarCode_Click);
|
||||||
|
//
|
||||||
|
// lblBarCodeShow
|
||||||
|
//
|
||||||
|
this.lblBarCodeShow.AutoSize = true;
|
||||||
|
this.lblBarCodeShow.Location = new System.Drawing.Point(130, 227);
|
||||||
|
this.lblBarCodeShow.Name = "lblBarCodeShow";
|
||||||
|
this.lblBarCodeShow.Size = new System.Drawing.Size(80, 17);
|
||||||
|
this.lblBarCodeShow.TabIndex = 508;
|
||||||
|
this.lblBarCodeShow.Text = "点击图片下载";
|
||||||
|
this.lblBarCodeShow.Visible = false;
|
||||||
|
//
|
||||||
|
// lblShippingMarkShow
|
||||||
|
//
|
||||||
|
this.lblShippingMarkShow.AutoSize = true;
|
||||||
|
this.lblShippingMarkShow.Location = new System.Drawing.Point(130, 399);
|
||||||
|
this.lblShippingMarkShow.Name = "lblShippingMarkShow";
|
||||||
|
this.lblShippingMarkShow.Size = new System.Drawing.Size(80, 17);
|
||||||
|
this.lblShippingMarkShow.TabIndex = 509;
|
||||||
|
this.lblShippingMarkShow.Text = "点击图片下载";
|
||||||
|
this.lblShippingMarkShow.Visible = false;
|
||||||
|
//
|
||||||
|
// btnClose
|
||||||
|
//
|
||||||
|
this.btnClose.CanvasColor = System.Drawing.SystemColors.Control;
|
||||||
|
this.btnClose.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
|
||||||
|
this.btnClose.DisabledBackColor = System.Drawing.Color.Empty;
|
||||||
|
this.btnClose.Location = new System.Drawing.Point(275, 439);
|
||||||
|
this.btnClose.Name = "btnClose";
|
||||||
|
this.btnClose.Size = new System.Drawing.Size(55, 26);
|
||||||
|
this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnClose.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnClose.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnClose.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
|
||||||
|
this.btnClose.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnClose.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
|
||||||
|
this.btnClose.Style.GradientAngle = 90;
|
||||||
|
this.btnClose.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnClose.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
|
||||||
|
this.btnClose.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnClose.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||||
|
this.btnClose.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
|
||||||
|
this.btnClose.TabIndex = 1036;
|
||||||
|
this.btnClose.Text = "关闭";
|
||||||
|
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
|
||||||
|
//
|
||||||
|
// JitOrderUploadFileForm
|
||||||
|
//
|
||||||
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
|
this.ClientSize = new System.Drawing.Size(427, 531);
|
||||||
|
this.Controls.Add(this.panel2);
|
||||||
|
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||||
|
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
|
||||||
|
this.Name = "JitOrderUploadFileForm";
|
||||||
|
this.Text = "上传相关文件";
|
||||||
|
this.TitleText = "上传相关文件";
|
||||||
|
this.Load += new System.EventHandler(this.JitOrderUploadFileForm_Load);
|
||||||
|
this.Controls.SetChildIndex(this.panel2, 0);
|
||||||
|
this.panel2.ResumeLayout(false);
|
||||||
|
this.panel2.PerformLayout();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.pbShippingMark)).EndInit();
|
||||||
|
((System.ComponentModel.ISupportInitialize)(this.pbBarCode)).EndInit();
|
||||||
|
this.ResumeLayout(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
private System.Windows.Forms.Panel panel2;
|
||||||
|
private DevComponents.DotNetBar.PanelEx btnUpload2;
|
||||||
|
private System.Windows.Forms.PictureBox pbShippingMark;
|
||||||
|
private DevComponents.DotNetBar.PanelEx btnUpload1;
|
||||||
|
private DevComponents.DotNetBar.PanelEx btnOk;
|
||||||
|
private System.Windows.Forms.TextBox txtJiaTongCode;
|
||||||
|
private System.Windows.Forms.PictureBox pbBarCode;
|
||||||
|
private System.Windows.Forms.Label label3;
|
||||||
|
private System.Windows.Forms.Label label2;
|
||||||
|
private System.Windows.Forms.Label label1;
|
||||||
|
private DevComponents.DotNetBar.PanelEx btnSet1;
|
||||||
|
private System.Windows.Forms.Label lblShippingMark;
|
||||||
|
private System.Windows.Forms.Label lblBarCode;
|
||||||
|
private System.Windows.Forms.Label lblShippingMarkShow;
|
||||||
|
private System.Windows.Forms.Label lblBarCodeShow;
|
||||||
|
private DevComponents.DotNetBar.PanelEx btnClose;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,266 @@
|
|||||||
|
using AllBase;
|
||||||
|
using AllBase.Model.Result;
|
||||||
|
using NaiBa.Util.Extension;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Data;
|
||||||
|
using System.Drawing;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
using TemuKJD.BaseForms;
|
||||||
|
using Work;
|
||||||
|
|
||||||
|
namespace TemuKJD.KJDForms.JITForms
|
||||||
|
{
|
||||||
|
public partial class JitOrderUploadFileForm : LRBaseForm
|
||||||
|
{
|
||||||
|
public bool isClientJit;
|
||||||
|
TemuDBOrderInfo temuDBOrderInfo = null;
|
||||||
|
public JitOrderUploadFileForm(TemuDBOrderInfo _temuDBOrderInfo)
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
temuDBOrderInfo = _temuDBOrderInfo;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void JitOrderUploadFileForm_Load(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
btnUpload1.Visible = btnUpload2.Visible = false;
|
||||||
|
btnOk.Visible = false;
|
||||||
|
lblShippingMark.Text = lblBarCode.Text = "";
|
||||||
|
if (isClientJit)
|
||||||
|
{
|
||||||
|
btnUpload1.Visible = btnUpload2.Visible = true;
|
||||||
|
btnOk.Visible = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.txtJiaTongCode.Text = temuDBOrderInfo?.jiaTongCode;
|
||||||
|
Task.Run(() =>
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(temuDBOrderInfo.barCodeMd5))
|
||||||
|
{
|
||||||
|
var url = BaseClass.BuildObjString("order/get_order_code_file");
|
||||||
|
var data = UserLogin.GetSignaturex();
|
||||||
|
data += "&file_md5=" + temuDBOrderInfo.barCodeMd5;
|
||||||
|
data += "&shop_id=" + temuDBOrderInfo.supplierId;
|
||||||
|
|
||||||
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Invoke(new Action(() => {
|
||||||
|
this.pbBarCode.Image = Properties.Resources.pdf;
|
||||||
|
var file_md5 = BaseRegex.GetStringJson(ref html, "file_md5");
|
||||||
|
var file_base64 = BaseRegex.GetStringJson(ref html, "file_base64");
|
||||||
|
this.pbBarCode.Tag = file_base64;
|
||||||
|
this.lblBarCode.Text = file_md5 + ".pdf";
|
||||||
|
lblBarCodeShow.Visible = true;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(temuDBOrderInfo.shippingMarkMd5))
|
||||||
|
{
|
||||||
|
var url = BaseClass.BuildObjString("order/get_order_code_file");
|
||||||
|
var data = UserLogin.GetSignaturex();
|
||||||
|
data += "&file_md5=" + temuDBOrderInfo.shippingMarkMd5;
|
||||||
|
data += "&shop_id=" + temuDBOrderInfo.supplierId;
|
||||||
|
|
||||||
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Invoke(new Action(() => {
|
||||||
|
this.pbShippingMark.Image = Properties.Resources.pdf;
|
||||||
|
var file_md5 = BaseRegex.GetStringJson(ref html, "file_md5");
|
||||||
|
var file_base64 = BaseRegex.GetStringJson(ref html, "file_base64");
|
||||||
|
this.pbShippingMark.Tag = file_base64;
|
||||||
|
this.lblShippingMark.Text = file_md5 + ".pdf";
|
||||||
|
lblShippingMarkShow.Visible = true;
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnSet1_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnUpload1_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
OpenFileDialog openFileDialog = new OpenFileDialog();
|
||||||
|
openFileDialog.Multiselect = false;
|
||||||
|
// 设置过滤条件,只显示文本文件
|
||||||
|
openFileDialog.Filter = "dpf文件 (*.pdf)|*.pdf|All files (*.*)|*.*";
|
||||||
|
// 显示对话框并获取结果
|
||||||
|
if (openFileDialog.ShowDialog() == DialogResult.OK)
|
||||||
|
{
|
||||||
|
string filePath = openFileDialog.FileName;
|
||||||
|
UpdatePdfFile(filePath, "barCode");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnUpload2_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
OpenFileDialog openFileDialog = new OpenFileDialog();
|
||||||
|
openFileDialog.Multiselect = false;
|
||||||
|
// 设置过滤条件,只显示文本文件
|
||||||
|
openFileDialog.Filter = "dpf文件 (*.pdf)|*.pdf|All files (*.*)|*.*";
|
||||||
|
// 显示对话框并获取结果
|
||||||
|
if (openFileDialog.ShowDialog() == DialogResult.OK)
|
||||||
|
{
|
||||||
|
string filePath = openFileDialog.FileName;
|
||||||
|
UpdatePdfFile(filePath, "shippingMark");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool UpdatePdfFile(string filePath, string type)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
byte[] fileBytes = File.ReadAllBytes(filePath);
|
||||||
|
// 将字节数组转换为Base64字符串
|
||||||
|
string file_base64 = Convert.ToBase64String(fileBytes);
|
||||||
|
string file_md5 = BaseClass.GetFileMd5(filePath);
|
||||||
|
|
||||||
|
var url = BaseClass.BuildObjString("order/add_order_code_file");
|
||||||
|
var data = UserLogin.GetSignaturex();
|
||||||
|
data += "&file_base64=" + file_base64;
|
||||||
|
data += "&file_md5=" + file_md5;
|
||||||
|
data += "&shop_id=" + temuDBOrderInfo.supplierId;
|
||||||
|
|
||||||
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
BaseMsgForm.ShowError("文件上传服务端失败,请重试!" + BaseRegex.GetStringJson(ref html, "msg"));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (type == "shippingMark")
|
||||||
|
{
|
||||||
|
this.pbShippingMark.Image = Properties.Resources.pdf;
|
||||||
|
this.pbShippingMark.Tag = file_base64;
|
||||||
|
this.lblShippingMark.Text = file_md5 + ".pdf";
|
||||||
|
lblShippingMarkShow.Visible = true;
|
||||||
|
}
|
||||||
|
if (type == "barCode")
|
||||||
|
{
|
||||||
|
this.pbBarCode.Image = Properties.Resources.pdf;
|
||||||
|
this.pbBarCode.Tag = file_base64;
|
||||||
|
this.lblBarCode.Text = file_md5 + ".pdf";
|
||||||
|
lblBarCodeShow.Visible = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
BaseMsgForm.ShowError("文件上传服务端失败!" + ex.Message);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnOk_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
string jiaTongCode = txtJiaTongCode.Text.Trim();
|
||||||
|
string shippingMarkMd5 = lblShippingMark.Text.Replace(".pdf", "");
|
||||||
|
string barCodeMd5 = lblBarCode.Text.Replace(".pdf", "");
|
||||||
|
|
||||||
|
var url = BaseClass.BuildObjString("order/save_order_code_file_link");
|
||||||
|
var data = UserLogin.GetSignaturex();
|
||||||
|
data += "&jia_tong_code=" + jiaTongCode;
|
||||||
|
data += "&bar_code_md5=" + barCodeMd5;
|
||||||
|
data += "&shipping_mark_md5=" + shippingMarkMd5;
|
||||||
|
data += "&sub_order_sn=" + temuDBOrderInfo.subPurchaseOrderSn;
|
||||||
|
data += "&shop_id=" + temuDBOrderInfo.supplierId;
|
||||||
|
|
||||||
|
var html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
html = GetHtml.PostUtf8(url, data);
|
||||||
|
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
|
||||||
|
{
|
||||||
|
var errMsg = BaseRegex.GetStringJson(ref html, "msg");
|
||||||
|
BaseMsgForm.ShowError(errMsg);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
temuDBOrderInfo.jiaTongCode = jiaTongCode;
|
||||||
|
temuDBOrderInfo.shippingMarkMd5 = shippingMarkMd5;
|
||||||
|
temuDBOrderInfo.barCodeMd5 = barCodeMd5;
|
||||||
|
BaseMsgForm.ShowInfo("保存成功!");
|
||||||
|
this.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void pbBarCode_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var base64String = pbBarCode.Tag.ParseToString();
|
||||||
|
if (!string.IsNullOrEmpty(base64String))
|
||||||
|
{
|
||||||
|
SaveFileDialog dialog = new SaveFileDialog();
|
||||||
|
dialog.Title = "保存pdf文件...";
|
||||||
|
dialog.Filter = "pdf files (*.pdf)|*.pdf|All files (*.*)|*.*";
|
||||||
|
dialog.RestoreDirectory = true;
|
||||||
|
|
||||||
|
|
||||||
|
dialog.FileName = temuDBOrderInfo.subPurchaseOrderSn + " - 商品条码.pdf";
|
||||||
|
if (dialog.ShowDialog() != DialogResult.OK)
|
||||||
|
return;
|
||||||
|
|
||||||
|
byte[] pdfBytes = Convert.FromBase64String(base64String);
|
||||||
|
// 将字节数组写入到文件
|
||||||
|
File.WriteAllBytes(dialog.FileName, pdfBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void pbShippingMark_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var base64String = pbShippingMark.Tag.ParseToString();
|
||||||
|
if (!string.IsNullOrEmpty(base64String))
|
||||||
|
{
|
||||||
|
SaveFileDialog dialog = new SaveFileDialog();
|
||||||
|
dialog.Title = "保存pdf文件...";
|
||||||
|
dialog.Filter = "pdf files (*.pdf)|*.pdf|All files (*.*)|*.*";
|
||||||
|
dialog.RestoreDirectory = true;
|
||||||
|
|
||||||
|
|
||||||
|
dialog.FileName = temuDBOrderInfo.subPurchaseOrderSn + " - 箱唛.pdf";
|
||||||
|
if (dialog.ShowDialog() != DialogResult.OK)
|
||||||
|
return;
|
||||||
|
|
||||||
|
byte[] pdfBytes = Convert.FromBase64String(base64String);
|
||||||
|
// 将字节数组写入到文件
|
||||||
|
File.WriteAllBytes(dialog.FileName, pdfBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void btnClose_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
this.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,298 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<root>
|
||||||
|
<!--
|
||||||
|
Microsoft ResX Schema
|
||||||
|
|
||||||
|
Version 2.0
|
||||||
|
|
||||||
|
The primary goals of this format is to allow a simple XML format
|
||||||
|
that is mostly human readable. The generation and parsing of the
|
||||||
|
various data types are done through the TypeConverter classes
|
||||||
|
associated with the data types.
|
||||||
|
|
||||||
|
Example:
|
||||||
|
|
||||||
|
... ado.net/XML headers & schema ...
|
||||||
|
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||||
|
<resheader name="version">2.0</resheader>
|
||||||
|
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||||
|
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||||
|
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||||
|
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||||
|
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||||
|
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||||
|
</data>
|
||||||
|
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||||
|
<comment>This is a comment</comment>
|
||||||
|
</data>
|
||||||
|
|
||||||
|
There are any number of "resheader" rows that contain simple
|
||||||
|
name/value pairs.
|
||||||
|
|
||||||
|
Each data row contains a name, and value. The row also contains a
|
||||||
|
type or mimetype. Type corresponds to a .NET class that support
|
||||||
|
text/value conversion through the TypeConverter architecture.
|
||||||
|
Classes that don't support this are serialized and stored with the
|
||||||
|
mimetype set.
|
||||||
|
|
||||||
|
The mimetype is used for serialized objects, and tells the
|
||||||
|
ResXResourceReader how to depersist the object. This is currently not
|
||||||
|
extensible. For a given mimetype the value must be set accordingly:
|
||||||
|
|
||||||
|
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||||
|
that the ResXResourceWriter will generate, however the reader can
|
||||||
|
read any of the formats listed below.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.binary.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.soap.base64
|
||||||
|
value : The object must be serialized with
|
||||||
|
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
|
||||||
|
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||||
|
value : The object must be serialized into a byte array
|
||||||
|
: using a System.ComponentModel.TypeConverter
|
||||||
|
: and then encoded with base64 encoding.
|
||||||
|
-->
|
||||||
|
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||||
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:choice maxOccurs="unbounded">
|
||||||
|
<xsd:element name="metadata">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="assembly">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="data">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
|
<xsd:attribute ref="xml:space" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="resheader">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:choice>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
<resheader name="resmimetype">
|
||||||
|
<value>text/microsoft-resx</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="version">
|
||||||
|
<value>2.0</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="reader">
|
||||||
|
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<resheader name="writer">
|
||||||
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
|
</resheader>
|
||||||
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
|
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
|
||||||
|
AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
|
||||||
|
AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
|
||||||
|
AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
|
||||||
|
OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
|
||||||
|
AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
|
||||||
|
///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
|
||||||
|
//////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
|
||||||
|
mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
|
||||||
|
mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
|
||||||
|
mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
|
||||||
|
mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
|
||||||
|
mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
|
||||||
|
mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
|
||||||
|
mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
|
||||||
|
//+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
|
||||||
|
mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
|
||||||
|
//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
|
||||||
|
//uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
|
||||||
|
//+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
|
||||||
|
if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
|
||||||
|
mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
|
||||||
|
MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
|
||||||
|
iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
|
||||||
|
mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
|
||||||
|
kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
|
||||||
|
/////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
|
||||||
|
mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
|
||||||
|
mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
|
||||||
|
mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
|
||||||
|
mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
|
||||||
|
//85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
|
||||||
|
mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
|
||||||
|
mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
|
||||||
|
mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
|
||||||
|
mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
|
||||||
|
///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
|
||||||
|
//////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
|
||||||
|
mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
|
||||||
|
mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
|
||||||
|
mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
|
||||||
|
mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
|
||||||
|
///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
|
||||||
|
////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
|
||||||
|
//////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
|
||||||
|
/4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
|
||||||
|
mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
|
||||||
|
mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
|
||||||
|
mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
|
||||||
|
eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
|
||||||
|
///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
|
||||||
|
mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
|
||||||
|
/4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
|
||||||
|
///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
|
||||||
|
mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
|
||||||
|
mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
|
||||||
|
mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
|
||||||
|
mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
|
||||||
|
AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
|
||||||
|
AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
|
||||||
|
mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
|
||||||
|
MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
|
||||||
|
AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
|
||||||
|
AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
|
||||||
|
Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
|
||||||
|
AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
|
||||||
|
AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
|
||||||
|
AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
|
||||||
|
AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
|
||||||
|
AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
|
||||||
|
AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
|
||||||
|
AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
|
||||||
|
AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
|
||||||
|
AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
|
||||||
|
AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
|
||||||
|
AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
|
||||||
|
AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
|
||||||
|
AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
|
||||||
|
AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
|
||||||
|
AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
|
||||||
|
AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
|
||||||
|
AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
|
||||||
|
AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
|
||||||
|
AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
|
||||||
|
AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
|
||||||
|
AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
|
||||||
|
AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
|
||||||
|
AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
|
||||||
|
AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
|
||||||
|
AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
|
||||||
|
AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
|
||||||
|
AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
|
||||||
|
AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
|
||||||
|
AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
|
||||||
|
AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
|
||||||
|
wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
</root>
|
||||||
+801
-624
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -139,7 +139,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
|||||||
{
|
{
|
||||||
var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList();
|
var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList();
|
||||||
if (IsClientJit)
|
if (IsClientJit)
|
||||||
list = list.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList();
|
list = GlobalConfig.ShopLoginList.Where(s => s.LoginStatus2 == "国际版在线" && s.jit_expire_time >= DateTime.Now.Date).ToList();
|
||||||
foreach (DataGridViewRow row in dgvShop.Rows)
|
foreach (DataGridViewRow row in dgvShop.Rows)
|
||||||
{
|
{
|
||||||
if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString()))
|
if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString()))
|
||||||
|
|||||||
@@ -30,15 +30,15 @@
|
|||||||
{
|
{
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductEditNotesForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductEditNotesForm));
|
||||||
this.panel2 = new System.Windows.Forms.Panel();
|
this.panel2 = new System.Windows.Forms.Panel();
|
||||||
|
this.txtStickMarkCharge = new System.Windows.Forms.TextBox();
|
||||||
|
this.txtDeliveryCharge = new System.Windows.Forms.TextBox();
|
||||||
this.btnSkuAi = new DevComponents.DotNetBar.PanelEx();
|
this.btnSkuAi = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.btnOk = new DevComponents.DotNetBar.PanelEx();
|
this.btnOk = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.txtCostPrice = new System.Windows.Forms.TextBox();
|
this.txtCostPrice = new System.Windows.Forms.TextBox();
|
||||||
this.label10 = new System.Windows.Forms.Label();
|
this.label10 = new System.Windows.Forms.Label();
|
||||||
this.label9 = new System.Windows.Forms.Label();
|
|
||||||
this.txtGroup = new System.Windows.Forms.TextBox();
|
this.txtGroup = new System.Windows.Forms.TextBox();
|
||||||
this.btnAuto = new DevComponents.DotNetBar.PanelEx();
|
this.btnAuto = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.pnlRestore = new DevComponents.DotNetBar.PanelEx();
|
this.pnlRestore = new DevComponents.DotNetBar.PanelEx();
|
||||||
this.label7 = new System.Windows.Forms.Label();
|
|
||||||
this.txtFissionWords = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtFissionWords = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.txtEndWords = new System.Windows.Forms.TextBox();
|
this.txtEndWords = new System.Windows.Forms.TextBox();
|
||||||
this.label6 = new System.Windows.Forms.Label();
|
this.label6 = new System.Windows.Forms.Label();
|
||||||
@@ -55,10 +55,10 @@
|
|||||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||||
this.label8 = new System.Windows.Forms.Label();
|
this.label8 = new System.Windows.Forms.Label();
|
||||||
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
|
||||||
this.txtDeliveryCharge = new System.Windows.Forms.TextBox();
|
|
||||||
this.txtStickMarkCharge = new System.Windows.Forms.TextBox();
|
|
||||||
this.label11 = new System.Windows.Forms.Label();
|
this.label11 = new System.Windows.Forms.Label();
|
||||||
this.label12 = new System.Windows.Forms.Label();
|
this.label12 = new System.Windows.Forms.Label();
|
||||||
|
this.label7 = new System.Windows.Forms.Label();
|
||||||
|
this.label9 = new System.Windows.Forms.Label();
|
||||||
this.panel2.SuspendLayout();
|
this.panel2.SuspendLayout();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
@@ -101,6 +101,20 @@
|
|||||||
this.panel2.Size = new System.Drawing.Size(464, 686);
|
this.panel2.Size = new System.Drawing.Size(464, 686);
|
||||||
this.panel2.TabIndex = 1;
|
this.panel2.TabIndex = 1;
|
||||||
//
|
//
|
||||||
|
// txtStickMarkCharge
|
||||||
|
//
|
||||||
|
this.txtStickMarkCharge.Location = new System.Drawing.Point(346, 341);
|
||||||
|
this.txtStickMarkCharge.Name = "txtStickMarkCharge";
|
||||||
|
this.txtStickMarkCharge.Size = new System.Drawing.Size(80, 23);
|
||||||
|
this.txtStickMarkCharge.TabIndex = 477;
|
||||||
|
//
|
||||||
|
// txtDeliveryCharge
|
||||||
|
//
|
||||||
|
this.txtDeliveryCharge.Location = new System.Drawing.Point(218, 341);
|
||||||
|
this.txtDeliveryCharge.Name = "txtDeliveryCharge";
|
||||||
|
this.txtDeliveryCharge.Size = new System.Drawing.Size(80, 23);
|
||||||
|
this.txtDeliveryCharge.TabIndex = 476;
|
||||||
|
//
|
||||||
// btnSkuAi
|
// btnSkuAi
|
||||||
//
|
//
|
||||||
this.btnSkuAi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
this.btnSkuAi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
|
||||||
@@ -167,15 +181,6 @@
|
|||||||
this.label10.TabIndex = 454;
|
this.label10.TabIndex = 454;
|
||||||
this.label10.Text = " 成本价";
|
this.label10.Text = " 成本价";
|
||||||
//
|
//
|
||||||
// label9
|
|
||||||
//
|
|
||||||
this.label9.AutoSize = true;
|
|
||||||
this.label9.Location = new System.Drawing.Point(35, 316);
|
|
||||||
this.label9.Name = "label9";
|
|
||||||
this.label9.Size = new System.Drawing.Size(56, 17);
|
|
||||||
this.label9.TabIndex = 447;
|
|
||||||
this.label9.Text = " 分组";
|
|
||||||
//
|
|
||||||
// txtGroup
|
// txtGroup
|
||||||
//
|
//
|
||||||
this.txtGroup.Location = new System.Drawing.Point(90, 313);
|
this.txtGroup.Location = new System.Drawing.Point(90, 313);
|
||||||
@@ -232,15 +237,6 @@
|
|||||||
this.pnlRestore.Text = "还原";
|
this.pnlRestore.Text = "还原";
|
||||||
this.pnlRestore.Click += new System.EventHandler(this.pnlRestore_Click);
|
this.pnlRestore.Click += new System.EventHandler(this.pnlRestore_Click);
|
||||||
//
|
//
|
||||||
// label7
|
|
||||||
//
|
|
||||||
this.label7.AutoSize = true;
|
|
||||||
this.label7.Location = new System.Drawing.Point(35, 399);
|
|
||||||
this.label7.Name = "label7";
|
|
||||||
this.label7.Size = new System.Drawing.Size(56, 17);
|
|
||||||
this.label7.TabIndex = 403;
|
|
||||||
this.label7.Text = "裂变分词";
|
|
||||||
//
|
|
||||||
// txtFissionWords
|
// txtFissionWords
|
||||||
//
|
//
|
||||||
this.txtFissionWords.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
this.txtFissionWords.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||||
@@ -348,7 +344,7 @@
|
|||||||
// label3
|
// label3
|
||||||
//
|
//
|
||||||
this.label3.AutoSize = true;
|
this.label3.AutoSize = true;
|
||||||
this.label3.Location = new System.Drawing.Point(35, 186);
|
this.label3.Location = new System.Drawing.Point(35, 185);
|
||||||
this.label3.Name = "label3";
|
this.label3.Name = "label3";
|
||||||
this.label3.Size = new System.Drawing.Size(56, 17);
|
this.label3.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label3.TabIndex = 392;
|
this.label3.TabIndex = 392;
|
||||||
@@ -385,7 +381,7 @@
|
|||||||
// label8
|
// label8
|
||||||
//
|
//
|
||||||
this.label8.AutoSize = true;
|
this.label8.AutoSize = true;
|
||||||
this.label8.Location = new System.Drawing.Point(31, 279);
|
this.label8.Location = new System.Drawing.Point(31, 264);
|
||||||
this.label8.Name = "label8";
|
this.label8.Name = "label8";
|
||||||
this.label8.Size = new System.Drawing.Size(56, 17);
|
this.label8.Size = new System.Drawing.Size(56, 17);
|
||||||
this.label8.TabIndex = 386;
|
this.label8.TabIndex = 386;
|
||||||
@@ -414,20 +410,6 @@
|
|||||||
this.txtNotes.Size = new System.Drawing.Size(337, 47);
|
this.txtNotes.Size = new System.Drawing.Size(337, 47);
|
||||||
this.txtNotes.TabIndex = 385;
|
this.txtNotes.TabIndex = 385;
|
||||||
//
|
//
|
||||||
// txtDeliveryCharge
|
|
||||||
//
|
|
||||||
this.txtDeliveryCharge.Location = new System.Drawing.Point(218, 341);
|
|
||||||
this.txtDeliveryCharge.Name = "txtDeliveryCharge";
|
|
||||||
this.txtDeliveryCharge.Size = new System.Drawing.Size(80, 23);
|
|
||||||
this.txtDeliveryCharge.TabIndex = 476;
|
|
||||||
//
|
|
||||||
// txtStickMarkCharge
|
|
||||||
//
|
|
||||||
this.txtStickMarkCharge.Location = new System.Drawing.Point(346, 341);
|
|
||||||
this.txtStickMarkCharge.Name = "txtStickMarkCharge";
|
|
||||||
this.txtStickMarkCharge.Size = new System.Drawing.Size(80, 23);
|
|
||||||
this.txtStickMarkCharge.TabIndex = 477;
|
|
||||||
//
|
|
||||||
// label11
|
// label11
|
||||||
//
|
//
|
||||||
this.label11.AutoSize = true;
|
this.label11.AutoSize = true;
|
||||||
@@ -446,6 +428,24 @@
|
|||||||
this.label12.TabIndex = 479;
|
this.label12.TabIndex = 479;
|
||||||
this.label12.Text = "贴单费";
|
this.label12.Text = "贴单费";
|
||||||
//
|
//
|
||||||
|
// label7
|
||||||
|
//
|
||||||
|
this.label7.AutoSize = true;
|
||||||
|
this.label7.Location = new System.Drawing.Point(35, 399);
|
||||||
|
this.label7.Name = "label7";
|
||||||
|
this.label7.Size = new System.Drawing.Size(56, 17);
|
||||||
|
this.label7.TabIndex = 403;
|
||||||
|
this.label7.Text = "裂变分词";
|
||||||
|
//
|
||||||
|
// label9
|
||||||
|
//
|
||||||
|
this.label9.AutoSize = true;
|
||||||
|
this.label9.Location = new System.Drawing.Point(35, 316);
|
||||||
|
this.label9.Name = "label9";
|
||||||
|
this.label9.Size = new System.Drawing.Size(56, 17);
|
||||||
|
this.label9.TabIndex = 447;
|
||||||
|
this.label9.Text = " 分组";
|
||||||
|
//
|
||||||
// DbProductEditNotesForm
|
// DbProductEditNotesForm
|
||||||
//
|
//
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
|
||||||
|
|||||||
Generated
+10
@@ -563,6 +563,16 @@ namespace TemuKJD.Properties {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
|
||||||
|
/// </summary>
|
||||||
|
internal static System.Drawing.Bitmap pdf {
|
||||||
|
get {
|
||||||
|
object obj = ResourceManager.GetObject("pdf", resourceCulture);
|
||||||
|
return ((System.Drawing.Bitmap)(obj));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
|
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -259,6 +259,9 @@
|
|||||||
<data name="normal_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="normal_hover" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\normal.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\normal.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="pdf" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
|
<value>..\resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
|
</data>
|
||||||
<data name="qrcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="qrcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||||
<value>..\Resources\qrcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
<value>..\Resources\qrcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 28 KiB |
@@ -26,6 +26,7 @@
|
|||||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
<ErrorReport>prompt</ErrorReport>
|
<ErrorReport>prompt</ErrorReport>
|
||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
|
|||||||
Reference in new issue
Block a user