From bbbc12148b5172e2f0745a02f34a71216d3f8e27 Mon Sep 17 00:00:00 2001 From: wule Date: Fri, 5 Dec 2025 21:22:56 +0800 Subject: [PATCH] =?UTF-8?q?jit=E6=8E=A8=E5=8D=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=99=A4=E7=BB=9F=E8=AE=A1=E5=A4=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 2 +- .../KJD_WebService/BLL/KJD/OrderManage.cs | 232 ++- .../KJD_WebService/BLL/KJD/ToolManage.cs | 119 +- .../KJD_WebService/BLL/KJD/UserManage.cs | 2 +- .../KJD_WebService/KJD_WebService.csproj.user | 2 +- .../KJD_WebService/OrderService.asmx.cs | 51 + KJDService/KJD_WebService/Utils/MySqlUtils.cs | 51 + TEMUKJD/Extension/DataGridViewExtension.cs | 199 +++ TEMUKJD/KJD.csproj | 10 + .../KJDForms/AdminForms/AdminForm.Designer.cs | 14 +- TEMUKJD/KJDForms/AdminForms/AdminForm.cs | 9 +- .../AdminProductPriceCheckForm.Designer.cs | 138 +- .../AdminForms/AdminProductPriceCheckForm.cs | 33 +- TEMUKJD/KJDForms/JITForms/JITForm.cs | 5 +- .../JitOrderUploadFileForm.Designer.cs | 334 ++++ .../JITForms/JitOrderUploadFileForm.cs | 266 +++ .../JITForms/JitOrderUploadFileForm.resx | 298 ++++ .../JITForms/JitPushOrder.Designer.cs | 1425 +++++++++-------- TEMUKJD/KJDForms/JITForms/JitPushOrder.cs | 990 ++++++++---- TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs | 2 +- .../DbProductEditNotesForm.Designer.cs | 76 +- TEMUKJD/Properties/Resources.Designer.cs | 10 + TEMUKJD/Properties/Resources.resx | 3 + TEMUKJD/Resources/pdf.png | Bin 0 -> 28345 bytes Work/Work.csproj | 1 + 25 files changed, 3130 insertions(+), 1142 deletions(-) create mode 100644 TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.Designer.cs create mode 100644 TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.cs create mode 100644 TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.resx create mode 100644 TEMUKJD/Resources/pdf.png diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index cc162a4..a359d95 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 709; + public static int VersionCount = 711; //public static int VersionCount = 613; /// diff --git a/KJDService/KJD_WebService/BLL/KJD/OrderManage.cs b/KJDService/KJD_WebService/BLL/KJD/OrderManage.cs index dd7cc0e..195b85c 100644 --- a/KJDService/KJD_WebService/BLL/KJD/OrderManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/OrderManage.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Data; using System.Linq; using System.Web; +using System.Web.Security; namespace KJD_Web.BLL { @@ -98,6 +99,8 @@ namespace KJD_Web.BLL var shop_id = RegexUtils.GetStringQuery(ref inputData, "shop_id")?.Replace("'", "\\'"); if (string.IsNullOrEmpty(shop_id)) 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 = TimeUtils.DateTimeToTimestampMilliseconds(DateTime.Now.Date.AddDays(-45)); @@ -115,6 +118,8 @@ namespace KJD_Web.BLL where += " and o.purchaseTime > " + start_time; if (!string.IsNullOrWhiteSpace(shop_id)) where += " and o.supplierId = '" + shop_id + "'"; + if (!string.IsNullOrEmpty(upload_order_status)) + where += " and upLoadStatus = " + upload_order_status; sql += where; var count = mySql.ExecuteRowCount(sql); @@ -149,7 +154,7 @@ namespace KJD_Web.BLL id = Convert.ToInt32(row["id"]), add_time = Convert.ToDateTime(row["add_time"]), mdy_time = Convert.ToDateTime(row["mdy_time"]), - notes = row["notes"].ToString(), + notes = row["notes"].ParseToString(), availableSaleDays = row["availableSaleDays"].ParseToNullableDecimal(), barCodeMd5 = row["barCodeMd5"].ParseToString(), category = row["category"].ParseToString(), @@ -243,6 +248,7 @@ namespace KJD_Web.BLL sql += where; var rst = mySql.ExecuteNonQuery(sql); + mySql.Close(); if (rst) { @@ -255,5 +261,229 @@ namespace KJD_Web.BLL } 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\":\"输入为空\"}"; + } } } \ No newline at end of file diff --git a/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs b/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs index 08e5e00..ad4323b 100644 --- a/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/ToolManage.cs @@ -85,67 +85,68 @@ namespace KJD_Web.BLL -// string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; -// MysqlUtils mySql = new MysqlUtils(conn); -// string sql = ""; -// for (int i = 0; i < 128; i++) -// { -// //sql = @"drop table if exists kjd_map.spu_map_" + i + ";\r\n"; -// sql = @"CREATE TABLE IF NOT EXISTS kjd_order.order_" + i + @" ( -// `id` int NOT NULL AUTO_INCREMENT, -// `supplierId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '店铺Id', -// `originalPurchaseOrderSn` 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, -// `category` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, -// `productId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品编号', -// `productSkcId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL, -// `productSkcPicture` varchar(250) COLLATE utf8mb4_general_ci NOT NULL COMMENT '主图', -// `productSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '货号', -// `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废', -// `productSkuId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL, -// `className` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'sku规格', -// `currencyType` varchar(10) COLLATE utf8mb4_general_ci NOT NULL, -// `supplierPrice` int NOT NULL COMMENT '申报价格', -// `purchaseQuantity` int NOT NULL COMMENT '备货件数', -// `deliverQuantity` int NOT NULL COMMENT '送货件数', -// `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数', -// `availableSaleDays` decimal(10, 0) NOT NULL COMMENT '可售天数', -// `qcResult` int DEFAULT NULL COMMENT '抽检结果 1合格 2不合格', -// `thumbUrlList` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'sku图片', -// `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间', -// `deliverTime` bigint DEFAULT NULL COMMENT '发货时间', -// `receiveTime` bigint DEFAULT NULL COMMENT '收货时间', -// `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间', -// `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间', -// `deliveryOrderSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货单号', -// `receiveWarehouseId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库Id', -// `receiveWarehouseName` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库', -// `warehouseGroupId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '仓组Id', -// `jiaTongCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '佳同码', -// `barCodeMd5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品条码MD5', -// `shippingMark​Md5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '箱唛文件MD5', -// `notes` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注', -// `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, -// `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -// PRIMARY KEY (`id`), -// UNIQUE KEY `index_subPurchaseOrderSn` (`subPurchaseOrderSn`) USING BTREE -//) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '订单推送表'"; + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = ""; + for (int i = 0; i < 128; i++) + { + //sql = @"drop table if exists kjd_map.spu_map_" + i + ";\r\n"; + sql = @"CREATE TABLE IF NOT EXISTS kjd_order.order_" + i + @" ( + `id` int NOT NULL AUTO_INCREMENT, + `supplierId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '店铺Id', + `originalPurchaseOrderSn` 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, + `category` varchar(50) COLLATE utf8mb4_general_ci NOT NULL, + `productId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL COMMENT '商品编号', + `productSkcId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL, + `productSkcPicture` varchar(250) COLLATE utf8mb4_general_ci NOT NULL COMMENT '主图', + `productSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '货号', + `status` int NOT NULL COMMENT '状态 1待发货 2已送货 7已入库 8已作废', + `productSkuId` varchar(25) COLLATE utf8mb4_general_ci NOT NULL, + `className` varchar(100) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'sku规格', + `currencyType` varchar(10) COLLATE utf8mb4_general_ci NOT NULL, + `supplierPrice` int NOT NULL COMMENT '申报价格', + `purchaseQuantity` int NOT NULL COMMENT '备货件数', + `deliverQuantity` int NOT NULL COMMENT '送货件数', + `realReceiveAuthenticQuantity` int NOT NULL COMMENT '入库件数', + `availableSaleDays` decimal(10, 0) NOT NULL COMMENT '可售天数', + `qcResult` int DEFAULT NULL COMMENT '抽检结果 1合格 2不合格', + `thumbUrlList` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT 'sku图片', + `purchaseTime` bigint NOT NULL COMMENT '备货单创建时间', + `deliverTime` bigint DEFAULT NULL COMMENT '发货时间', + `receiveTime` bigint DEFAULT NULL COMMENT '收货时间', + `expectLatestDeliverTimeOrDefault` bigint NOT NULL COMMENT '最迟发货时间', + `expectLatestArrivalTimeOrDefault` bigint NOT NULL COMMENT '最迟到货时间', + `deliveryOrderSn` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '发货单号', + `receiveWarehouseId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库Id', + `receiveWarehouseName` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '实际收货仓库', + `warehouseGroupId` varchar(25) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '仓组Id', + `jiaTongCode` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '佳同码', + `barCodeMd5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '商品条码MD5', + `shippingMark​Md5` varchar(32) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '箱唛文件MD5', + `notes` varchar(50) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '备注', + `add_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `mdy_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `index_subPurchaseOrderSn` (`subPurchaseOrderSn`) USING BTREE +) 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 `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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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\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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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\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 `shippingMark​Md5` varchar (32) NULL COMMENT '箱唛文件MD5'\r\nAFTER\r\n `barCodeMd5`,\r\nMODIFY\r\n COLUMN `notes` varchar (50) NULL COMMENT '备注'\r\nAFTER\r\n `shippingMark​Md5`,\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 `shippingMark​Md5` `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'"; -// var rst = mySql.ExecuteNonQuery(sql); -// } -// mySql.Close(); + sql = "ALTER TABLE\r\n kjd_order.order_" + i + " CHANGE COLUMN `shippingMark​Md5` `shippingMarkMd5` varchar (32) NULL COMMENT '箱唛文件MD5'"; + sql = "ALTER TABLE\r\n kjd_order.order_code_" + i + " DROP COLUMN `subPurchaseOrderSn`,\r\n DROP COLUMN `jiaTongCode`,\r\n DROP COLUMN `shippingMark​Md5`,\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(); } } } \ No newline at end of file diff --git a/KJDService/KJD_WebService/BLL/KJD/UserManage.cs b/KJDService/KJD_WebService/BLL/KJD/UserManage.cs index 44e0bfc..a870c9b 100644 --- a/KJDService/KJD_WebService/BLL/KJD/UserManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/UserManage.cs @@ -46,7 +46,7 @@ namespace KJD_Web.BLL company_name = row["company_name"].ToString(), 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, - 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)) diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 4bcdc04..1b87364 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles diff --git a/KJDService/KJD_WebService/OrderService.asmx.cs b/KJDService/KJD_WebService/OrderService.asmx.cs index aa3d279..4a90183 100644 --- a/KJDService/KJD_WebService/OrderService.asmx.cs +++ b/KJDService/KJD_WebService/OrderService.asmx.cs @@ -83,6 +83,57 @@ namespace KJD_Web var result = 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.End(); } diff --git a/KJDService/KJD_WebService/Utils/MySqlUtils.cs b/KJDService/KJD_WebService/Utils/MySqlUtils.cs index b15b3e5..1614f74 100644 --- a/KJDService/KJD_WebService/Utils/MySqlUtils.cs +++ b/KJDService/KJD_WebService/Utils/MySqlUtils.cs @@ -2,10 +2,12 @@ using System; using System.Collections.Generic; using System.Data; +using System.Data.SqlTypes; using System.IO; using System.Linq; using System.Threading; using System.Web; +using System.Web.UI.WebControls.WebParts; namespace KJD_Web.Utils { @@ -379,6 +381,55 @@ namespace KJD_Web.Utils return null; } + public int ExecuteRecordsRows(string SqlString) + { + return ExecuteRecordsRows(SqlString, null); + } + /// + /// 返回更改、插入或删除的行数 + /// + /// + /// + /// + 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; + } + /// /// 返回插入ID /// diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs index a860a95..a68dc82 100644 --- a/TEMUKJD/Extension/DataGridViewExtension.cs +++ b/TEMUKJD/Extension/DataGridViewExtension.cs @@ -534,6 +534,205 @@ namespace TemuKJD.Extension }; } + + public static void AddVerticalMergeCell(this DataGridView dgv, ConcurrentList 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) { dgv.Scroll += (s, e) => diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 0083095..e5f31cf 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -160,6 +160,12 @@ JITForm.cs + + Form + + + JitOrderUploadFileForm.cs + Form @@ -919,6 +925,9 @@ JITForm.cs + + JitOrderUploadFileForm.cs + JitPushOrder.cs @@ -1285,6 +1294,7 @@ + diff --git a/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs index 36582b7..1dc3bbd 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminForm.Designer.cs @@ -38,7 +38,8 @@ 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 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, treeNode2, treeNode3, @@ -48,7 +49,8 @@ treeNode7, treeNode8, treeNode9, - treeNode10}); + treeNode10, + treeNode11}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -159,10 +161,12 @@ treeNode9.Text = "JIT卡密管理"; treeNode10.Name = "加入发货台"; treeNode10.Text = "加入发货台"; - treeNode11.Name = "超级权限管理"; - treeNode11.Text = "超级权限管理"; + treeNode11.Name = "JIT订单扣费"; + treeNode11.Text = "JIT订单扣费"; + treeNode12.Name = "超级权限管理"; + treeNode12.Text = "超级权限管理"; 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.Size = new System.Drawing.Size(140, 446); this.tv.TabIndex = 1; diff --git a/TEMUKJD/KJDForms/AdminForms/AdminForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminForm.cs index 0833709..c714320 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminForm.cs @@ -14,6 +14,7 @@ using TemuKJD.BaseForms; using TemuKJD.KJDForms.ProductSelectForms; using TemuKJD.KJDForms.ProductThirdSelectForms; using TemuKJD.KJDForms.ProductForms; +using TemuKJD.KJDForms.JITForms; namespace TemuKJD.KJDForms.AdminForms { @@ -29,6 +30,7 @@ namespace TemuKJD.KJDForms.AdminForms public Lazy joinDeliveryFrom = new Lazy(); public Lazy jitForm = new Lazy(); public Lazy adminCardCodeFrom = new Lazy(); + public Lazy jitPushOrder = new Lazy(); public AdminForm() { @@ -40,7 +42,7 @@ namespace TemuKJD.KJDForms.AdminForms tv.ExpandGroup(tv.Nodes[0].Name); List hideName = new List() { "超级用户管理", "超级店铺管理", "选品数据库", "选品加价管理", "认领待上传", "库存上传", "商品核价", - "加入发货台", "开通JIT", "JIT卡密管理" }; + "加入发货台", "开通JIT", "JIT卡密管理", "JIT订单扣费" }; if (BaseClass.GroupId == 3) { @@ -57,6 +59,7 @@ namespace TemuKJD.KJDForms.AdminForms hideName.Remove("加入发货台"); if (MainForm.instance.pnlJit.Visible == true) hideName.Remove("JIT卡密管理"); + hideName.Remove("JIT订单扣费"); hideName.Remove("开通JIT"); } if (BaseClass.SaLevel==2) @@ -127,6 +130,10 @@ namespace TemuKJD.KJDForms.AdminForms case "JIT卡密管理": SetForm(adminCardCodeFrom.Value); break; + case "JIT订单扣费": + jitPushOrder.Value.IsClientJit = false; + SetForm(jitPushOrder.Value); + break; } })); }).Start(); diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs index 9ca6e3e..6d05993 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs @@ -30,15 +30,15 @@ namespace TemuKJD.KJDForms.AdminForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnSearchPrice3 = new DevComponents.DotNetBar.PanelEx(); @@ -96,7 +96,6 @@ namespace TemuKJD.KJDForms.AdminForms this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components); this.pnlRestoreSizeAndNumber = new System.Windows.Forms.Panel(); this.numPieces = new System.Windows.Forms.NumericUpDown(); - this.label11 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); this.numHeight2 = 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.label19 = 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.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); @@ -496,22 +497,22 @@ namespace TemuKJD.KJDForms.AdminForms // this.dgvExtCode.AllowUserToAddRows = false; this.dgvExtCode.AllowUserToDeleteRows = false; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); - this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); + this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19; this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); this.dgvExtCode.AutoRowNumber = false; this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvExtCode.BackgroundColor = System.Drawing.Color.White; this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20; this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelectExtCode, this.colFilterExtCode, @@ -1045,7 +1046,6 @@ namespace TemuKJD.KJDForms.AdminForms // pnlRestoreSizeAndNumber // this.pnlRestoreSizeAndNumber.Controls.Add(this.numPieces); - this.pnlRestoreSizeAndNumber.Controls.Add(this.label11); this.pnlRestoreSizeAndNumber.Controls.Add(this.label17); this.pnlRestoreSizeAndNumber.Controls.Add(this.numHeight2); 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.label19); 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.Name = "pnlRestoreSizeAndNumber"; this.pnlRestoreSizeAndNumber.Size = new System.Drawing.Size(278, 58); @@ -1067,7 +1069,7 @@ namespace TemuKJD.KJDForms.AdminForms // numPieces // 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.Maximum = new decimal(new int[] { 99999, @@ -1076,7 +1078,7 @@ namespace TemuKJD.KJDForms.AdminForms 0}); this.numPieces.Name = "numPieces"; 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.Value = new decimal(new int[] { 1, @@ -1084,25 +1086,15 @@ namespace TemuKJD.KJDForms.AdminForms 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 // 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.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.Text = "数量"; + this.label17.Text = "量"; // // numHeight2 // @@ -1288,6 +1280,27 @@ namespace TemuKJD.KJDForms.AdminForms this.label20.TabIndex = 684; 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 // this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; @@ -1348,19 +1361,19 @@ namespace TemuKJD.KJDForms.AdminForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle21.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1579,19 +1592,19 @@ namespace TemuKJD.KJDForms.AdminForms // this.dgvPriceCheck.AllowUserToAddRows = false; this.dgvPriceCheck.AllowUserToDeleteRows = false; - dataGridViewCellStyle14.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle23.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle23; this.dgvPriceCheck.AutoRowNumber = true; this.dgvPriceCheck.BackgroundColor = System.Drawing.Color.White; this.dgvPriceCheck.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24; this.dgvPriceCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPriceCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1704,8 +1717,8 @@ namespace TemuKJD.KJDForms.AdminForms // // colProdName // - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProdName.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProdName.DefaultCellStyle = dataGridViewCellStyle25; this.colProdName.HeaderText = "标题"; this.colProdName.Name = "colProdName"; this.colProdName.ReadOnly = true; @@ -1713,8 +1726,8 @@ namespace TemuKJD.KJDForms.AdminForms // // colSkuName // - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSkuName.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSkuName.DefaultCellStyle = dataGridViewCellStyle26; this.colSkuName.HeaderText = "规格名称"; this.colSkuName.Name = "colSkuName"; this.colSkuName.ReadOnly = true; @@ -1764,8 +1777,8 @@ namespace TemuKJD.KJDForms.AdminForms // // colCreatTime // - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle27; this.colCreatTime.HeaderText = "创建时间"; this.colCreatTime.Name = "colCreatTime"; this.colCreatTime.ReadOnly = true; @@ -2025,5 +2038,6 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.Label label17; private System.Windows.Forms.Panel pnlRestoreSizeAndNumber; private DevComponents.DotNetBar.PanelEx btnSearchPrice3; + private UserComponent.UcCheckBox chkLessThan; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs index d9fbcf8..25a790e 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs @@ -30,7 +30,7 @@ namespace TemuKJD.KJDForms.AdminForms public bool IsClientJit { get; set; } = false; CheckBox chkSelectAll; PriceCheckConfig priceCheckConfig = null; - List lstPriceCheckFilterConfig = new List(); + ConcurrentList lstPriceCheckFilterConfig = new ConcurrentList(); public CancellationTokenSource cancellationTokenSource { get; set; } = null; public ConcurrentList lstAdminShopInfo { get; set; } = new ConcurrentList(); public ConcurrentList lstCheckPriceInfo = new ConcurrentList(); @@ -43,9 +43,9 @@ namespace TemuKJD.KJDForms.AdminForms private void AdminProductPriceCheckForm_Load(object sender, EventArgs e) { - lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("price_check_filter_config"); + lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("price_check_filter_config"); if (lstPriceCheckFilterConfig == null) - lstPriceCheckFilterConfig = new List(); + lstPriceCheckFilterConfig = new ConcurrentList(); //this.dgvShop.AddSelectorColumn("colSelect"); 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; btnSearchPrice3.Visible = false; + btnStop.Location = btnSearchPrice3.Location; + btnStop.Size = btnSearchPrice3.Size; } if (IsClientJit) @@ -127,7 +129,7 @@ namespace TemuKJD.KJDForms.AdminForms { var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList(); 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) { if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString())) @@ -2171,7 +2173,12 @@ namespace TemuKJD.KJDForms.AdminForms //长宽高超50且重量大于1000克认为是有意改大了参数需要还原 //if (skc.skuList.Any(s => (s.len >= 45 * 10 || s.width >= 45 * 10 || s.height >= 45 * 10) && s.weight >= 1000 * 1000)) // 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 false; } @@ -2449,6 +2456,22 @@ namespace TemuKJD.KJDForms.AdminForms { 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 diff --git a/TEMUKJD/KJDForms/JITForms/JITForm.cs b/TEMUKJD/KJDForms/JITForms/JITForm.cs index 6034ace..c2f7143 100644 --- a/TEMUKJD/KJDForms/JITForms/JITForm.cs +++ b/TEMUKJD/KJDForms/JITForms/JITForm.cs @@ -31,7 +31,10 @@ namespace TemuKJD.KJDForms.JITForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "请在列表中填写要隐藏的Tab页面", "JIT推单" }; + List hideName = new List() { "请在列表中填写要隐藏的Tab页面", /*"JIT推单"*/ }; +#if DEBUG + hideName.Remove("JIT推单"); +#endif foreach (var item in hideName) { diff --git a/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.Designer.cs b/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.Designer.cs new file mode 100644 index 0000000..c19a3af --- /dev/null +++ b/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.Designer.cs @@ -0,0 +1,334 @@ + +namespace TemuKJD.KJDForms.JITForms +{ + partial class JitOrderUploadFileForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + 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; + } +} \ No newline at end of file diff --git a/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.cs b/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.cs new file mode 100644 index 0000000..2c68d33 --- /dev/null +++ b/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.cs @@ -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(); + } + } +} diff --git a/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.resx b/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.resx new file mode 100644 index 0000000..2bdeb30 --- /dev/null +++ b/TEMUKJD/KJDForms/JITForms/JitOrderUploadFileForm.resx @@ -0,0 +1,298 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + + 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== + + + \ No newline at end of file diff --git a/TEMUKJD/KJDForms/JITForms/JitPushOrder.Designer.cs b/TEMUKJD/KJDForms/JITForms/JitPushOrder.Designer.cs index 8e62e24..2ef8eb5 100644 --- a/TEMUKJD/KJDForms/JITForms/JitPushOrder.Designer.cs +++ b/TEMUKJD/KJDForms/JITForms/JitPushOrder.Designer.cs @@ -30,35 +30,35 @@ namespace TemuKJD.KJDForms.JITForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnGetDbOrder = new DevComponents.DotNetBar.PanelEx(); + this.pnlStatistics = new System.Windows.Forms.Panel(); + this.lblAuthorizedAmount = new System.Windows.Forms.Label(); + this.pnlGetNewOrder = new System.Windows.Forms.Panel(); + this.btnStop = new DevComponents.DotNetBar.PanelEx(); + this.btnSearchOrder = new DevComponents.DotNetBar.PanelEx(); this.lblNextGetTime = new System.Windows.Forms.Label(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.txtProductSn = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.btnRestore = new DevComponents.DotNetBar.PanelEx(); + this.txtProductId = new System.Windows.Forms.TextBox(); + this.txtSubOrderSn = new System.Windows.Forms.TextBox(); this.btnFilter = new DevComponents.DotNetBar.PanelEx(); - this.txtSkcId = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); this.line2 = new DevComponents.DotNetBar.Controls.Line(); this.line3 = new DevComponents.DotNetBar.Controls.Line(); - this.line1 = new DevComponents.DotNetBar.Controls.Line(); - this.btnStop = new DevComponents.DotNetBar.PanelEx(); - this.btnResetExtCode = new DevComponents.DotNetBar.PanelEx(); - this.txtExtCode = new System.Windows.Forms.TextBox(); - this.label12 = new System.Windows.Forms.Label(); - this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); - this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); - this.btnSearchOrder = new DevComponents.DotNetBar.PanelEx(); - this.txtSpuId = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.label5 = new System.Windows.Forms.Label(); this.txtNotes = new System.Windows.Forms.TextBox(); @@ -68,7 +68,8 @@ namespace TemuKJD.KJDForms.JITForms this.txtShopId = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); - this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.label6 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); this.splitContainer3 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.pbShopLoading = new System.Windows.Forms.PictureBox(); @@ -84,8 +85,45 @@ namespace TemuKJD.KJDForms.JITForms this.colJitStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label7 = new System.Windows.Forms.Label(); + this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.txtSkcId = new System.Windows.Forms.TextBox(); + this.txtSpuId = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.dtpStartTime = new System.Windows.Forms.DateTimePicker(); + this.dtpEndTime = new System.Windows.Forms.DateTimePicker(); + this.label12 = new System.Windows.Forms.Label(); + this.txtExtCode = new System.Windows.Forms.TextBox(); + this.btnResetExtCode = new DevComponents.DotNetBar.PanelEx(); + this.btnRestoreSizeAndNumber = new DevComponents.DotNetBar.PanelEx(); + this.numJudgeWeight = new System.Windows.Forms.NumericUpDown(); + this.numJudgeLen = new System.Windows.Forms.NumericUpDown(); + this.lblJudgeLen = new System.Windows.Forms.Label(); + this.lblJudgeWeight = new System.Windows.Forms.Label(); + this.chkFilterSize = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.pnlRestoreSizeAndNumber = new System.Windows.Forms.Panel(); + this.numPieces = new System.Windows.Forms.NumericUpDown(); + this.label11 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); + this.numHeight2 = new System.Windows.Forms.NumericUpDown(); + this.numHeight1 = new System.Windows.Forms.NumericUpDown(); + this.numWidth1 = new System.Windows.Forms.NumericUpDown(); + this.numWidth2 = new System.Windows.Forms.NumericUpDown(); + this.numLen1 = new System.Windows.Forms.NumericUpDown(); + this.numWeight2 = new System.Windows.Forms.NumericUpDown(); + this.numWeight1 = new System.Windows.Forms.NumericUpDown(); + this.numLen2 = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.label20 = new System.Windows.Forms.Label(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.dgvStock = new TemuKJD.UserComponent.DataGridViewEx(); + this.splitContainer4 = new System.Windows.Forms.SplitContainer(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.btnClear = new DevComponents.DotNetBar.PanelEx(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colIndexId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -109,40 +147,16 @@ namespace TemuKJD.KJDForms.JITForms this.colPrcie = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colStockUpNum = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colUploadCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colUploadOrder = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colUploadCode = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colUploadOrder = new System.Windows.Forms.DataGridViewLinkColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.splitContainer4 = new System.Windows.Forms.SplitContainer(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.btnClear = new DevComponents.DotNetBar.PanelEx(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.btnRestoreSizeAndNumber = new DevComponents.DotNetBar.PanelEx(); - this.numJudgeWeight = new System.Windows.Forms.NumericUpDown(); - this.numJudgeLen = new System.Windows.Forms.NumericUpDown(); - this.lblJudgeLen = new System.Windows.Forms.Label(); - this.lblJudgeWeight = new System.Windows.Forms.Label(); - this.chkFilterSize = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.pnlRestoreSizeAndNumber = new System.Windows.Forms.Panel(); - this.numPieces = new System.Windows.Forms.NumericUpDown(); - this.label11 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.numHeight2 = new System.Windows.Forms.NumericUpDown(); - this.numHeight1 = new System.Windows.Forms.NumericUpDown(); - this.numWidth1 = new System.Windows.Forms.NumericUpDown(); - this.numWidth2 = new System.Windows.Forms.NumericUpDown(); - this.numLen1 = new System.Windows.Forms.NumericUpDown(); - this.numWeight2 = new System.Windows.Forms.NumericUpDown(); - this.numWeight1 = new System.Windows.Forms.NumericUpDown(); - this.numLen2 = new System.Windows.Forms.NumericUpDown(); - this.label15 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.ucGroupBoxEx1.SuspendLayout(); + this.pnlStatistics.SuspendLayout(); + this.pnlGetNewOrder.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit(); this.splitContainer3.Panel1.SuspendLayout(); this.splitContainer3.Panel2.SuspendLayout(); @@ -153,12 +167,7 @@ namespace TemuKJD.KJDForms.JITForms this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvStock)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); - this.splitContainer4.Panel1.SuspendLayout(); - this.splitContainer4.Panel2.SuspendLayout(); - this.splitContainer4.SuspendLayout(); + this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).BeginInit(); this.pnlRestoreSizeAndNumber.SuspendLayout(); @@ -171,6 +180,12 @@ namespace TemuKJD.KJDForms.JITForms ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numLen2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvStock)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); + this.splitContainer4.Panel1.SuspendLayout(); + this.splitContainer4.Panel2.SuspendLayout(); + this.splitContainer4.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -189,7 +204,7 @@ namespace TemuKJD.KJDForms.JITForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); - this.splitContainer1.Size = new System.Drawing.Size(1469, 611); + this.splitContainer1.Size = new System.Drawing.Size(1489, 611); this.splitContainer1.SplitterDistance = 140; this.splitContainer1.TabIndex = 13; // @@ -200,22 +215,17 @@ namespace TemuKJD.KJDForms.JITForms | System.Windows.Forms.AnchorStyles.Right))); this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx1.Controls.Add(this.lblNextGetTime); + this.ucGroupBoxEx1.Controls.Add(this.btnGetDbOrder); + this.ucGroupBoxEx1.Controls.Add(this.pnlStatistics); + this.ucGroupBoxEx1.Controls.Add(this.pnlGetNewOrder); + this.ucGroupBoxEx1.Controls.Add(this.txtProductSn); + this.ucGroupBoxEx1.Controls.Add(this.label9); + this.ucGroupBoxEx1.Controls.Add(this.btnRestore); + this.ucGroupBoxEx1.Controls.Add(this.txtProductId); + this.ucGroupBoxEx1.Controls.Add(this.txtSubOrderSn); this.ucGroupBoxEx1.Controls.Add(this.btnFilter); - this.ucGroupBoxEx1.Controls.Add(this.txtSkcId); - this.ucGroupBoxEx1.Controls.Add(this.label1); this.ucGroupBoxEx1.Controls.Add(this.line2); this.ucGroupBoxEx1.Controls.Add(this.line3); - this.ucGroupBoxEx1.Controls.Add(this.line1); - this.ucGroupBoxEx1.Controls.Add(this.btnStop); - this.ucGroupBoxEx1.Controls.Add(this.btnResetExtCode); - this.ucGroupBoxEx1.Controls.Add(this.txtExtCode); - this.ucGroupBoxEx1.Controls.Add(this.label12); - this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime); - this.ucGroupBoxEx1.Controls.Add(this.dtpStartTime); - this.ucGroupBoxEx1.Controls.Add(this.btnSearchOrder); - this.ucGroupBoxEx1.Controls.Add(this.txtSpuId); - this.ucGroupBoxEx1.Controls.Add(this.label7); this.ucGroupBoxEx1.Controls.Add(this.btnEmpty); this.ucGroupBoxEx1.Controls.Add(this.label5); this.ucGroupBoxEx1.Controls.Add(this.txtNotes); @@ -225,98 +235,75 @@ namespace TemuKJD.KJDForms.JITForms this.ucGroupBoxEx1.Controls.Add(this.txtShopId); this.ucGroupBoxEx1.Controls.Add(this.label2); this.ucGroupBoxEx1.Controls.Add(this.label3); - this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime); + this.ucGroupBoxEx1.Controls.Add(this.label6); + this.ucGroupBoxEx1.Controls.Add(this.label8); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(1465, 140); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(1485, 140); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "参数设置"; + this.ucGroupBoxEx1.Enter += new System.EventHandler(this.ucGroupBoxEx1_Enter); // - // lblNextGetTime + // btnGetDbOrder // - this.lblNextGetTime.ForeColor = System.Drawing.SystemColors.ControlDarkDark; - this.lblNextGetTime.Location = new System.Drawing.Point(563, 53); - this.lblNextGetTime.Name = "lblNextGetTime"; - this.lblNextGetTime.Size = new System.Drawing.Size(201, 72); - this.lblNextGetTime.TabIndex = 1291; - this.lblNextGetTime.Text = "这里显示距离下次读取订单剩余时间间隔数字"; + this.btnGetDbOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnGetDbOrder.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnGetDbOrder.DisabledBackColor = System.Drawing.Color.Empty; + this.btnGetDbOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnGetDbOrder.Location = new System.Drawing.Point(400, 103); + this.btnGetDbOrder.Name = "btnGetDbOrder"; + this.btnGetDbOrder.Size = new System.Drawing.Size(86, 23); + this.btnGetDbOrder.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetDbOrder.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetDbOrder.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnGetDbOrder.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnGetDbOrder.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnGetDbOrder.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnGetDbOrder.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnGetDbOrder.Style.GradientAngle = 90; + this.btnGetDbOrder.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnGetDbOrder.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetDbOrder.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnGetDbOrder.TabIndex = 1383; + this.btnGetDbOrder.Text = "查询扣费订单"; + this.btnGetDbOrder.Click += new System.EventHandler(this.btnGetDbOrder_Click); // - // btnFilter + // pnlStatistics // - this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty; - this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilter.Location = new System.Drawing.Point(952, 111); - this.btnFilter.Name = "btnFilter"; - this.btnFilter.Size = new System.Drawing.Size(110, 23); - this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnFilter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnFilter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnFilter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnFilter.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnFilter.Style.GradientAngle = 90; - this.btnFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnFilter.TabIndex = 1290; - this.btnFilter.Text = "筛选显示订单"; + this.pnlStatistics.Controls.Add(this.lblAuthorizedAmount); + this.pnlStatistics.Location = new System.Drawing.Point(880, 13); + this.pnlStatistics.Name = "pnlStatistics"; + this.pnlStatistics.Size = new System.Drawing.Size(577, 119); + this.pnlStatistics.TabIndex = 1367; // - // txtSkcId + // lblAuthorizedAmount // - this.txtSkcId.Location = new System.Drawing.Point(841, 39); - this.txtSkcId.Name = "txtSkcId"; - this.txtSkcId.Size = new System.Drawing.Size(221, 23); - this.txtSkcId.TabIndex = 1285; + this.lblAuthorizedAmount.AutoSize = true; + this.lblAuthorizedAmount.Location = new System.Drawing.Point(21, 15); + this.lblAuthorizedAmount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblAuthorizedAmount.Name = "lblAuthorizedAmount"; + this.lblAuthorizedAmount.Size = new System.Drawing.Size(104, 17); + this.lblAuthorizedAmount.TabIndex = 1335; + this.lblAuthorizedAmount.Text = "账号剩余授权金："; // - // label1 + // pnlGetNewOrder // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(797, 41); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 17); - this.label1.TabIndex = 1286; - this.label1.Text = "SkcId："; - // - // line2 - // - this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.line2.Location = new System.Drawing.Point(780, 21); - this.line2.Name = "line2"; - this.line2.Size = new System.Drawing.Size(11, 104); - this.line2.TabIndex = 1284; - this.line2.Text = "line2"; - this.line2.VerticalLine = true; - // - // line3 - // - this.line3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.line3.Location = new System.Drawing.Point(263, 21); - this.line3.Name = "line3"; - this.line3.Size = new System.Drawing.Size(11, 104); - this.line3.TabIndex = 1265; - this.line3.Text = "line3"; - this.line3.VerticalLine = true; - // - // line1 - // - this.line1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.line1.Location = new System.Drawing.Point(534, 21); - this.line1.Name = "line1"; - this.line1.Size = new System.Drawing.Size(11, 104); - this.line1.TabIndex = 1263; - this.line1.Text = "line1"; - this.line1.VerticalLine = true; + this.pnlGetNewOrder.Controls.Add(this.btnStop); + this.pnlGetNewOrder.Controls.Add(this.btnSearchOrder); + this.pnlGetNewOrder.Controls.Add(this.lblNextGetTime); + this.pnlGetNewOrder.Controls.Add(this.line1); + this.pnlGetNewOrder.Location = new System.Drawing.Point(615, 13); + this.pnlGetNewOrder.Name = "pnlGetNewOrder"; + this.pnlGetNewOrder.Size = new System.Drawing.Size(249, 119); + this.pnlGetNewOrder.TabIndex = 1354; // // btnStop // this.btnStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStop.Location = new System.Drawing.Point(565, 24); + this.btnStop.Location = new System.Drawing.Point(18, 29); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(45, 23); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -335,66 +322,13 @@ namespace TemuKJD.KJDForms.JITForms this.btnStop.Text = "停止"; this.btnStop.Click += new System.EventHandler(this.btnStop_Click); // - // btnResetExtCode - // - this.btnResetExtCode.CanvasColor = System.Drawing.SystemColors.Control; - this.btnResetExtCode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnResetExtCode.DisabledBackColor = System.Drawing.Color.Empty; - this.btnResetExtCode.Location = new System.Drawing.Point(1030, 63); - this.btnResetExtCode.Name = "btnResetExtCode"; - this.btnResetExtCode.Size = new System.Drawing.Size(32, 23); - this.btnResetExtCode.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnResetExtCode.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnResetExtCode.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); - this.btnResetExtCode.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; - this.btnResetExtCode.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnResetExtCode.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; - this.btnResetExtCode.Style.GradientAngle = 90; - this.btnResetExtCode.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; - this.btnResetExtCode.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnResetExtCode.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnResetExtCode.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnResetExtCode.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnResetExtCode.TabIndex = 1005; - this.btnResetExtCode.Text = "重置"; - // - // txtExtCode - // - this.txtExtCode.Location = new System.Drawing.Point(841, 63); - this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(187, 23); - this.txtExtCode.TabIndex = 1003; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(807, 66); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(44, 17); - this.label12.TabIndex = 1004; - this.label12.Text = "货号："; - // - // dtpEndTime - // - this.dtpEndTime.Location = new System.Drawing.Point(952, 87); - this.dtpEndTime.Name = "dtpEndTime"; - this.dtpEndTime.Size = new System.Drawing.Size(110, 23); - this.dtpEndTime.TabIndex = 1001; - // - // dtpStartTime - // - this.dtpStartTime.Location = new System.Drawing.Point(841, 87); - this.dtpStartTime.Name = "dtpStartTime"; - this.dtpStartTime.Size = new System.Drawing.Size(110, 23); - this.dtpStartTime.TabIndex = 1000; - // // btnSearchOrder // this.btnSearchOrder.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSearchOrder.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearchOrder.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearchOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearchOrder.Location = new System.Drawing.Point(612, 24); + this.btnSearchOrder.Location = new System.Drawing.Point(65, 29); this.btnSearchOrder.Name = "btnSearchOrder"; this.btnSearchOrder.Size = new System.Drawing.Size(147, 23); this.btnSearchOrder.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -412,21 +346,123 @@ namespace TemuKJD.KJDForms.JITForms this.btnSearchOrder.Text = "查询待发货订单"; this.btnSearchOrder.Click += new System.EventHandler(this.btnSearchOrder_Click); // - // txtSpuId + // lblNextGetTime // - this.txtSpuId.Location = new System.Drawing.Point(841, 15); - this.txtSpuId.Name = "txtSpuId"; - this.txtSpuId.Size = new System.Drawing.Size(221, 23); - this.txtSpuId.TabIndex = 997; + this.lblNextGetTime.ForeColor = System.Drawing.SystemColors.ControlDarkDark; + this.lblNextGetTime.Location = new System.Drawing.Point(16, 58); + this.lblNextGetTime.Name = "lblNextGetTime"; + this.lblNextGetTime.Size = new System.Drawing.Size(201, 45); + this.lblNextGetTime.TabIndex = 1291; + this.lblNextGetTime.Text = "这里显示距离下次读取订单剩余时间间隔数字"; // - // label7 + // line1 // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(797, 17); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(54, 17); - this.label7.TabIndex = 998; - this.label7.Text = "SpuId："; + this.line1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.line1.Location = new System.Drawing.Point(233, 9); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(11, 104); + this.line1.TabIndex = 1263; + this.line1.Text = "line1"; + this.line1.VerticalLine = true; + // + // txtProductSn + // + this.txtProductSn.Location = new System.Drawing.Point(350, 76); + this.txtProductSn.Name = "txtProductSn"; + this.txtProductSn.Size = new System.Drawing.Size(181, 23); + this.txtProductSn.TabIndex = 1315; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Location = new System.Drawing.Point(293, 79); + this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(68, 17); + this.label9.TabIndex = 1316; + this.label9.Text = "商品货号："; + // + // btnRestore + // + this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control; + this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRestore.Location = new System.Drawing.Point(534, 76); + this.btnRestore.Name = "btnRestore"; + this.btnRestore.Size = new System.Drawing.Size(37, 23); + this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestore.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnRestore.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnRestore.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnRestore.Style.GradientAngle = 90; + this.btnRestore.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRestore.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnRestore.TabIndex = 1314; + this.btnRestore.Text = "重置"; + this.btnRestore.Click += new System.EventHandler(this.btnRestore_Click); + // + // txtProductId + // + this.txtProductId.Location = new System.Drawing.Point(350, 49); + this.txtProductId.Name = "txtProductId"; + this.txtProductId.Size = new System.Drawing.Size(221, 23); + this.txtProductId.TabIndex = 1308; + // + // txtSubOrderSn + // + this.txtSubOrderSn.Location = new System.Drawing.Point(350, 22); + this.txtSubOrderSn.Name = "txtSubOrderSn"; + this.txtSubOrderSn.Size = new System.Drawing.Size(221, 23); + this.txtSubOrderSn.TabIndex = 1307; + // + // btnFilter + // + this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty; + this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnFilter.Location = new System.Drawing.Point(491, 103); + this.btnFilter.Name = "btnFilter"; + this.btnFilter.Size = new System.Drawing.Size(80, 23); + this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnFilter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnFilter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnFilter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnFilter.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnFilter.Style.GradientAngle = 90; + this.btnFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnFilter.TabIndex = 1290; + this.btnFilter.Text = "筛选订单"; + this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click); + // + // line2 + // + this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.line2.Location = new System.Drawing.Point(585, 21); + this.line2.Name = "line2"; + this.line2.Size = new System.Drawing.Size(11, 104); + this.line2.TabIndex = 1284; + this.line2.Text = "line2"; + this.line2.VerticalLine = true; + // + // line3 + // + this.line3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.line3.Location = new System.Drawing.Point(263, 21); + this.line3.Name = "line3"; + this.line3.Size = new System.Drawing.Size(11, 104); + this.line3.TabIndex = 1265; + this.line3.Text = "line3"; + this.line3.VerticalLine = true; // // btnEmpty // @@ -534,17 +570,25 @@ namespace TemuKJD.KJDForms.JITForms this.label3.TabIndex = 381; this.label3.Text = "店铺名称："; // - // chkSearchTime + // label6 // - this.chkSearchTime.AutoSize = true; - this.chkSearchTime.Checked = true; - this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkSearchTime.Location = new System.Drawing.Point(794, 88); - this.chkSearchTime.Name = "chkSearchTime"; - this.chkSearchTime.Size = new System.Drawing.Size(63, 21); - this.chkSearchTime.TabIndex = 1002; - this.chkSearchTime.Text = "日期："; - this.chkSearchTime.UseVisualStyleBackColor = true; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(293, 25); + this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(68, 17); + this.label6.TabIndex = 1309; + this.label6.Text = "备货单号："; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Location = new System.Drawing.Point(290, 52); + this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(71, 17); + this.label8.TabIndex = 1310; + this.label8.Text = "SKC/SPU："; // // splitContainer3 // @@ -561,7 +605,7 @@ namespace TemuKJD.KJDForms.JITForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1469, 467); + this.splitContainer3.Size = new System.Drawing.Size(1489, 467); this.splitContainer3.SplitterDistance = 437; this.splitContainer3.TabIndex = 1; // @@ -581,6 +625,7 @@ namespace TemuKJD.KJDForms.JITForms // // splitContainer2.Panel2 // + this.splitContainer2.Panel2.Controls.Add(this.panel1); this.splitContainer2.Panel2.Controls.Add(this.btnRestoreSizeAndNumber); this.splitContainer2.Panel2.Controls.Add(this.numJudgeWeight); this.splitContainer2.Panel2.Controls.Add(this.numJudgeLen); @@ -591,7 +636,7 @@ namespace TemuKJD.KJDForms.JITForms this.splitContainer2.Panel2.Controls.Add(this.pbLoading); this.splitContainer2.Panel2.Controls.Add(this.dgvStock); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1469, 437); + this.splitContainer2.Size = new System.Drawing.Size(1489, 437); this.splitContainer2.SplitterDistance = 325; this.splitContainer2.TabIndex = 0; // @@ -622,19 +667,19 @@ namespace TemuKJD.KJDForms.JITForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle34.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle35.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle35.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle35.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle35.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle35.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -735,364 +780,120 @@ namespace TemuKJD.KJDForms.JITForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // - // pbLoading - // - this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; - this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(529, 193); - this.pbLoading.Name = "pbLoading"; - this.pbLoading.Size = new System.Drawing.Size(50, 50); - this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbLoading.TabIndex = 675; - this.pbLoading.TabStop = false; - this.pbLoading.Visible = false; - // - // dgvStock - // - this.dgvStock.AllowUserToAddRows = false; - this.dgvStock.AllowUserToDeleteRows = false; - dataGridViewCellStyle36.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle36; - this.dgvStock.AutoRowNumber = true; - this.dgvStock.BackgroundColor = System.Drawing.Color.White; - this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle37.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle37; - this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.colCheck, - this.colIndexId, - this.colSupplierId, - this.colSupplierName, - this.colSupplierInfo, - this.colSubOrderSn, - this.colSubOrderSnInfo, - this.colImgUrl, - this.colProductSkcPic, - this.colParentStockId, - this.colProductId, - this.colUpProuctId, - this.colProdSkc, - this.colProdName, - this.colProductSn, - this.colProdInfo, - this.colSkuImgUrl, - this.colSkuImg, - this.colSkuInfo, - this.colCost, - this.colPrcie, - this.colStockUpNum, - this.colCreateTime, - this.colUploadCode, - this.colUploadOrder, - this.colMsg}); - this.dgvStock.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvStock.Location = new System.Drawing.Point(0, 0); - this.dgvStock.Name = "dgvStock"; - this.dgvStock.ReadOnly = true; - this.dgvStock.RowTemplate.Height = 23; - this.dgvStock.Size = new System.Drawing.Size(1136, 437); - this.dgvStock.TabIndex = 676; - // - // colCheck - // - this.colCheck.HeaderText = "选择"; - this.colCheck.Name = "colCheck"; - this.colCheck.ReadOnly = true; - this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colCheck.Width = 30; - // - // colIndexId - // - this.colIndexId.HeaderText = "编号"; - this.colIndexId.Name = "colIndexId"; - this.colIndexId.ReadOnly = true; - this.colIndexId.Visible = false; - // - // colSupplierId - // - this.colSupplierId.HeaderText = "店铺Id"; - this.colSupplierId.Name = "colSupplierId"; - this.colSupplierId.ReadOnly = true; - this.colSupplierId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colSupplierId.Visible = false; - // - // colSupplierName - // - this.colSupplierName.HeaderText = "店铺名称"; - this.colSupplierName.Name = "colSupplierName"; - this.colSupplierName.ReadOnly = true; - this.colSupplierName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colSupplierName.Visible = false; - // - // colSupplierInfo - // - dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierInfo.DefaultCellStyle = dataGridViewCellStyle38; - this.colSupplierInfo.HeaderText = "店铺信息"; - this.colSupplierInfo.Name = "colSupplierInfo"; - this.colSupplierInfo.ReadOnly = true; - this.colSupplierInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colSupplierInfo.Width = 120; - // - // colSubOrderSn - // - this.colSubOrderSn.HeaderText = "备货单号"; - this.colSubOrderSn.Name = "colSubOrderSn"; - this.colSubOrderSn.ReadOnly = true; - this.colSubOrderSn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colSubOrderSn.Visible = false; - this.colSubOrderSn.Width = 120; - // - // colSubOrderSnInfo - // - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSubOrderSnInfo.DefaultCellStyle = dataGridViewCellStyle39; - this.colSubOrderSnInfo.HeaderText = "备货单号信息"; - this.colSubOrderSnInfo.Name = "colSubOrderSnInfo"; - this.colSubOrderSnInfo.ReadOnly = true; - this.colSubOrderSnInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colSubOrderSnInfo.Width = 150; - // - // colImgUrl - // - this.colImgUrl.HeaderText = "SKC图片路径"; - this.colImgUrl.Name = "colImgUrl"; - this.colImgUrl.ReadOnly = true; - this.colImgUrl.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colImgUrl.Visible = false; - // - // colProductSkcPic - // - this.colProductSkcPic.HeaderText = "SKC图"; - this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colProductSkcPic.Name = "colProductSkcPic"; - this.colProductSkcPic.ReadOnly = true; - this.colProductSkcPic.Width = 60; - // - // colParentStockId - // - this.colParentStockId.HeaderText = "备货母单号"; - this.colParentStockId.Name = "colParentStockId"; - this.colParentStockId.ReadOnly = true; - this.colParentStockId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colParentStockId.Visible = false; - this.colParentStockId.Width = 200; - // - // colProductId - // - this.colProductId.HeaderText = "商品ID"; - this.colProductId.Name = "colProductId"; - this.colProductId.ReadOnly = true; - this.colProductId.Visible = false; - this.colProductId.Width = 90; - // - // colUpProuctId - // - this.colUpProuctId.HeaderText = "上家商品ID"; - this.colUpProuctId.Name = "colUpProuctId"; - this.colUpProuctId.ReadOnly = true; - this.colUpProuctId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colUpProuctId.Visible = false; - // - // colProdSkc - // - this.colProdSkc.FillWeight = 150F; - this.colProdSkc.HeaderText = "商品SKC"; - this.colProdSkc.Name = "colProdSkc"; - this.colProdSkc.ReadOnly = true; - this.colProdSkc.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colProdSkc.Visible = false; - this.colProdSkc.Width = 90; - // - // colProdName - // - dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProdName.DefaultCellStyle = dataGridViewCellStyle40; - this.colProdName.HeaderText = "标题"; - this.colProdName.Name = "colProdName"; - this.colProdName.ReadOnly = true; - this.colProdName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colProdName.Visible = false; - this.colProdName.Width = 150; - // - // colProductSn - // - this.colProductSn.HeaderText = "货号"; - this.colProductSn.Name = "colProductSn"; - this.colProductSn.ReadOnly = true; - this.colProductSn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colProductSn.Visible = false; - // - // colProdInfo - // - dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProdInfo.DefaultCellStyle = dataGridViewCellStyle41; - this.colProdInfo.HeaderText = "商品信息"; - this.colProdInfo.Name = "colProdInfo"; - this.colProdInfo.ReadOnly = true; - this.colProdInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colProdInfo.Width = 200; - // - // colSkuImgUrl - // - this.colSkuImgUrl.HeaderText = "SKU图片路径"; - this.colSkuImgUrl.Name = "colSkuImgUrl"; - this.colSkuImgUrl.ReadOnly = true; - this.colSkuImgUrl.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colSkuImgUrl.Visible = false; - this.colSkuImgUrl.Width = 60; - // - // colSkuImg - // - this.colSkuImg.HeaderText = "SKU图"; - this.colSkuImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colSkuImg.Name = "colSkuImg"; - this.colSkuImg.ReadOnly = true; - this.colSkuImg.Width = 60; - // - // colSkuInfo - // - dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSkuInfo.DefaultCellStyle = dataGridViewCellStyle42; - this.colSkuInfo.HeaderText = "SKU信息"; - this.colSkuInfo.Name = "colSkuInfo"; - this.colSkuInfo.ReadOnly = true; - this.colSkuInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colSkuInfo.Width = 120; - // - // colCost - // - dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colCost.DefaultCellStyle = dataGridViewCellStyle43; - this.colCost.HeaderText = "成本"; - this.colCost.Name = "colCost"; - this.colCost.ReadOnly = true; - this.colCost.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colCost.Width = 80; - // - // colPrcie - // - this.colPrcie.HeaderText = "申报价格"; - this.colPrcie.Name = "colPrcie"; - this.colPrcie.ReadOnly = true; - this.colPrcie.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colPrcie.Width = 65; - // - // colStockUpNum - // - this.colStockUpNum.HeaderText = "备货件数"; - this.colStockUpNum.Name = "colStockUpNum"; - this.colStockUpNum.ReadOnly = true; - this.colStockUpNum.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colStockUpNum.Width = 65; - // - // colCreateTime - // - dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle44; - this.colCreateTime.HeaderText = "备货单创建时间"; - this.colCreateTime.Name = "colCreateTime"; - this.colCreateTime.ReadOnly = true; - this.colCreateTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // colUploadCode - // - this.colUploadCode.HeaderText = "上传条码/箱唛"; - this.colUploadCode.Name = "colUploadCode"; - this.colUploadCode.ReadOnly = true; - this.colUploadCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - // - // colUploadOrder - // - this.colUploadOrder.HeaderText = "上传订单"; - this.colUploadOrder.Name = "colUploadOrder"; - this.colUploadOrder.ReadOnly = true; - this.colUploadOrder.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colUploadOrder.Width = 80; - // - // colMsg - // - this.colMsg.HeaderText = "操作信息"; - this.colMsg.Name = "colMsg"; - this.colMsg.ReadOnly = true; - this.colMsg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colMsg.Width = 300; - // - // splitContainer4 - // - this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer4.Location = new System.Drawing.Point(0, 0); - this.splitContainer4.Name = "splitContainer4"; - // - // splitContainer4.Panel1 - // - this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); - // - // splitContainer4.Panel2 - // - this.splitContainer4.Panel2.Controls.Add(this.btnClear); - this.splitContainer4.Panel2.Controls.Add(this.statusBar); - this.splitContainer4.Size = new System.Drawing.Size(1469, 26); - this.splitContainer4.SplitterDistance = 321; - this.splitContainer4.TabIndex = 3; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(321, 26); - this.ucSplitPage1.TabIndex = 5; - this.ucSplitPage1.TotalPage = 1; - // - // btnClear - // - this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(1050, 0); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(90, 21); - this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.Style.GradientAngle = 90; - this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; - this.btnClear.TabIndex = 440; - this.btnClear.Text = "清空结果"; - this.btnClear.Visible = false; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1144, 26); - this.statusBar.TabIndex = 2; + // panel1 + // + this.panel1.Controls.Add(this.label7); + this.panel1.Controls.Add(this.chkSearchTime); + this.panel1.Controls.Add(this.txtSkcId); + this.panel1.Controls.Add(this.txtSpuId); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.dtpStartTime); + this.panel1.Controls.Add(this.dtpEndTime); + this.panel1.Controls.Add(this.label12); + this.panel1.Controls.Add(this.txtExtCode); + this.panel1.Controls.Add(this.btnResetExtCode); + this.panel1.Location = new System.Drawing.Point(22, 151); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(278, 152); + this.panel1.TabIndex = 1168; + this.panel1.Visible = false; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(7, 15); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(54, 17); + this.label7.TabIndex = 998; + this.label7.Text = "SpuId："; + // + // chkSearchTime + // + this.chkSearchTime.AutoSize = true; + this.chkSearchTime.Checked = true; + this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked; + this.chkSearchTime.Location = new System.Drawing.Point(4, 86); + this.chkSearchTime.Name = "chkSearchTime"; + this.chkSearchTime.Size = new System.Drawing.Size(63, 21); + this.chkSearchTime.TabIndex = 1002; + this.chkSearchTime.Text = "日期："; + this.chkSearchTime.UseVisualStyleBackColor = true; + // + // txtSkcId + // + this.txtSkcId.Location = new System.Drawing.Point(51, 37); + this.txtSkcId.Name = "txtSkcId"; + this.txtSkcId.Size = new System.Drawing.Size(221, 23); + this.txtSkcId.TabIndex = 1285; + // + // txtSpuId + // + this.txtSpuId.Location = new System.Drawing.Point(51, 13); + this.txtSpuId.Name = "txtSpuId"; + this.txtSpuId.Size = new System.Drawing.Size(221, 23); + this.txtSpuId.TabIndex = 997; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(7, 39); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(52, 17); + this.label1.TabIndex = 1286; + this.label1.Text = "SkcId："; + // + // dtpStartTime + // + this.dtpStartTime.Location = new System.Drawing.Point(51, 85); + this.dtpStartTime.Name = "dtpStartTime"; + this.dtpStartTime.Size = new System.Drawing.Size(110, 23); + this.dtpStartTime.TabIndex = 1000; + // + // dtpEndTime + // + this.dtpEndTime.Location = new System.Drawing.Point(162, 85); + this.dtpEndTime.Name = "dtpEndTime"; + this.dtpEndTime.Size = new System.Drawing.Size(110, 23); + this.dtpEndTime.TabIndex = 1001; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(17, 64); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(44, 17); + this.label12.TabIndex = 1004; + this.label12.Text = "货号："; + // + // txtExtCode + // + this.txtExtCode.Location = new System.Drawing.Point(51, 61); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(187, 23); + this.txtExtCode.TabIndex = 1003; + // + // btnResetExtCode + // + this.btnResetExtCode.CanvasColor = System.Drawing.SystemColors.Control; + this.btnResetExtCode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnResetExtCode.DisabledBackColor = System.Drawing.Color.Empty; + this.btnResetExtCode.Location = new System.Drawing.Point(240, 61); + this.btnResetExtCode.Name = "btnResetExtCode"; + this.btnResetExtCode.Size = new System.Drawing.Size(32, 23); + this.btnResetExtCode.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnResetExtCode.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnResetExtCode.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); + this.btnResetExtCode.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.btnResetExtCode.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnResetExtCode.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.btnResetExtCode.Style.GradientAngle = 90; + this.btnResetExtCode.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center; + this.btnResetExtCode.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnResetExtCode.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnResetExtCode.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnResetExtCode.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnResetExtCode.TabIndex = 1005; + this.btnResetExtCode.Text = "重置"; // // btnRestoreSizeAndNumber // @@ -1436,10 +1237,369 @@ namespace TemuKJD.KJDForms.JITForms this.label20.TabIndex = 684; this.label20.Text = "重"; // + // pbLoading + // + this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(539, 193); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 675; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // dgvStock + // + this.dgvStock.AllowUserToAddRows = false; + this.dgvStock.AllowUserToDeleteRows = false; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + this.dgvStock.AutoRowNumber = true; + this.dgvStock.BackgroundColor = System.Drawing.Color.White; + this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colCheck, + this.colIndexId, + this.colSupplierId, + this.colSupplierName, + this.colSupplierInfo, + this.colSubOrderSn, + this.colSubOrderSnInfo, + this.colImgUrl, + this.colProductSkcPic, + this.colParentStockId, + this.colProductId, + this.colUpProuctId, + this.colProdSkc, + this.colProdName, + this.colProductSn, + this.colProdInfo, + this.colSkuImgUrl, + this.colSkuImg, + this.colSkuInfo, + this.colCost, + this.colPrcie, + this.colStockUpNum, + this.colCreateTime, + this.colUploadCode, + this.colUploadOrder, + this.colMsg}); + this.dgvStock.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvStock.Location = new System.Drawing.Point(0, 0); + this.dgvStock.Name = "dgvStock"; + this.dgvStock.ReadOnly = true; + this.dgvStock.RowTemplate.Height = 23; + this.dgvStock.Size = new System.Drawing.Size(1156, 437); + this.dgvStock.TabIndex = 676; + this.dgvStock.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvStock_CellContentClick); + // + // splitContainer4 + // + this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer4.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer4.Location = new System.Drawing.Point(0, 0); + this.splitContainer4.Name = "splitContainer4"; + // + // splitContainer4.Panel1 + // + this.splitContainer4.Panel1.Controls.Add(this.ucSplitPage1); + // + // splitContainer4.Panel2 + // + this.splitContainer4.Panel2.Controls.Add(this.btnClear); + this.splitContainer4.Panel2.Controls.Add(this.statusBar); + this.splitContainer4.Size = new System.Drawing.Size(1489, 26); + this.splitContainer4.SplitterDistance = 321; + this.splitContainer4.TabIndex = 3; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(321, 26); + this.ucSplitPage1.TabIndex = 5; + this.ucSplitPage1.TotalPage = 1; + // + // btnClear + // + this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; + this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnClear.Location = new System.Drawing.Point(1070, 0); + this.btnClear.Name = "btnClear"; + this.btnClear.Size = new System.Drawing.Size(90, 21); + this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnClear.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnClear.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnClear.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnClear.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.Style.GradientAngle = 90; + this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; + this.btnClear.TabIndex = 440; + this.btnClear.Text = "清空结果"; + this.btnClear.Visible = false; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1164, 26); + this.statusBar.TabIndex = 2; + // + // colCheck + // + this.colCheck.HeaderText = "选择"; + this.colCheck.Name = "colCheck"; + this.colCheck.ReadOnly = true; + this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colCheck.Visible = false; + this.colCheck.Width = 30; + // + // colIndexId + // + this.colIndexId.HeaderText = "编号"; + this.colIndexId.Name = "colIndexId"; + this.colIndexId.ReadOnly = true; + this.colIndexId.Visible = false; + // + // colSupplierId + // + this.colSupplierId.HeaderText = "店铺Id"; + this.colSupplierId.Name = "colSupplierId"; + this.colSupplierId.ReadOnly = true; + this.colSupplierId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colSupplierId.Visible = false; + // + // colSupplierName + // + this.colSupplierName.HeaderText = "店铺名称"; + this.colSupplierName.Name = "colSupplierName"; + this.colSupplierName.ReadOnly = true; + this.colSupplierName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colSupplierName.Visible = false; + // + // colSupplierInfo + // + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierInfo.DefaultCellStyle = dataGridViewCellStyle5; + this.colSupplierInfo.HeaderText = "店铺信息"; + this.colSupplierInfo.Name = "colSupplierInfo"; + this.colSupplierInfo.ReadOnly = true; + this.colSupplierInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colSupplierInfo.Width = 120; + // + // colSubOrderSn + // + this.colSubOrderSn.HeaderText = "备货单号"; + this.colSubOrderSn.Name = "colSubOrderSn"; + this.colSubOrderSn.ReadOnly = true; + this.colSubOrderSn.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSubOrderSn.Visible = false; + this.colSubOrderSn.Width = 120; + // + // colSubOrderSnInfo + // + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSubOrderSnInfo.DefaultCellStyle = dataGridViewCellStyle6; + this.colSubOrderSnInfo.HeaderText = "备货单号信息"; + this.colSubOrderSnInfo.Name = "colSubOrderSnInfo"; + this.colSubOrderSnInfo.ReadOnly = true; + this.colSubOrderSnInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colSubOrderSnInfo.Width = 150; + // + // colImgUrl + // + this.colImgUrl.HeaderText = "SKC图片路径"; + this.colImgUrl.Name = "colImgUrl"; + this.colImgUrl.ReadOnly = true; + this.colImgUrl.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colImgUrl.Visible = false; + // + // colProductSkcPic + // + this.colProductSkcPic.HeaderText = "SKC图"; + this.colProductSkcPic.Name = "colProductSkcPic"; + this.colProductSkcPic.ReadOnly = true; + this.colProductSkcPic.Width = 60; + // + // colParentStockId + // + this.colParentStockId.HeaderText = "备货母单号"; + this.colParentStockId.Name = "colParentStockId"; + this.colParentStockId.ReadOnly = true; + this.colParentStockId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colParentStockId.Visible = false; + this.colParentStockId.Width = 200; + // + // colProductId + // + this.colProductId.HeaderText = "商品ID"; + this.colProductId.Name = "colProductId"; + this.colProductId.ReadOnly = true; + this.colProductId.Visible = false; + this.colProductId.Width = 90; + // + // colUpProuctId + // + this.colUpProuctId.HeaderText = "上家商品ID"; + this.colUpProuctId.Name = "colUpProuctId"; + this.colUpProuctId.ReadOnly = true; + this.colUpProuctId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colUpProuctId.Visible = false; + // + // colProdSkc + // + this.colProdSkc.FillWeight = 150F; + this.colProdSkc.HeaderText = "商品SKC"; + this.colProdSkc.Name = "colProdSkc"; + this.colProdSkc.ReadOnly = true; + this.colProdSkc.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colProdSkc.Visible = false; + this.colProdSkc.Width = 90; + // + // colProdName + // + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProdName.DefaultCellStyle = dataGridViewCellStyle7; + this.colProdName.HeaderText = "标题"; + this.colProdName.Name = "colProdName"; + this.colProdName.ReadOnly = true; + this.colProdName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colProdName.Visible = false; + this.colProdName.Width = 150; + // + // colProductSn + // + this.colProductSn.HeaderText = "货号"; + this.colProductSn.Name = "colProductSn"; + this.colProductSn.ReadOnly = true; + this.colProductSn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colProductSn.Visible = false; + // + // colProdInfo + // + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProdInfo.DefaultCellStyle = dataGridViewCellStyle8; + this.colProdInfo.HeaderText = "商品信息"; + this.colProdInfo.Name = "colProdInfo"; + this.colProdInfo.ReadOnly = true; + this.colProdInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colProdInfo.Width = 200; + // + // colSkuImgUrl + // + this.colSkuImgUrl.HeaderText = "SKU图片路径"; + this.colSkuImgUrl.Name = "colSkuImgUrl"; + this.colSkuImgUrl.ReadOnly = true; + this.colSkuImgUrl.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colSkuImgUrl.Visible = false; + this.colSkuImgUrl.Width = 60; + // + // colSkuImg + // + this.colSkuImg.HeaderText = "SKU图"; + this.colSkuImg.Name = "colSkuImg"; + this.colSkuImg.ReadOnly = true; + this.colSkuImg.Width = 60; + // + // colSkuInfo + // + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSkuInfo.DefaultCellStyle = dataGridViewCellStyle9; + this.colSkuInfo.HeaderText = "SKU信息"; + this.colSkuInfo.Name = "colSkuInfo"; + this.colSkuInfo.ReadOnly = true; + this.colSkuInfo.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colSkuInfo.Width = 120; + // + // colCost + // + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCost.DefaultCellStyle = dataGridViewCellStyle10; + this.colCost.HeaderText = "成本"; + this.colCost.Name = "colCost"; + this.colCost.ReadOnly = true; + this.colCost.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colCost.Width = 80; + // + // colPrcie + // + this.colPrcie.HeaderText = "申报价格"; + this.colPrcie.Name = "colPrcie"; + this.colPrcie.ReadOnly = true; + this.colPrcie.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colPrcie.Width = 65; + // + // colStockUpNum + // + this.colStockUpNum.HeaderText = "备货件数"; + this.colStockUpNum.Name = "colStockUpNum"; + this.colStockUpNum.ReadOnly = true; + this.colStockUpNum.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colStockUpNum.Width = 65; + // + // colCreateTime + // + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle11; + this.colCreateTime.HeaderText = "备货单创建时间"; + this.colCreateTime.Name = "colCreateTime"; + this.colCreateTime.ReadOnly = true; + this.colCreateTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // colUploadCode + // + this.colUploadCode.HeaderText = "上传条码/箱唛"; + this.colUploadCode.Name = "colUploadCode"; + this.colUploadCode.ReadOnly = true; + this.colUploadCode.Resizable = System.Windows.Forms.DataGridViewTriState.True; + // + // colUploadOrder + // + this.colUploadOrder.HeaderText = "上传订单"; + this.colUploadOrder.Name = "colUploadOrder"; + this.colUploadOrder.ReadOnly = true; + this.colUploadOrder.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colUploadOrder.Width = 80; + // + // colMsg + // + this.colMsg.HeaderText = "操作信息"; + this.colMsg.Name = "colMsg"; + this.colMsg.ReadOnly = true; + this.colMsg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colMsg.Width = 300; + // // JitPushOrder // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1469, 611); + this.ClientSize = new System.Drawing.Size(1489, 611); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Name = "JitPushOrder"; @@ -1452,6 +1612,9 @@ namespace TemuKJD.KJDForms.JITForms this.splitContainer1.ResumeLayout(false); this.ucGroupBoxEx1.ResumeLayout(false); this.ucGroupBoxEx1.PerformLayout(); + this.pnlStatistics.ResumeLayout(false); + this.pnlStatistics.PerformLayout(); + this.pnlGetNewOrder.ResumeLayout(false); this.splitContainer3.Panel1.ResumeLayout(false); this.splitContainer3.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); @@ -1464,12 +1627,8 @@ namespace TemuKJD.KJDForms.JITForms this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dgvStock)).EndInit(); - this.splitContainer4.Panel1.ResumeLayout(false); - this.splitContainer4.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); - this.splitContainer4.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).EndInit(); this.pnlRestoreSizeAndNumber.ResumeLayout(false); @@ -1483,6 +1642,12 @@ namespace TemuKJD.KJDForms.JITForms ((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numWeight1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numLen2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvStock)).EndInit(); + this.splitContainer4.Panel1.ResumeLayout(false); + this.splitContainer4.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit(); + this.splitContainer4.ResumeLayout(false); this.ResumeLayout(false); } @@ -1493,13 +1658,11 @@ namespace TemuKJD.KJDForms.JITForms private UserComponent.UcGroupBoxEx ucGroupBoxEx1; private DevComponents.DotNetBar.Controls.Line line3; private DevComponents.DotNetBar.Controls.Line line1; - private DevComponents.DotNetBar.PanelEx btnStop; private DevComponents.DotNetBar.PanelEx btnResetExtCode; private System.Windows.Forms.TextBox txtExtCode; private System.Windows.Forms.Label label12; private System.Windows.Forms.DateTimePicker dtpEndTime; private System.Windows.Forms.DateTimePicker dtpStartTime; - private DevComponents.DotNetBar.PanelEx btnSearchOrder; private System.Windows.Forms.TextBox txtSpuId; private System.Windows.Forms.Label label7; private DevComponents.DotNetBar.PanelEx btnEmpty; @@ -1537,7 +1700,43 @@ namespace TemuKJD.KJDForms.JITForms private System.Windows.Forms.TextBox txtSkcId; private System.Windows.Forms.Label label1; private DevComponents.DotNetBar.Controls.Line line2; + private DevComponents.DotNetBar.PanelEx btnRestoreSizeAndNumber; + private System.Windows.Forms.NumericUpDown numJudgeWeight; + private System.Windows.Forms.NumericUpDown numJudgeLen; + private System.Windows.Forms.Label lblJudgeLen; + private System.Windows.Forms.Label lblJudgeWeight; + private UserComponent.UcCheckBox chkFilterSize; + private System.Windows.Forms.Panel pnlRestoreSizeAndNumber; + private System.Windows.Forms.NumericUpDown numPieces; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.NumericUpDown numHeight2; + private System.Windows.Forms.NumericUpDown numHeight1; + private System.Windows.Forms.NumericUpDown numWidth1; + private System.Windows.Forms.NumericUpDown numWidth2; + private System.Windows.Forms.NumericUpDown numLen1; + private System.Windows.Forms.NumericUpDown numWeight2; + private System.Windows.Forms.NumericUpDown numWeight1; + private System.Windows.Forms.NumericUpDown numLen2; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.PanelEx btnRestore; + private System.Windows.Forms.TextBox txtProductId; + private System.Windows.Forms.TextBox txtSubOrderSn; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.TextBox txtProductSn; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Panel pnlGetNewOrder; + private DevComponents.DotNetBar.PanelEx btnStop; + private System.Windows.Forms.Label lblAuthorizedAmount; + private DevComponents.DotNetBar.PanelEx btnSearchOrder; private System.Windows.Forms.Label lblNextGetTime; + private System.Windows.Forms.Panel pnlStatistics; + private DevComponents.DotNetBar.PanelEx btnGetDbOrder; private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck; private System.Windows.Forms.DataGridViewTextBoxColumn colIndexId; private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId; @@ -1561,30 +1760,8 @@ namespace TemuKJD.KJDForms.JITForms private System.Windows.Forms.DataGridViewTextBoxColumn colPrcie; private System.Windows.Forms.DataGridViewTextBoxColumn colStockUpNum; private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTime; - private System.Windows.Forms.DataGridViewTextBoxColumn colUploadCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colUploadOrder; + private System.Windows.Forms.DataGridViewLinkColumn colUploadCode; + private System.Windows.Forms.DataGridViewLinkColumn colUploadOrder; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; - private DevComponents.DotNetBar.PanelEx btnRestoreSizeAndNumber; - private System.Windows.Forms.NumericUpDown numJudgeWeight; - private System.Windows.Forms.NumericUpDown numJudgeLen; - private System.Windows.Forms.Label lblJudgeLen; - private System.Windows.Forms.Label lblJudgeWeight; - private UserComponent.UcCheckBox chkFilterSize; - private System.Windows.Forms.Panel pnlRestoreSizeAndNumber; - private System.Windows.Forms.NumericUpDown numPieces; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.NumericUpDown numHeight2; - private System.Windows.Forms.NumericUpDown numHeight1; - private System.Windows.Forms.NumericUpDown numWidth1; - private System.Windows.Forms.NumericUpDown numWidth2; - private System.Windows.Forms.NumericUpDown numLen1; - private System.Windows.Forms.NumericUpDown numWeight2; - private System.Windows.Forms.NumericUpDown numWeight1; - private System.Windows.Forms.NumericUpDown numLen2; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.Label label20; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/JITForms/JitPushOrder.cs b/TEMUKJD/KJDForms/JITForms/JitPushOrder.cs index 8476740..7842ab5 100644 --- a/TEMUKJD/KJDForms/JITForms/JitPushOrder.cs +++ b/TEMUKJD/KJDForms/JITForms/JitPushOrder.cs @@ -20,6 +20,7 @@ using TemuKJD.Extension; using TemuKJD.KJDForms.AdminForms; using TemuKJD.KJDForms.ProductForms; using TemuKJD.KJDForms.ShopForms; +using TemuKJD.ToolForms; using Work; namespace TemuKJD.KJDForms.JITForms @@ -51,18 +52,25 @@ namespace TemuKJD.KJDForms.JITForms private void JitPushOrder_Load(object sender, EventArgs e) { - if (BaseClass.Mobile == "15288888888") - { - btnRestoreSizeAndNumber.Visible = true; - } + //if (BaseClass.Mobile == "15288888888") + //{ + // btnRestoreSizeAndNumber.Visible = true; + //} if (!IsClientJit) { ucSplitPage1.Visible = true; + btnGetDbOrder.Visible = true; + pnlGetNewOrder.Visible = false; + pnlStatistics.Visible = false; + colJitStatus.Visible = false; } else { ucSplitPage1.Visible = false; + btnGetDbOrder.Visible = false; + pnlGetNewOrder.Visible = true; + pnlStatistics.Visible = true; } lblNextGetTime.Text = ""; @@ -102,7 +110,10 @@ namespace TemuKJD.KJDForms.JITForms this.txtExtCode.TextChanged += Txt_TextChanged; this.chkSearchTime.CheckedChanged += Txt_TextChanged; - loadServerDbOrder(); + lblAuthorizedAmount.Text = "剩余授权金:" + BaseClass.AuthorizedAmount; + + if (IsClientJit) + loadServerDbOrder(); } private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { @@ -117,7 +128,7 @@ namespace TemuKJD.KJDForms.JITForms { var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList(); 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) { if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString())) @@ -150,7 +161,7 @@ namespace TemuKJD.KJDForms.JITForms if (!IsClientJit) { //this.pbShopLoading.Visible = true; - //SearchShop(this.ucSplitPage1.CurrentPage); + SearchShop(this.ucSplitPage1.CurrentPage); } else { @@ -163,16 +174,95 @@ namespace TemuKJD.KJDForms.JITForms { if (!IsClientJit) { - //if (this.ucSplitPage1.CurrentPage != 1) - // this.ucSplitPage1.CurrentPage = 1; - //else - // SearchShop(1); + if (this.ucSplitPage1.CurrentPage != 1) + this.ucSplitPage1.CurrentPage = 1; + else + SearchShop(1); } else { RefreshShop(); } } + public void SearchShop(int page) + { + List userShopIdList = dgvShop.Rows.Cast() + .Where(r => r.Cells["colSelect"].Value.ParseToBool()) + .Select(r => r.Cells["colShopId"].Value.ParseToString() + r.Cells["colUser"].Value.ParseToString()).ToList(); + + Invoke(new Action(() => + { + this.pbShopLoading.Visible = true; + this.dgvShop.Rows.Clear(); + lstAdminShopInfo.Clear(); + })); + + Task.Run(() => + { + int pageCount; + var list = AdminGetServerShopLst(out pageCount, page); + lstAdminShopInfo.AddRange(list); + this.ucSplitPage1.TotalPage = pageCount; + + foreach (var shop in lstAdminShopInfo) + { + bool canUse = shop.LoginStatus2 == "国际版在线"; + Invoke(new Action(() => + { + int rowIndex = this.dgvShop.Rows.Add( + userShopIdList.Contains(shop.ShopId + shop.UserName), + shop.UserName, + shop.LoginName, + shop.ShopId, + shop.ShopAccount, + shop.Notes, + canUse ? "在线" : "掉线", + canUse, + string.Empty + ); + displayShopStatus(shop); + })); + } + + Invoke(new Action(() => + { + this.pbShopLoading.Visible = false; + })); + }); + } + public List AdminGetServerShopLst(out int pageCount, int page = 1, int pageSize = 50) + { + List list = new List(); + pageCount = 1; + + var url = BaseClass.BuildObjString("shop/admin_get_shop_list"); + //if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked) + // url = BaseClass.BuildObjString("shop/sub_sa_get_select_prod_shop"); + var data = UserLogin.GetSignaturex() + + "&page=" + page + + "&page_size=" + pageSize + + "&shop_ids=" + txtShopId.Text.Trim().Trim(',') + + "&shop_names=" + txtShopName.Text.Trim().Trim(',') + + "&search_notes=" + txtNotes.Text.Trim().Trim(','); + //if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked) + // data += "&operate_sub_sa_name=" + BaseClass.UserName; + 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("shop_id") || !html.Contains("shop_account") || !html.Contains("login_pass")) + { + return list; + } + + int count = BaseRegex.GetIntJson(ref html, "count"); + pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt(); + pageCount = Math.Max(pageCount, 1); + + return ShopBLL.DeserializationShop(html); + } private void RefreshShop() { @@ -418,9 +508,8 @@ namespace TemuKJD.KJDForms.JITForms return; } - lstOrderForSupplierInfo.Clear(); + btnSearchOrder.Enabled = false; //dgvStock.Rows.Clear(); - var dgvRows = this.dgvShop.Rows.Cast();//.Where(r => lstShopId.Contains(r.Cells["colShopId"].Value.ParseToString())); foreach (var row in dgvRows) { @@ -430,315 +519,453 @@ namespace TemuKJD.KJDForms.JITForms cancellationTokenSource = new CancellationTokenSource(); Task.Run(() => { - var lstShopIdTemp = new List(); - lstShopIdTemp.AddRange(lstShopId); - int i = 0; - foreach (var shopId in lstShopIdTemp) - { - this.Invoke(new Action(() => - { - this.statusBar.lblTaskStatus.Text = "正在查询..."; - this.statusBar.pgbTaskProgress.Maximum = lstShopIdTemp.Count; - this.statusBar.UpdateProgressBar(i + 1); - i++; - })); + GetNewOrderLoop(lstShopId, cancellationTokenSource); + }, cancellationTokenSource.Token); + } + void GetNewOrderLoop(List lstShopId, CancellationTokenSource _cancellationTokenSource) + { + var nextReadTime = DateTime.Now; + while (true) + { + if (nextReadTime <= DateTime.Now) + { + Task.Run(() => + { + lstOrderForSupplierInfo.Clear(); + GetNewOrder(lstShopId, cancellationTokenSource); + }); + nextReadTime = DateTime.Now.AddMinutes(30); + } + Thread.Sleep(1000); + Invoke(new Action(() => { + var ticks = nextReadTime - DateTime.Now; + lblNextGetTime.Text = "距离下次读取剩余：" + ticks.Minutes + "分" + ticks.Seconds + "秒"; + })); + if (cancellationTokenSource?.IsCancellationRequested == true) + { + Invoke(new Action(() => + { + btnSearchOrder.Enabled = true; + lblNextGetTime.Text = "已停止"; + })); + break; + } + } + } + + void GetNewOrder(List lstShopId, CancellationTokenSource _cancellationTokenSource) + { + var lstShopIdTemp = new List(); + lstShopIdTemp.AddRange(lstShopId); + int i = 0; + foreach (var shopId in lstShopIdTemp) + { + this.Invoke(new Action(() => + { + this.statusBar.lblTaskStatus.Text = "正在查询..."; + this.statusBar.pgbTaskProgress.Maximum = lstShopIdTemp.Count; + this.statusBar.UpdateProgressBar(i + 1); + i++; + })); + + if (cancellationTokenSource.IsCancellationRequested) + break; + + ShopLoginInfo shop = null; + if (!IsClientJit) + { + shop = this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId); + } + else + { + shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); + } + if (shop == null) + continue; + + #region 检测登录 + if (shop.LoginStatus2 != "国际版在线") + { + continue; + } + if (!IsClientJit) + { + AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + } + else + { + ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); + } + if (shop.LoginStatus2 != "国际版在线") + { + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "店铺掉线"; + row.Cells["colLoginStatus"].Value = "未登录"; + row.Cells["colCanUse"].Value = false; + } + })); + continue; + } + #endregion + + Invoke(new Action(() => + { + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "正在查询"; + } + })); + + int page = 1; + int totalPage = 1; + int pageSize = 20; + bool isError = false; + string errorMsg = ""; + while (page <= totalPage) + { if (cancellationTokenSource.IsCancellationRequested) break; - ShopLoginInfo shop = null; - if (!IsClientJit) + Thread.Sleep(100 + Randomx.GetId(200)); + string jsonStr = GetShopStockList2(shop, page, pageSize); + if (!jsonStr.Contains("\"success\":true")) { - shop = this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId); - } - else - { - shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == shopId); - } - if (shop == null) - continue; - - #region 检测登录 - if (shop.LoginStatus2 != "国际版在线") - { - continue; - } - if (!IsClientJit) - { - AdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - } - else - { - ShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - } - if (shop.LoginStatus2 != "国际版在线") - { - Invoke(new Action(() => + isError = true; + var errMsg = BaseRegex.GetStringJson(ref jsonStr, "error_msg"); + if (string.IsNullOrEmpty(errMsg)) + errMsg = BaseRegex.GetStringJson(ref jsonStr, "errorMsg"); + if (string.IsNullOrEmpty(errMsg)) + errMsg = jsonStr; + if (!errorMsg.Contains(errMsg)) { - var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName); - foreach (var row in rows) - { - row.Cells["colMessage"].Value = "店铺掉线"; - row.Cells["colLoginStatus"].Value = "未登录"; - row.Cells["colCanUse"].Value = false; - } - })); - continue; - } - #endregion - - Invoke(new Action(() => - { - var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); - foreach (var row in rows) - { - row.Cells["colMessage"].Value = "正在查询"; + errorMsg += " " + errMsg; } - })); + } - int page = 1; - int totalPage = 1; - int pageSize = 20; - bool isError = false; - string errorMsg = ""; - while (page <= totalPage) + ConcurrentList subOrderInfoLst = new ConcurrentList(); + if (jsonStr.Contains("\"success\":true")) { - if (cancellationTokenSource.IsCancellationRequested) - break; - - Thread.Sleep(100 + Randomx.GetId(200)); - string jsonStr = GetShopStockList2(shop, page, pageSize); - if (!jsonStr.Contains("\"success\":true")) + var jArr = new JArray(); + try { - isError = true; - var errMsg = BaseRegex.GetStringJson(ref jsonStr, "error_msg"); - if (string.IsNullOrEmpty(errMsg)) - errMsg = BaseRegex.GetStringJson(ref jsonStr, "errorMsg"); - if (string.IsNullOrEmpty(errMsg)) - errMsg = jsonStr; - if (!errorMsg.Contains(errMsg)) - { - errorMsg += " " + errMsg; - } + var jObj = JObject.Parse(jsonStr); + jArr = jObj["result"]?["subOrderForSupplierList"] as JArray; + if (jArr == null) + jArr = new JArray(); + + var list = JsonHelper.DeserializeJsonToList(jArr.ToString()); + list = list.Where(s => !lstTemuDBOrderInfo.Any(o => o.subPurchaseOrderSn == s.subPurchaseOrderSn)).ToList(); + subOrderInfoLst.AddRange(list); } - - ConcurrentList subOrderInfoLst = new ConcurrentList(); - if (jsonStr.Contains("\"success\":true")) - { - var jArr = new JArray(); - try + catch (Exception ex) + { + //BaseMsgForm.ShowError(ex.Message); + Invoke(new Action(() => { - var jObj = JObject.Parse(jsonStr); - jArr = jObj["result"]?["subOrderForSupplierList"] as JArray; - if (jArr == null) - jArr = new JArray(); - - var list = JsonHelper.DeserializeJsonToList(jArr.ToString()); - list = list.Where(s => !lstTemuDBOrderInfo.Any(o => o.subPurchaseOrderSn == s.subPurchaseOrderSn)).ToList(); - subOrderInfoLst.AddRange(list); - } - catch (Exception ex) { BaseMsgForm.ShowError(ex.Message); } - - List upProdList = new List(); - if (subOrderInfoLst.Count > 0) - { - var spuIdLst = subOrderInfoLst.Select(o => o.productId.ParseToString()).Distinct().ToList(); - // 获取产品数据库中的成本价格 - upProdList = AdminProductPriceCheckForm.GetUpSpuIdLst(spuIdLst); - } - - foreach (var subOrderInfo in subOrderInfoLst) - { - var upProd = upProdList.FirstOrDefault(p => p.draft_id == subOrderInfo.productId.ParseToLong()); - TemuDBOrderInfo dbOrderInfo = new TemuDBOrderInfo() + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colLoginName"].Value.ToString() == shop.LoginName); + foreach (var row in rows) { - add_time = DateTime.Now, - availableSaleDays = subOrderInfo.skuQuantityDetailList.FirstOrDefault().availableSaleDays, - barCodeMd5 = null, - category = subOrderInfo.category, - className = subOrderInfo.skuQuantityDetailList.FirstOrDefault().className, - costPrice = (upProd?.cost_price * 100m)?.ParseToInt(), - currencyType = subOrderInfo.skuQuantityDetailList.FirstOrDefault().currencyType, - deliverQuantity = subOrderInfo.skuQuantityDetailList.FirstOrDefault().deliverQuantity.ParseToInt(), - deliverTime = subOrderInfo.deliverInfo.deliverTime, - deliveryFee = (upProd?.delivery_fee * 100m)?.ParseToInt(), - deliveryOrderSn = subOrderInfo.deliverInfo.deliveryOrderSn, - expectLatestArrivalTimeOrDefault = subOrderInfo.deliverInfo.expectLatestArrivalTimeOrDefault.ParseToLong(), - expectLatestDeliverTimeOrDefault = subOrderInfo.deliverInfo.expectLatestDeliverTimeOrDefault.ParseToLong(), - extCode = subOrderInfo.skuQuantityDetailList.FirstOrDefault().extCode, - id = null, - jiaTongCode = null, - markFee = (upProd?.mark_fee * 100m)?.ParseToInt(), - mdy_time = DateTime.Now, - notes = null, - originalPurchaseOrderSn = subOrderInfo.originalPurchaseOrderSn, - productId = subOrderInfo.productId.ParseToString(), - productName = subOrderInfo.productName, - productSkcId = subOrderInfo.productSkcId.ParseToString(), - productSkcPicture = subOrderInfo.productSkcPicture, - productSkuId = subOrderInfo.skuQuantityDetailList.FirstOrDefault().productSkuId.ParseToString(), - productSn = subOrderInfo.productSn, - purchaseQuantity = subOrderInfo.skuQuantityDetailList.FirstOrDefault().purchaseQuantity.ParseToInt(), - purchaseTime = subOrderInfo.purchaseTime.ParseToLong(), - qcResult = subOrderInfo.skuQuantityDetailList.FirstOrDefault().qcResult, - realReceiveAuthenticQuantity = subOrderInfo.skuQuantityDetailList.FirstOrDefault().realReceiveAuthenticQuantity.ParseToInt(), - receiveTime = subOrderInfo.deliverInfo.receiveTime, - receiveWarehouseId = subOrderInfo.deliverInfo.receiveWarehouseId.ParseToString(), - receiveWarehouseName = subOrderInfo.deliverInfo.receiveWarehouseName, - shippingMarkMd5 = null, - status = subOrderInfo.status.ParseToInt(), - subPurchaseOrderSn = subOrderInfo.subPurchaseOrderSn, - supplierId = subOrderInfo.supplierId.ParseToString(), - supplierName = subOrderInfo.supplierName, - supplierPrice = subOrderInfo.skuQuantityDetailList.FirstOrDefault().supplierPrice.ParseToInt(), - thumbUrlList = subOrderInfo.skuQuantityDetailList.FirstOrDefault().thumbUrlList.FirstOrDefault(), - upLoadStatus = 0, - upProductId = upProd?.draft_id.ParseToString(), - warehouseGroupId = subOrderInfo.warehouseGroupId.ParseToString(), - }; - lstOrderForSupplierInfo.Add(subOrderInfo); - lstTemuDBOrderInfo.Add(dbOrderInfo); - - - var url = BaseClass.BuildObjString("order/add_order"); - var data = UserLogin.GetSignaturex() + - //"&page=" + page + - //"&page_size=" + pageSize + - "&shop_id=" + dbOrderInfo.supplierId + - "&order_data=" + HttpUtility.UrlEncode(JsonHelper.SerializeObject(dbOrderInfo), Encoding.UTF8); - //if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked) - // data += "&operate_sub_sa_name=" + BaseClass.UserName; - 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")) - { - + row.Cells["colMessage"].Value = "读取错误" + ex.Message; + row.Cells["colCanUse"].Value = false; } + })); + } + + List upProdList = new List(); + if (subOrderInfoLst.Count > 0) + { + var spuIdLst = subOrderInfoLst.Select(o => o.productId.ParseToString()).Distinct().ToList(); + // 获取产品数据库中的成本价格 + upProdList = AdminProductPriceCheckForm.GetUpSpuIdLst(spuIdLst); + } + + foreach (var subOrderInfo in subOrderInfoLst) + { + var upProd = upProdList.FirstOrDefault(p => p.draft_id == subOrderInfo.productId.ParseToLong()); + TemuDBOrderInfo dbOrderInfo = new TemuDBOrderInfo() + { + add_time = DateTime.Now, + availableSaleDays = subOrderInfo.skuQuantityDetailList.FirstOrDefault().availableSaleDays, + barCodeMd5 = null, + category = subOrderInfo.category, + className = subOrderInfo.skuQuantityDetailList.FirstOrDefault().className, + costPrice = (upProd?.cost_price * 100m)?.ParseToInt(), + currencyType = subOrderInfo.skuQuantityDetailList.FirstOrDefault().currencyType, + deliverQuantity = subOrderInfo.skuQuantityDetailList.FirstOrDefault().deliverQuantity.ParseToInt(), + deliverTime = subOrderInfo.deliverInfo.deliverTime, + deliveryFee = (upProd?.delivery_fee * 100m)?.ParseToInt(), + deliveryOrderSn = subOrderInfo.deliverInfo.deliveryOrderSn, + expectLatestArrivalTimeOrDefault = subOrderInfo.deliverInfo.expectLatestArrivalTimeOrDefault.ParseToLong(), + expectLatestDeliverTimeOrDefault = subOrderInfo.deliverInfo.expectLatestDeliverTimeOrDefault.ParseToLong(), + extCode = subOrderInfo.skuQuantityDetailList.FirstOrDefault().extCode, + id = null, + jiaTongCode = null, + markFee = (upProd?.mark_fee * 100m)?.ParseToInt(), + mdy_time = DateTime.Now, + notes = null, + originalPurchaseOrderSn = subOrderInfo.originalPurchaseOrderSn, + productId = subOrderInfo.productId.ParseToString(), + productName = subOrderInfo.productName, + productSkcId = subOrderInfo.productSkcId.ParseToString(), + productSkcPicture = subOrderInfo.productSkcPicture, + productSkuId = subOrderInfo.skuQuantityDetailList.FirstOrDefault().productSkuId.ParseToString(), + productSn = subOrderInfo.productSn, + purchaseQuantity = subOrderInfo.skuQuantityDetailList.FirstOrDefault().purchaseQuantity.ParseToInt(), + purchaseTime = subOrderInfo.purchaseTime.ParseToLong(), + qcResult = subOrderInfo.skuQuantityDetailList.FirstOrDefault().qcResult, + realReceiveAuthenticQuantity = subOrderInfo.skuQuantityDetailList.FirstOrDefault().realReceiveAuthenticQuantity.ParseToInt(), + receiveTime = subOrderInfo.deliverInfo.receiveTime, + receiveWarehouseId = subOrderInfo.deliverInfo.receiveWarehouseId.ParseToString(), + receiveWarehouseName = subOrderInfo.deliverInfo.receiveWarehouseName, + shippingMarkMd5 = null, + status = subOrderInfo.status.ParseToInt(), + subPurchaseOrderSn = subOrderInfo.subPurchaseOrderSn, + supplierId = subOrderInfo.supplierId.ParseToString(), + supplierName = subOrderInfo.supplierName, + supplierPrice = subOrderInfo.skuQuantityDetailList.FirstOrDefault().supplierPrice.ParseToInt(), + thumbUrlList = subOrderInfo.skuQuantityDetailList.FirstOrDefault().thumbUrlList.FirstOrDefault(), + upLoadStatus = 0, + upProductId = upProd?.draft_id.ParseToString(), + warehouseGroupId = subOrderInfo.warehouseGroupId.ParseToString(), + }; + lstOrderForSupplierInfo.Add(subOrderInfo); + lstTemuDBOrderInfo.Add(dbOrderInfo); - Invoke(new Action(() => + var url = BaseClass.BuildObjString("order/add_order"); + var data = UserLogin.GetSignaturex() + + //"&page=" + page + + //"&page_size=" + pageSize + + "&shop_id=" + dbOrderInfo.supplierId + + "&order_data=" + HttpUtility.UrlEncode(JsonHelper.SerializeObject(dbOrderInfo), Encoding.UTF8); + //if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked) + // data += "&operate_sub_sa_name=" + BaseClass.UserName; + 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")) + { + + + + } + + + Invoke(new Action(() => + { + int rowId = 0; + var rows = this.dgvStock.Rows.Cast(); + foreach (var r in rows) { - int rowId = 0; - var rows = this.dgvStock.Rows.Cast(); - foreach (var r in rows) + if (r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId && r.Cells["colCreateTime"].Value.ParseToLong() <= dbOrderInfo.purchaseTime) { - if (r.Cells["colSupplierId"].Value.ParseToString() == shop.ShopId && r.Cells["colCreateTime"].Value.ParseToLong() <= dbOrderInfo.purchaseTime) - { - rowId = r.Index; - break; - } + rowId = r.Index; + break; } - this.dgvStock.Rows.Insert(rowId, - false, - "", - dbOrderInfo.supplierId, - dbOrderInfo.supplierName, - dbOrderInfo.supplierId + "\r\n" + dbOrderInfo.supplierName, - - dbOrderInfo.subPurchaseOrderSn, - dbOrderInfo.subPurchaseOrderSn + - "\r\n需 " + BaseClass.StampToDateTime((dbOrderInfo.expectLatestDeliverTimeOrDefault / 1000).ParseToInt()).ToString("MM-dd HH:mm:ss") + " 前发货" + - "\r\n需 " + BaseClass.StampToDateTime((dbOrderInfo.expectLatestArrivalTimeOrDefault / 1000).ParseToInt()).ToString("MM-dd HH:mm:ss") + " 前到货", - - dbOrderInfo.productSkcPicture.Replace("https", "http").Replace("img.kwcdn.com", "img.cdnfe.com") + "?imageMogr2/thumbnail/54x54"", - DataGridViewExtension.defaultBitmap, - - dbOrderInfo.originalPurchaseOrderSn, - dbOrderInfo.productId, - dbOrderInfo.upProductId, - dbOrderInfo.productSkcId, - dbOrderInfo.productName, - dbOrderInfo.productSn, - "备货母单号: " + dbOrderInfo.originalPurchaseOrderSn + "\r\n" - + "SKC: " + dbOrderInfo.productSkcId + "\r\n" - + "货号: " + dbOrderInfo.productSn + "\r\n" - + getLength2312Str(dbOrderInfo.productName, 50), - - - dbOrderInfo.productSkcPicture.Replace("https", "http").Replace("img.kwcdn.com", "img.cdnfe.com") + "?imageMogr2/thumbnail/54x54"", - DataGridViewExtension.defaultBitmap, - dbOrderInfo.className + "\r\nSKU ID: " + dbOrderInfo.productSkuId, - - "成本价:" + (dbOrderInfo.costPrice / 100m) + "\r\n车队费:" + (dbOrderInfo.deliveryFee / 100m) + "\r\n贴单费:" + (dbOrderInfo.markFee / 100m), - - dbOrderInfo.supplierPrice / 100m, - dbOrderInfo.purchaseQuantity, - BaseClass.StampToDateTime((dbOrderInfo.purchaseTime / 1000).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss") - ); - - var row = dgvStock.Rows[rowId]; - row.Height = 120; - - if (dbOrderInfo.originalPurchaseOrderSn != indexOrderSn) - { - indexId++; - indexOrderSn = dbOrderInfo.originalPurchaseOrderSn; - } - else - { - row.Cells["colProdInfo"].Value = ""; - row.Cells["colProductSkcPic"].Value = this.defaultBitmap; - } - if (indexId % 2 == 1) - row.DefaultCellStyle.BackColor = Color.White; - else - row.DefaultCellStyle.BackColor = Color.FromArgb(235, 235, 235); - })); - } - - int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt(); - totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt(); + } + InsertRow(rowId, dbOrderInfo); + })); } - page++; + + int total = BaseRegex.GetStringJson(ref jsonStr, "total").ParseToInt(); + totalPage = Math.Ceiling(1.0m * total / pageSize).ParseToInt(); } - - Invoke(new Action(() => - { - var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); - - if (!isError) - { - foreach (var row in rows) - { - row.Cells["colMessage"].Value = "已查询"; - } - } - else - { - foreach (var row in rows) - { - row.Cells["colMessage"].Value = "查询失败" + errorMsg; - } - } - })); + page++; } + Invoke(new Action(() => { - string sRst = "查询结束！"; - if (cancellationTokenSource.IsCancellationRequested) - sRst = "已取消查询！"; + var rows = this.dgvShop.Rows.Cast().Where(r => r.Cells["colShopId"].Value.ToString() == shop.ShopId); - BaseMsgForm.ShowInfo(sRst); - this.statusBar.lblTaskStatus.Text = sRst; + if (!isError) + { + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "已查询"; + } + } + else + { + foreach (var row in rows) + { + row.Cells["colMessage"].Value = "查询失败" + errorMsg; + } + } })); - }, cancellationTokenSource.Token); + } + Invoke(new Action(() => + { + string sRst = "查询结束！"; + if (cancellationTokenSource.IsCancellationRequested) + sRst = "已取消查询！"; + + //BaseMsgForm.ShowInfo(sRst); + this.statusBar.lblTaskStatus.Text = sRst; + })); + } + + ConcurrentList MergeInfoCells = new ConcurrentList(); + ConcurrentList MergeImgCells = new ConcurrentList(); + void InsertRow(int rowId, TemuDBOrderInfo dbOrderInfo) + { + this.dgvStock.Rows.Insert(rowId, + false, + "", + dbOrderInfo.supplierId, + dbOrderInfo.supplierName, + dbOrderInfo.supplierId + "\r\n" + dbOrderInfo.supplierName, + + dbOrderInfo.subPurchaseOrderSn, + dbOrderInfo.subPurchaseOrderSn + + "\r\n需 " + BaseClass.StampToDateTime((dbOrderInfo.expectLatestDeliverTimeOrDefault / 1000).ParseToInt()).ToString("MM-dd HH:mm:ss") + " 前发货" + + "\r\n需 " + BaseClass.StampToDateTime((dbOrderInfo.expectLatestArrivalTimeOrDefault / 1000).ParseToInt()).ToString("MM-dd HH:mm:ss") + " 前到货", + + dbOrderInfo.productSkcPicture.Replace("https", "http").Replace("img.kwcdn.com", "img.cdnfe.com") + "?imageMogr2/thumbnail/54x54"", + DataGridViewExtension.defaultBitmap, + + dbOrderInfo.originalPurchaseOrderSn, + dbOrderInfo.productId, + dbOrderInfo.upProductId, + dbOrderInfo.productSkcId, + dbOrderInfo.productName, + dbOrderInfo.productSn, + "备货母单号: " + dbOrderInfo.originalPurchaseOrderSn + "\r\n" + + "SKC: " + dbOrderInfo.productSkcId + "\r\n" + + "货号: " + dbOrderInfo.productSn + "\r\n" + + getLength2312Str(dbOrderInfo.productName, 50), + + + dbOrderInfo.thumbUrlList.Replace("https", "http").Replace("img.kwcdn.com", "img.cdnfe.com") + "?imageMogr2/thumbnail/54x54"", + DataGridViewExtension.defaultBitmap, + dbOrderInfo.className + "\r\nSKU ID: " + dbOrderInfo.productSkuId, + + "成本价:" + (dbOrderInfo.costPrice / 100m) + "\r\n车队费:" + (dbOrderInfo.deliveryFee / 100m) + "\r\n贴单费:" + (dbOrderInfo.markFee / 100m), + + dbOrderInfo.supplierPrice / 100m, + dbOrderInfo.purchaseQuantity, // 备货件数 + BaseClass.StampToDateTime((dbOrderInfo.purchaseTime / 1000).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"), // 备货单创建时间 + "", + "" + ); + + var row = dgvStock.Rows[rowId]; + row.Height = 120; + + SetRowLinkCellText(dbOrderInfo, row); + + if (dbOrderInfo.originalPurchaseOrderSn != indexOrderSn) + { + indexId++; + indexOrderSn = dbOrderInfo.originalPurchaseOrderSn; + if (MergeInfoCells.Count > 1) + { + ConcurrentList cells = new ConcurrentList(); + cells.AddRange(MergeInfoCells); + dgvStock.AddVerticalMergeCell(cells); + } + if (MergeImgCells.Count > 1) + { + ConcurrentList cells = new ConcurrentList(); + cells.AddRange(MergeImgCells); + dgvStock.AddVerticalMergeCell(cells); + } + MergeInfoCells.Clear(); + MergeImgCells.Clear(); + MergeInfoCells.Insert(0, dgvStock.Rows[rowId].Cells["colProdInfo"]); + MergeImgCells.Insert(0, dgvStock.Rows[rowId].Cells["colProductSkcPic"]); + } + else + { + MergeInfoCells.Insert(0, dgvStock.Rows[rowId].Cells["colProdInfo"]); + MergeImgCells.Insert(0, dgvStock.Rows[rowId].Cells["colProductSkcPic"]); + if (dgvStock.Rows.Count > rowId + 1) + { + //dgvStock.Rows[rowId + 1].Cells["colProdInfo"].Value = ""; + dgvStock.Rows[rowId + 1].Cells["colProductSkcPic"].Value = this.defaultBitmap; + } + } + if (indexId % 2 == 1) + row.DefaultCellStyle.BackColor = Color.White; + else + row.DefaultCellStyle.BackColor = Color.FromArgb(235, 235, 235); + + FilterRow(row); + } + + void SetRowLinkCellText(TemuDBOrderInfo dbOrderInfo, DataGridViewRow row) + { + string upLoadCodeText = ""; + //if (dbOrderInfo.upLoadStatus < 2) + { + upLoadCodeText = "上传"; + if (!string.IsNullOrWhiteSpace(dbOrderInfo.jiaTongCode) && !string.IsNullOrWhiteSpace(dbOrderInfo.barCodeMd5) && + !string.IsNullOrWhiteSpace(dbOrderInfo.shippingMarkMd5)) + { + upLoadCodeText = "修改上传"; + } + } + if (!IsClientJit) + { + upLoadCodeText = "查看"; + } + string upLoadOrderText = ""; + if (dbOrderInfo.upLoadStatus < 2 && upLoadCodeText == "修改上传") + { + upLoadOrderText = "上传订单"; + } + if (dbOrderInfo.upLoadStatus >= 2) + { + upLoadOrderText = "已上传"; + } + row.Cells["colUploadCode"].Value = upLoadCodeText; + row.Cells["colUploadOrder"].Value = upLoadOrderText; } void loadServerDbOrder() { - Task.Run(() => { - - foreach(var shop in GlobalConfig.ShopLoginList) + Task.Run(() => + { + var shops = GlobalConfig.ShopLoginList; + if (!IsClientJit) { - if(shop.jit_expire_time >= DateTime.Now.Date) + var lstShopId = dgvShop.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); + if (lstShopId.Count == 0) + { + Invoke(new Action(() => + { + BaseMsgForm.ShowInfo("请选择店铺！"); + })); + return; + } + lstTemuDBOrderInfo.Clear(); + Invoke(new Action(() => + { + dgvStock.Rows.Clear(); + })); + shops.Clear(); + foreach (var shopId in lstShopId) + { + shops.Add(this.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == shopId)); + } + } + for (int i = shops.Count - 1; i >= 0; i--) + { + var shop = shops[i]; + if (shop.jit_expire_time >= DateTime.Now.Date) { int page = 0; int totalPage = 1; int pageSize = 50; - while(page < totalPage) + while (page < totalPage) { page++; var url = BaseClass.BuildObjString("order/get_order_list"); @@ -747,6 +974,8 @@ namespace TemuKJD.KJDForms.JITForms //"&page_size=" + pageSize + "&shop_id=" + shop.ShopId + "&page=" + page; + if (!IsClientJit) + data += "&upload_order_status=2"; //if (BaseClass.SaLevel > 1 && !chkSearchAllShop.Checked) // data += "&operate_sub_sa_name=" + BaseClass.UserName; var html = GetHtml.PostUtf8(url, data); @@ -767,61 +996,8 @@ namespace TemuKJD.KJDForms.JITForms Invoke(new Action(() => { int rowId = 0; - this.dgvStock.Rows.Insert(rowId, - false, - "", - dbOrderInfo.supplierId, - dbOrderInfo.supplierName, - dbOrderInfo.supplierId + "\r\n" + dbOrderInfo.supplierName, + InsertRow(rowId, dbOrderInfo); - dbOrderInfo.subPurchaseOrderSn, - dbOrderInfo.subPurchaseOrderSn + - "\r\n需 " + BaseClass.StampToDateTime((dbOrderInfo.expectLatestDeliverTimeOrDefault / 1000).ParseToInt()).ToString("MM-dd HH:mm:ss") + " 前发货" + - "\r\n需 " + BaseClass.StampToDateTime((dbOrderInfo.expectLatestArrivalTimeOrDefault / 1000).ParseToInt()).ToString("MM-dd HH:mm:ss") + " 前到货", - - dbOrderInfo.productSkcPicture.Replace("https", "http").Replace("img.kwcdn.com", "img.cdnfe.com") + "?imageMogr2/thumbnail/54x54"", - DataGridViewExtension.defaultBitmap, - - dbOrderInfo.originalPurchaseOrderSn, - dbOrderInfo.productId, - dbOrderInfo.upProductId, - dbOrderInfo.productSkcId, - dbOrderInfo.productName, - dbOrderInfo.productSn, - "备货母单号: " + dbOrderInfo.originalPurchaseOrderSn + "\r\n" - + "SKC: " + dbOrderInfo.productSkcId + "\r\n" - + "货号: " + dbOrderInfo.productSn + "\r\n" - + getLength2312Str(dbOrderInfo.productName, 50), - - - dbOrderInfo.productSkcPicture.Replace("https", "http").Replace("img.kwcdn.com", "img.cdnfe.com") + "?imageMogr2/thumbnail/54x54"", - DataGridViewExtension.defaultBitmap, - dbOrderInfo.className + "\r\nSKU ID: " + dbOrderInfo.productSkuId, - - "成本价:" + (dbOrderInfo.costPrice / 100m) + "\r\n车队费:" + (dbOrderInfo.deliveryFee / 100m) + "\r\n贴单费:" + (dbOrderInfo.markFee / 100m), - - dbOrderInfo.supplierPrice / 100m, - dbOrderInfo.purchaseQuantity, - BaseClass.StampToDateTime((dbOrderInfo.purchaseTime / 1000).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss") - ); - - var row = dgvStock.Rows[rowId]; - row.Height = 120; - - if (dbOrderInfo.originalPurchaseOrderSn != indexOrderSn) - { - indexId++; - indexOrderSn = dbOrderInfo.originalPurchaseOrderSn; - } - else if (dgvStock.Rows.Count > rowId + 1) - { - dgvStock.Rows[rowId + 1].Cells["colProdInfo"].Value = ""; - dgvStock.Rows[rowId + 1].Cells["colProductSkcPic"].Value = this.defaultBitmap; - } - if (indexId % 2 == 1) - row.DefaultCellStyle.BackColor = Color.White; - else - row.DefaultCellStyle.BackColor = Color.FromArgb(235, 235, 235); })); } @@ -855,9 +1031,14 @@ namespace TemuKJD.KJDForms.JITForms RestoreSizeAndNumber(); } + /// + /// 因已出单商品无法再修改尺寸重量，暂时作废 + /// void RestoreSizeAndNumber() { - + // 因已出单商品无法再修改尺寸重量，暂时作废 + if (DateTime.Now > new DateTime(2025, 12, 1)) + return; //this.statusBar.lblTaskStatus.Text = "正在批量还原包装规格尺寸与SKU分类数量"; //this.pbLoading.Visible = true; Task.Run(() => @@ -1375,5 +1556,130 @@ namespace TemuKJD.KJDForms.JITForms { Thread.Sleep(sleepTime); } + + private void dgvStock_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvStock.Columns[e.ColumnIndex].HeaderText; + string shopId = dgvStock.Rows[e.RowIndex].Cells["colSupplierId"].Value.ParseToString(); + string prodId = dgvStock.Rows[e.RowIndex].Cells["colProductId"].Value.ParseToString(); + string subOrderId = dgvStock.Rows[e.RowIndex].Cells["colSubOrderSn"].Value.ParseToString(); // 备货单号 + + switch (headerText) + { + case "Skc图片111": + { + string url = dgvStock.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("img.kwcdn.com", "img.cdnfe.com").Split('?').FirstOrDefault(); + url = url.IndexOf("?") < 0 ? url : url.Substring(0, url.IndexOf("?")); + ShowImgForm imgFrom = new ShowImgForm(url); + imgFrom.ShowDialog(); + } + break; + case "上传条码/箱唛": + { + var dbOrder = this.lstTemuDBOrderInfo.FirstOrDefault(o => o.subPurchaseOrderSn == subOrderId); + var row = dgvStock.Rows[e.RowIndex]; + if (dbOrder == null) + { + BaseMsgForm.ShowError("订单不存在！"); + return; + } + JitOrderUploadFileForm uploadFileForm = new JitOrderUploadFileForm(dbOrder); + uploadFileForm.isClientJit = this.IsClientJit; + uploadFileForm.ShowDialog(); + SetRowLinkCellText(dbOrder, row); + } + break; + case "上传订单": + { + var dbOrder = this.lstTemuDBOrderInfo.FirstOrDefault(o => o.subPurchaseOrderSn == subOrderId); + var row = dgvStock.Rows[e.RowIndex]; + if (row.Cells["colUploadOrder"].Value.ParseToString() != "上传订单") + { + //BaseMsgForm.ShowError("订单状态不可上传！"); + return; + } + if (BaseMsgForm.ShowConfirm("确定上传？将扣除授权金！").DialogResult == DialogResult.OK) + { + decimal fee = (dbOrder.deliveryFee.ParseToDecimal() * 0.01m + dbOrder.markFee.ParseToDecimal() * 0.01m) * dbOrder.purchaseQuantity; + var url = BaseClass.BuildObjString("order/upload_order"); + var data = UserLogin.GetSignaturex(); + data += "&shop_id=" + dbOrder.supplierId; + data += "&subPurchaseOrderSn=" + dbOrder.subPurchaseOrderSn; + data += "&fee=" + fee; + 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")) + { + try + { + BaseClass.AuthorizedAmount -= fee; + this.lblAuthorizedAmount.Text = "剩余授权金:" + BaseClass.AuthorizedAmount; + + dbOrder.upLoadStatus = 2; + SetRowLinkCellText(dbOrder, row); + } + catch { } + } + else + { + var errMsg = BaseRegex.GetStringJson(ref html, "msg"); + BaseMsgForm.ShowError(errMsg); + } + } + } + break; + case "": + dgvStock.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvStock.Rows[e.RowIndex].Cells["colCheck"].Value; + break; + default: + break; + } + } + + private void btnFilter_Click(object sender, EventArgs e) + { + //if (IsClientJit) + { + foreach (DataGridViewRow row in dgvStock.Rows) + { + FilterRow(row); + } + } + //else + { + } + } + + void FilterRow(DataGridViewRow row) + { + if (row.Cells["colSubOrderSn"].Value.ParseToString().Contains(txtSubOrderSn.Text.Trim()) && + (row.Cells["colProductId"].Value.ParseToString().Contains(txtProductId.Text.Trim()) || row.Cells["colProdSkc"].Value.ParseToString().Contains(txtProductId.Text.Trim())) && + row.Cells["colProductSn"].Value.ParseToString().Contains(txtProductSn.Text.Trim())) + { + row.Visible = true; + } + else + { + row.Visible = false; + } + } + + private void ucGroupBoxEx1_Enter(object sender, EventArgs e) + { + + } + + private void btnRestore_Click(object sender, EventArgs e) + { + txtSubOrderSn.Text = txtProductSn.Text = txtProductId.Text = ""; + } + + private void btnGetDbOrder_Click(object sender, EventArgs e) + { + loadServerDbOrder(); + } } } diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs index 74cabd1..feab495 100644 --- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs +++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs @@ -139,7 +139,7 @@ namespace TemuKJD.KJDForms.ProductForms { var list = lstAdminShopInfo.Where(s => s.LoginStatus2 == "国际版在线").ToList(); 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) { if (list.Any(l => l.ShopId == row.Cells["colShopId"]?.Value?.ToString())) diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs index 2c832ed..4dfdd6a 100644 --- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs +++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductEditNotesForm.Designer.cs @@ -30,15 +30,15 @@ { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductEditNotesForm)); 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.btnOk = new DevComponents.DotNetBar.PanelEx(); this.txtCostPrice = new System.Windows.Forms.TextBox(); this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); this.txtGroup = new System.Windows.Forms.TextBox(); this.btnAuto = 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.txtEndWords = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); @@ -55,10 +55,10 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label8 = new System.Windows.Forms.Label(); 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.label12 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); @@ -101,6 +101,20 @@ this.panel2.Size = new System.Drawing.Size(464, 686); 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 // 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.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 // this.txtGroup.Location = new System.Drawing.Point(90, 313); @@ -232,15 +237,6 @@ this.pnlRestore.Text = "还原"; 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 // this.txtFissionWords.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -348,7 +344,7 @@ // label3 // 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.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 392; @@ -385,7 +381,7 @@ // label8 // 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.Size = new System.Drawing.Size(56, 17); this.label8.TabIndex = 386; @@ -414,20 +410,6 @@ this.txtNotes.Size = new System.Drawing.Size(337, 47); 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 // this.label11.AutoSize = true; @@ -446,6 +428,24 @@ this.label12.TabIndex = 479; 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 // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/TEMUKJD/Properties/Resources.Designer.cs b/TEMUKJD/Properties/Resources.Designer.cs index 0a7e0f9..d60d105 100644 --- a/TEMUKJD/Properties/Resources.Designer.cs +++ b/TEMUKJD/Properties/Resources.Designer.cs @@ -563,6 +563,16 @@ namespace TemuKJD.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap pdf { + get { + object obj = ResourceManager.GetObject("pdf", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/TEMUKJD/Properties/Resources.resx b/TEMUKJD/Properties/Resources.resx index 8bcc176..a8a5be4 100644 --- a/TEMUKJD/Properties/Resources.resx +++ b/TEMUKJD/Properties/Resources.resx @@ -259,6 +259,9 @@ ..\Resources\normal.hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\qrcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/TEMUKJD/Resources/pdf.png b/TEMUKJD/Resources/pdf.png new file mode 100644 index 0000000000000000000000000000000000000000..73b8de9354257b53befae22c6ef4492211a45806 GIT binary patch literal 28345 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 DB@{#V literal 0 HcmV?d00001 diff --git a/Work/Work.csproj b/Work/Work.csproj index abe1cbc..90e52d4 100644 --- a/Work/Work.csproj +++ b/Work/Work.csproj @@ -26,6 +26,7 @@ DEBUG;TRACE prompt 4 + Off pdbonly