Commit Graph

1440 Commits

Author SHA1 Message Date
caoqianming 68e4164fe0 记录表格serializer增加material 2021-09-28 14:31:45 +08:00
shilixia b963b53140 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-28 14:01:37 +08:00
shilixia 768d6156b7 xial 2021-09-28 14:01:30 +08:00
caoqianming 8556c7149d 记录表格增加物料字段 2021-09-28 13:57:50 +08:00
shijing e6edee03ea ticketSearch 2021-09-26 09:04:14 +08:00
shijing 767c20bc90 workflowMenu 2021-09-24 15:32:30 +08:00
shijing 142bd0a8d0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-23 16:29:18 +08:00
shijing cdc0d30244 workflowTrans 2021-09-23 16:29:11 +08:00
caoqianming 8bf6eb37d9 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-23 08:53:39 +08:00
caoqianming 5b47ea14f3 选多人处理service 2021-09-23 08:53:31 +08:00
shijing 3a07876bce Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 15:02:48 +08:00
shijing d87044c323 workflowTicketPage 2021-09-22 15:02:41 +08:00
caoqianming 9ed53b3df0 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 14:45:52 +08:00
caoqianming 81aede9497 工作流handle serialize 2021-09-22 14:45:43 +08:00
shijing 6896f4ae9f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 14:28:06 +08:00
shijing 11142df98c workflow 2021-09-22 14:27:57 +08:00
shilixia cf5ab840b4 tijiao 2021-09-22 13:59:08 +08:00
shilixia aec826efc6 tijiaozigongxu 2021-09-22 13:58:32 +08:00
caoqianming 76db3beadc Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 10:58:20 +08:00
shilixia 1559fb95a4 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-22 10:05:08 +08:00
shilixia 1ca3522153 xiugai 2021-09-22 10:05:02 +08:00
caoqianming 274ba0739e 数据采集最小化 2021-09-22 09:11:16 +08:00
caoqianming da65c59893 修改文件夹名称 2021-09-22 09:08:23 +08:00
caoqianming 737bb015fe 增加数据采集 2021-09-19 21:15:52 +08:00
shijing a95db059bf Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-18 11:34:37 +08:00
shijing bbfaa3ed07 liuchengtu 2021-09-18 11:34:24 +08:00
shilixia 92823553cb wuliao 2021-09-17 09:06:50 +08:00
shilixia 64c4a4884e wuliao 2021-09-16 16:32:05 +08:00
shilixia c9f448616b dingdan 2021-09-16 15:36:13 +08:00
shilixia 8a27610586 zhiliangguanli 2021-09-16 10:21:54 +08:00
shilixia f2f9ba0e35 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-16 08:40:29 +08:00
shilixia b2683b4a9c xial 2021-09-16 08:40:06 +08:00
caoqianming c27a77bac9 增加标准和检测项目表 2021-09-15 23:36:06 +08:00
shilixia adb2ec2471 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-15 13:39:22 +08:00
shilixia 36478034fd shebeihetong 2021-09-15 13:39:15 +08:00
shijing 30c4006252 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-15 09:35:53 +08:00
shijing 706a6f77db sizeSelect 2021-09-15 09:35:45 +08:00
shilixia 461f3bd2ce jiaozhunjianding 2021-09-14 16:52:27 +08:00
shilixia cb2beb1d3e shebei 2021-09-14 14:56:17 +08:00
shilixia 74af9283f7 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-14 11:21:20 +08:00
shilixia 05095bd774 tijiso 2021-09-14 11:21:06 +08:00
unknown 876b9a6263 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-14 09:49:55 +08:00
unknown dc9c162024 pageSearch 2021-09-14 09:49:37 +08:00
shilixia 5db16f4fc2 shebei 2021-09-14 09:02:14 +08:00
shilixia 368b9f9c12 hetong,xiugai 2021-09-13 16:08:15 +08:00
shilixia 1b6c7c5e07 kehu 2021-09-13 09:48:18 +08:00
shilixia d918bb68db kehu 2021-09-13 09:45:52 +08:00
““shijing 9289dea03a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-10 14:28:41 +08:00
““shijing 0eb6481dc2 form 2021-09-10 14:27:52 +08:00
caoqianming 7eda1cc7a5 处理冲突 2021-09-10 14:24:00 +08:00