oem逻辑优化 订单查询服务端相关代码

AllBase/AllBase.csproj

@@ -187,6 +187,8 @@
     <Compile Include="Model\Config\WxShopUploadInfo.cs" />
     <Compile Include="Model\Data\WXBuyUrlNotesInfo.cs" />
     <Compile Include="Model\Data\WXOrderDecryptAddressInfo.cs" />
+    <Compile Include="Model\DBModel\oms_wei_external_procurement_log.cs" />
+    <Compile Include="Model\DBModel\oms_wei_order.cs" />
     <Compile Include="Model\DBModel\user_payment_record.cs" />
     <Compile Include="Model\Param\CollectManage\FissionSettingParam.cs" />
     <Compile Include="Model\Param\OrderManage\FreightTemplateParam.cs" />

AllBase/BaseClass.cs

@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1215;
+        public static int VersionCount = 1217;
         public static string MainPath = "29wx";
         //public static string MainPath = "29wx";
         //public static string MainPath = "29pdd";

AllBase/Model/DBModel/oms_wei_external_procurement_log.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel
+{
+
+    public class oms_wei_external_procurement_log
+    {
+        public oms_wei_order oms_Wei_Order { get; set; }
+
+        public string OutOrderNumStr
+        {
+            get { return "采购单号：" + out_order_no; }
+            set { }
+        }
+        public string OutOrderBuyerStr
+        {
+            get { return "采购账户：" + buyer_account; }
+            set { }
+        }
+
+
+        public long id { get; set; }
+        public string out_order_no { get; set; }
+        public string order_no { get; set; }
+        public string order_sku_id { get; set; }
+        public string buyer_account { get; set; }
+        public int? out_amount { get; set; }
+        public string purchaser_note { get; set; }
+        public string express_1_company { get; set; }
+        public string express_1_waybill { get; set; }
+        public string express_2_company { get; set; }
+        public string express_2_waybill { get; set; }
+        public string refund_status { get; set; }
+        public DateTime pickup_time { get; set; }
+        /// <summary>
+        /// 中转仓状态：0 未使用，1 已创建，2 创建失败，3 处理中（业务方根据此字段处理中转流程）
+        /// 使用此字段判断中转仓库是否已取号
+        /// </summary>
+        public int? transfer_warehouse_status { get; set; }
+        public string raw_message { get; set; }
+        public DateTime created_time { get; set; }
+        public DateTime updated_time { get; set; }
+        public string platform { get; set; }
+        public string order_platform_code { get; set; }
+        /// <summary>
+        /// 唯一值编码，一般为外采单号
+        /// </summary>
+        public string order_code { get; set; }
+        /// <summary>
+        /// 取号状态 1 正常取号  2提前取号  3已更正  (已修改提前取号为正常取号)
+        /// 使用此字段判断取号状态，如果是提前取号，需要修改新的物流单号，此时服务端状态将替换为已更正
+        /// </summary>
+        public int? pre_allocated_order_no { get; set; }
+        public int? is_transfer_ship { get; set; }
+        public string random_code { get; set; }
+    }
+}

AllBase/Model/DBModel/oms_wei_order.cs

@@ -0,0 +1,246 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel
+{
+    public class oms_wei_order
+    {
+        public long id { get; set; }
+        public long shop_id { get; set; }
+        public string shop_name { get; set; }
+        /// <summary>
+        /// 商户ID
+        /// </summary>
+        public long merchant_id { get; set; }
+        public string order_id { get; set; }
+        /// <summary>
+        /// 买家身份标识
+        /// </summary>
+        public string openid { get; set; }
+        public int create_time { get; set; }
+        public int update_time { get; set; }
+        public string unionid { get; set; }
+        /// <summary>
+        /// 状态10	待付款；20	待发货；21	部分发货；30	待收货；100	完成；200	全部商品售后之后，订单取消；250	未付款用户主动取消或超时未付款订单自动取消；
+        /// </summary>
+        public int? status { get; set; }
+        /// <summary>
+        /// 售后信息json
+        /// </summary>
+        public string aftersale_detail { get; set; }
+        /// <summary>
+        /// 支付信息
+        /// </summary>
+        public string pay_info { get; set; }
+        /// <summary>
+        /// 额外信息
+        /// </summary>
+        public string ext_info { get; set; }
+        /// <summary>
+        /// 商品总价
+        /// </summary>
+        public int? product_price { get; set; }
+        /// <summary>
+        /// 订单金额，单位为分，order_price=original_order_price-discounted_price-deduction_price-change_down_price
+        /// </summary>
+        public int? order_price { get; set; }
+        /// <summary>
+        /// 采购价，单位为分
+        /// </summary>
+        public int? purchase_price { get; set; }
+        /// <summary>
+        /// 采购时间
+        /// </summary>
+        public int? purchase_time { get; set; }
+        /// <summary>
+        /// 运费，单位为分
+        /// </summary>
+        public int? freight { get; set; }
+        /// <summary>
+        /// 平台服务费（微信小店：预计技术服务费），单位为分
+        /// </summary>
+        public int? predict_commission_fee { get; set; }
+        /// <summary>
+        /// 达人佣金（微信小店：分账金额），单位为分
+        /// </summary>
+        public int? commission_amount { get; set; }
+        /// <summary>
+        /// 优惠券优惠金额，单位为分
+        /// </summary>
+        public int? discounted_price { get; set; }
+        /// <summary>
+        /// 利润（实付金额-采购价-平台服务费-达人佣金，达人佣金、采购价为空值则为0）
+        /// </summary>
+        public int? profit { get; set; }
+        /// <summary>
+        /// 采购状态，默认值为：0未采购，推送仓库时修改为1采购
+        /// </summary>
+        public int? purchase_status { get; set; }
+        /// <summary>
+        /// 延迟发货时间(微信小店：商品发货时效，超时此时间未发货即为发货超时)
+        /// </summary>
+        public int? delivery_deadline { get; set; }
+        /// <summary>
+        /// 发货时间
+        /// </summary>
+        public int? delivery_time { get; set; }
+        /// <summary>
+        /// 收货人姓名
+        /// </summary>
+        public string user_name { get; set; }
+        /// <summary>
+        /// 邮编
+        /// </summary>
+        public string postal_code { get; set; }
+        public string province_name { get; set; }
+        public string city_name { get; set; }
+        /// <summary>
+        /// 区
+        /// </summary>
+        public string county_name { get; set; }
+        /// <summary>
+        /// 详细地址 
+        /// </summary>
+        public string detail_info { get; set; }
+        public string tel_number { get; set; }
+        /// <summary>
+        /// 门牌号码
+        /// </summary>
+        public string house_number { get; set; }
+        /// <summary>
+        /// 虚拟发货订单联系方式(deliver_method=1时返回)
+        /// </summary>
+        public string virtual_order_tel_number { get; set; }
+        /// <summary>
+        /// 额外的联系方式信息（虚拟号码相关）
+        /// </summary>
+        public string tel_number_ext_info { get; set; }
+        /// <summary>
+        /// 0：不使用虚拟号码，1：使用虚拟号码
+        /// </summary>
+        public int? use_tel_number { get; set; }
+        /// <summary>
+        /// 标识当前店铺下一个唯一的用户收货地址
+        /// </summary>
+        public string hash_code { get; set; }
+        /// <summary>
+        /// 发货物流信息JSON
+        /// </summary>
+        public string delivery_product_info { get; set; }
+        /// <summary>
+        /// 发货完成时间，秒级时间戳
+        /// </summary>
+        public int? ship_done_time { get; set; }
+        /// <summary>
+        /// 电子面单代发时的订单密文
+        /// </summary>
+        public string ewaybill_order_code { get; set; }
+        /// <summary>
+        /// 结算信息json
+        /// </summary>
+        public string settle_info { get; set; }
+        /// <summary>
+        /// 订单审核状态（0待审核1已审核）
+        /// </summary>
+        public int? audit_status { get; set; }
+        /// <summary>
+        /// 订单审核时间
+        /// </summary>
+        public DateTime audit_time { get; set; }
+        /// <summary>
+        /// erp发货快递公司
+        /// </summary>
+        public string erp_send_company { get; set; }
+        /// <summary>
+        /// erp发货快递单号
+        /// </summary>
+        public string erp_send_code { get; set; }
+        /// <summary>
+        /// erp发货状态
+        /// </summary>
+        public int? erp_send_status { get; set; }
+        /// <summary>
+        /// erp发货时间
+        /// </summary>
+        public DateTime erp_send_time { get; set; }
+        /// <summary>
+        /// 旗帜颜色备注，1：灰旗，2：红旗，3：橙旗，4：绿旗，5：天蓝旗，6：紫旗
+        /// </summary>
+        public int? colour_flag { get; set; }
+        /// <summary>
+        /// 旗帜备注时间
+        /// </summary>
+        public DateTime colour_flag_update_time { get; set; }
+        /// <summary>
+        /// 供应商备注异常单
+        /// </summary>
+        public string supplier_remark_exception { get; set; }
+        /// <summary>
+        /// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正
+        /// </summary>
+        public int? gift_order_status { get; set; }
+        /// <summary>
+        /// 店铺备注：取微信ext_info.merchant_notes
+        /// </summary>
+        public string shop_remark { get; set; }
+        /// <summary>
+        /// 软件备注
+        /// </summary>
+        public string soft_remark { get; set; }
+        /// <summary>
+        /// 外采金额（单位：分，整数存储）
+        /// </summary>
+        public int? out_amount { get; set; }
+        /// <summary>
+        /// 外采账户
+        /// </summary>
+        public string out_account { get; set; }
+        /// <summary>
+        /// 外采订单号
+        /// </summary>
+        public string out_order_no { get; set; }
+        /// <summary>
+        /// 外采快递公司
+        /// </summary>
+        public string out_express_company { get; set; }
+        /// <summary>
+        /// 外采快递单号
+        /// </summary>
+        public string out_express_no { get; set; }
+        /// <summary>
+        /// 外采是否发货（0 未发货，1 已发货）
+        /// </summary>
+        public int? out_shipped { get; set; }
+        /// <summary>
+        /// 判断是否优化过发货0 未优化， 1已优化
+        /// </summary>
+        public int? is_shipment_optimized { get; set; }
+        /// <summary>
+        /// 判断是否优随机使用快递单号0 未使用， 1已使用
+        /// </summary>
+        public int? is_express_no_used { get; set; }
+        /// <summary>
+        /// 外采订单售后状态
+        /// </summary>
+        public string out_after_sale_status { get; set; }
+        /// <summary>
+        /// 是否支持运费险：0-不支持，1-支持
+        /// </summary>
+        public int? has_freight_insurance { get; set; }
+        /// <summary>
+        /// 运费险金额（单位：元）
+        /// </summary>
+        public decimal? freight_insurance_amount { get; set; }
+        /// <summary>
+        /// 是否外采礼物单：0-否，1-是（外采订单）
+        /// </summary>
+        public int? external_gift { get; set; }
+        /// <summary>
+        /// 中转仓的状态 0未使用，1已创建，2创建失败(购买失败)，3已创建未有上游快递单号，4已创建有上游快递单号
+        /// </summary>
+        public decimal? transfer_warehouse_status { get; set; }
+    }
+}

Bin.Pak/History/川合供应链/io.pak

@@ -0,0 +1 @@
+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 truncated

Bin.Pak/History/川合供应链/na.pak

@@ -0,0 +1 @@
+川合供应链MThd川合供应链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 truncated

Bin.Pak/History/强胜科技/io.txt

@@ -0,0 +1 @@
+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 truncated

Bin.Pak/History/强胜科技/na.txt

@@ -0,0 +1 @@
+强胜科技MThd强胜科技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 truncated

Bin.Pak/package260701川合供应链 x64.nsi

@@ -0,0 +1,189 @@
+; 该脚本使用 HM VNISEdit 脚本编辑器向导产生
+
+; 安装程序初始定义常量
+!define PRODUCT_NAME "川合供应链"
+!define PRODUCT_VERSION "v12.15"
+;!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

Bin.Pak/package260701强胜科技 x64.nsi

@@ -19,7 +19,7 @@ SetCompressor lzma
 
 ; MUI 预定义常量
 !define MUI_ABORTWARNING
-!define MUI_ICON "${SOURCE_PATH}\favicon.ico"
+!define MUI_ICON "${UTILS_PATH}\favicon.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
 !define MUI_UNICON "${UTILS_PATH}\uninstall.ico"
 

KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs

@@ -706,10 +706,13 @@ namespace KJD_Web.BLL.BXX
                         string parameName = "@prodNameWords" + index;
                         paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = parameName, Value = word/*.Replace("&", "＆").Replace("'", "\\'")*/, });
                         //multi_search_prod_name += " or p.product_name like '%" + parameName + "%'";
-                        multi_search_prod_name += " or p.product_name like CONCAT('%'," + parameName + ",'%')";
-                        
+                        //multi_search_prod_name += " or p.product_name like CONCAT('%'," + parameName + ",'%')";
+                        multi_search_prod_name += " or p.product_name like CONCAT(" + parameName + ",'%')";
+
                     }
                     where += " and (" + multi_search_prod_name.Substring(4) + ")";
+
+                    //where += " and p.product_name like '" + search_prod_name + "'";
                 }
                 if (!string.IsNullOrWhiteSpace(search_prod_name_in))
                 {

KJDService/KJD_WebService/BLL/WXXD/WXOrderManage.cs

@@ -648,9 +648,12 @@ namespace KJD_Web.BLL.WXXD
                 string order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_no"))?.Replace("'", "\\'");
                 string order_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_sku_id"))?.Replace("'", "\\'");
                 string out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_order_no"))?.Replace("'", "\\'");
+                string pre_allocated_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "pre_allocated_order_no"))?.Replace("'", "\\'");
+                string transfer_warehouse_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "transfer_warehouse_status"))?.Replace("'", "\\'");
                 string not_count = RegexUtils.GetStringQuery(ref inputData, "not_count")?.Replace("'", "\\'");
-                if (string.IsNullOrEmpty(order_no) && string.IsNullOrEmpty(out_order_no) && string.IsNullOrEmpty(order_sku_id))
-                    return "{\"code\":500,\"msg\":\"商品查询信息不能为空\"}";
+                string is_admin = RegexUtils.GetStringQuery(ref inputData, "is_admin")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(order_no) && string.IsNullOrEmpty(out_order_no) && string.IsNullOrEmpty(order_sku_id) && is_admin != "true")
+                    return "{\"code\":500,\"msg\":\"中转订单查询信息不能为空\"}";
 
                 string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
                 MysqlUtils mySql = new MysqlUtils(conn);
@@ -666,6 +669,12 @@ namespace KJD_Web.BLL.WXXD
                     where += " and order_sku_id IN ('" + order_sku_id.Replace(",", "','") + "')";
                 if (out_order_no != null)
                     where += " and out_order_no IN ('" + out_order_no.Replace(",", "','") + "')";
+                // 取号状态
+                if (pre_allocated_order_no != null)
+                    where += " and pre_allocated_order_no IN (" + pre_allocated_order_no + ")";
+                // 仓库状态
+                if (transfer_warehouse_status != null)
+                    where += " and transfer_warehouse_status IN (" + transfer_warehouse_status + ")";
                 sql += where;
                 sql += ";";
 
@@ -682,6 +691,15 @@ namespace KJD_Web.BLL.WXXD
                     sql = "SELECT * FROM `erp`.`oms_wei_external_procurement_log` WHERE 1=1";
                     sql += where;
                     sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";";
+
+                    // 客戶端查兩次
+                    //if (is_admin == "true")
+                    //{
+                    //    sql = "SELECT e.*,o.create_time as order_create_time FROM `erp`.`oms_wei_external_procurement_log` e LEFT JOIN `erp`.`oms_wei_order` ON e.order_no = o.order_id WHERE 1=1";
+                    //    sql += where;
+                    //    sql += " order by id desc limit " + Math.Max(0, page - 1) * page_size + "," + page_size + ";";
+                    //}
+
                     dt = mySql.ExecuteDataTable(sql);
                 }
                 mySql.Close();
@@ -703,19 +721,23 @@ namespace KJD_Web.BLL.WXXD
                                 out_order_no = row["out_order_no"].ParseToString(),
                                 purchaser_note = row["purchaser_note"].ParseToString(),
                                 created_time = row["created_time"].ParseToString().ParseToDateTime(),
-                                 express_1_company = row["express_1_company"].ParseToString(),
-                                 express_1_waybill = row["express_1_waybill"].ParseToString(),
-                                 express_2_company = row["express_2_company"].ParseToString(),
+                                express_1_company = row["express_1_company"].ParseToString(),
+                                express_1_waybill = row["express_1_waybill"].ParseToString(),
+                                express_2_company = row["express_2_company"].ParseToString(),
                                 express_2_waybill = row["express_2_waybill"].ParseToString(),
-                                 order_code = row["order_code"].ParseToString(),
-                                 order_platform_code = row["order_platform_code"].ParseToString(),
-                                 pickup_time = row["pickup_time"].ParseToString().ParseToDateTime(),
-                                 platform = row["platform"].ParseToString(), 
-                                  pre_allocated_order_no = row["pre_allocated_order_no"].ParseToNullableInt(), 
-                                  raw_message  = row["raw_message"].ParseToString(), 
-                                  refund_status = row["refund_status"].ParseToString(), 
-                                  transfer_warehouse_status = row["transfer_warehouse_status"].ParseToNullableInt(), 
-                                  updated_time = row["updated_time"].ParseToString().ParseToDateTime(), 
+                                order_code = row["order_code"].ParseToString(),
+                                order_platform_code = row["order_platform_code"].ParseToString(),
+                                pickup_time = row["pickup_time"].ParseToString().ParseToDateTime(),
+                                platform = row["platform"].ParseToString(),
+                                pre_allocated_order_no = row["pre_allocated_order_no"].ParseToNullableInt(),
+                                raw_message = row["raw_message"].ParseToString(),
+                                refund_status = row["refund_status"].ParseToString(),
+                                transfer_warehouse_status = row["transfer_warehouse_status"].ParseToNullableInt(),
+                                updated_time = row["updated_time"].ParseToString().ParseToDateTime(),
+                                is_transfer_ship = row["is_transfer_ship"].ParseToNullableInt(),
+                                random_code = row["random_code"].ParseToString(),
+                                transfer_refund_status = row["transfer_refund_status"].ParseToNullableInt(),
+                                order_void_status = row["order_void_status"].ParseToNullableInt(),
                             });
                         }
                         JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
@@ -737,7 +759,7 @@ namespace KJD_Web.BLL.WXXD
         }
 
         /// <summary>
-        /// 修改中转仓订单信息，临时补救
+        /// 修改中转仓订单信息(真实物流)，临时补救
         /// </summary>
         /// <param name="inputData"></param>
         /// <returns></returns>
@@ -754,12 +776,17 @@ namespace KJD_Web.BLL.WXXD
                 string out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_order_no"))?.Replace("'", "\\'");
                 string express_1_company = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "express_1_company"))?.Replace("'", "\\'");
                 string express_1_waybill = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "express_1_waybil"))?.Replace("'", "\\'");
+                string refund_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "refund_status"))?.Replace("'", "\\'");
                 if (string.IsNullOrEmpty(out_order_no))
                     return "{\"code\":500,\"msg\":\"订单外部ID信息不能为空\"}";
-                if (string.IsNullOrEmpty(express_1_company))
-                    return "{\"code\":500,\"msg\":\"物流公司不能为空\"}";
-                if (string.IsNullOrEmpty(express_1_waybill))
-                    return "{\"code\":500,\"msg\":\"物流单号不能为空\"}";
+                //if (string.IsNullOrEmpty(express_1_company))
+                //    return "{\"code\":500,\"msg\":\"物流公司不能为空\"}";
+                //if (string.IsNullOrEmpty(express_1_waybill))
+                //    return "{\"code\":500,\"msg\":\"物流单号不能为空\"}";
+
+                 if (string.IsNullOrEmpty(express_1_company) && string.IsNullOrEmpty(express_1_waybill) && string.IsNullOrEmpty(refund_status))
+                     return "{\"code\":500,\"msg\":\"修改信息不能为空\"}";
+
 
                 string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
                 MysqlUtils mySql = new MysqlUtils(conn);
@@ -767,9 +794,13 @@ namespace KJD_Web.BLL.WXXD
                 string sql = "";
                 var count = -1;
 
-                sql = " update `erp`.`oms_wei_external_procurement_log` ";
-                sql += " set express_1_company='" + express_1_company + "',";
-                sql += " express_1_waybill='" + express_1_waybill + "',";
+                sql = " update `erp`.`oms_wei_external_procurement_log` set ";
+                if (!string.IsNullOrEmpty(express_1_company))
+                    sql += " express_1_company='" + express_1_company + "',";
+                if (!string.IsNullOrEmpty(express_1_waybill))
+                    sql += " express_1_waybill='" + express_1_waybill + "',";
+                if (!string.IsNullOrEmpty(refund_status))
+                    sql += " refund_status='" + refund_status + "',";
                 sql = sql.TrimEnd(',');
                 sql += " where out_order_no = '" + out_order_no + "';";
                 
@@ -786,7 +817,7 @@ namespace KJD_Web.BLL.WXXD
         }
 
         /// <summary>
-        /// 修改中转仓订单信息，临时补救
+        /// 修改中转仓订单信息(取号状态)，临时补救
         /// </summary>
         /// <param name="inputData"></param>
         /// <returns></returns>
@@ -829,6 +860,52 @@ namespace KJD_Web.BLL.WXXD
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
+        /// <summary>
+        /// 删除中转仓订单 临时补救，慎用
+        /// </summary>
+        /// <param name="inputData"></param>
+        /// <returns></returns>
+        public string WXDelErpTransitWarehouseOrder(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                if (!WXUserManage.GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+                var timeCalc = DateTime.Now;
+
+                string out_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "out_order_no"))?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(out_order_no))
+                    return "{\"code\":500,\"msg\":\"订单外部ID信息不能为空\"}";
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "";
+                var count = -1;
+
+                sql = " DELETE FROM `erp`.`oms_wei_external_procurement_log` WHERE out_order_no in ('" + out_order_no.Replace(",", "','") + "')"; 
+
+                count = mySql.ExecuteAffectedRows(sql);
+                mySql.Close();
+
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}";
+                }
+                if (count == 0)
+                {
+                    return "{\"code\":500,\"msg\":\"删除失败，订单不存在\",\"affected_rows\":" + count + "}";
+                }
+                return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}";
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
+        /// <summary>
+        /// 修改订单软件备注
+        /// </summary>
+        /// <param name="inputData"></param>
+        /// <returns></returns>
         public string WXUpdateErpSoftRemark(string inputData)
         {
             if (!string.IsNullOrEmpty(inputData))
@@ -865,5 +942,235 @@ namespace KJD_Web.BLL.WXXD
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
+
+        public string WXAddMdyBuyerOrder(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                if (!WXUserManage.GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+                var timeCalc = DateTime.Now;
+
+                string wx_order_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_order_id"))?.Replace("'", "\\'");
+                string wx_sku_id = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_sku_id"))?.Replace("'", "\\'");
+                string TransitCreateTime = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "TransitCreateTime"))?.Replace("'", "\\'");
+                string pre_allocated_order_no = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "pre_allocated_order_no"))?.Replace("'", "\\'");
+                string buyerId = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "buyerId"))?.Replace("'", "\\'");
+                string buyerName = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "buyerName"))?.Replace("'", "\\'");
+                string pdd_order_sn = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "pdd_order_sn"))?.Replace("'", "\\'");
+                string order_amount = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_amount"))?.Replace("'", "\\'");
+                string order_time = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_time"))?.Replace("'", "\\'");
+                string outExpressCompanyCode = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "outExpressCompanyCode"))?.Replace("'", "\\'");
+                string tracking_number = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "tracking_number"))?.Replace("'", "\\'");
+                string order_status_prompt = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_status_prompt"))?.Replace("'", "\\'");
+                string after_sales_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "after_sales_status"))?.Replace("'", "\\'");
+                string order_detail = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "order_detail"))?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(wx_order_id) || string.IsNullOrEmpty(pdd_order_sn))
+                    return "{\"code\":500,\"msg\":\"订单ID不能为空\"}";
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "";
+                var count = -1;
+
+                sql = "select id from wxxd.order_pdd_buyer_order where order_sn='" + pdd_order_sn + "'";
+                var id = mySql.ExecuteFirstInt(sql);
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    mySql.Close();
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}";
+                }
+
+                //sql = "INSERT INTO wxxd.order_pdd_buyer_order (wx_order_id,wx_sku_id,TransitCreateTime,pre_allocated_order_no,buyerId,buyerName,order_sn,order_amount,order_time," +
+                //    "outExpressCompanyCode,tracking_number,order_status_prompt,after_sales_status,order_detail)";
+                //sql += "VALUES(@wx_order_id,@wx_sku_id,@TransitCreateTime,@pre_allocated_order_no,@buyerId,@buyerName,@pdd_order_sn,@order_amount,@order_time," +
+                //    "@outExpressCompanyCode,@tracking_number,@order_status_prompt,@after_sales_status,@order_detail)";
+                //sql += " ON DUPLICATE KEY UPDATE wx_order_id=VALUES(@wx_order_id),wx_sku_id=VALUES(@wx_sku_id),TransitCreateTime=VALUES(@TransitCreateTime)," +
+                //    "pre_allocated_order_no=VALUES(@pre_allocated_order_no),buyerId=VALUES(@buyerId),buyerName=VALUES(@buyerName),order_amount=VALUES(@order_amount)," +
+                //    "order_time=VALUES(@order_time),outExpressCompanyCode=VALUES(@outExpressCompanyCode),tracking_number=VALUES(@tracking_number),order_status_prompt=VALUES(@order_status_prompt)," +
+                //    "after_sales_status=VALUES(@after_sales_status),order_detail=VALUES(@order_detail)";
+
+                if (id == 0)
+                {
+                    sql = "INSERT INTO wxxd.order_pdd_buyer_order (wx_order_id,wx_sku_id,TransitCreateTime,pre_allocated_order_no,buyerId,buyerName,order_sn,order_amount,order_time," +
+                                        "outExpressCompanyCode,tracking_number,order_status_prompt,after_sales_status,order_detail)";
+                    sql += "VALUES(@wx_order_id,@wx_sku_id,@TransitCreateTime,@pre_allocated_order_no,@buyerId,@buyerName,@pdd_order_sn,@order_amount,@order_time," +
+                        "@outExpressCompanyCode,@tracking_number,@order_status_prompt,@after_sales_status,@order_detail);";
+                }
+                else
+                {
+                    sql = "UPDATE wxxd.order_pdd_buyer_order SET ";
+                    if (!string.IsNullOrEmpty(wx_order_id))
+                        sql += " wx_order_id=@wx_order_id,";
+                    if (!string.IsNullOrEmpty(wx_sku_id))
+                        sql += " wx_sku_id=@wx_sku_id,";
+                    if (!string.IsNullOrEmpty(TransitCreateTime))
+                        sql += " TransitCreateTime=@TransitCreateTime,";
+                    if (!string.IsNullOrEmpty(pre_allocated_order_no))
+                        sql += " pre_allocated_order_no=@pre_allocated_order_no,";
+                    if (!string.IsNullOrEmpty(buyerId))
+                        sql += " buyerId=@buyerId,";
+                    if (!string.IsNullOrEmpty(buyerName))
+                        sql += " buyerName=@buyerName,";
+                    if (!string.IsNullOrEmpty(order_amount))
+                        sql += " order_amount=@order_amount,";
+                    if (!string.IsNullOrEmpty(order_time))
+                        sql += " order_time=@order_time,";
+                    if (!string.IsNullOrEmpty(outExpressCompanyCode))
+                        sql += " outExpressCompanyCode=@outExpressCompanyCode,";
+                    if (!string.IsNullOrEmpty(tracking_number))
+                        sql += " tracking_number=@tracking_number,";
+                    if (!string.IsNullOrEmpty(order_status_prompt))
+                        sql += " order_status_prompt=@order_status_prompt,";
+                    if (!string.IsNullOrEmpty(after_sales_status))
+                        sql += " after_sales_status=@after_sales_status,";
+                    if (!string.IsNullOrEmpty(order_detail))
+                        sql += " order_detail=@order_detail,";
+                    sql = sql.TrimEnd(',');
+                    sql += " where order_sn=@pdd_order_sn";
+                }
+                //260705-105706954352823
+
+
+                List<MySqlParameter> paramLst = new List<MySqlParameter>();
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "wx_order_id", Value = wx_order_id, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "wx_sku_id", Value = wx_sku_id, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.DateTime, ParameterName = "TransitCreateTime", Value = TransitCreateTime.ParseToDateTime(), });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "pre_allocated_order_no", Value = pre_allocated_order_no.ParseToInt(), });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "buyerId", Value = buyerId, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "buyerName", Value = buyerName, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "pdd_order_sn", Value = pdd_order_sn, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_amount", Value = order_amount, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.Int64, ParameterName = "order_time", Value = order_time.ParseToLong(), });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "outExpressCompanyCode", Value = outExpressCompanyCode, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "tracking_number", Value = tracking_number, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_status_prompt", Value = order_status_prompt, });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.Int32, ParameterName = "after_sales_status", Value = after_sales_status.ParseToInt(), });
+                paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "order_detail", Value = order_detail, });
+                //sql = " update `wxxd`.`order_pdd_buyer_order` set ";
+                //if (!string.IsNullOrEmpty(soft_remark))
+                //    sql += " soft_remark=" + soft_remark + ",";
+                //sql = sql.TrimEnd(',');
+                //sql += " where order_id = '" + wx_order_id + "';";
+
+                count = mySql.ExecuteAffectedRows(sql, paramLst.ToArray());
+                mySql.Close();
+
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"affected_rows\":" + count + "}";
+                }
+                return "{\"code\":200,\"msg\":\"success\",\"affected_rows\":" + count + "}";
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
+
+        public string WXGetBuyerOrderList(string inputData, bool isDetail = false)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                if (!WXUserManage.GetSign(inputData))
+                    return "{\"code\":999,\"msg\":\"校验失败\"}";
+                var timeCalc = DateTime.Now;
+
+                var wx_order_id_in = RegexUtils.GetStringQuery(ref inputData, "wx_order_id_in")?.Replace("'", "\\'");
+                var buyer_order_sn_in = RegexUtils.GetStringQuery(ref inputData, "buyer_order_sn_in")?.Replace("'", "\\'");
+                if (wx_order_id_in.IsNullOrEmpty() && string.IsNullOrEmpty(buyer_order_sn_in))
+                {
+                    return "{\"code\":500,\"msg\":\"未指定订单\"}";
+                }
+                var sort_type = RegexUtils.GetStringQuery(ref inputData, "sort_type")?.Replace("'", "\\'");
+                var is_not_count = RegexUtils.GetStringQuery(ref inputData, "is_not_count") != "false";
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(500);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "SELECT COUNT(id) FROM wxxd.order_pdd_buyer_order o WHERE 1=1 ";
+
+                string where = "";
+                if (!string.IsNullOrWhiteSpace(wx_order_id_in))
+                    where += " and o.wx_order_id in ('" + wx_order_id_in.Replace(",", "','") + "')";
+                if (!string.IsNullOrWhiteSpace(buyer_order_sn_in))
+                    where += " and o.order_sn in ('" + buyer_order_sn_in.Replace(",", "','") + "')";
+                sql += where;
+
+                var count = 0;
+                if (!is_not_count)
+                    count = mySql.ExecuteRowCount(sql);
+
+                DataTable dt;
+                if (count == 0 && !is_not_count)
+                {
+                    dt = new DataTable();
+                }
+                else
+                {
+                    sql = "SELECT o.* FROM" +
+                        " wxxd.order_pdd_buyer_order o " +
+                        " WHERE 1=1";
+
+                    //where子句
+                    sql += where;
+
+                    if (sort_type == "asc")
+                        sql += " ORDER BY o.id ASC";
+                    else
+                        sql += " ORDER BY o.id DESC";
+                    sql += " LIMIT " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+                    dt = mySql.ExecuteDataTable(sql);
+                }
+
+                mySql.Close();
+                if (dt != null)
+                {
+                    try
+                    {
+                        List<order_pdd_buyer_order> refundItemList = new List<order_pdd_buyer_order>();
+                        foreach (DataRow row in dt.Rows)
+                        {
+                            order_pdd_buyer_order order = new order_pdd_buyer_order
+                            {
+                                 id = row["id"].ParseToLong(),
+                                 add_time = row["add_time"].ParseToString ().ParseToDateTime(),
+                                 after_sales_status = row["after_sales_status"].ParseToNullableInt(),
+                                 buyerId = row["buyerId"].ParseToString(),
+                                 buyerName = row["buyerName"].ParseToString(),
+                                 mdy_time = row["mdy_time"].ParseToString().ParseToDateTime(),
+                                 order_amount = row["order_amount"].ParseToNullableInt(),
+                                 order_detail = row["order_detail"].ParseToString(),
+                                 order_sn = row["order_sn"].ParseToString(),
+                                 order_status_prompt = row["order_status_prompt"].ParseToString(),
+                                 order_time = row["order_time"].ParseToNullableLong(),
+                                 outExpressCompanyCode = row["outExpressCompanyCode"].ParseToString(),
+                                 pre_allocated_order_no = row["pre_allocated_order_no"].ParseToNullableInt(),
+                                 tracking_number = row["tracking_number"].ParseToString(),
+                                 TransitCreateTime = row["TransitCreateTime"].ParseToString().ParseToDateTime(),
+                                 wx_order_id = row["wx_order_id"].ParseToString(),
+                                 wx_sku_id = row["wx_sku_id"].ParseToString(),
+                            };
+                            refundItemList.Add(order);
+                        }
+                        JsonSerializerSettings jsonSetting = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
+                        var data = JsonUtils.SerializeObjectToString(refundItemList, jsonSetting);
+                        var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
+                    }
+                    catch (Exception ex)
+                    {
+                        return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                    }
+                }
+                else
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
     }
 }

KJDService/KJD_WebService/KJD_WebService.csproj

@@ -135,6 +135,7 @@
     <Compile Include="Model\WxModel\oms_wei_order.cs" />
     <Compile Include="Model\WxModel\oms_wei_order_item.cs" />
     <Compile Include="Model\WxModel\oms_wei_refund.cs" />
+    <Compile Include="Model\WxModel\order_pdd_buyer_order.cs" />
     <Compile Include="Model\WxModel\user_payment_record.cs" />
     <Compile Include="Model\WxModel\WXBuyUrlNotesInfo.cs" />
     <Compile Include="Model\WxModel\WXClientProductInfoLite.cs" />

KJDService/KJD_WebService/Model/WxModel/oms_wei_external_procurement_log.cs

@@ -34,5 +34,15 @@ namespace KJD_Web.Model.WxModel
         /// 1正常取号  2提前取号
         /// </summary>
         public int? pre_allocated_order_no { get; set; }
+        public int? is_transfer_ship { get; set; }
+        public string random_code { get; set; }
+        /// <summary>
+        /// 1, "拒收" 2, "拦截" 3, "取消" 4, "订单作废"
+        /// </summary>
+        public int? transfer_refund_status { get; set; }
+        /// <summary>
+        /// 订单作废状态：0=正常，1=已作废，2=作废失败
+        /// </summary>
+        public int? order_void_status { get; set; }
     }
 }

KJDService/KJD_WebService/Model/WxModel/order_pdd_buyer_order.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace KJD_Web.Model.WxModel
+{
+    public class order_pdd_buyer_order
+    {
+        public long? id { get; set; }
+        public string wx_order_id { get; set; }
+        public string wx_sku_id { get; set; }
+        public DateTime TransitCreateTime { get; set; }
+        public int? pre_allocated_order_no { get; set; }
+        public string buyerId { get; set; }
+        public string buyerName { get; set; }
+        public string order_sn { get; set; }
+        public int? order_amount { get; set; }
+        public long? order_time { get; set; }
+        public string outExpressCompanyCode { get; set; }
+        public string tracking_number { get; set; }
+        /// <summary>
+        /// 订单状态
+        /// </summary>
+        public string order_status_prompt { get; set; }
+        public int? after_sales_status { get; set; }
+        public string order_detail { get; set; }
+        public DateTime add_time { get; set; }
+        public DateTime mdy_time { get; set; }
+    }
+}

KJDService/KJD_WebService/WXOrderService.asmx.cs

@@ -169,6 +169,21 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        /// <summary>
+        /// 删除中转仓指定订单 临时补救，慎用
+        /// </summary>
+        [WebMethod]
+        public void wx_del_erp_transit_warehouse_order()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXOrderManage().WXDelErpTransitWarehouseOrder(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
 
         [WebMethod]
         public void wx_update_erp_soft_remark()
@@ -181,5 +196,30 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
+
+
+        [WebMethod]
+        public void wx_add_mdy_buyer_order()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXOrderManage().WXAddMdyBuyerOrder(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
+        [WebMethod]
+        public void wx_get_buyer_order_list()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new WXOrderManage().WXGetBuyerOrderList(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
     }
 }

TEMUKJD/KJD.csproj

@@ -207,6 +207,12 @@
     <Compile Include="PDDForms\ProductSelectForms\PDDDBProdGroupManageFrom.Designer.cs">
       <DependentUpon>PDDDBProdGroupManageFrom.cs</DependentUpon>
     </Compile>
+    <Compile Include="WXForms\AdminForms\WXAdminTransitWarehouseManage.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="WXForms\AdminForms\WXAdminTransitWarehouseManage.Designer.cs">
+      <DependentUpon>WXAdminTransitWarehouseManage.cs</DependentUpon>
+    </Compile>
     <Compile Include="WXForms\AiTalkForms\WxAiTalkForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -1373,6 +1379,9 @@
     <EmbeddedResource Include="PDDForms\ProductSelectForms\PDDDBProdGroupManageFrom.resx">
       <DependentUpon>PDDDBProdGroupManageFrom.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="WXForms\AdminForms\WXAdminTransitWarehouseManage.resx">
+      <DependentUpon>WXAdminTransitWarehouseManage.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="WXForms\AiTalkForms\WxAiTalkForm.resx">
       <DependentUpon>WxAiTalkForm.cs</DependentUpon>
     </EmbeddedResource>

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs

@@ -936,17 +936,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbHasFission.Location = new System.Drawing.Point(801, 42);
+            this.cmbHasFission.Location = new System.Drawing.Point(800, 42);
             this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbHasFission.Name = "cmbHasFission";
-            this.cmbHasFission.Size = new System.Drawing.Size(49, 25);
+            this.cmbHasFission.Size = new System.Drawing.Size(51, 25);
             this.cmbHasFission.TabIndex = 981;
             // 
             // label20
             // 
             this.label20.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(745, 44);
+            this.label20.Location = new System.Drawing.Point(744, 44);
             this.label20.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(56, 17);
@@ -956,18 +956,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtViewUvMin
             // 
             this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtViewUvMin.Location = new System.Drawing.Point(690, 41);
+            this.txtViewUvMin.Location = new System.Drawing.Point(687, 41);
             this.txtViewUvMin.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtViewUvMin.Name = "txtViewUvMin";
-            this.txtViewUvMin.Size = new System.Drawing.Size(49, 23);
+            this.txtViewUvMin.Size = new System.Drawing.Size(51, 23);
             this.txtViewUvMin.TabIndex = 980;
             // 
             // chkViewUvMin
             // 
             this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Right;
-            this.chkViewUvMin.Location = new System.Drawing.Point(631, 42);
+            this.chkViewUvMin.Location = new System.Drawing.Point(634, 42);
             this.chkViewUvMin.Name = "chkViewUvMin";
-            this.chkViewUvMin.Size = new System.Drawing.Size(56, 21);
+            this.chkViewUvMin.Size = new System.Drawing.Size(50, 21);
             this.chkViewUvMin.TabIndex = 978;
             this.chkViewUvMin.Text = "曝光≥";
             this.chkViewUvMin.UseVisualStyleBackColor = true;
@@ -980,17 +980,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbPddRelation.Location = new System.Drawing.Point(690, 7);
+            this.cmbPddRelation.Location = new System.Drawing.Point(687, 7);
             this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbPddRelation.Name = "cmbPddRelation";
-            this.cmbPddRelation.Size = new System.Drawing.Size(49, 25);
+            this.cmbPddRelation.Size = new System.Drawing.Size(51, 25);
             this.cmbPddRelation.TabIndex = 805;
             // 
             // label19
             // 
             this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label19.AutoSize = true;
-            this.label19.Location = new System.Drawing.Point(634, 9);
+            this.label19.Location = new System.Drawing.Point(631, 9);
             this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label19.Name = "label19";
             this.label19.Size = new System.Drawing.Size(56, 17);
@@ -1003,10 +1003,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.SetColumnSpan(this.dtpEnd, 2);
             this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpEnd.Location = new System.Drawing.Point(576, 76);
+            this.dtpEnd.Location = new System.Drawing.Point(574, 76);
             this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.dtpEnd.Name = "dtpEnd";
-            this.dtpEnd.Size = new System.Drawing.Size(111, 23);
+            this.dtpEnd.Size = new System.Drawing.Size(110, 23);
             this.dtpEnd.TabIndex = 979;
             // 
             // dtpStart
@@ -1015,30 +1015,30 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.SetColumnSpan(this.dtpStart, 2);
             this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpStart.Location = new System.Drawing.Point(465, 76);
+            this.dtpStart.Location = new System.Drawing.Point(461, 76);
             this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.dtpStart.Name = "dtpStart";
-            this.dtpStart.Size = new System.Drawing.Size(108, 23);
+            this.dtpStart.Size = new System.Drawing.Size(110, 23);
             this.dtpStart.TabIndex = 978;
             // 
             // chkTime
             // 
-            this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.chkTime.Location = new System.Drawing.Point(397, 77);
+            this.chkTime.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.chkTime.Location = new System.Drawing.Point(416, 77);
             this.chkTime.Name = "chkTime";
-            this.chkTime.Size = new System.Drawing.Size(65, 21);
+            this.chkTime.Size = new System.Drawing.Size(42, 21);
             this.chkTime.TabIndex = 977;
-            this.chkTime.Text = "时间范围";
+            this.chkTime.Text = "时间";
             this.chkTime.UseVisualStyleBackColor = true;
             // 
             // cmbCat2
             // 
             this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat2.FormattingEnabled = true;
-            this.cmbCat2.Location = new System.Drawing.Point(248, 77);
+            this.cmbCat2.Location = new System.Drawing.Point(252, 77);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
-            this.cmbCat2.Size = new System.Drawing.Size(49, 25);
+            this.cmbCat2.Size = new System.Drawing.Size(51, 25);
             this.cmbCat2.TabIndex = 804;
             this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter2_SelectedIndexChanged);
             // 
@@ -1067,17 +1067,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtSecretStyleCode
             // 
             this.txtSecretStyleCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtSecretStyleCode.Location = new System.Drawing.Point(248, 6);
+            this.txtSecretStyleCode.Location = new System.Drawing.Point(252, 6);
             this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSecretStyleCode.Name = "txtSecretStyleCode";
-            this.txtSecretStyleCode.Size = new System.Drawing.Size(49, 23);
+            this.txtSecretStyleCode.Size = new System.Drawing.Size(51, 23);
             this.txtSecretStyleCode.TabIndex = 812;
             // 
             // label14
             // 
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(209, 79);
+            this.label14.Location = new System.Drawing.Point(213, 79);
             this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(39, 17);
@@ -1088,7 +1088,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(216, 9);
+            this.label15.Location = new System.Drawing.Point(220, 9);
             this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(32, 17);
@@ -1099,7 +1099,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(520, 44);
+            this.label13.Location = new System.Drawing.Point(518, 44);
             this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(56, 17);
@@ -1121,10 +1121,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "机会商品",
             "以图搜品",
             "多多外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(248, 42);
+            this.cmbSourceType.Location = new System.Drawing.Point(252, 42);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(49, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(51, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             // 
@@ -1132,7 +1132,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(216, 44);
+            this.label10.Location = new System.Drawing.Point(220, 44);
             this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(32, 17);
@@ -1156,7 +1156,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtSPU.Location = new System.Drawing.Point(60, 6);
             this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(49, 23);
+            this.txtSPU.Size = new System.Drawing.Size(51, 23);
             this.txtSPU.TabIndex = 434;
             // 
             // cmbWxCat
@@ -1167,10 +1167,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbWxCat.Location = new System.Drawing.Point(576, 7);
+            this.cmbWxCat.Location = new System.Drawing.Point(574, 7);
             this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxCat.Name = "cmbWxCat";
-            this.cmbWxCat.Size = new System.Drawing.Size(49, 25);
+            this.cmbWxCat.Size = new System.Drawing.Size(51, 25);
             this.cmbWxCat.TabIndex = 802;
             // 
             // txtSKC
@@ -1179,7 +1179,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtSKC.Location = new System.Drawing.Point(60, 41);
             this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSKC.Name = "txtSKC";
-            this.txtSKC.Size = new System.Drawing.Size(49, 23);
+            this.txtSKC.Size = new System.Drawing.Size(51, 23);
             this.txtSKC.TabIndex = 432;
             // 
             // cmbSort
@@ -1189,10 +1189,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSort.Items.AddRange(new object[] {
             "入库时间",
             "曝光量"});
-            this.cmbSort.Location = new System.Drawing.Point(342, 42);
+            this.cmbSort.Location = new System.Drawing.Point(348, 42);
             this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSort.Name = "cmbSort";
-            this.cmbSort.Size = new System.Drawing.Size(49, 25);
+            this.cmbSort.Size = new System.Drawing.Size(51, 25);
             this.cmbSort.TabIndex = 448;
             this.cmbSort.Text = "入库时间";
             // 
@@ -1200,7 +1200,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(310, 44);
+            this.label6.Location = new System.Drawing.Point(316, 44);
             this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(32, 17);
@@ -1211,7 +1211,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(310, 9);
+            this.label4.Location = new System.Drawing.Point(316, 9);
             this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(32, 17);
@@ -1222,7 +1222,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(520, 9);
+            this.label12.Location = new System.Drawing.Point(518, 9);
             this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(56, 17);
@@ -1232,17 +1232,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtExtCode
             // 
             this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtExtCode.Location = new System.Drawing.Point(342, 6);
+            this.txtExtCode.Location = new System.Drawing.Point(348, 6);
             this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtExtCode.Name = "txtExtCode";
-            this.txtExtCode.Size = new System.Drawing.Size(49, 23);
+            this.txtExtCode.Size = new System.Drawing.Size(51, 23);
             this.txtExtCode.TabIndex = 429;
             // 
             // lblGroup
             // 
             this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblGroup.AutoSize = true;
-            this.lblGroup.Location = new System.Drawing.Point(122, 44);
+            this.lblGroup.Location = new System.Drawing.Point(124, 44);
             this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblGroup.Name = "lblGroup";
             this.lblGroup.Size = new System.Drawing.Size(32, 17);
@@ -1253,10 +1253,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(154, 42);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(156, 42);
             this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
-            this.cmbGroupFilter.Size = new System.Drawing.Size(49, 25);
+            this.cmbGroupFilter.Size = new System.Drawing.Size(51, 25);
             this.cmbGroupFilter.TabIndex = 653;
             // 
             // cmbExportToOutServer
@@ -1268,17 +1268,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "是",
             "否",
             "导出未拉回"});
-            this.cmbExportToOutServer.Location = new System.Drawing.Point(576, 42);
+            this.cmbExportToOutServer.Location = new System.Drawing.Point(574, 42);
             this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbExportToOutServer.Name = "cmbExportToOutServer";
-            this.cmbExportToOutServer.Size = new System.Drawing.Size(49, 25);
+            this.cmbExportToOutServer.Size = new System.Drawing.Size(51, 25);
             this.cmbExportToOutServer.TabIndex = 803;
             // 
             // label3
             // 
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(397, 9);
+            this.label3.Location = new System.Drawing.Point(405, 9);
             this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(56, 17);
@@ -1288,10 +1288,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtProdName
             // 
             this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtProdName.Location = new System.Drawing.Point(465, 6);
+            this.txtProdName.Location = new System.Drawing.Point(461, 6);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(49, 23);
+            this.txtProdName.Size = new System.Drawing.Size(51, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // cmbWxSafe
@@ -1304,10 +1304,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "安全商品",
             "违规商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(465, 42);
+            this.cmbWxSafe.Location = new System.Drawing.Point(461, 42);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(49, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(51, 25);
             this.cmbWxSafe.TabIndex = 676;
             this.cmbWxSafe.Text = "安全+未校验";
             // 
@@ -1315,7 +1315,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.lblWxSafe.AutoSize = true;
-            this.lblWxSafe.Location = new System.Drawing.Point(397, 44);
+            this.lblWxSafe.Location = new System.Drawing.Point(405, 44);
             this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblWxSafe.Name = "lblWxSafe";
             this.lblWxSafe.Size = new System.Drawing.Size(56, 17);
@@ -1326,7 +1326,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblNotes.AutoSize = true;
-            this.lblNotes.Location = new System.Drawing.Point(122, 9);
+            this.lblNotes.Location = new System.Drawing.Point(124, 9);
             this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblNotes.Name = "lblNotes";
             this.lblNotes.Size = new System.Drawing.Size(32, 17);
@@ -1336,20 +1336,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtNotes
             // 
             this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtNotes.Location = new System.Drawing.Point(154, 6);
+            this.txtNotes.Location = new System.Drawing.Point(156, 6);
             this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtNotes.Name = "txtNotes";
-            this.txtNotes.Size = new System.Drawing.Size(49, 23);
+            this.txtNotes.Size = new System.Drawing.Size(51, 23);
             this.txtNotes.TabIndex = 439;
             // 
             // cmbCat1
             // 
             this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat1.FormattingEnabled = true;
-            this.cmbCat1.Location = new System.Drawing.Point(154, 77);
+            this.cmbCat1.Location = new System.Drawing.Point(156, 77);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(49, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(51, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter1_SelectedIndexChanged);
             // 
@@ -1357,7 +1357,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(115, 79);
+            this.label2.Location = new System.Drawing.Point(117, 79);
             this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(39, 17);
@@ -1368,10 +1368,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat3.FormattingEnabled = true;
-            this.cmbCat3.Location = new System.Drawing.Point(342, 77);
+            this.cmbCat3.Location = new System.Drawing.Point(348, 77);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(49, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(51, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCateFilter3_SelectedIndexChanged);
             // 
@@ -1379,7 +1379,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(303, 79);
+            this.label17.Location = new System.Drawing.Point(309, 79);
             this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(39, 17);
@@ -1392,7 +1392,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtRealCoid.Location = new System.Drawing.Point(60, 76);
             this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtRealCoid.Name = "txtRealCoid";
-            this.txtRealCoid.Size = new System.Drawing.Size(49, 23);
+            this.txtRealCoid.Size = new System.Drawing.Size(51, 23);
             this.txtRealCoid.TabIndex = 814;
             // 
             // btnEmpty
@@ -1401,7 +1401,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEmpty.Location = new System.Drawing.Point(856, 40);
+            this.btnEmpty.Location = new System.Drawing.Point(857, 40);
             this.btnEmpty.Name = "btnEmpty";
             this.btnEmpty.Size = new System.Drawing.Size(46, 25);
             this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1427,7 +1427,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(856, 5);
+            this.btnSearch.Location = new System.Drawing.Point(857, 5);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(46, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1449,7 +1449,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(745, 9);
+            this.label11.Location = new System.Drawing.Point(744, 9);
             this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(56, 17);
@@ -1464,10 +1464,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "普通商品",
             "爆款数据"});
-            this.cmbSpProdType.Location = new System.Drawing.Point(801, 7);
+            this.cmbSpProdType.Location = new System.Drawing.Point(800, 7);
             this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSpProdType.Name = "cmbSpProdType";
-            this.cmbSpProdType.Size = new System.Drawing.Size(49, 25);
+            this.cmbSpProdType.Size = new System.Drawing.Size(51, 25);
             this.cmbSpProdType.TabIndex = 677;
             // 
             // panel1
@@ -1478,9 +1478,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.SetColumnSpan(this.panel1, 4);
             this.panel1.Controls.Add(this.chkWXComplateProd);
             this.panel1.Controls.Add(this.chkNoUserProduct);
-            this.panel1.Location = new System.Drawing.Point(693, 73);
+            this.panel1.Location = new System.Drawing.Point(690, 73);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(212, 29);
+            this.panel1.Size = new System.Drawing.Size(215, 29);
             this.panel1.TabIndex = 982;
             // 
             // chkWXComplateProd

TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs

@@ -41,7 +41,8 @@
             System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("图片工具");
             System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("运单管理");
             System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("充值二维码");
-            System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
+            System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("中转订单管理");
+            System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] {
             treeNode1,
             treeNode2,
             treeNode3,
@@ -54,7 +55,8 @@
             treeNode10,
             treeNode11,
             treeNode12,
-            treeNode13});
+            treeNode13,
+            treeNode14});
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -171,10 +173,12 @@
             treeNode12.Text = "运单管理";
             treeNode13.Name = "充值二维码";
             treeNode13.Text = "充值二维码";
-            treeNode14.Name = "超级权限管理";
-            treeNode14.Text = "超级权限管理";
+            treeNode14.Name = "中转订单管理";
+            treeNode14.Text = "中转订单管理";
+            treeNode15.Name = "超级权限管理";
+            treeNode15.Text = "超级权限管理";
             this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
-            treeNode14});
+            treeNode15});
             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;

TEMUKJD/WXForms/AdminForms/WXAdminForm.cs

@@ -31,6 +31,7 @@ namespace TemuKJD.WXForms.AdminForms
         public Lazy<WXWaybillManageForm> waybillManageForm = new Lazy<WXWaybillManageForm>();
         public Lazy<JstBanPlatformForm> banPlatformForm = new Lazy<JstBanPlatformForm>();
         public Lazy<WXAdminSetTopUpQrCodeForm> adminSetTopUpQrCodeForm = new Lazy<WXAdminSetTopUpQrCodeForm>();
+        public Lazy<WXAdminTransitWarehouseManage> wxAdminTransitWarehouseManage = new Lazy<WXAdminTransitWarehouseManage>();
 
         public WXAdminForm()
         {
@@ -123,6 +124,9 @@ namespace TemuKJD.WXForms.AdminForms
                 case "充值二维码":
                     SetForm(adminSetTopUpQrCodeForm.Value);
                     break;
+                case "中转订单管理":
+                    SetForm(wxAdminTransitWarehouseManage.Value);
+                    break;
             }
                 //}));
             //}).Start();

TEMUKJD/WXForms/AdminForms/WXAdminTransitWarehouseManage.Designer.cs

@@ -0,0 +1,720 @@
+
+namespace TemuKJD.WXForms.AdminForms
+{
+    partial class WXAdminTransitWarehouseManage
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXAdminTransitWarehouseManage));
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.btnLoginSelect = new DevComponents.DotNetBar.PanelEx();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.textBox2 = new System.Windows.Forms.TextBox();
+            this.txtWxOrderNo = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.txt = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.btnSearch = new DevComponents.DotNetBar.PanelEx();
+            this.txtOutOrderNo = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.pbLoading = new System.Windows.Forms.PictureBox();
+            this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
+            this.chkAutoDrag = new System.Windows.Forms.CheckBox();
+            this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
+            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colOutOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colWxCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colGroupName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colAccountNote = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colMinus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colProductRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPlus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCookie = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPickupTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colUploadAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_raw_message = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colChatAccount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colLoginStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colPlatform = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_order_platform_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_order_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.pre_allocated_order_no = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_is_transfer_ship = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.col_random_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.tableLayoutPanel2.SuspendLayout();
+            this.panel5.SuspendLayout();
+            this.panel4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
+            this.panel3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.BackColor = System.Drawing.Color.White;
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Panel2.Margin = new System.Windows.Forms.Padding(4);
+            this.splitContainer1.Size = new System.Drawing.Size(1271, 576);
+            this.splitContainer1.SplitterDistance = 115;
+            this.splitContainer1.TabIndex = 34;
+            // 
+            // tableLayoutPanel2
+            // 
+            this.tableLayoutPanel2.ColumnCount = 2;
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tableLayoutPanel2.Controls.Add(this.panel5, 1, 0);
+            this.tableLayoutPanel2.Controls.Add(this.panel4, 0, 0);
+            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+            this.tableLayoutPanel2.RowCount = 1;
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(1271, 115);
+            this.tableLayoutPanel2.TabIndex = 37;
+            // 
+            // panel5
+            // 
+            this.panel5.Controls.Add(this.btnLoginSelect);
+            this.panel5.Location = new System.Drawing.Point(1008, 3);
+            this.panel5.Name = "panel5";
+            this.panel5.Size = new System.Drawing.Size(260, 109);
+            this.panel5.TabIndex = 1;
+            // 
+            // btnLoginSelect
+            // 
+            this.btnLoginSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnLoginSelect.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnLoginSelect.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnLoginSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnLoginSelect.Location = new System.Drawing.Point(180, 12);
+            this.btnLoginSelect.Name = "btnLoginSelect";
+            this.btnLoginSelect.Size = new System.Drawing.Size(66, 23);
+            this.btnLoginSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnLoginSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnLoginSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnLoginSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnLoginSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnLoginSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnLoginSelect.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnLoginSelect.Style.GradientAngle = 90;
+            this.btnLoginSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnLoginSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnLoginSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnLoginSelect.TabIndex = 467;
+            this.btnLoginSelect.Text = "删除选中";
+            this.btnLoginSelect.Click += new System.EventHandler(this.btnLoginSelect_Click);
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.textBox2);
+            this.panel4.Controls.Add(this.txtWxOrderNo);
+            this.panel4.Controls.Add(this.label5);
+            this.panel4.Controls.Add(this.label3);
+            this.panel4.Controls.Add(this.txt);
+            this.panel4.Controls.Add(this.label2);
+            this.panel4.Controls.Add(this.btnSearch);
+            this.panel4.Controls.Add(this.txtOutOrderNo);
+            this.panel4.Controls.Add(this.label1);
+            this.panel4.Controls.Add(this.btnEmpty);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel4.Location = new System.Drawing.Point(3, 3);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(999, 109);
+            this.panel4.TabIndex = 0;
+            // 
+            // textBox2
+            // 
+            this.textBox2.Location = new System.Drawing.Point(740, 12);
+            this.textBox2.Multiline = true;
+            this.textBox2.Name = "textBox2";
+            this.textBox2.Size = new System.Drawing.Size(98, 23);
+            this.textBox2.TabIndex = 459;
+            // 
+            // txtWxOrderNo
+            // 
+            this.txtWxOrderNo.Location = new System.Drawing.Point(321, 12);
+            this.txtWxOrderNo.Multiline = true;
+            this.txtWxOrderNo.Name = "txtWxOrderNo";
+            this.txtWxOrderNo.Size = new System.Drawing.Size(179, 94);
+            this.txtWxOrderNo.TabIndex = 419;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(263, 15);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(68, 17);
+            this.label5.TabIndex = 420;
+            this.label5.Text = "微信单号：";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(681, 15);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(68, 17);
+            this.label3.TabIndex = 458;
+            this.label3.Text = "取号状态：";
+            // 
+            // txt
+            // 
+            this.txt.Location = new System.Drawing.Point(572, 12);
+            this.txt.Multiline = true;
+            this.txt.Name = "txt";
+            this.txt.Size = new System.Drawing.Size(98, 23);
+            this.txt.TabIndex = 457;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(513, 15);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(68, 17);
+            this.label2.TabIndex = 456;
+            this.label2.Text = "仓库状态：";
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.Location = new System.Drawing.Point(856, 12);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(56, 23);
+            this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSearch.Style.GradientAngle = 90;
+            this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearch.TabIndex = 449;
+            this.btnSearch.Text = "搜索";
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // txtOutOrderNo
+            // 
+            this.txtOutOrderNo.Location = new System.Drawing.Point(73, 12);
+            this.txtOutOrderNo.Multiline = true;
+            this.txtOutOrderNo.Name = "txtOutOrderNo";
+            this.txtOutOrderNo.Size = new System.Drawing.Size(179, 94);
+            this.txtOutOrderNo.TabIndex = 417;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(15, 15);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(68, 17);
+            this.label1.TabIndex = 418;
+            this.label1.Text = "外采单号：";
+            // 
+            // btnEmpty
+            // 
+            this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnEmpty.Location = new System.Drawing.Point(917, 12);
+            this.btnEmpty.Name = "btnEmpty";
+            this.btnEmpty.Size = new System.Drawing.Size(56, 23);
+            this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnEmpty.Style.GradientAngle = 90;
+            this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnEmpty.TabIndex = 413;
+            this.btnEmpty.Text = "清空条件";
+            this.btnEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.BackColor = System.Drawing.Color.White;
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.BackColor = System.Drawing.Color.White;
+            this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
+            this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
+            this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.chkAutoDrag);
+            this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
+            this.splitContainer2.Panel2.Controls.Add(this.statusBar);
+            this.splitContainer2.Size = new System.Drawing.Size(1271, 457);
+            this.splitContainer2.SplitterDistance = 428;
+            this.splitContainer2.TabIndex = 0;
+            // 
+            // 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(610, 189);
+            this.pbLoading.Name = "pbLoading";
+            this.pbLoading.Size = new System.Drawing.Size(50, 50);
+            this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pbLoading.TabIndex = 6;
+            this.pbLoading.TabStop = false;
+            // 
+            // dgvShop
+            // 
+            this.dgvShop.AllowUserToAddRows = false;
+            this.dgvShop.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvShop.AutoRowNumber = true;
+            this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.dgvShop.BackgroundColor = System.Drawing.Color.White;
+            this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            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,
+            this.colOutOrderNo,
+            this.colShopId,
+            this.colShopAccount,
+            this.colWxCreateTime,
+            this.colShopName,
+            this.colNotes,
+            this.colGroupName,
+            this.colAccountNote,
+            this.colMinus,
+            this.colProductRemaining,
+            this.colPlus,
+            this.colCookie,
+            this.colUser,
+            this.colPickupTime,
+            this.colUploadAccount,
+            this.col_raw_message,
+            this.colChatAccount,
+            this.colLoginStatus,
+            this.colPlatform,
+            this.col_order_platform_code,
+            this.col_order_code,
+            this.pre_allocated_order_no,
+            this.col_is_transfer_ship,
+            this.col_random_code,
+            this.colMsg});
+            this.dgvShop.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvShop.Location = new System.Drawing.Point(4, 0);
+            this.dgvShop.MultiSelectCheckBox = true;
+            this.dgvShop.Name = "dgvShop";
+            this.dgvShop.ReadOnly = true;
+            this.dgvShop.RowTemplate.Height = 23;
+            this.dgvShop.ShowCellErrors = false;
+            this.dgvShop.Size = new System.Drawing.Size(1263, 428);
+            this.dgvShop.TabIndex = 5;
+            this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
+            this.dgvShop.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvShop_CellMouseDown);
+            // 
+            // chkAutoDrag
+            // 
+            this.chkAutoDrag.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.chkAutoDrag.AutoSize = true;
+            this.chkAutoDrag.BackColor = System.Drawing.Color.White;
+            this.chkAutoDrag.Location = new System.Drawing.Point(595, 0);
+            this.chkAutoDrag.Name = "chkAutoDrag";
+            this.chkAutoDrag.Size = new System.Drawing.Size(159, 21);
+            this.chkAutoDrag.TabIndex = 3;
+            this.chkAutoDrag.Text = "登录时自动滑动拼图验证";
+            this.chkAutoDrag.UseVisualStyleBackColor = false;
+            this.chkAutoDrag.Visible = false;
+            // 
+            // ucSplitPage1
+            // 
+            this.ucSplitPage1.CurrentPage = 1;
+            this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.ucSplitPage1.IsShowPageSize = true;
+            this.ucSplitPage1.Location = new System.Drawing.Point(882, 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(389, 25);
+            this.ucSplitPage1.TabIndex = 4;
+            this.ucSplitPage1.TotalPage = 1;
+            // 
+            // 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(1271, 25);
+            this.statusBar.TabIndex = 1;
+            // 
+            // panel3
+            // 
+            this.panel3.BackColor = System.Drawing.Color.White;
+            this.panel3.Controls.Add(this.splitContainer1);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.panel3.Location = new System.Drawing.Point(1, 33);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(1271, 576);
+            this.panel3.TabIndex = 35;
+            // 
+            // colSelect
+            // 
+            this.colSelect.FillWeight = 26F;
+            this.colSelect.HeaderText = "选";
+            this.colSelect.Name = "colSelect";
+            this.colSelect.ReadOnly = true;
+            this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // colOutOrderNo
+            // 
+            this.colOutOrderNo.FillWeight = 60F;
+            this.colOutOrderNo.HeaderText = "外采单号";
+            this.colOutOrderNo.Name = "colOutOrderNo";
+            this.colOutOrderNo.ReadOnly = true;
+            // 
+            // colShopId
+            // 
+            this.colShopId.FillWeight = 60F;
+            this.colShopId.HeaderText = "微信单号";
+            this.colShopId.Name = "colShopId";
+            this.colShopId.ReadOnly = true;
+            // 
+            // colShopAccount
+            // 
+            this.colShopAccount.FillWeight = 30F;
+            this.colShopAccount.HeaderText = "sku编号";
+            this.colShopAccount.Name = "colShopAccount";
+            this.colShopAccount.ReadOnly = true;
+            // 
+            // colWxCreateTime
+            // 
+            this.colWxCreateTime.FillWeight = 50F;
+            this.colWxCreateTime.HeaderText = "订单时间";
+            this.colWxCreateTime.Name = "colWxCreateTime";
+            this.colWxCreateTime.ReadOnly = true;
+            // 
+            // colShopName
+            // 
+            this.colShopName.FillWeight = 50F;
+            this.colShopName.HeaderText = "店铺名称";
+            this.colShopName.Name = "colShopName";
+            this.colShopName.ReadOnly = true;
+            // 
+            // colNotes
+            // 
+            this.colNotes.FillWeight = 50F;
+            this.colNotes.HeaderText = "拍单买手号";
+            this.colNotes.Name = "colNotes";
+            this.colNotes.ReadOnly = true;
+            // 
+            // colGroupName
+            // 
+            this.colGroupName.FillWeight = 40F;
+            this.colGroupName.HeaderText = "外采金额";
+            this.colGroupName.Name = "colGroupName";
+            this.colGroupName.ReadOnly = true;
+            // 
+            // colAccountNote
+            // 
+            this.colAccountNote.FillWeight = 40F;
+            this.colAccountNote.HeaderText = "账户备注";
+            this.colAccountNote.Name = "colAccountNote";
+            this.colAccountNote.ReadOnly = true;
+            // 
+            // colMinus
+            // 
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colMinus.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colMinus.FillWeight = 35F;
+            this.colMinus.HeaderText = "物流1公司";
+            this.colMinus.Name = "colMinus";
+            this.colMinus.ReadOnly = true;
+            // 
+            // colProductRemaining
+            // 
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colProductRemaining.DefaultCellStyle = dataGridViewCellStyle4;
+            this.colProductRemaining.FillWeight = 55F;
+            this.colProductRemaining.HeaderText = "物流1单号";
+            this.colProductRemaining.Name = "colProductRemaining";
+            this.colProductRemaining.ReadOnly = true;
+            // 
+            // colPlus
+            // 
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colPlus.DefaultCellStyle = dataGridViewCellStyle5;
+            this.colPlus.FillWeight = 35F;
+            this.colPlus.HeaderText = "物流2公司";
+            this.colPlus.Name = "colPlus";
+            this.colPlus.ReadOnly = true;
+            // 
+            // colCookie
+            // 
+            this.colCookie.FillWeight = 55F;
+            this.colCookie.HeaderText = "物流2单号";
+            this.colCookie.Name = "colCookie";
+            this.colCookie.ReadOnly = true;
+            // 
+            // colUser
+            // 
+            this.colUser.FillWeight = 38F;
+            this.colUser.HeaderText = "售后状态";
+            this.colUser.Name = "colUser";
+            this.colUser.ReadOnly = true;
+            // 
+            // colPickupTime
+            // 
+            this.colPickupTime.FillWeight = 40F;
+            this.colPickupTime.HeaderText = "取件时间";
+            this.colPickupTime.Name = "colPickupTime";
+            this.colPickupTime.ReadOnly = true;
+            // 
+            // colUploadAccount
+            // 
+            this.colUploadAccount.FillWeight = 38F;
+            this.colUploadAccount.HeaderText = "仓库状态";
+            this.colUploadAccount.Name = "colUploadAccount";
+            this.colUploadAccount.ReadOnly = true;
+            // 
+            // col_raw_message
+            // 
+            this.col_raw_message.FillWeight = 50F;
+            this.col_raw_message.HeaderText = "附加信息";
+            this.col_raw_message.Name = "col_raw_message";
+            this.col_raw_message.ReadOnly = true;
+            // 
+            // colChatAccount
+            // 
+            this.colChatAccount.FillWeight = 50F;
+            this.colChatAccount.HeaderText = "创建时间";
+            this.colChatAccount.Name = "colChatAccount";
+            this.colChatAccount.ReadOnly = true;
+            // 
+            // colLoginStatus
+            // 
+            this.colLoginStatus.FillWeight = 50F;
+            this.colLoginStatus.HeaderText = "更新时间";
+            this.colLoginStatus.Name = "colLoginStatus";
+            this.colLoginStatus.ReadOnly = true;
+            // 
+            // colPlatform
+            // 
+            this.colPlatform.FillWeight = 40F;
+            this.colPlatform.HeaderText = "仓库编码";
+            this.colPlatform.Name = "colPlatform";
+            this.colPlatform.ReadOnly = true;
+            // 
+            // col_order_platform_code
+            // 
+            this.col_order_platform_code.FillWeight = 35F;
+            this.col_order_platform_code.HeaderText = "平台编码";
+            this.col_order_platform_code.Name = "col_order_platform_code";
+            this.col_order_platform_code.ReadOnly = true;
+            // 
+            // col_order_code
+            // 
+            this.col_order_code.HeaderText = "订单编码";
+            this.col_order_code.Name = "col_order_code";
+            this.col_order_code.ReadOnly = true;
+            this.col_order_code.Visible = false;
+            // 
+            // pre_allocated_order_no
+            // 
+            this.pre_allocated_order_no.FillWeight = 38F;
+            this.pre_allocated_order_no.HeaderText = "取号状态";
+            this.pre_allocated_order_no.Name = "pre_allocated_order_no";
+            this.pre_allocated_order_no.ReadOnly = true;
+            // 
+            // col_is_transfer_ship
+            // 
+            this.col_is_transfer_ship.FillWeight = 38F;
+            this.col_is_transfer_ship.HeaderText = "是否物流";
+            this.col_is_transfer_ship.Name = "col_is_transfer_ship";
+            this.col_is_transfer_ship.ReadOnly = true;
+            // 
+            // col_random_code
+            // 
+            this.col_random_code.FillWeight = 40F;
+            this.col_random_code.HeaderText = "溯源码";
+            this.col_random_code.Name = "col_random_code";
+            this.col_random_code.ReadOnly = true;
+            // 
+            // colMsg
+            // 
+            this.colMsg.HeaderText = "操作结果";
+            this.colMsg.Name = "colMsg";
+            this.colMsg.ReadOnly = true;
+            this.colMsg.Visible = false;
+            // 
+            // WXAdminTransitWarehouseManage
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.ClientSize = new System.Drawing.Size(1273, 610);
+            this.Controls.Add(this.panel3);
+            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.KeyPreview = true;
+            this.Name = "WXAdminTransitWarehouseManage";
+            this.Text = "微信小店店铺列表";
+            this.TitleText = "微信小店店铺列表";
+            this.Load += new System.EventHandler(this.AdminShopForm_Load);
+            this.VisibleChanged += new System.EventHandler(this.AdminShopForm_VisibleChanged);
+            this.Controls.SetChildIndex(this.panel3, 0);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.tableLayoutPanel2.ResumeLayout(false);
+            this.panel5.ResumeLayout(false);
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            this.splitContainer2.Panel2.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
+            this.panel3.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.PictureBox pbLoading;
+        private UserComponent.DataGridViewEx dgvShop;
+        private System.Windows.Forms.CheckBox chkAutoDrag;
+        private UserControls.StatusBarUserControl statusBar;
+        private DevComponents.DotNetBar.PanelEx btnEmpty;
+        private UserControls.UcSplitPage ucSplitPage1;
+        private System.Windows.Forms.TextBox txtOutOrderNo;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox txtWxOrderNo;
+        private System.Windows.Forms.Label label5;
+        private DevComponents.DotNetBar.PanelEx btnSearch;
+        private DevComponents.DotNetBar.PanelEx btnLoginSelect;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.TextBox textBox2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox txt;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOutOrderNo;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopAccount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colWxCreateTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colGroupName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colAccountNote;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMinus;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colProductRemaining;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPlus;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colCookie;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colUser;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPickupTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colUploadAccount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn col_raw_message;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colChatAccount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colLoginStatus;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colPlatform;
+        private System.Windows.Forms.DataGridViewTextBoxColumn col_order_platform_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn col_order_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn pre_allocated_order_no;
+        private System.Windows.Forms.DataGridViewTextBoxColumn col_is_transfer_ship;
+        private System.Windows.Forms.DataGridViewTextBoxColumn col_random_code;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
+    }
+}

TEMUKJD/WXForms/AdminForms/WXAdminTransitWarehouseManage.cs

@@ -0,0 +1,338 @@
+using AllBase;
+using AllBase.Helper;
+using AllBase.Model.DBModel;
+using AllBase.Model.Param.TemuProductManage;
+using AllBase.Model.Result;
+using NaiBa.Util;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Printing;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using TemuKJD.BaseForms;
+using TemuKJD.BLL;
+using TemuKJD.Extension;
+using TemuKJD.WXForms.ShopForms;
+using Work;
+
+namespace TemuKJD.WXForms.AdminForms
+{
+    public partial class WXAdminTransitWarehouseManage : BaseForms.BaseGeneralForm
+    {
+        static WXAdminTransitWarehouseManage inst = null;
+        public static WXAdminTransitWarehouseManage Instance
+        {
+            get { if (inst == null) inst = new WXAdminTransitWarehouseManage(); return inst; }
+            set { inst = value; }
+        }
+
+        public static ConcurrentList<oms_wei_external_procurement_log> lstTransitWarehouseOrder { get; set; } = new ConcurrentList<oms_wei_external_procurement_log>();
+
+        public WXAdminTransitWarehouseManage()
+        {
+            InitializeComponent();
+
+            Instance = this;
+        }
+
+        private void AdminShopForm_Load(object sender, EventArgs e)
+        {
+            this.ucSplitPage1.PageChange += UcSplitPage1_PageChange;
+
+            this.dgvShop.AddSelectorColumn("colSelect");
+            //this.dgvShop.AddMergeColumnHeader(new List<string>() { /*"colMinus",*/ "colProductRemaining", "colPlus" }, "选品限额");
+            //this.dgvShop.AddMergeColumn(new List<string>() { /*"colMinus",*/ "colProductRemaining", "colPlus" });
+            //this.dgvShop.Columns["colMinus"].HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            //this.dgvShop.Columns["colPlus"].HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+            //this.dgvShop.Columns["colPlus"].HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
+
+            if (BaseClass.SaLevel != 1)
+            {
+                //dgvShop.Columns["colSubSa"].Visible = false;
+            }
+        }
+
+        bool firstLoad = true;
+        private void AdminShopForm_VisibleChanged(object sender, EventArgs e)
+        {
+            if (this.Visible == true && firstLoad)
+            {
+                firstLoad = false;
+                this.pbLoading.Visible = true;
+                SearchTransitOrder(this.ucSplitPage1.CurrentPage);
+            }
+        }
+
+        private void UcSplitPage1_PageChange(object obj)
+        {
+            SearchTransitOrder(this.ucSplitPage1.CurrentPage);
+        }
+
+        public void SearchTransitOrder(int page)
+        {
+            List<string> shopIdList = GetCheckedShopIdList();
+            if (InvokeRequired)
+            {
+                Invoke(new Action(() =>
+                {
+                    this.pbLoading.Visible = true;
+                    this.dgvShop.Rows.Clear();
+                    lstTransitWarehouseOrder.Clear();
+                }));
+            }
+            else
+            {
+                this.pbLoading.Visible = true;
+                this.dgvShop.Rows.Clear();
+                lstTransitWarehouseOrder.Clear();
+            }
+            Task.Run(() =>
+            {
+                int pageCount;
+                decimal seconds = 0;
+                var list = AdminGetServerShopLst(out pageCount, out seconds, page, ucSplitPage1.PageSize);
+                lstTransitWarehouseOrder.AddRange(list);
+                this.ucSplitPage1.TotalPage = pageCount;
+
+
+                var url = BaseClass.BuildWXObjString("order/get_erp_order_list");
+                var data = UserLogin.GetSignaturex();
+                data += "&erp_order_id_in=" + string.Join(",", list.Select(s => s.order_no));
+                data += "&is_not_count=true";
+                data += "&page_size=" + 5000;
+                Thread.Sleep(200);
+                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"))
+                {
+                }
+                else
+                {
+                    var orderList = JsonHelper.DeserializeJsonToList<oms_wei_order>(JObject.Parse(html)["data"].ParseToString());
+                    if (orderList == null)
+                        orderList = new List<oms_wei_order>();
+
+                    foreach (var order in lstTransitWarehouseOrder)
+                    {
+                        order.oms_Wei_Order = orderList.FirstOrDefault(o => o.order_id == order.order_no);
+                    }
+                }
+
+
+                foreach (var order in lstTransitWarehouseOrder)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        int rowIndex = this.dgvShop.Rows.Add(
+                            false,
+                            order.out_order_no,
+                            order.order_no,
+                            order.order_sku_id,
+                            BaseClass.StampToDateTime(order.oms_Wei_Order.create_time).ToString("yy-MM-dd HH:mm"),
+                            order.oms_Wei_Order.shop_name,
+                            order.buyer_account,
+                            order.out_amount * 0.01m,
+                            order.purchaser_note,
+                            order.express_1_company,
+                            order.express_1_waybill,
+                            order.express_2_company,
+                            order.express_2_waybill,
+                            order.refund_status,
+                            order.pickup_time == DateTime.MinValue ? "" : order.pickup_time.ToString("yy-MM-dd HH:mm"),
+                            order.transfer_warehouse_status,
+                            order.raw_message,
+                            order.created_time.ToString("yy-MM-dd HH:mm"),
+                            order.updated_time.ToString("yy-MM-dd HH:mm"),
+                            order.platform,
+                            order.order_platform_code,
+                            order.order_code,
+                            order.pre_allocated_order_no,
+                            order.is_transfer_ship,
+                            order.random_code
+                        );
+                    }));
+                }
+
+                Invoke(new Action(() =>
+                {
+                    this.pbLoading.Visible = false;
+                    this.statusBar.lblTaskStatus.Text = "店铺查询完毕";
+#if DEBUG
+                    this.statusBar.lblTaskStatus.Text += "，耗时：" + seconds;
+#endif
+                }));
+            });
+        }
+
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            if (this.ucSplitPage1.CurrentPage != 1)
+                this.ucSplitPage1.CurrentPage = 1;
+            else
+                SearchTransitOrder(1);
+        }
+
+        private void pnlEmpty_Click(object sender, EventArgs e)
+        {
+            this.txtWxOrderNo.Text = "";
+            this.txtOutOrderNo.Text = "";
+            this.txt.Text = "";
+            this.textBox2.Text = "";
+        }
+
+        bool IsOperate = false;
+        private void btnLoginSelect_Click(object sender, EventArgs e)
+        {
+            if (BaseMsgForm.ShowConfirm("确定删除仓库单吗？删除后不可恢复！").DialogResult == DialogResult.Cancel)
+                return;
+
+            IsOperate = true;
+            {
+                List<string> outOrderIds = GetCheckedList();
+                if (!outOrderIds.Any())
+                {
+                    BaseMsgForm.ShowError("请选择需要删除的仓库单");
+                    IsOperate = false;
+                    return;
+                }
+
+                //todo 删除订单
+                var url3 = BaseClass.BuildWXObjString("order/wx_del_erp_transit_warehouse_order");
+                var data3 = UserLogin.GetSignaturex();
+                if (outOrderIds.Count > 0)
+                    data3 += "&out_order_no=" + string.Join(",", outOrderIds);
+                var html3 = GetHtml.PostUtf8(url3, data3);
+                if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                    html3 = GetHtml.PostUtf8(url3, data3);
+
+                if (html3.Contains("\"code\":200"))
+                {
+                    if (this.ucSplitPage1.CurrentPage != 1)
+                        this.ucSplitPage1.CurrentPage = 1;
+                    else
+                        SearchTransitOrder(1);
+                }
+                else
+                {
+                    BaseMsgForm.ShowError("删除失败" + BaseRegex.GetStringJson(ref html3, "msg"));
+                }
+            }
+            IsOperate = false;
+        }
+
+        private void dgvShop_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            string headerText = dgvShop.Columns[e.ColumnIndex].HeaderText;
+            string outOrderNo = dgvShop.Rows[e.RowIndex].Cells["colOutOrderNo"].Value.ParseToString();
+            var order = lstTransitWarehouseOrder.FirstOrDefault(v => v.out_order_no == outOrderNo);
+            var row = dgvShop.Rows[e.RowIndex];
+
+            switch (headerText)
+            {
+                case "删除":
+                    if (BaseMsgForm.ShowConfirm("确定删除仓库单吗？删除后不可恢复！").DialogResult == DialogResult.Cancel)
+                        return;
+                    break;
+                case "":
+                    row.Cells["colSelect"].Value = !row.Cells["colSelect"].Value.ParseToBool();
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        private List<string> GetCheckedList()
+        {
+            List<string> checkOrderLst = new List<string>();
+            for (int i = 0; i < dgvShop.Rows.Count; i++)
+            {
+                if (dgvShop.Rows[i].Cells["colSelect"].Value.ParseToBool())
+                {
+                    string shopName = dgvShop.Rows[i].Cells["colOutOrderNo"].Value.ParseToString();
+                    checkOrderLst.Add(shopName);
+                }
+            }
+            return checkOrderLst;
+        }
+
+        private List<string> GetCheckedShopIdList()
+        {
+            List<string> shopNameList = new List<string>();
+            for (int i = 0; i < dgvShop.Rows.Count; i++)
+            {
+                if (dgvShop.Rows[i].Cells["colSelect"].Value.ParseToBool())
+                {
+                    string shopName = dgvShop.Rows[i].Cells["colShopId"].Value.ParseToString();
+                    shopName += dgvShop.Rows[i].Cells["colUser"].Value.ParseToString(); 
+                    shopNameList.Add(shopName);
+                }
+            }
+            return shopNameList;
+        }
+
+        public List<oms_wei_external_procurement_log> AdminGetServerShopLst(out int pageCount, out decimal seconds, int page = 1, int pageSize = 50)
+        {
+            pageCount = 0;
+            seconds = 0;
+
+            var url3 = BaseClass.BuildWXObjString("order/wx_get_transit_order");
+            var data3 = UserLogin.GetSignaturex();
+            Invoke(new Action(() => { }));
+            if (!string.IsNullOrEmpty(txtOutOrderNo.Text.Trim()))
+                data3 += "&out_order_no=" + string.Join(",", this.txtOutOrderNo.Text.Split(new string[] { "\r", "\n", " "}, StringSplitOptions.RemoveEmptyEntries));
+            if (!string.IsNullOrEmpty(txtWxOrderNo.Text.Trim()))
+                data3 += "&order_no=" + string.Join(",", this.txtWxOrderNo.Text.Split(new string[] { "\r", "\n", " " }, StringSplitOptions.RemoveEmptyEntries));
+            if (!string.IsNullOrEmpty(txt.Text.Trim()))
+                data3 += "&transfer_warehouse_status=" + string.Join(",", this.txt.Text.Split(new string[] { "\r", "\n", " " }, StringSplitOptions.RemoveEmptyEntries));
+            if (!string.IsNullOrEmpty(textBox2.Text.Trim()))
+                data3 += "&pre_allocated_order_no=" + string.Join(",", this.textBox2.Text.Split(new string[] { "\r", "\n", " " }, StringSplitOptions.RemoveEmptyEntries));
+            data3 += "&is_admin=true";
+            data3 += "&page=" + page;
+            data3 += "&page_size=" + pageSize;
+            data3 += "&not_count=false";
+            var html3 = GetHtml.PostUtf8(url3, data3);
+            if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                html3 = GetHtml.PostUtf8(url3, data3);
+            if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+            {
+                //Dispatcher.Invoke(new Action(() =>
+                //{
+                //    BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
+                //}));
+                //break;
+            }
+            List<oms_wei_external_procurement_log> transitOrderList = new List<oms_wei_external_procurement_log>();
+            try
+            {
+                transitOrderList = JsonHelper.DeserializeJsonToList<oms_wei_external_procurement_log>(JObject.Parse(html3)["data"].ParseToString());
+                if (transitOrderList == null)
+                    transitOrderList = new List<oms_wei_external_procurement_log>();
+            }
+            catch 
+            { 
+            }
+            seconds = BaseRegex.GetDecimalJson(ref html3, "seconds");
+            int count = BaseRegex.GetIntJson(ref html3, "count");
+            pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
+            pageCount = Math.Max(pageCount, 1);
+            return transitOrderList;
+        }
+
+        private void dgvShop_CellMouseDown(object sender, DataGridViewCellMouseEventArgs e)
+        {
+        }
+    }
+}

TEMUKJD/WXForms/AdminForms/WXAdminTransitWarehouseManage.resx

@@ -0,0 +1,376 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOutOrderNo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colWxCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colShopName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colGroupName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAccountNote.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMinus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductRemaining.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPlus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCookie.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUser.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPickupTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUploadAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="col_raw_message.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colChatAccount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colLoginStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colPlatform.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="col_order_platform_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="col_order_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="pre_allocated_order_no.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="col_is_transfer_ship.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="col_random_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP//
+        AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ
+        AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA
+        OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT
+        AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj///////
+        ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP//
+        //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4
+        mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ
+        mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ
+        mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ
+        mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ
+        mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ
+        mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY
+        //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ
+        mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf
+        //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/
+        //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv///
+        //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP//
+        if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ
+        mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz
+        MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///
+        iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ
+        mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4
+        kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP//
+        /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ
+        mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ
+        mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ
+        mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ
+        mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ
+        //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ
+        mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ
+        mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ
+        mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT
+        mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj///////
+        ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn///
+        //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ
+        mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ
+        mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ
+        mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ
+        mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj///////////
+        ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY//////
+        ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP
+        //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4
+        /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ
+        mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ
+        mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7
+        mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4
+        eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb////
+        ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ
+        mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj/////
+        /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/
+        ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ
+        mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ
+        mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ
+        mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ
+        mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA
+        AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA
+        AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ
+        mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz
+        MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA
+        AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w
+        AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA
+        Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA
+        AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA
+        AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA
+        AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA
+        AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA
+        AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA
+        AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA
+        AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA
+        AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA
+        AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA
+        AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA
+        AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD/////
+        wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w==
+</value>
+  </data>
+</root>

TEMUKJD/WXForms/TalkForms/PDDBuyerOrderListForm.cs

@@ -48,7 +48,7 @@ namespace TemuKJD.WXForms.TalkForms
         ConcurrentList<PddBuyerAfterSaleLiteInfo> lstPddBuyerAfterSaleInfoLite { get; set; } = new ConcurrentList<PddBuyerAfterSaleLiteInfo>();
         public CancellationTokenSource cancellationTokenSource { get; set; } = new CancellationTokenSource();
         //public ChromiumWebBrowser cefWebBrowser = null;
-        public BuyerOrderConfig buyerOrderConfig = new BuyerOrderConfig();
+        public BuyerReadOrderConfig buyerOrderConfig = new BuyerReadOrderConfig();
         public DateTime nextGetOrderTime = DateTime.MinValue;
         public bool isLoadComplate = false;
         public bool firstVisible = false;
@@ -74,9 +74,9 @@ namespace TemuKJD.WXForms.TalkForms
             dgvAfterSale.Height = dgvPddBuyerOrder.Height;
             dgvAfterSale.SendToBack();
 
-            buyerOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerOrderConfig>("pdd_buyer_order_config");
+            buyerOrderConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<BuyerReadOrderConfig>("pdd_buyer_order_config");
             if (buyerOrderConfig == null)
-                buyerOrderConfig = new BuyerOrderConfig();
+                buyerOrderConfig = new BuyerReadOrderConfig();
 
             this.chkPause.Checked = buyerOrderConfig.IsPause;
             this.chkAutoAfterSale.Checked = buyerOrderConfig.IsAutoAfterSale;
@@ -2129,7 +2129,7 @@ namespace TemuKJD.WXForms.TalkForms
         }
     }
 
-    public class BuyerOrderConfig
+    public class BuyerReadOrderConfig
     {
         public bool IsPause = false;
         public bool IsAutoAfterSale = true;