Commit Graph

17 Commits

Author SHA1 Message Date
禹翔辉
8c9a211295 Accept Merge Request #203: (feature/sf刀具功能分支 -> develop)
Merge Request: 智能工厂类型备注样式调整

Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/203?initial=true
2023-06-16 11:13:21 +08:00
yuxianghui
062b50d34c 智能工厂类型备注样式调整 2023-06-16 11:01:24 +08:00
qihao.gong@jikimo.com
23aba08c87 处理bug 2023-06-16 10:56:25 +08:00
qihao.gong@jikimo.com
018fecfc59 处理冲突 2023-06-16 10:02:33 +08:00
jinling.yang
6068a55b79 新增sf的刀具模板的相关刀具物料字段 2023-06-13 17:30:35 +08:00
mgw
3d04200ca7 解决冲突 2023-06-12 14:35:14 +08:00
jinling.yang
a812c603ea 代码规范整理,产品页面模型和胚料的模型类型字段做显示 2023-02-09 15:26:08 +08:00
gqh
d032f89272 sf优化绑定托盘,工单form显示开始按钮 加工时间 2023-02-01 17:53:32 +08:00
gqh
f5c8623c72 sf优化 2023-01-30 17:33:38 +08:00
gqh
d0497aa043 工单优化 2023-01-09 20:40:27 +08:00
jinling.yang
b7723f82d0 优化sf获取cnc程序和ftp 2023-01-09 19:54:02 +08:00
jinling.yang
5fcb17d048 胚料bug修复,销售订单明细行路线修复,编程单下发优化 2022-12-27 17:28:47 +08:00
jinling.yang
5e2d75b23e 修改胚料部分 2022-12-09 17:23:07 +08:00
gqh
4fa8bb964d 合并 2022-11-30 14:42:52 +08:00
gqh
51ff0dc6ac 行业编码注册获取到sf 2022-11-23 14:11:59 +08:00
gqh
1582896ac4 机床唯一编码生成 2022-11-23 11:00:07 +08:00
jinling.yang
830f3bb35e 212 2022-11-21 20:04:56 +08:00