Commit Graph

  • a1ff5dfae7 feature:订单导入模板调整 gaorl 2023-07-04 09:53:41 +0800
  • 5e20c4a712 Merge branch 'release' into test gaorl 2023-07-04 08:44:46 +0800
  • 39c68b9f86 feature:同步公司库物料编码 gaorl 2023-07-04 08:44:30 +0800
  • 72a787f034 Merge branch 'release' into test gaorl 2023-07-03 16:54:58 +0800
  • b41ae4350e feature:物料编辑无税率不修改 gaorl 2023-07-03 16:54:25 +0800
  • 35df8ddea5 feature:作废自动回推bug修复 gaorl 2023-06-30 16:21:16 +0800
  • 90254d15d7 feature:订单导入自行编码超16位、明细合并物料编码不允许为空、开票明细先去开票名称、再取物料名称 gaorl 2023-06-30 16:03:10 +0800
  • bbfbd5d7bd Merge branch 'release' into test gaorl 2023-06-30 14:25:08 +0800
  • 1c44f37505 feature: gaorl 2023-06-30 14:24:51 +0800
  • d352d8d300 Merge branch 'release' into test gaorl 2023-06-30 13:47:11 +0800
  • 46eccbabee feature:明细合并不存在合并数据bug修复 gaorl 2023-06-30 13:46:53 +0800
  • 4b0d08fa94 Merge branch 'release' into test gaorl 2023-06-30 11:46:49 +0800
  • 7c34afcbe3 feature:升级base-merge 版本 gaorl 2023-06-30 11:46:33 +0800
  • 0108bb2a62 feature:升级base的版本 gaorl 2023-06-30 11:45:10 +0800
  • b70bb85eea Merge branch 'release' into test gaorl 2023-06-30 10:59:12 +0800
  • 9d8933529d feature:明细合并 gaorl 2023-06-30 10:58:50 +0800
  • 58002555b7 调整日志级别 WangQi 2023-06-30 10:26:38 +0800
  • 4a700d8e49 Merge branch 'release' into test gaorl 2023-06-29 19:10:14 +0800
  • 6e18397dd4 feature:明细合并优化 gaorl 2023-06-29 19:09:51 +0800
  • 846a76079e Merge branch 'release' into test gaorl 2023-06-28 08:20:00 +0800
  • 2b28a29b15 feature:同步公司库,无自行编码时,生成一个自定义编码 gaorl 2023-06-28 08:19:15 +0800
  • b084fbe10a feature:明细合并 gaorl 2023-06-27 19:03:00 +0800
  • 0241ccd285 feature:明细合并 gaorl 2023-06-27 17:26:22 +0800
  • c13a9d8941 Merge branch 'release' into test gaorl 2023-06-27 16:05:59 +0800
  • 820a6cb4ea feature:明细合并 gaorl 2023-06-27 16:05:24 +0800
  • 68cf721c33 feature:明细合并 gaorl 2023-06-27 14:04:51 +0800
  • 148477fcb1 Merge branch 'release' into test gaorl 2023-06-27 08:18:51 +0800
  • 8595556568 feature:明细合并 gaorl 2023-06-27 08:18:24 +0800
  • 9277fa730a Merge branch 'release' into test gaorl 2023-06-26 21:12:32 +0800
  • 94f51e3011 feature:明细合并 gaorl 2023-06-26 21:12:18 +0800
  • edb754ca1e feature:明细合并 gaorl 2023-06-26 20:20:42 +0800
  • 46d632327d Merge branch 'release' into test gaorl 2023-06-26 19:07:56 +0800
  • 1ec32c3660 feature:明细合并 gaorl 2023-06-26 19:07:35 +0800
  • 19fe8050b9 Merge branch 'release' into test gaorl 2023-06-26 18:53:58 +0800
  • fe9e6ff03a feature:明细行合并 gaorl 2023-06-26 18:53:28 +0800
  • e066523aa0 Merge branch 'release' into test gaorl 2023-06-26 16:51:48 +0800
  • 6022c58703 feature:明细合并 gaorl 2023-06-26 16:51:26 +0800
  • 88c2acff9b Merge branch 'release' into test gaorl 2023-06-26 15:20:51 +0800
  • b7eee49818 feature:明细合并 gaorl 2023-06-26 15:19:58 +0800
  • 58e29d95d2 Merge branch 'release' into test gaorl 2023-06-26 11:58:11 +0800
  • 3fbf33192d feature:回推SAP时,明细行携带结算单号 gaorl 2023-06-26 11:55:36 +0800
  • 080a848a71 feature:同步公司库时,不更新单价 gaorl 2023-06-25 19:39:10 +0800
  • 21e83181fb feature:明细行合并 gaorl 2023-06-25 17:08:18 +0800
  • db118ee8c1 feature:合并明细 gaorl 2023-06-25 15:11:09 +0800
  • da1a43b6c8 feature:合并名称日志 gaorl 2023-06-25 15:00:21 +0800
  • 0a2e034d7c Merge branch 'release' into test gaorl 2023-06-25 14:22:40 +0800
  • c80c1c6707 feature:同步物料至公司库 gaorl 2023-06-25 14:21:58 +0800
  • 565b62811e Merge branch 'release' into test gaorl 2023-06-25 11:31:13 +0800
  • f8e0059fcb feature:同步公司库 gaorl 2023-06-25 11:30:47 +0800
  • bf2aa122c5 Merge branch 'release' into test gaorl 2023-06-25 11:12:16 +0800
  • 4865ce282d feature:明细合并 gaorl 2023-06-25 11:11:55 +0800
  • cd4d872c73 Merge branch 'release' into test gaorl 2023-06-25 09:42:27 +0800
  • 32e790b7e8 feature:电商02回推添加请求头 gaorl 2023-06-25 09:41:30 +0800
  • 5e3af15b05 Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-06-24 21:01:31 +0800
  • 2ecf7e4d8b Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test gaorl 2023-06-24 17:34:54 +0800
  • b1b1e85411 Merge branch 'release' into test gaorl 2023-06-24 17:34:29 +0800
  • e384b7363e feature:物料信息导入调整、接口数据重复数据校验 gaorl 2023-06-24 17:33:25 +0800
  • 3f902cb70c feature:物料信息导入计数 gaorl 2023-06-21 16:34:28 +0800
  • 44eaa9bca5 Merge remote-tracking branch 'origin/release' into release wangrangrang 2023-06-21 14:58:58 +0800
  • 5447484a20 修改成品油明细为空问题 wangrangrang 2023-06-21 14:42:23 +0800
  • 929e11929a Merge branch 'feature/cpy_splite' into test wangrangrang 2023-06-21 14:27:11 +0800
  • 8c8dc4397b 修改成品油明细为空问题 wangrangrang 2023-06-21 14:26:23 +0800
  • e495ea99cc 购方信息查不到跳过校验 WangQi 2023-06-21 12:34:25 +0800
  • 9287cdb4b6 Merge remote-tracking branch 'origin/test' into test WangQi 2023-06-21 12:31:23 +0800
  • 9e8df35bea 购方信息查不到跳过校验 WangQi 2023-06-21 12:31:09 +0800
  • e59e248b19 Merge branch 'release' into test gaorl 2023-06-21 11:55:47 +0800
  • 2e8ae0ee17 feature:明细合并名称、规格型号、单位判空,转换为空字符串 gaorl 2023-06-21 11:55:33 +0800
  • 452b86bfc4 Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test gaorl 2023-06-21 11:07:43 +0800
  • 511dd166c5 Merge branch 'release' into test gaorl 2023-06-21 11:07:30 +0800
  • 956d66287a feature:生成预制不校验容差 gaorl 2023-06-21 11:03:35 +0800
  • 669a2dea7b Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-06-21 10:57:54 +0800
  • db5cc20186 购方信息查不到跳过校验 WangQi 2023-06-21 10:05:20 +0800
  • 55061b56f8 购方信息查不到跳过校验 WangQi 2023-06-21 10:03:04 +0800
  • bab99e5a7d Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-06-20 18:46:03 +0800
  • f7b85a3c7b 合并拆分成品油分支 V1.0.5 wangrangrang 2023-06-20 17:27:12 +0800
  • 77f44ffa35 Merge branch 'feature/cpy_splite' into release wangrangrang 2023-06-20 17:23:39 +0800
  • 3a1670ea2d feature:更新物料优惠政策变更 gaorl 2023-06-20 16:50:53 +0800
  • a90e8564f7 feature:开票后保存客商信息 gaorl 2023-06-20 11:28:25 +0800
  • ef265204eb Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test gaorl 2023-06-20 11:28:04 +0800
  • e1b11052a7 Merge branch 'release' into test gaorl 2023-06-20 11:26:19 +0800
  • 67cf6050d3 feature:修改优惠政策标识 gaorl 2023-06-20 11:24:41 +0800
  • c97b036ef2 Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-06-20 11:23:32 +0800
  • e9977aefc8 Merge remote-tracking branch 'origin/task_4631_wq' into release WangQi 2023-06-20 08:52:48 +0800
  • ce980ebd0c Merge branch 'bugfix_3491_wq' into test WangQi 2023-06-19 17:18:27 +0800
  • ad36b5ea68 bugfix:3491 WangQi 2023-06-19 17:17:45 +0800
  • 10a5481afe Merge remote-tracking branch 'origin/bugfix_3491_wq' into test WangQi 2023-06-19 16:49:21 +0800
  • ef576fd4b3 bugfix:3491 WangQi 2023-06-19 16:48:57 +0800
  • b4fd3e8f1b Merge branch 'release' into test gaorl 2023-06-19 14:02:58 +0800
  • 0bbe339c17 Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release gaorl 2023-06-19 14:02:13 +0800
  • b614cd2fd6 feature:开票后保存客商信息 gaorl 2023-06-16 16:12:03 +0800
  • 0a6c515a17 Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test gaorl 2023-06-16 09:32:47 +0800
  • 2e7de81f6b Merge branch 'release' into test gaorl 2023-06-16 09:32:06 +0800
  • d7f5214188 feature:新增客户信息 用客户编码 + ent_id 校验重复性 gaorl 2023-06-16 09:31:25 +0800
  • f001bf9a6b feature 1.电商逻辑 zhenghaiyang@ele-cloud.com 2023-06-16 09:28:10 +0800
  • 3d48a23aa5 Merge remote-tracking branch 'origin/test' into test WangQi 2023-06-16 09:06:31 +0800
  • c6a2f07c44 Merge remote-tracking branch 'origin/task_4631_wq' into test WangQi 2023-06-16 09:06:10 +0800
  • 80edb696d2 task4631 开票申请单详情接口增加是否校验客户信息字段 WangQi 2023-06-16 09:05:47 +0800
  • b65af212bf Merge branch 'release' into test gaorl 2023-06-16 09:00:46 +0800
  • f1a2ec0730 feature:税编列设置为文本 gaorl 2023-06-16 08:59:57 +0800
  • b2843c6cbc Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-06-16 08:56:59 +0800