Commit Graph

Select branches

Hide Pull Requests

liangku_skuoptimazation

master

updatebug

yijia

Mono Color

• 67ed4491d9 1.新增1688付款通知，处理订单平价 2.1688改价通知，处理订单平价 3.平价触发条件修改 1）所有采购单为1688平台 2）所有采购单为在线采购 3）订单不处于取消/部分采购 shanji 2023-07-28 09:46:14 +0800
• c2b3b22cef 修复查询报错 shanji 2023-07-26 22:56:56 +0800
• dff359d639 修复查询报错 shanji 2023-07-26 22:47:49 +0800
• fc235ad6ad 10030 shanji 2023-07-26 22:16:06 +0800
• 1c63268657 1.批量修复采购商数据 2.订单列表返回值新增采购商 shanji 2023-07-26 16:41:48 +0800
• 532221ecc1 修改商品售价按全量提交 shanji 2023-07-26 12:00:05 +0800
• 25795b92e4 1.在1688改价通知对接拳探改价做平价处理 2.新增拳探商品改价接口 shanji 2023-07-26 01:09:08 +0800
• 60ad5da497 改价接口 shanji 2023-07-25 10:07:12 +0800
• 58f784c0b1 关联预览支持同配件按采购件数等比分配采购货款和采购运费 shanji 2023-07-25 00:16:44 +0800
• afa9defe17 在线采购支持分批采购 1.取消将现有采购单设为失效 2.计算订单成本时将该笔订单下所有采购单成本查出并进行计算 shanji 2023-07-24 12:29:33 +0800
• e3d0f02c75 1 shanji 2023-07-24 02:28:16 +0800
• 5f38a0b436 1 shanji 2023-07-23 14:29:29 +0800
• fdd6ab9a6b 1 shanji 2023-07-23 14:21:59 +0800
• b2d2738ee6 合格证补充任务增加钉钉通知 shanji 2023-07-23 14:06:53 +0800
• a5f1446bd4 齐库推送合格证信息时进行批量更新 shanji 2023-07-23 01:57:43 +0800
• 58c99f9a44 3.根据条件创建待核算任务 4.核算接口增加核算任务完成逻辑 5.订单搜索条件新增 5.1 待配置-仅显示需修改 5.2 待配置-仅显示配置超时(合格证拟定或补充超时) 5.3 待核算-仅显示超时 5.4 优化查询逻辑 6.订单查询返回sku的合格证拟定或合格证补充任务(如果有) 7.绩效考核增加合格证拟定任务和合格证补充任务 shanji 2023-07-22 21:56:22 +0800
• 2375fe11c3 1.订单sku配置状态更新接口 1.1 收到需修改，根据条件创建合格证补充任务 1.2 收到已配置，完成合格证相关任务 1.3 更新订单SKU配置状态 2.创建采购单和关联采购单时根据条件创建合格证拟定任务 shanji 2023-07-22 01:15:26 +0800
• 42c0f26ece 1 shanji 2023-07-20 19:34:58 +0800
• 2e61d573ef 订单sku增加发货标识 shanji 2023-07-20 13:08:57 +0800
• 1b1c37f674 订单sku计算发货装填 shanji 2023-07-20 13:05:11 +0800
• 99e1c9e062 调整代发入仓订单的快递归属计算规则 shanji 2023-07-20 11:14:42 +0800
• 2443a4ef0b 新增采购单删除接口 shanji 2023-07-18 21:49:09 +0800
• faa314dc00 1 shanji 2023-07-18 18:01:15 +0800
• d5e2eee528 10129 shanji 2023-07-18 17:29:06 +0800
• 0674c5f826 保存采购商Id2 shanji 2023-07-18 17:06:34 +0800
• 90a0bc15b8 1688发货流程，翻译中断流程 shanji 2023-07-18 15:34:06 +0800
• 14a4ddfcd8 增加订单查询条件 shanji 2023-07-18 12:07:47 +0800
• 4dfc8b52c9 1 shanji 2023-07-18 12:07:03 +0800
• 6f3051a968 增加历史采购单日志 shanji 2023-07-17 18:40:45 +0800
• 33c7742475 10028 shanji 2023-07-17 13:06:04 +0800
• f95d9fdad0 1 shanji 2023-07-16 23:54:17 +0800
• c904a3947a Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb shanji 2023-07-16 23:44:53 +0800
• 1238c820d4 入库采购单查询 shanji 2023-07-16 23:44:48 +0800
• 609fd6cb0c 取消过滤价格为0的sku shanji 2023-07-16 10:21:15 +0800
• 0d1b87465a 关联采购单对接齐库合格证查询 shanji 2023-07-15 12:16:50 +0800
• a6a367c8f1 对接齐库合格证查询接口 shanji 2023-07-15 00:32:46 +0800
• 7e3aa5fe25 待配置条件更新 shanji 2023-07-14 17:06:53 +0800
• 2148031304 更新订单统计 shanji 2023-07-14 16:40:40 +0800
• 28ed4dcf1f 订单各状态统计接口 shanji 2023-07-14 15:20:33 +0800
• de565c034e 完善设置快递单接口，更新设置历史采购单接口 shanji 2023-07-13 18:32:38 +0800
• 2af36c81ed 1.修改齐库推送规则，快递非签收不做通知 2.修改1688发货推送，忽略厂家代发入仓订单的采购单推送 3.修改手动发货接口，限制厂家代发入仓订单的请求 4.新增设置快递单和入仓采购单接口 (厂家代发入仓订单专属) 5.修改订单列表接口，快递单层返回入库采购单号 6.取消订单同时删除采购限时任务 7.修改订单同步，检测到取消订单删除采购限时任务 shanji 2023-07-13 16:44:49 +0800
• 534711237b 厂家代入仓订单发货 shanji 2023-07-13 12:44:54 +0800
• 0a0ad75e31 订单sku增加限时任务固定字段 shanji 2023-07-12 17:06:34 +0800
• 68993b5cb8 修改限时任务查询条件 shanji 2023-07-12 14:32:14 +0800
• 3f26626fdb 1 shanji 2023-07-12 14:11:44 +0800
• 5c95ed4907 1 shanji 2023-07-12 13:53:45 +0800
• b8698d03b4 Merge branch 'timelimittask' shanji 2023-07-12 13:51:14 +0800
• 0906bf741b 增加超时条件 shanji 2023-07-12 13:51:03 +0800
• dbe51889f3 Merge branch 'timelimittask' shanji 2023-07-12 00:37:48 +0800
• 85db56a600 限时任务增加OrderSn shanji 2023-07-12 00:37:21 +0800
• 7b35e882fa Merge branch 'timelimittask' shanji 2023-07-11 20:35:20 +0800
• d112888ee8 1 shanji 2023-07-11 20:35:10 +0800
• 84b557566e 1 shanji 2023-07-10 22:42:24 +0800
• c39002a55c 1 shanji 2023-07-10 22:41:39 +0800
• e9a3a60369 采购超时统计 shanji 2023-07-10 22:40:45 +0800
• 5bff392a5a 速腾快递 shanji 2023-07-10 18:04:06 +0800
• c0fc142cba 增加考核绩效菜单 shanji 2023-07-10 15:21:01 +0800
• 12fe34e009 1 shanji 2023-07-10 13:29:36 +0800
• c4f9580164 限时任务 shanji 2023-07-10 13:23:50 +0800
• e39e85fb5e 在线采购更新采购任务 shanji 2023-07-10 01:25:15 +0800
• 97dd7185ab 采购限时任务创建 shanji 2023-07-10 00:10:14 +0800
• 4ba2a0bf9c Merge branch 'master' into newOrderState shanji 2023-07-09 18:38:14 +0800
• ea77596b9b 1 shanji 2023-07-09 18:37:55 +0800
• cf1dc79728 Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb 506583276@qq.com 2023-07-08 10:56:31 +0800
• bb0b1d0797 Merge branch 'newOrderState' shanji 2023-07-06 21:42:54 +0800
• 9b4cff8a54 更新订单zhuangtia shanji 2023-07-06 21:42:41 +0800
• 5b13f33057 修改采购单接口 shanji 2023-07-06 14:44:34 +0800
• 92081d248e 1 shanji 2023-07-06 00:55:40 +0800
• 9afa97b184 1 shanji 2023-07-05 20:41:15 +0800
• 4b65e11769 1 shanji 2023-07-05 15:33:20 +0800
• 7ce4ca2360 Merge branch 'newOrderState' of http://code.qiyue666.com/pengcong001/bbwyb into newOrderState shanji 2023-07-05 15:31:30 +0800
• c558124d2a 1 shanji 2023-07-05 15:31:25 +0800
• d1f261d976 批量手动收货 shanji 2023-07-04 22:24:11 +0800
• 8f244747b5 修复bug shanji 2023-07-04 14:37:03 +0800
• a7bb3e53fb 1 shanji 2023-07-04 13:45:11 +0800
• df1cf00668 1 shanji 2023-07-04 13:19:22 +0800
• e255327e8d 1.新增齐库验收通知接口 2.新增订单状态：待验收 待核算 3.根据订单代入仓标识决定是否推送齐库到货信息 4.统一快递单匹配归属sku规则 5.暂时下线修改快递单号接口 shanji 2023-07-04 13:16:52 +0800
• 7b87ebf2a9 验收接口 shanji 2023-07-04 01:08:43 +0800
• 10b16fc4ea Merge branch 'master' into newOrderState shanji 2023-07-03 23:56:06 +0800
• bd222eb7d4 1 shanji 2023-07-03 23:32:11 +0800
• b5db58ed00 1 shanji 2023-07-03 23:28:58 +0800
• 24e60da6bf B端订单增加IntoStockType，订单Sku增加是否验收 shanji 2023-07-03 17:16:46 +0800
• 681479c99a 调整订单状态判定算法 shanji 2023-06-30 14:25:23 +0800
• 342ee9cfb4 1 shanji 2023-06-29 23:11:40 +0800
• cf4ea04c39 查询快递单 shanji 2023-06-29 22:49:15 +0800
• 7e076fbc8e 1 shanji 2023-06-29 15:39:08 +0800
• e36898231c 1 shanji 2023-06-29 13:58:45 +0800
• e7dde046f7 关联验证 shanji 2023-06-29 12:03:18 +0800
• aa9610a0ab 清理取消单数据 shanji 2023-06-29 01:21:04 +0800
• 357ab3689b 1 shanji 2023-06-28 22:53:00 +0800
• cff4ebaee4 快递单数据修复 shanji 2023-06-28 22:14:23 +0800
• a463b67c42 支持夸单包裹 shanji 2023-06-28 15:27:46 +0800
• 9c4e96b370 1688发货，手动发货增加快递单关系表逻辑 shanji 2023-06-28 11:40:29 +0800
• f71d07a486 修复关联预览采购单价计算错误的问题 shanji 2023-06-27 18:31:45 +0800
• 598b238837 Merge branch 'master' of http://code.qiyue666.com/pengcong001/bbwyb 506583276@qq.com 2023-06-27 15:01:23 +0800
• 977599bd05 1 506583276@qq.com 2023-06-27 15:01:11 +0800
• 341c986525 采购sku标题过滤 shanji 2023-06-26 23:46:07 +0800
• 9d9aad2ec1 关联验证 shanji 2023-06-25 20:29:11 +0800
• 31e924de5d 修复关联预览除以0的问题 shanji 2023-06-25 20:21:09 +0800
• 4c915f0ec7 修改单号，手动发货，新增日志 shanji 2023-06-25 14:34:41 +0800