Commit Graph

661 Commits

Author SHA1 Message Date
caoqianming d6c59afbc4 工作流自定义字段排序 2021-12-22 10:39:44 +08:00
caoqianming f1f92c0d9c Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-22 10:37:30 +08:00
caoqianming 72e5d89cac 工作流自定义字段排序 2021-12-22 10:37:24 +08:00
shilixia 3772a9b715 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-22 09:46:23 +08:00
shilixia feffb4eaca baofei 2021-12-22 09:46:15 +08:00
caoqianming 5fed3d5ad8 报废操作bug 2021-12-22 09:02:51 +08:00
caoqianming b0dbcc2499 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-22 08:35:28 +08:00
caoqianming b104a93828 报废操作bug 2021-12-22 08:35:21 +08:00
shijing f3e79b3052 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-21 17:01:23 +08:00
shijing ac2dd89df4 ganttchange 2021-12-21 17:01:16 +08:00
caoqianming 71e00d8455 报废接口修改 2021-12-21 16:32:38 +08:00
caoqianming d892a0651d 报废操作针对冷加工进行修改 2021-12-21 16:20:20 +08:00
caoqianming 0bd5516cef handleticket bug修复 2021-12-21 10:04:19 +08:00
caoqianming d54df1a442 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-21 09:26:15 +08:00
caoqianming 0e37cd6c9c 工作流引擎测试未修改 2021-12-21 09:26:08 +08:00
shilixia 6e1d5d93b5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 16:31:35 +08:00
shilixia 3c29f07edc renwuguanl22i 2021-12-20 16:31:27 +08:00
caoqianming 0babf4df77 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 16:29:18 +08:00
caoqianming 60dbd38ca2 开发服务器bug 2021-12-20 16:29:10 +08:00
shilixia be1169e158 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 16:26:12 +08:00
shilixia 5a83ffbe80 renwuguanli 2021-12-20 16:26:06 +08:00
caoqianming 61a1b9c858 增加生产计划检索条件 2021-12-20 15:52:15 +08:00
caoqianming fb156d125a 半成品列表增加查询条件 2021-12-20 15:06:35 +08:00
caoqianming 199428c9ed Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 15:05:13 +08:00
caoqianming 9e0033a39c 更新开发服务器 2021-12-20 15:05:04 +08:00
shijing eb5c5ed920 test 2021-12-20 14:47:46 +08:00
shijing 8a36bf26bd Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 14:38:13 +08:00
shijing cd4556a644 ganttTimeRange 2021-12-20 14:38:04 +08:00
shilixia eef9972931 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 14:12:31 +08:00
shilixia 85c8a85594 baofei 2021-12-20 14:12:24 +08:00
shijing 18cc087da6 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-20 11:32:33 +08:00
shijing d94b9c4827 ganttBottom 2021-12-20 11:32:25 +08:00
caoqianming 186fbff1c5 报废操作bug修改 2021-12-20 10:46:36 +08:00
caoqianming 2f30f51219 报废操作bug 2021-12-20 09:30:12 +08:00
caoqianming 09de208ca5 报废操作bug 2021-12-20 09:23:50 +08:00
caoqianming 0827f5de77 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-17 17:12:31 +08:00
caoqianming da239f0907 更新开发服务器 2021-12-17 17:12:17 +08:00
shijing e160894743 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-17 16:05:47 +08:00
shijing 3ca92c4423 gant1 2021-12-17 16:05:39 +08:00
caoqianming 20dff07fe2 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-17 15:38:27 +08:00
caoqianming 1641e3cede 更新开发服务器 2021-12-17 15:38:19 +08:00
shijing 88d2e747d9 gantt 2021-12-17 15:11:55 +08:00
shijing 65280b7411 ddd 2021-12-17 09:19:15 +08:00
shijing f41c41836c Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-16 23:37:45 +08:00
shijing 3a6c31ea77 testRecordandshowgantt 2021-12-16 23:37:32 +08:00
caoqianming 6a44978456 test record item bug 2021-12-16 17:26:21 +08:00
caoqianming fadb56715e wproduct enum bug 2021-12-16 17:07:51 +08:00
caoqianming e9cea356d3 testrecord item parent 2021-12-16 17:01:11 +08:00
shilixia e4706e2635 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-12-16 16:28:19 +08:00
shilixia e129f7e306 xiugai 2021-12-16 16:28:11 +08:00