Commit Graph

  • 692475adfe Merge branch 'feature/cpy_splite' into 'test' 王让让 2023-06-09 00:58:23 +0000
  • 6a4ddb94fb 修改预制发票自动拆分成品油和非成品油 wangrangrang 2023-06-09 08:56:42 +0800
  • e31dfeb857 Merge branch 'test' of http://192.168.12.182/invoice/sims-order into test gaorl 2023-06-09 08:39:46 +0800
  • 51fba21048 feature:1、同步公司库按钮,2、物料功能优化3、智能赋码生成预制强制校验 gaorl 2023-06-09 08:24:24 +0800
  • 10b8e96a69 OFD转PNG接口调试 WangQi 2023-06-08 21:18:33 +0800
  • fa841e42dd Merge remote-tracking branch 'sdny/release' into release V1.0.4 zhenghaiyang@ele-cloud.com 2023-06-08 21:00:56 +0800
  • b58e6acc4c feature 1.修复OFD转png设置默认状态 zhenghaiyang@ele-cloud.com 2023-06-08 20:57:41 +0800
  • 4c6974414c OFD转PNG接口调试 WangQi 2023-06-08 20:56:00 +0800
  • c475395dc1 Merge remote-tracking branch 'sdny/release' into test zhenghaiyang@ele-cloud.com 2023-06-08 17:29:08 +0800
  • 624b44b71c Merge remote-tracking branch 'origin/bugfix_3066' into release WangQi 2023-06-08 16:22:05 +0800
  • 95b48988e2 Merge branch 'task_4516_wq' into release WangQi 2023-06-08 16:19:04 +0800
  • 166064928e Merge remote-tracking branch 'origin/task_4530_wq' into release WangQi 2023-06-08 16:18:45 +0800
  • 7aee7498ac feature:购方信息导入 gaorl 2023-06-08 15:58:48 +0800
  • 2d1d9df9ef Merge remote-tracking branch 'sdny/release' into test zhenghaiyang@ele-cloud.com 2023-06-08 15:28:06 +0800
  • 5aedbec1c1 Merge remote-tracking branch 'origin/release' into release WangQi 2023-06-08 14:27:31 +0800
  • a5c13192ec task4216 ofd转png接口使用影像系统接口 增加开关配置 WangQi 2023-06-08 14:27:03 +0800
  • ed691702c3 Merge branch 'dev_task_4216' into release WangQi 2023-06-08 14:26:23 +0800
  • 0cb5832401 feature:物料逻辑重新梳理 gaorl 2023-06-06 20:09:26 +0800
  • c9064a3997 feature:获取mdm物料时,不更新公司库,不更新税收编码 gaorl 2023-06-06 20:04:51 +0800
  • f13a22eac9 feature:购方信息导入,buyer_code导入判空 gaorl 2023-06-06 18:05:58 +0800
  • dd5bdb7c2c Merge branch 'dev_task_4216' into test WangQi 2023-06-06 17:08:21 +0800
  • f21bd058f3 task4216 ofd转png接口使用影像系统接口 增加开关配置 WangQi 2023-06-06 17:05:35 +0800
  • 48880dc213 feature:导入物料规格型号40个字符长度处理 gaorl 2023-06-06 15:29:24 +0800
  • baf36758bb feature:开票组织查询调整,名称和税号取设置默认的行,如果不存在取下标0的展示 gaorl 2023-06-06 14:55:49 +0800
  • b6f6194040 Merge remote-tracking branch 'origin/task_4516_wq' into test WangQi 2023-06-06 14:29:57 +0800
  • c6c68f01fc task4516 sap报账单删除功能 WangQi 2023-06-06 14:29:29 +0800
  • 7fb023b5b6 task4516 sap报账单删除功能 WangQi 2023-06-06 11:08:43 +0800
  • f27bd5c18b feature 1.修复红票清单标志问题 zhenghaiyang@ele-cloud.com 2023-06-05 19:30:53 +0800
  • 8abef61735 Merge remote-tracking branch 'origin/task_4530_wq' into test WangQi 2023-06-05 16:07:15 +0800
  • a4b75b13e4 task4530 WangQi 2023-06-05 16:06:54 +0800
  • 95f9424982 Merge remote-tracking branch 'origin/task_4530_wq' into test WangQi 2023-06-05 15:50:59 +0800
  • 8b0f11ba2e task4530 WangQi 2023-06-05 15:50:42 +0800
  • ad44adf600 Merge remote-tracking branch 'origin/task_4530_wq' into test WangQi 2023-06-05 15:41:13 +0800
  • b5fca06951 task4530 WangQi 2023-06-05 15:40:11 +0800
  • c45754fda8 Merge remote-tracking branch 'origin/bugfix_3066' into test WangQi 2023-05-31 10:53:54 +0800
  • cb3863c01d Merge remote-tracking branch 'origin/task_4437' into test WangQi 2023-05-31 10:52:24 +0800
  • 2771b60ca8 Merge remote-tracking branch 'origin/task_4437' into release WangQi 2023-05-31 10:51:56 +0800
  • ed260e91b1 task4437 WangQi 2023-05-31 10:51:38 +0800
  • d7d913b34d Merge remote-tracking branch 'origin/bugfix_3158' into release WangQi 2023-05-31 09:50:08 +0800
  • 079de67787 bug3066 WangQi 2023-05-30 08:57:58 +0800
  • a57e448fdd Merge remote-tracking branch 'origin/release' into test zhenghaiyang@ele-cloud.com 2023-05-29 19:34:14 +0800
  • ffb7d94aa2 feature 1.修改规格型号 zhenghaiyang@ele-cloud.com 2023-05-29 19:31:56 +0800
  • cf7410da07 Merge remote-tracking branch 'sdny/test' into test zhenghaiyang@ele-cloud.com 2023-05-29 19:28:15 +0800
  • 90536c7319 feature 1.修改规格型号 zhenghaiyang@ele-cloud.com 2023-05-29 19:28:09 +0800
  • c1354cbd9b Merge remote-tracking branch 'origin/bugfix_3158' into test WangQi 2023-05-29 17:16:32 +0800
  • 9c40d64e36 bug3158 WangQi 2023-05-29 16:57:54 +0800
  • 2682670e2a feature 1.修改配置 zhenghaiyang@ele-cloud.com 2023-05-29 16:28:15 +0800
  • efe9853432 feature 1.处理报错问题 zhenghaiyang@ele-cloud.com 2023-05-29 14:55:50 +0800
  • a6222d0198 Merge remote-tracking branch 'origin/test' into test WangQi 2023-05-29 14:42:55 +0800
  • 2278393973 Merge remote-tracking branch 'origin/dev_task_4216' into test WangQi 2023-05-29 14:42:25 +0800
  • c8226f4bb0 task:4216 WangQi 2023-05-29 14:42:08 +0800
  • 2f9083526e feature 1.处理匹配后的规格信号超长问题 zhenghaiyang@ele-cloud.com 2023-05-29 14:31:58 +0800
  • 2647d9ad6e feature:更新物料成品油清单标识为4的问题 gaorl 2023-05-29 09:40:09 +0800
  • f97e567632 feature:获取getUserInfo 时,开票组织全部设置为非默认,手工设置默认 gaorl 2023-05-27 11:35:53 +0800
  • 2c25c323dc feature:批量明细合并 gaorl 2023-05-26 17:03:55 +0800
  • a8127afa09 feature:批量合并明细 gaorl 2023-05-26 16:47:22 +0800
  • 02db9b34cb Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release gaorl 2023-05-26 16:46:04 +0800
  • a13e25a388 feature 1.判断全电发票不添加地址电话 zhenghaiyang@ele-cloud.com 2023-05-26 16:39:06 +0800
  • 213bb58f03 Merge branch 'test' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-05-26 11:43:54 +0800
  • 47f63694c9 feature:接口开票、更新物料补全商品编码时去掉前后空格 gaorl 2023-05-26 11:38:40 +0800
  • 9073c01da9 feature:批量勾选订单合并明细行 gaorl 2023-05-26 11:33:57 +0800
  • 40e844ff2b feature:订单手工拆分、明细行拆分,如果部分为成品油拆分完,需要修改清单标志为4,超8行明细为1,默认为0 gaorl 2023-05-26 10:35:00 +0800
  • e2fc102e98 feature:开具发票报错物料,条件删除逗号 gaorl 2023-05-25 20:22:36 +0800
  • 600c7878b8 Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release gaorl 2023-05-25 19:35:35 +0800
  • d7dacf428f feature:发票开具成功后,存在则更新公司物料库,不存在则插入 gaorl 2023-05-25 19:34:34 +0800
  • e69db84900 feature:生成预制发票校验是否全部为矿产品 gaorl 2023-05-25 19:31:20 +0800
  • aabd19b98e Merge remote-tracking branch 'origin/release' into release v1.0.0.1 WangQi 2023-05-25 16:48:49 +0800
  • 99f45186d0 Merge remote-tracking branch 'origin/bugfix_3144_wq' into release WangQi 2023-05-25 16:48:29 +0800
  • 8277908050 Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release gaorl 2023-05-25 16:47:24 +0800
  • 13f45979fd feature:生成预制发票时,判断部分为矿产的订单不允许生成预制 gaorl 2023-05-25 16:46:13 +0800
  • 817021a5fe Merge remote-tracking branch 'origin/bugfix_3144_wq' into test WangQi 2023-05-25 16:20:56 +0800
  • 6ed01cff76 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-25 16:20:55 +0800
  • d55fc66b16 feature 1.如果都是含稅數據進行价税分离 zhenghaiyang@ele-cloud.com 2023-05-25 16:20:36 +0800
  • afb02874b0 bug:3144 WangQi 2023-05-25 16:19:36 +0800
  • fbfc0184f8 feature:mdm拉取物料规格型号切割40个字节 gaorl 2023-05-25 15:59:40 +0800
  • fac8d1c6f7 feature:mdm 拉取物料时规格信息按照第一个下划线切割取其后面的内容 gaorl 2023-05-25 15:17:35 +0800
  • cab9bd681d Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release zhenghaiyang@ele-cloud.com 2023-05-24 14:58:04 +0800
  • 7d181b2097 feature 1.放开冲红成品油的校验 zhenghaiyang@ele-cloud.com 2023-05-24 14:57:41 +0800
  • 508c242cd2 Merge remote-tracking branch 'origin/dev_task_4173' into release WangQi 2023-05-23 15:28:26 +0800
  • 8635548e09 Merge remote-tracking branch 'origin/release' into test WangQi 2023-05-23 08:25:07 +0800
  • d3d6d49325 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-22 18:12:01 +0800
  • ea4019a4b4 feature 1.推送影像增加固定参数 zhenghaiyang@ele-cloud.com 2023-05-22 18:11:51 +0800
  • 627675814d feature:允许手工勾选物料更新 gaorl 2023-05-22 15:27:36 +0800
  • ad90ea29c7 Merge remote-tracking branch 'origin/dev_task_4173' into test WangQi 2023-05-22 09:15:13 +0800
  • 57278aeca3 task:4173 bug修复 WangQi 2023-05-22 09:14:52 +0800
  • 535fd0d559 feature:重复驳回的订单不再更新流水号 gaorl 2023-05-21 11:02:20 +0800
  • 9fa00657a8 feature 1.返回成功的状态 zhenghaiyang@ele-cloud.com 2023-05-19 16:59:10 +0800
  • f1ed220213 task:4216 影像ofd to png接口报错暂停开发 WangQi 2023-05-19 15:26:03 +0800
  • ad74101a7d feature 1.修复已拆分已开票的数据返回sap错误信息 zhenghaiyang@ele-cloud.com 2023-05-19 14:29:01 +0800
  • 34f9de750e feature 1.匹配后的商品名称大于90位进行截取 zhenghaiyang@ele-cloud.com 2023-05-18 15:22:17 +0800
  • 27ea8d5ffa feature 1.发票明细导出增加矿别 zhenghaiyang@ele-cloud.com 2023-05-18 14:20:16 +0800
  • fbe3b57fb8 feature 1.商品名称超过90位则进行截取 zhenghaiyang@ele-cloud.com 2023-05-18 11:41:31 +0800
  • 5fe62516ec Merge remote-tracking branch 'origin/dev_task_4173' into test WangQi 2023-05-18 10:03:36 +0800
  • 1db98ecd43 feature 1.修复人员信息取值不对问题 zhenghaiyang@ele-cloud.com 2023-05-18 09:14:13 +0800
  • 02a953fe0e task:4173 test WangQi 2023-05-18 09:13:56 +0800
  • 4d8c1756c6 task:4173 test WangQi 2023-05-18 08:38:58 +0800
  • 6a89e194f1 task:4173 test WangQi 2023-05-18 08:28:52 +0800
  • e40595313c task:4173 test WangQi 2023-05-18 08:17:56 +0800
  • c98a2b72d5 feature 1.修复物料模板 zhenghaiyang@ele-cloud.com 2023-05-17 19:01:33 +0800
  • 55bb4dd1c3 feature 1.修复多税盘开票点使用错误问题 zhenghaiyang@ele-cloud.com 2023-05-17 17:52:51 +0800