Commit Graph

  • e93491b628 task:4173 test WangQi 2023-05-17 17:32:44 +0800
  • deb27e7ef6 task:4173 test WangQi 2023-05-17 17:10:05 +0800
  • 54f77bb255 task:4173 test WangQi 2023-05-17 17:08:45 +0800
  • a6c53f04d0 task:4173 WangQi 2023-05-17 16:54:22 +0800
  • e152bb1599 feature:物料导入物料编码为空时生成自定义的物料编码 gaorl 2023-05-17 16:15:22 +0800
  • 61aeb25b48 Merge branch 'release' of http://192.168.12.182/invoice/sims-order into dev_task_4173 WangQi 2023-05-17 15:06:07 +0800
  • 3b2d2deac8 feature:物料信息新增编辑 gaorl 2023-05-16 21:03:35 +0800
  • 100e220c8a feature:订单导入客户信息,存在则跳过 gaorl 2023-05-16 20:21:22 +0800
  • a2f4c5f2ab feature:订单导入客户信息,存在则跳过 gaorl 2023-05-16 19:15:08 +0800
  • 6c2795c90e feature:物料更新 gaorl 2023-05-16 19:06:24 +0800
  • 6e118c6126 feature:新增物料存在则更新 gaorl 2023-05-16 18:57:35 +0800
  • 40a1c002f6 feature:客户编码、物料编码如果为空或者00000000,后端自动生成一个匹配 gaorl 2023-05-16 17:17:24 +0800
  • 0a6a7d3626 Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release gaorl 2023-05-16 16:21:17 +0800
  • 14f557bbed feature:物料新增重复入库判断 gaorl 2023-05-16 16:20:54 +0800
  • d99684a688 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-16 16:09:32 +0800
  • dcb8d19e6a feature 1.全电的数量、单价长度为13位 zhenghaiyang@ele-cloud.com 2023-05-16 16:09:25 +0800
  • b5f8054077 feature:订单编辑保存时不重新获取税编 gaorl 2023-05-16 14:15:13 +0800
  • 480016ca77 task:4173 WangQi 2023-05-16 10:58:04 +0800
  • 5c43c3852d task:4173 WangQi 2023-05-16 10:52:22 +0800
  • bbf1177dc4 feature:订单导入客户信息,存在则跳过 gaorl 2023-05-16 10:47:36 +0800
  • 30c0634989 feature:新增、编辑物料其他公司已存在的不能入库问题解决 gaorl 2023-05-16 09:08:22 +0800
  • 01053763df feature:redis 哨兵、buyer_code\encoding 导入补0, gaorl 2023-05-15 19:51:13 +0800
  • acfb434519 feature:新增、编辑客户信息去重优先取默认值的 gaorl 2023-05-15 19:30:33 +0800
  • 8f6d06e2f2 feature:保存客户信息,地址、银行信息去重 gaorl 2023-05-15 17:57:20 +0800
  • c87fedc4f1 feature:发票已开具的订单,重新提交时直接返回S gaorl 2023-05-15 17:34:17 +0800
  • 7ec4c029d2 feature:1、明细合并判断清单标志为1的需要判断合并后明细行、2、新增、编辑客户信息相同明细行相同的去重 gaorl 2023-05-15 14:31:50 +0800
  • 7c429337bc feature:更新订单明细物料 gaorl 2023-05-15 11:24:20 +0800
  • 503529d3ac feature:更新订单明细物料 gaorl 2023-05-15 10:51:42 +0800
  • 56b7365738 Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release gaorl 2023-05-12 21:32:01 +0800
  • 0f8350d10c feature:订单明细合并 gaorl 2023-05-12 21:31:46 +0800
  • a09a056642 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-12 17:24:28 +0800
  • 0869dc5476 feature 1.修改补全公司代码逻辑 zhenghaiyang@ele-cloud.com 2023-05-12 17:24:22 +0800
  • 8e2b595284 feature:订单明细合并 gaorl 2023-05-12 17:06:37 +0800
  • 06cda2b441 feature:合并订单明细 gaorl 2023-05-12 17:02:45 +0800
  • 2a667e2d1b Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-12 15:33:05 +0800
  • d5817733f9 feature 1.接口来源的数据不校验成品油信息 zhenghaiyang@ele-cloud.com 2023-05-12 15:32:26 +0800
  • 9df67caf73 feature:更新订单明细物料 gaorl 2023-05-11 20:46:20 +0800
  • dd50cba1cb feature:更新订单明细物料 gaorl 2023-05-11 20:31:18 +0800
  • 26a9554628 feature:更新订单明细物料 gaorl 2023-05-11 19:46:47 +0800
  • 61bd07d8ef feature:更新订单明细物料 gaorl 2023-05-11 19:26:13 +0800
  • fabfd5f47a feature:更新订单物料 gaorl 2023-05-11 19:04:19 +0800
  • 3ca81badce feature:订单驳回接口已开具的发票全部冲红或者作废,允许驳回 gaorl 2023-05-11 18:32:04 +0800
  • 5afc8c64cd feature:接口开具获取开票组织 gaorl 2023-05-11 17:20:47 +0800
  • 7e815f1428 feature:订单编辑更新物料、接口开具取开票组织信息 gaorl 2023-05-11 16:35:07 +0800
  • bae2a03b24 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-11 14:34:14 +0800
  • df15763b14 feature 1.增加判断逻辑 zhenghaiyang@ele-cloud.com 2023-05-11 14:34:09 +0800
  • ed4e08d277 feature:接口开票取开票组织的销项默认值 gaorl 2023-05-11 14:18:46 +0800
  • 74082994c6 feature:接口开票销方组织取订单的开票组织默认值,不取大B gaorl 2023-05-11 11:44:13 +0800
  • 75910cf06e Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release zhenghaiyang@ele-cloud.com 2023-05-11 10:30:20 +0800
  • f464588399 feature 1.修复判断逻辑 zhenghaiyang@ele-cloud.com 2023-05-11 10:29:49 +0800
  • e2802568ee feature:添加redis客户端依赖包 gaorl 2023-05-10 20:52:25 +0800
  • a37e158ab3 feature:哨兵模式 gaorl 2023-05-10 20:09:29 +0800
  • 375965a853 feature 1.还原代码 zhenghaiyang@ele-cloud.com 2023-05-10 19:03:26 +0800
  • dc7f3bae60 feature: 销项票池添加销方组织 gaorl 2023-05-10 18:58:52 +0800
  • c6ae2c6537 Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release gaorl 2023-05-10 18:57:15 +0800
  • 7fc0b8db65 feature 1.赋值成品油数据 zhenghaiyang@ele-cloud.com 2023-05-10 18:06:47 +0800
  • f3c5497448 feature:redis哨兵配置 gaorl 2023-05-10 16:53:45 +0800
  • 09b820461f Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-10 16:23:32 +0800
  • 0d7c88ac2f feature 1.sap推入的数据保持不含税处理 zhenghaiyang@ele-cloud.com 2023-05-10 16:23:20 +0800
  • e1f4ee980f feature:订单驳回接口已开具的发票全部冲红或者作废,允许驳回 gaorl 2023-05-09 21:27:02 +0800
  • aee0df9f2d feature 1.客商信息购方电话增加到30位 zhenghaiyang@ele-cloud.com 2023-05-09 19:54:55 +0800
  • 0345cc7ac7 feature 1.扩展购方电话长度到30位 zhenghaiyang@ele-cloud.com 2023-05-09 19:01:16 +0800
  • 523f37c897 feature 1.扩展购方电话长度到30位 zhenghaiyang@ele-cloud.com 2023-05-09 17:26:29 +0800
  • 962f0c2aff Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-09 17:08:41 +0800
  • cc827cceac feature 1.修改sap传入的单价精度不够的问题 zhenghaiyang@ele-cloud.com 2023-05-09 17:08:35 +0800
  • 06c8cd96b8 feature:order getUserInfo接口更新开票组织时,不更新默认标志 gaorl 2023-05-09 16:45:46 +0800
  • e61cd353e7 feature:公司物料库返回值不过滤为空的 gaorl 2023-05-09 14:16:05 +0800
  • 35c223d035 feature 1.修复更新覆盖的问题 zhenghaiyang@ele-cloud.com 2023-05-08 19:08:02 +0800
  • b5c3b127d7 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-08 16:56:42 +0800
  • 4ca94b155b feature 1.修复更新客户信息问题 zhenghaiyang@ele-cloud.com 2023-05-08 16:56:36 +0800
  • 156d7b0d72 feature:order开票组织里补全税号时,deptType 设置为10 gaorl 2023-05-08 14:53:34 +0800
  • eaee5ed78d feature:物料来源转换枚举统一处理 gaorl 2023-05-08 11:07:39 +0800
  • 9f51a34d5e Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-07 18:02:10 +0800
  • c1c8a3e43d feature 1.取消开票凭证号 zhenghaiyang@ele-cloud.com 2023-05-07 18:02:05 +0800
  • 1e13e02c47 feature:开票组织树重复项bug修复 gaorl 2023-05-07 11:34:07 +0800
  • be2bcd3dbb 日志打印 wangzhikun 2023-05-06 22:41:14 +0800
  • 7bccc97b7f Merge branch 'release' of http://192.168.12.182/invoice/sims-order into release zhenghaiyang@ele-cloud.com 2023-05-06 17:11:23 +0800
  • 56da788e2b feature 1.替换公司编码 zhenghaiyang@ele-cloud.com 2023-05-06 17:10:35 +0800
  • 2cb5d887c9 feature:客户信息分页调整 gaorl 2023-05-04 18:47:10 +0800
  • 4f8b890a5f feature:客户信息返回的total调整 gaorl 2023-05-04 17:09:42 +0800
  • b08e0322a7 feature:推送影像 gaorl 2023-05-04 16:33:49 +0800
  • 55ffa4c05f feature:物料引用、购房信息从税号改为entid、推送影像截取日志 gaorl 2023-05-04 16:31:39 +0800
  • 011357b0fa feature 1.结算单号保持一致 zhenghaiyang@ele-cloud.com 2023-05-04 15:19:20 +0800
  • 1da951f4e3 feature 1.去除编码 zhenghaiyang@ele-cloud.com 2023-05-04 15:09:06 +0800
  • 67b9e8fa6c feature 1.调用底层不传入自行编码 zhenghaiyang@ele-cloud.com 2023-05-04 14:44:11 +0800
  • 8034a0464a feature 1.修改自行编码长度 zhenghaiyang@ele-cloud.com 2023-05-03 21:46:20 +0800
  • bd6f26488a feature 1.修改保存购方信息空指针 zhenghaiyang@ele-cloud.com 2023-05-03 20:17:21 +0800
  • 0ab9d56606 feature 1.修改开票后编码报错问题 zhenghaiyang@ele-cloud.com 2023-05-03 20:10:35 +0800
  • 5c43751646 feature 1.修改自行编码的长度规则 zhenghaiyang@ele-cloud.com 2023-05-03 19:33:36 +0800
  • 6bc9019b2f feature 1.修改不全數據規則 zhenghaiyang@ele-cloud.com 2023-05-03 17:21:15 +0800
  • c93812b9e7 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-03 16:41:32 +0800
  • 532d5849c8 feature 1.MDM,元年物料客商数据为两套 zhenghaiyang@ele-cloud.com 2023-05-03 16:41:26 +0800
  • acd95dc988 feature:订单三个页面和发票查询页面添加所属组织字段 gaorl 2023-05-03 16:06:42 +0800
  • 37bc4668c4 feature 1.集团物料增加税收分类编码 zhenghaiyang@ele-cloud.com 2023-05-03 15:56:52 +0800
  • ea67a43d98 feature:驳回接口拆分或者页面逻辑删除的订单也需要重新修改流水号,否则进不来 gaorl 2023-05-03 15:07:46 +0800
  • 2094cf7b44 Merge remote-tracking branch 'origin/release' into release zhenghaiyang@ele-cloud.com 2023-05-03 14:35:34 +0800
  • 360154e953 feature 1.放开成品油超8行校验 zhenghaiyang@ele-cloud.com 2023-05-03 14:35:29 +0800
  • 6bc065fdf0 feature:mdm下发客户信息不更新buyer_manage_info_detail gaorl 2023-05-03 14:26:10 +0800
  • d15744d876 feature:发票查询由invoice表的ent_id,切换到process表ent_id,零时方案 gaorl 2023-05-03 09:25:02 +0800
  • 367e0d9a3e feature:订单接口逻辑删除包括订单拆分后订单、发票开具报错redis锁释放、发票开具调用税控前校验订单的有效性 gaorl 2023-05-02 21:27:14 +0800