Commit Graph

1417 Commits

Author SHA1 Message Date
shijing c5005b0e7f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-05-19 17:50:55 +08:00
shijing fdd1f1736a 车间操作子工序过程检查表及菜单修改 2022-05-19 17:50:47 +08:00
曹前明 072a3ad0ed operation list serializer 2022-05-19 17:24:24 +08:00
曹前明 8d9788698c recordform update material 2022-05-19 15:51:02 +08:00
曹前明 e9e9835b5d OperationListSerializer修改 2022-05-19 15:46:21 +08:00
曹前明 1c514b1e4e Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-05-19 15:42:30 +08:00
曹前明 074520a418 OperationListSerializer修改 2022-05-19 15:42:23 +08:00
shijing 636c1bd7b4 显示物料的基本信息 2022-05-17 09:15:34 +08:00
shijing 48f96ed571 0509processFormType 2022-05-09 08:28:26 +08:00
shijing 198b50b90c 0507 2022-05-07 15:40:18 +08:00
shijing d04acd4f52 0507 2022-05-07 15:25:28 +08:00
shijing fe865bed58 0507 2022-05-07 15:22:52 +08:00
shijing 7615236343 0507 2022-05-07 15:18:35 +08:00
shijing 1b942ae4d1 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-05-07 15:01:57 +08:00
shijing 46c08d9e2f 0507 2022-05-07 15:01:46 +08:00
caoqianming b02edd3751 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-05-07 13:54:41 +08:00
caoqianming 3c66bf4244 导出bug 2022-05-07 13:54:33 +08:00
shijing 6be9f81064 login 2022-05-06 09:29:50 +08:00
shijing 6b99cb6cc4 login 2022-05-06 09:25:11 +08:00
shijing 6e6fc0c0ac login 2022-05-06 09:10:46 +08:00
shijing df91dd18f4 login 2022-05-06 09:06:46 +08:00
shijing e40977274d unproductticketDetail 2022-05-05 13:35:32 +08:00
shijing 42ba144223 unproductticketDetail 2022-05-05 11:28:06 +08:00
shijing 7273dbc35a confirmationBeforeFaceBrushSubmit 2022-04-29 11:17:01 +08:00
shijing a75ea367b8 exportrPoint 2022-04-29 09:56:41 +08:00
shijing da2b2950b5 materilDetailAndEditmateril 2022-04-28 17:15:44 +08:00
shijing 87d004b60c fun 2022-04-28 10:39:04 +08:00
shijing 1986621d4c gongyingshanggongyingwuliao 2022-04-28 08:43:57 +08:00
shijing 60a27f9a21 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-27 17:14:56 +08:00
shijing 1c2f425e78 functionBrtton 2022-04-27 17:14:50 +08:00
caoqianming 6aa01443ea fifoitem 权限放开 2022-04-27 15:52:38 +08:00
caoqianming 50dda78a92 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-27 15:37:12 +08:00
caoqianming 834089f266 修改get_permission_list 2022-04-27 15:37:04 +08:00
shijing 2fb5240c9a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-27 15:23:25 +08:00
shijing 06bb4e35aa functionBrtton 2022-04-27 15:23:17 +08:00
caoqianming 2c0d4dda32 material 增加file字段 2022-04-27 10:37:37 +08:00
caoqianming 1f3be8d689 token days 1 2022-04-27 10:18:55 +08:00
caoqianming 98b48f54b3 token 先设置为1分钟 2022-04-27 09:24:21 +08:00
caoqianming f96645ae29 到岗统计权限问题 2022-04-26 23:14:07 +08:00
caoqianming 451f50ff46 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-26 23:00:18 +08:00
caoqianming bab858f8f1 face 0.36 流程卡权限去除 2022-04-26 23:00:08 +08:00
shijing 01d41a5bf0 buttonControl 2022-04-26 15:08:16 +08:00
shijing 5aa0fed51b Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-25 13:58:52 +08:00
shijing dbed58cbf6 massageBig 2022-04-25 13:58:44 +08:00
caoqianming 268b23be3a 0.42-0.38 2022-04-24 12:38:49 +08:00
shijing f9cfce58e5 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-24 09:24:18 +08:00
shijing a90cfc8077 0424 2022-04-24 09:24:06 +08:00
caoqianming 2b88abf7f6 first test_ subplan is_submited 2022-04-24 09:17:08 +08:00
caoqianming 90b75e8892 修改为0.42 2022-04-24 08:42:50 +08:00
caoqianming 1ce30de621 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2022-04-22 16:38:20 +08:00