1新代理商 2上货支持新外部采集数据 3标题裂变问题修复
This commit is contained in:
wule committed
1 parent
3a50a6783b
commit
b7241236ca
18 files changed
+363
-65
No files matched your search
@@ -31,7 +31,7 @@ namespace AllBase
|
||||
/// <summary>
|
||||
/// 版本ID
|
||||
/// </summary>
|
||||
public static int VersionCount = 1286;
|
||||
public static int VersionCount = 1288;
|
||||
public static string MainPath = "29wx";
|
||||
//public static string MainPath = "29wx";
|
||||
//public static string MainPath = "29pdd";
|
||||
|
||||
@@ -179,7 +179,7 @@ namespace AllBase.Model.DBModel
|
||||
/// </summary>
|
||||
public string supplier_remark_exception { get; set; }
|
||||
/// <summary>
|
||||
/// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正
|
||||
/// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正 3：礼物单发货失败
|
||||
/// </summary>
|
||||
public int? gift_order_status { get; set; }
|
||||
/// <summary>
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
@@ -0,0 +1 @@
|
||||
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 truncated
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
@@ -0,0 +1 @@
|
||||
悦次元网络科技MThd悦次元网络科技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 truncated
|
||||
@@ -0,0 +1,189 @@
|
||||
; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
|
||||
|
||||
; 安装程序初始定义常量
|
||||
!define PRODUCT_NAME "悦次元网络科技"
|
||||
!define PRODUCT_VERSION "v12.61"
|
||||
;!define PRODUCT_PUBLISHER "${PRODUCT_NAME}软件制作组"
|
||||
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29供应链.exe"
|
||||
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
|
||||
;!define PRODUCT_UNINST_ROOT_KEY "HKLM" ;需要管理员权限
|
||||
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
|
||||
!define UTILS_PATH ".\Utils"
|
||||
!define SOURCE_PATH "..\Bin.Oem"
|
||||
!define OUT_PUT_PATH ".\Bin"
|
||||
|
||||
SetCompressor lzma
|
||||
|
||||
; ------ MUI 现代界面定义 (1.67 版本以上兼容) ------
|
||||
!include "MUI.nsh"
|
||||
|
||||
; MUI 预定义常量
|
||||
!define MUI_ABORTWARNING
|
||||
!define MUI_ICON "${SOURCE_PATH}\favicon.ico"
|
||||
;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
|
||||
!define MUI_UNICON "${UTILS_PATH}\uninstall.ico"
|
||||
|
||||
; 语言选择窗口常量设置
|
||||
!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
|
||||
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
|
||||
!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
|
||||
|
||||
; 欢迎页面
|
||||
!insertmacro MUI_PAGE_WELCOME
|
||||
; 许可协议页面
|
||||
!define MUI_LICENSEPAGE_CHECKBOX
|
||||
!insertmacro MUI_PAGE_LICENSE "${UTILS_PATH}\Licence.txt"
|
||||
; 安装目录选择页面
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
; 安装过程页面
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
; 安装完成页面
|
||||
;!define MUI_FINISHPAGE_RUN "$INSTDIR\29供应链.exe" ;win10直接启动会双开，以下改为使用函数启动
|
||||
;!define MUI_FINISHPAGE_RUN "exe_file" ;指定要运行的可执行文件路径（如 $INSTDIR\MyApp.exe）。文件名含空格时无需加引号 。
|
||||
;!define MUI_FINISHPAGE_RUN_TEXT "text" ;设置复选框旁的显示文本（例如：“立即运行我的应用”）。
|
||||
;!define MUI_FINISHPAGE_RUN_PARAMETERS "params" ;传入运行参数。若参数含双引号，需用 \" 转义 。
|
||||
;!define MUI_FINISHPAGE_RUN_NOTCHECKED ;默认不选中该复选框（即默认不运行）。
|
||||
;!define MUI_FINISHPAGE_RUN_FUNCTION "func_name" ;替代直接运行 exe，改为调用自定义 NSIS 函数（此时 MUI_FINISHPAGE_RUN 可不带参数），适合需执行多步逻辑的场景 。
|
||||
;示例================================================================================================================
|
||||
;!include "MUI2.nsh"
|
||||
|
||||
;!define MUI_FINISHPAGE_RUN "$INSTDIR\MyApp.exe"
|
||||
;!define MUI_FINISHPAGE_RUN_TEXT "启动应用程序"
|
||||
;!define MUI_FINISHPAGE_RUN_PARAMETERS "/silent"
|
||||
;;!define MUI_FINISHPAGE_RUN_NOTCHECKED
|
||||
|
||||
;!insertmacro MUI_PAGE_FINISH
|
||||
;示例结束============================================================================================================
|
||||
|
||||
!define MUI_FINISHPAGE_RUN
|
||||
;安装函数定义
|
||||
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchExe"
|
||||
!insertmacro MUI_PAGE_FINISH
|
||||
|
||||
; 安装卸载过程页面
|
||||
!insertmacro MUI_UNPAGE_INSTFILES
|
||||
|
||||
; 安装界面包含的语言设置
|
||||
!insertmacro MUI_LANGUAGE "English"
|
||||
!insertmacro MUI_LANGUAGE "SimpChinese"
|
||||
|
||||
; 安装预释放文件
|
||||
!insertmacro MUI_RESERVEFILE_LANGDLL
|
||||
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
|
||||
; ------ MUI 现代界面定义结束 ------
|
||||
|
||||
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
|
||||
OutFile "${OUT_PUT_PATH}\${PRODUCT_NAME} ${PRODUCT_VERSION}.exe"
|
||||
InstallDir "$PROGRAMFILES\${PRODUCT_NAME}"
|
||||
;InstallDir "D:\${PRODUCT_NAME}"
|
||||
;InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"
|
||||
InstallDirRegKey HKCU "${PRODUCT_UNINST_KEY}" "UninstallString"
|
||||
ShowInstDetails show
|
||||
ShowUnInstDetails show
|
||||
BrandingText "${PRODUCT_NAME}安装程序"
|
||||
|
||||
Section "MainSection" SEC01
|
||||
SetOutPath "$INSTDIR"
|
||||
;SetOverwrite on|off|try|ifnewer ;强制覆盖|不覆盖|仅覆盖可写文件|仅覆盖旧文件
|
||||
SetOverwrite on
|
||||
;/x 排除的目录或文件
|
||||
;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29供应链.pdb" /x "data" "${SOURCE_PATH}\*.*"
|
||||
File /r /x "BaseClass.cs" /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" /x "29pdd.lnk" /x "29pdd.ico" "${SOURCE_PATH}\*.*"
|
||||
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
|
||||
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
|
||||
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\29供应链.exe" "" "$INSTDIR\favicon.ico"
|
||||
File "${SOURCE_PATH}\29供应链.exe"
|
||||
;SetOutPath "$TEMP"
|
||||
;File "${UTILS_PATH}\VC_redist_2015_2022.x64.exe"
|
||||
;ExecWait '$TEMP\vc_redist.x86.exe' # 一般(非静默)VC的安装
|
||||
;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install 静默安装
|
||||
SectionEnd
|
||||
|
||||
Section -AdditionalIcons
|
||||
SetOutPath $INSTDIR
|
||||
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk" "$INSTDIR\uninst.exe"
|
||||
SectionEnd
|
||||
|
||||
Section -Post
|
||||
WriteUninstaller "$INSTDIR\uninst.exe"
|
||||
;WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
|
||||
WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29供应链.exe"
|
||||
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
|
||||
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
|
||||
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29供应链.exe"
|
||||
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
|
||||
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_NAME}软件制作组"
|
||||
SectionEnd
|
||||
|
||||
#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--#
|
||||
|
||||
Function .onInit
|
||||
!insertmacro MUI_LANGDLL_DISPLAY
|
||||
FunctionEnd
|
||||
|
||||
;function要写字section之后
|
||||
Function LaunchExe
|
||||
;ExecShell "" "$INSTDIR\${PRODUCT_NAME}.exe"
|
||||
; 启动主程序，ExecWait 会等待程序启动后再继续（推荐用于确保启动成功）
|
||||
;ExecWait '"$INSTDIR\YourApp.exe"' // 等待也可以用来弹出必要组件安装时等待安装完成再继续运行安装程序。
|
||||
; 若希望安装程序立即关闭而不等待，可使用 Exec
|
||||
;Exec '"$INSTDIR\29供应链.exe"'
|
||||
Exec "$INSTDIR\29供应链.exe"
|
||||
; 以普通用户权限启动程序（即使安装包是管理员权限）
|
||||
;System::Call 'shell32::ShellExecute(i 0, t"open", t"explorer.exe", t"/e,$INSTDIR\start.bat", t"", i 0)'
|
||||
;Exec "$INSTDIR\start.bat"
|
||||
FunctionEnd
|
||||
|
||||
|
||||
/******************************
|
||||
* 以下是安装程序的卸载部分 *
|
||||
******************************/
|
||||
|
||||
Section Uninstall
|
||||
Delete "$INSTDIR\uninst.exe"
|
||||
Delete "$TEMP\vc_redist.x86.exe"
|
||||
Delete "$INSTDIR\29供应链.exe"
|
||||
|
||||
Delete "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall.lnk"
|
||||
Delete "$DESKTOP\${PRODUCT_NAME}.lnk"
|
||||
Delete "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk"
|
||||
|
||||
RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
|
||||
|
||||
RMDir /r "$INSTDIR\blob_storage"
|
||||
RMDir /r "$INSTDIR\Cache"
|
||||
RMDir /r "$INSTDIR\config"
|
||||
RMDir /r "$INSTDIR\data"
|
||||
RMDir /r "$INSTDIR\DawnCache"
|
||||
RMDir /r "$INSTDIR\GPUCache"
|
||||
RMDir /r "$INSTDIR\locales"
|
||||
RMDir /r "$INSTDIR\log"
|
||||
RMDir /r "$INSTDIR\ru-ru"
|
||||
RMDir /r "$INSTDIR\static"
|
||||
RMDir /r "$INSTDIR\taobao"
|
||||
RMDir /r "$INSTDIR\temp"
|
||||
RMDir /r "$INSTDIR\upBak"
|
||||
RMDir /r "$INSTDIR\upTemp"
|
||||
RMDir /r "$INSTDIR\x64"
|
||||
RMDir /r "$INSTDIR\x86"
|
||||
|
||||
RMDir /r "$INSTDIR"
|
||||
|
||||
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
|
||||
;DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
|
||||
DeleteRegKey HKCU "${PRODUCT_DIR_REGKEY}"
|
||||
SetAutoClose true
|
||||
SectionEnd
|
||||
|
||||
#-- 根据 NSIS 脚本编辑规则，所有 Function 区段必须放置在 Section 区段之后编写，以避免安装程序出现未可预知的问题。--#
|
||||
|
||||
Function un.onInit
|
||||
!insertmacro MUI_UNGETLANGUAGE
|
||||
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "您确实要完全移除 $(^Name) ，及其所有的组件？" IDYES +2
|
||||
Abort
|
||||
FunctionEnd
|
||||
|
||||
Function un.onUninstSuccess
|
||||
HideWindow
|
||||
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) 已成功地从您的计算机移除。"
|
||||
FunctionEnd
|
||||
@@ -711,7 +711,7 @@ namespace KJD_Web.BLL.BXX
|
||||
if (!string.IsNullOrEmpty(product_get_type))
|
||||
where += " and p.product_get_type in ('" + product_get_type.Replace(",", "','") + "')";
|
||||
else
|
||||
where += " and p.product_get_type in ('厂商直采','1688厂家','1688外部数据','微信小店','微信店采','母店采集','机会商品','以图搜品','多多外部数据')";
|
||||
where += " and p.product_get_type in ('厂商直采','1688厂家','1688外部数据','微信小店','微信店采','母店采集','机会商品','以图搜品','多多外部数据','微信外部数据')";
|
||||
if (!string.IsNullOrEmpty(wx_safe_status))
|
||||
where += " and p.wx_safe_status in ('" + wx_safe_status.Replace(",", "','") + "')";
|
||||
if (!string.IsNullOrEmpty(special_prod_type)/* && special_prod_type != "普通商品,爆款数据"*/)
|
||||
|
||||
@@ -50,7 +50,7 @@ namespace KJD_Web
|
||||
}
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
//[WebMethod]
|
||||
public void repair_miss_direct_order()
|
||||
{
|
||||
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||
@@ -59,13 +59,15 @@ namespace KJD_Web
|
||||
//var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE add_time > '2026-08-15 15:30' AND buy_type = '直发'";
|
||||
|
||||
//var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE add_time > '2026-08-13 15:30' AND add_time < '2026-08-15 15:30' And buy_type = '直发'";
|
||||
var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE add_time > '2026-08-10 15:30' AND add_time < '2026-08-12 15:30' And buy_type = '直发'";
|
||||
//var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE add_time > '2026-08-10 15:30' AND add_time < '2026-08-12 15:30' And buy_type = '直发'";
|
||||
//var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE add_time > '2026-08-08 15:30' AND add_time < '2026-08-10 15:30' And buy_type = '直发'";
|
||||
var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE add_time > '2026-7-15 15:30' AND add_time < '2026-08-15 15:30' And buy_type = '直发'";
|
||||
//var s = "SELECT order_id,out_order_id FROM `wxxd`.`order_item_ext` WHERE order_id in ('3738460213351447040') AND buy_type = '直发'";
|
||||
var dt1 = mySql.ExecuteDataTable(s);
|
||||
//out_order_no //out_express_no //out_shipped=0
|
||||
s = " Select order_id FROM erp.oms_wei_order WHERE order_id in ('" + string.Join("','", dt1.Rows.Cast<System.Data.DataRow>().Select(r => r["order_id"].ParseToLong()))+ "') " +
|
||||
" and out_order_no is null";
|
||||
dt1 = mySql.ExecuteDataTable(s);
|
||||
//s = " Select order_id FROM erp.oms_wei_order WHERE order_id in ('" + string.Join("','", dt1.Rows.Cast<System.Data.DataRow>().Select(r => r["order_id"].ParseToLong()))+ "') " +
|
||||
// " and out_order_no is null";
|
||||
//dt1 = mySql.ExecuteDataTable(s);
|
||||
|
||||
mySql.Close();
|
||||
|
||||
@@ -104,6 +106,19 @@ namespace KJD_Web
|
||||
};
|
||||
buyerOrderList.Add(order);
|
||||
}
|
||||
|
||||
foreach (var bo in buyerOrderList.ToList())
|
||||
{
|
||||
var buyerOrders = buyerOrderList.Where(r => r.wx_order_id == bo.wx_order_id).ToList();
|
||||
if (buyerOrders.Count > 1)
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
buyerOrderList.Remove(buyerOrders.FirstOrDefault());
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -111,7 +126,17 @@ namespace KJD_Web
|
||||
}
|
||||
string err = "";
|
||||
|
||||
buyerOrderList = buyerOrderList.OrderBy(b => b.add_time).ToList();
|
||||
buyerOrderList = buyerOrderList.OrderByDescending(b => b.add_time).ToList();
|
||||
|
||||
var buyerOrderListTmp = new List<Model.WxModel.order_pdd_buyer_order>();
|
||||
foreach(var od in buyerOrderList)
|
||||
{
|
||||
if (buyerOrderListTmp.Any(o => o.wx_order_id == od.wx_order_id))
|
||||
continue;
|
||||
buyerOrderListTmp.Add(od);
|
||||
}
|
||||
buyerOrderList = buyerOrderListTmp;
|
||||
|
||||
//46
|
||||
foreach (var pddOrder in buyerOrderList)
|
||||
{
|
||||
@@ -119,11 +144,16 @@ namespace KJD_Web
|
||||
// continue;
|
||||
|
||||
bool isSend = false;
|
||||
var pddOrderSn = "";
|
||||
|
||||
mySql = new MysqlUtils(conn);
|
||||
string sqlStr;
|
||||
sqlStr = " Select out_order_no FROM erp.oms_wei_order WHERE order_id in ('" + pddOrder.wx_order_id + "')";
|
||||
pddOrderSn = mySql.ExecuteFirst(sqlStr);
|
||||
|
||||
if (!pddOrder.outExpressCompanyCode.IsNullOrEmpty() && !pddOrder.tracking_number.IsNullOrEmpty())
|
||||
{
|
||||
mySql = new MysqlUtils(conn);
|
||||
var sqlStr = " Select status FROM erp.oms_wei_order WHERE order_id in ('" + pddOrder.wx_order_id + "')";
|
||||
sqlStr = " Select status FROM erp.oms_wei_order WHERE order_id in ('" + pddOrder.wx_order_id + "')";
|
||||
var status = mySql.ExecuteFirstInt(sqlStr);
|
||||
if (status > 20)
|
||||
{
|
||||
@@ -132,16 +162,19 @@ namespace KJD_Web
|
||||
// "' WHERE order_id = '" + pddOrder.wx_order_id + "'";
|
||||
}
|
||||
|
||||
|
||||
sqlStr = "update `erp`.`oms_wei_order` set out_express_company='" + pddOrder.outExpressCompanyCode + "',out_express_no='" + pddOrder.tracking_number +
|
||||
"' WHERE order_id = '" + pddOrder.wx_order_id + "'";
|
||||
var rows = mySql.ExecuteAffectedRows(sqlStr);
|
||||
}
|
||||
mySql.Close();
|
||||
if (!mySql.Message.IsNullOrEmpty())
|
||||
continue;
|
||||
|
||||
if (pddOrderSn == pddOrder.order_sn)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
mySql.Close();
|
||||
if (!mySql.Message.IsNullOrEmpty())
|
||||
continue;
|
||||
}
|
||||
|
||||
Newtonsoft.Json.Linq.JObject obj = new Newtonsoft.Json.Linq.JObject();
|
||||
obj["platform"] = "WEISHOP";
|
||||
@@ -171,6 +204,69 @@ namespace KJD_Web
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//[WebMethod]
|
||||
public void repair_miss_order_software_remark()
|
||||
{
|
||||
string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
|
||||
MysqlUtils mySql = new MysqlUtils(conn);
|
||||
|
||||
//var s1 = "SELECT order_id,soft_remark FROM `erp`.`oms_wei_order_bak_2608151610` WHERE create_time > '2026-7-15 15:30' AND create_time < '2026-08-15 15:30' and soft_remark is not null";
|
||||
var startTime = TimeUtils.DateTimeToTimestampSeconds("2026-6-25 16:10".ParseToDateTime()).ToString();
|
||||
var EndTime = TimeUtils.DateTimeToTimestampSeconds("2026-7-1 16:10".ParseToDateTime()).ToString();
|
||||
var s1 = "SELECT order_id,soft_remark FROM `erp`.`oms_wei_order_bak_2608151612` WHERE create_time > " + startTime + " AND create_time < " + EndTime + " and soft_remark is not null";
|
||||
var dt = mySql.ExecuteDataTable(s1);
|
||||
|
||||
mySql.Close();
|
||||
|
||||
string err = "";
|
||||
if (dt != null)
|
||||
{
|
||||
int id = 0;
|
||||
int cnt = 0;
|
||||
|
||||
var orderStr = "'" + string.Join("','", dt.Rows.Cast<System.Data.DataRow>().Select(rw => rw["order_id"].ParseToString())) + "'";
|
||||
var orderStr2 = "'" + string.Join("','", dt.Rows.Cast<System.Data.DataRow>().Select(rw => rw["order_id"].ParseToString() + "|" + rw["soft_remark"].ParseToString())) + "'";
|
||||
|
||||
foreach (System.Data.DataRow row in dt.Rows)
|
||||
{
|
||||
id++;
|
||||
var orderId = row["order_id"].ParseToString();
|
||||
var softwareRemark = row["soft_remark"].ParseToString();
|
||||
try
|
||||
{
|
||||
|
||||
mySql = new MysqlUtils(conn);
|
||||
string sqlStr;
|
||||
sqlStr = "SELECT soft_remark FROM `erp`.`oms_wei_order` WHERE order_id='" + orderId + "'";
|
||||
var remark = mySql.ExecuteFirst(sqlStr);
|
||||
if (remark.IsNullOrEmpty() && !string.IsNullOrEmpty(softwareRemark))
|
||||
{
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
mySql.Close();
|
||||
continue;
|
||||
}
|
||||
|
||||
sqlStr = " UPDATE erp.oms_wei_order set soft_remark='" + softwareRemark + "' WHERE order_id='" + orderId + "' AND (soft_remark IS NULL or soft_remark='')";
|
||||
var rows = mySql.ExecuteAffectedRows(sqlStr);
|
||||
cnt += rows;
|
||||
if (!mySql.Message.IsNullOrEmpty())
|
||||
{
|
||||
err += "\r\n" + orderId + " " + softwareRemark + " " + mySql.Message;
|
||||
}
|
||||
mySql.Close();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
err += "\r\n" + orderId + " " + softwareRemark + " " + mySql.Message;
|
||||
}
|
||||
}
|
||||
} //30 //59 //6 //5 //1 //1 //1
|
||||
}
|
||||
|
||||
[WebMethod]
|
||||
public void get_erp_order_list()
|
||||
{
|
||||
|
||||
@@ -837,7 +837,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
if (!string.IsNullOrWhiteSpace(product_get_type))
|
||||
{
|
||||
data += "&product_get_type=" + product_get_type.Replace("已采集数据", "1688外部数据")
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据");
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采,微信外部数据");
|
||||
}
|
||||
if (!string.IsNullOrWhiteSpace(group_add_user_name))
|
||||
data += "&add_user_name=" + group_add_user_name;
|
||||
@@ -1456,8 +1456,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
string productTitle = "";
|
||||
|
||||
if (dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "1688厂家" || dbProd.product_get_type_text == "1688外部数据" ||
|
||||
dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采" || dbProd.product_get_type_text == "机会商品" ||
|
||||
dbProd.product_get_type_text == "多多外部数据")
|
||||
dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采" || dbProd.product_get_type_text == "机会商品" ||
|
||||
dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据")
|
||||
{
|
||||
if ((dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采") && dbProd.wx_cat_leaf != null)
|
||||
{
|
||||
@@ -1537,7 +1537,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
mainImgLst3 = pInfo.detail.galleries.Where(g => g.type == 1).Take(3).Select(s => s.url).ToList();
|
||||
productTitle = pInfo.detail.goods_name;
|
||||
}
|
||||
if (dbProd.product_get_type_text == "机会商品" || dbProd.product_get_type_text == "多多外部数据")
|
||||
if (dbProd.product_get_type_text == "机会商品" || dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据")
|
||||
{
|
||||
string convertRst = "";
|
||||
var pInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(dbProd.product_json);
|
||||
@@ -1663,7 +1663,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
|
||||
mdyWxCat:
|
||||
if ((dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "1688厂家" || dbProd.product_get_type_text == "1688外部数据" ||
|
||||
dbProd.product_get_type_text == "微信小店" || dbProd.product_get_type_text == "微信店采" || dbProd.product_get_type_text == "机会商品" ||
|
||||
dbProd.product_get_type_text == "多多外部数据") && dbProd.wx_cat_1 != null && dbProd.wx_cat_leaf != null)
|
||||
dbProd.product_get_type_text == "多多外部数据" || dbProd.product_get_type_text == "微信外部数据") && dbProd.wx_cat_1 != null && dbProd.wx_cat_leaf != null)
|
||||
{
|
||||
var url = BaseClass.BuildPDDObjString("product/mdy_product");
|
||||
var data = Work.UserLogin.GetSignaturex() +
|
||||
|
||||
@@ -201,11 +201,17 @@ namespace TemuKJD.ToolForms
|
||||
|
||||
string resultStr = "";
|
||||
var jsStr = @"(function() {
|
||||
var txtElements = document.getElementsByTagName('textarea');
|
||||
//var txtElements = document.getElementsByTagName('textarea');
|
||||
var txtElements = document.getElementsByClassName('is-editor-empty');
|
||||
for (i = 0; i <txtElements.length; i++) {
|
||||
var txtElement = txtElements[i];
|
||||
var rect = txtElement.getBoundingClientRect();
|
||||
txtElement.click();
|
||||
//txtElement.click();
|
||||
const clickEvent = new Event('click', {
|
||||
bubbles: true, // 允许事件冒泡
|
||||
cancelable: true // 允许事件被取消
|
||||
});
|
||||
txtElement.dispatchEvent(clickEvent);
|
||||
return rect.left + ',' + rect.top;
|
||||
}
|
||||
return '';
|
||||
@@ -227,6 +233,9 @@ namespace TemuKJD.ToolForms
|
||||
Invoke(new Action(() => { cell.Value = "商品图片查询失败"; }));
|
||||
continue;
|
||||
}
|
||||
|
||||
host.SendMouseClickEvent(resultStr.Split(',').FirstOrDefault().ParseToInt(), resultStr.Split(',').Last().ParseToInt(), MouseButtonType.Left, false, 1, CefEventFlags.None);
|
||||
host.SendMouseClickEvent(resultStr.Split(',').FirstOrDefault().ParseToInt(), resultStr.Split(',').Last().ParseToInt(), MouseButtonType.Left, true, 1, CefEventFlags.None);
|
||||
Thread.Sleep(Randomx.GetId(200, 1000));
|
||||
|
||||
var img_url = prod.main_img;
|
||||
|
||||
+37
-36
@@ -32,14 +32,14 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
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();
|
||||
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 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();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.txtWaitSeconds = new System.Windows.Forms.TextBox();
|
||||
@@ -1903,6 +1903,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
"已采集数据",
|
||||
"微信小店",
|
||||
"微信店采",
|
||||
"微信外部数据",
|
||||
"母店采集",
|
||||
"机会商品",
|
||||
"以图搜品",
|
||||
@@ -2645,19 +2646,19 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9;
|
||||
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)))));
|
||||
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
|
||||
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,
|
||||
@@ -2889,19 +2890,19 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
this.dgvSelectProduct.AllowUserToAddRows = false;
|
||||
this.dgvSelectProduct.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
|
||||
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
this.dgvSelectProduct.AutoRowNumber = true;
|
||||
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
|
||||
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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
|
||||
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colCheck,
|
||||
@@ -2963,8 +2964,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
// colSupplierName
|
||||
//
|
||||
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13;
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
|
||||
this.colSupplierName.Frozen = true;
|
||||
this.colSupplierName.HeaderText = "店铺名称";
|
||||
this.colSupplierName.Name = "colSupplierName";
|
||||
@@ -3044,8 +3045,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
// colProductName
|
||||
//
|
||||
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProductName.DefaultCellStyle = dataGridViewCellStyle14;
|
||||
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProductName.DefaultCellStyle = dataGridViewCellStyle6;
|
||||
this.colProductName.HeaderText = "商品标题";
|
||||
this.colProductName.Name = "colProductName";
|
||||
this.colProductName.ReadOnly = true;
|
||||
@@ -3053,8 +3054,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
// colProductCat
|
||||
//
|
||||
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProductCat.DefaultCellStyle = dataGridViewCellStyle15;
|
||||
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7;
|
||||
this.colProductCat.HeaderText = "商品类目";
|
||||
this.colProductCat.Name = "colProductCat";
|
||||
this.colProductCat.ReadOnly = true;
|
||||
@@ -3109,8 +3110,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
//
|
||||
// colAddTime
|
||||
//
|
||||
dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16;
|
||||
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
||||
this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8;
|
||||
this.colAddTime.HeaderText = "上传时间";
|
||||
this.colAddTime.Name = "colAddTime";
|
||||
this.colAddTime.ReadOnly = true;
|
||||
|
||||
@@ -6237,7 +6237,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
{
|
||||
// 采集来源判断
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据")
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采");
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采,微信外部数据");
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -572,7 +572,7 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
{
|
||||
// 采集来源判断
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据")
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采");
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采,微信外部数据");
|
||||
}
|
||||
if (shop != null && !string.IsNullOrEmpty(shop.ShopId))
|
||||
{
|
||||
|
||||
@@ -149,8 +149,9 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
btnGetProdWxCate.Visible = false;
|
||||
btnStopStop.Visible = false;
|
||||
btnImportPddOutData.Visible = false;
|
||||
btnOut1688ProdSaveDb.Visible = false;
|
||||
btnAITitleFission.Visible = false;
|
||||
btnOut1688ProdSaveDb.Visible = false;
|
||||
btn_import_wx.Visible = false;
|
||||
btnAITitleFission.Visible = false;
|
||||
this.dgvDbProduct.Columns["col_edit"].Visible = false;
|
||||
}
|
||||
}
|
||||
@@ -478,8 +479,8 @@ namespace TemuKJD.WXForms.ProductForms
|
||||
{
|
||||
// 采集来源判断
|
||||
data += "&product_get_type=" + cmbSourceType.Text.Trim().Replace("已采集数据", "1688外部数据")
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采");
|
||||
}
|
||||
.Replace("多多商品", "机会商品,多多外部数据").Replace("1688商品", "1688厂家,1688外部数据").Replace("微信商品", "微信店采,微信外部数据");
|
||||
}
|
||||
|
||||
if (shop != null && !string.IsNullOrEmpty(shop.ShopId))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user