Commit Graph

1440 Commits

Author SHA1 Message Date
caoqianming 378e833090 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-10 14:23:30 +08:00
caoqianming 54a51f3a2c 处理冲突 2021-09-10 14:23:24 +08:00
caoqianming 9c8b7212b5 增加订单view 2021-09-10 13:51:29 +08:00
caoqianming 87c158888a Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-09 14:39:46 +08:00
caoqianming 8e9fede047 sammodel表 2021-09-09 14:39:35 +08:00
shilixia 2c2750bb2f tijiao 2021-09-09 14:20:45 +08:00
shilixia a97dd9e768 xial 2021-09-09 14:06:03 +08:00
shijing 9bacdad594 更新文件 step.vue 2021-09-08 14:13:10 +08:00
““shijing d5ab0dad5f addWord 2021-09-08 11:29:09 +08:00
““shijing 7dc90e6c45 addWord 2021-09-08 11:10:57 +08:00
““shijing 05c707fb24 addWord 2021-09-08 10:44:38 +08:00
shilixia 16fa7f9de8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-08 09:42:23 +08:00
shilixia 4e01229e6e gongxu 2021-09-08 09:42:16 +08:00
““shijing 46629a064c addWord 2021-09-08 09:20:48 +08:00
caoqianming 17789ed4a2 fix bug 2021-09-07 14:42:39 +08:00
caoqianming c5f0ff4a0f 技术文档列表接口 2021-09-07 14:39:17 +08:00
caoqianming bf8a965586 人脸识别调整 2021-09-07 12:18:45 +08:00
caoqianming bc84a62366 mtm 表单设计必填去除 2021-09-07 11:18:55 +08:00
caoqianming 20a89f3d3f 增加技术文档接口 2021-09-06 17:04:19 +08:00
shilixia 7ed06d8b40 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-06 13:36:32 +08:00
shilixia 7f4658cef2 wentixiugai 2021-09-06 13:36:25 +08:00
““shijing ab96880772 markandface 2021-09-06 11:31:57 +08:00
““shijing 71474afd1f Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-06 11:12:24 +08:00
““shijing fd76f31953 markandface 2021-09-06 11:10:44 +08:00
caoqianming 13dbd18efc 子工序列表返回设备信息 2021-09-06 09:12:43 +08:00
caoqianming 55a266808f 子工序列表增加设备信息 2021-09-06 09:07:55 +08:00
caoqianming 6805669f47 修改工序排列方式 2021-09-06 08:53:26 +08:00
shilixia b580f858eb Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-03 14:18:42 +08:00
shilixia a7efe58a78 TIJIAO 2021-09-03 14:18:25 +08:00
caoqianming ed4f99eea7 提交数据库 2021-09-02 16:23:09 +08:00
caoqianming 2932f8e867 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-02 16:20:22 +08:00
caoqianming 177699fb41 仓库信息增删改查接口 2021-09-02 16:20:15 +08:00
shilixia b2d1383d85 biaoge 2021-09-02 15:12:47 +08:00
shilixia bcd9fcb604 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-02 14:09:52 +08:00
shilixia f7e6772d32 xiala 2021-09-02 14:09:46 +08:00
caoqianming 24d64a9e17 formfield 读取接口 2021-09-02 13:39:02 +08:00
caoqianming 452d5d4cb8 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-01 14:48:18 +08:00
caoqianming 32459d8710 增加记录表格表 2021-09-01 14:47:10 +08:00
shilixia 03ff317841 Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-09-01 10:55:08 +08:00
shilixia 39da99ddf2 生产工艺 2021-09-01 10:54:57 +08:00
caoqianming cc9006b695 fix bug 2021-08-31 16:49:14 +08:00
caoqianming 9d294799f1 子工序详情增加设备信息 2021-08-31 16:47:36 +08:00
caoqianming 21e6f1e3de Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop 2021-08-31 16:10:54 +08:00
caoqianming 5458fef0d4 工序表增加workshop字段 2021-08-31 16:10:47 +08:00
““shijing 421e6d95cc version 2021-08-31 15:38:16 +08:00
caoqianming 818d3dfe41 同步数据库,优化response 2021-08-31 14:47:49 +08:00
caoqianming 2a220e962e 产品生产子工序表 2021-08-31 14:26:15 +08:00
caoqianming 107891ad6d 修改输入输出物料计数字段 2021-08-30 13:31:39 +08:00
caoqianming 615e84e04a fix conflict 2021-08-30 13:17:49 +08:00
caoqianming c66581adbb 输入输出物料接口 2021-08-30 13:14:32 +08:00