lym
|
7138811b63
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2025-01-09 14:54:10 +08:00 |
|
lym
|
6868110d54
|
api导入改善提示
|
2025-01-09 14:54:02 +08:00 |
|
lym
|
376af44963
|
文件导入改善
|
2025-01-07 14:21:29 +08:00 |
|
lym
|
87bd765361
|
api导入改善
|
2025-01-02 15:02:49 +08:00 |
|
lym
|
2c61663bc6
|
商品编号相关修改
|
2024-12-26 15:33:41 +08:00 |
|
lym
|
f3dc019a48
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-12-16 10:00:03 +08:00 |
|
lym
|
be33ea6e9c
|
配件权限配置修改
|
2024-12-16 09:59:34 +08:00 |
|
lym
|
84a8e68f5d
|
造型数据新增id和刀路id,小板备注去掉[]
|
2024-12-13 16:16:58 +08:00 |
|
lym
|
680edb4ccc
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-12-12 14:22:24 +08:00 |
|
lym
|
f944a37f55
|
造型修改孤岛数据
|
2024-12-12 14:22:15 +08:00 |
|
lym
|
e68c4b4743
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-12-10 15:31:07 +08:00 |
|
lym
|
9d14bb21be
|
bug924修改
|
2024-12-10 15:30:57 +08:00 |
|
lym
|
9aac3872f1
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-12-10 10:44:35 +08:00 |
|
lym
|
df4611cec7
|
管理详情分离组件
|
2024-12-10 10:44:23 +08:00 |
|
lym
|
586e23d3f9
|
余料管理相关修改
|
2024-12-09 14:40:33 +08:00 |
|
lym
|
3252fc9c84
|
拆单数据判断赋值
|
2024-12-06 15:53:04 +08:00 |
|
lym
|
8879101ed0
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-12-06 15:44:26 +08:00 |
|
lym
|
36875fd1db
|
拆单数据判断赋值
|
2024-12-06 15:44:17 +08:00 |
|
lym
|
2c10f27e4d
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-12-05 18:03:41 +08:00 |
|
lym
|
1a935c91f8
|
补板完善;修改配件类型匹配,对应异形数量、弧形地脚;bug-826,bug-812修改
|
2024-12-05 18:03:21 +08:00 |
|
lym
|
9d51ad3023
|
新增字段返回
|
2024-11-29 16:47:49 +08:00 |
|
lym
|
2a99653d11
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-11-29 16:24:44 +08:00 |
|
lym
|
47d1d450d1
|
添加自定义板编号,28日版xml导入
|
2024-11-29 16:24:35 +08:00 |
|
lym
|
af1a5cc033
|
暂注自定义板编号
|
2024-11-28 11:18:25 +08:00 |
|
lym
|
cfa5f77793
|
Merge branch 'main' of http://192.168.1.205:9980/cf_devdept2/cf_imes_server
|
2024-11-28 11:01:38 +08:00 |
|
lym
|
d3847c9745
|
xml导入修改,新增price,新增孔类型和id
|
2024-11-28 11:01:22 +08:00 |
|
lym
|
683eb69efd
|
配件新增、删除逻辑修改
|
2024-11-19 14:04:35 +08:00 |
|
lym
|
86603f927e
|
侧面造型修改
|
2024-11-14 11:31:45 +08:00 |
|
lym
|
e29ee20088
|
api配件新增、excel导入检查修改
|
2024-11-12 17:26:48 +08:00 |
|
lym
|
1bc9119504
|
api新增sideModel
|
2024-11-08 16:51:11 +08:00 |
|
lym
|
f4981dc0c7
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-11-08 09:24:54 +08:00 |
|
lym
|
7c24a7453c
|
新增配件管理、板材详情
|
2024-11-08 09:24:34 +08:00 |
|
lym
|
358ea04971
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-30 10:56:02 +08:00 |
|
lym
|
f5224fc030
|
代码检查部分错误修改
|
2024-10-30 10:54:52 +08:00 |
|
lym
|
334536bd03
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-29 11:12:32 +08:00 |
|
lym
|
1dccb8a267
|
岗位修复
|
2024-10-29 11:08:33 +08:00 |
|
lym
|
7573616d0c
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-28 11:03:35 +08:00 |
|
lym
|
17884649ba
|
api新增outline
|
2024-10-28 11:03:26 +08:00 |
|
lym
|
f191dc5759
|
提示语句修改
|
2024-10-22 15:04:00 +08:00 |
|
lym
|
ab2a46a19b
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-21 15:06:36 +08:00 |
|
lym
|
a77567bf3c
|
bug575修改
|
2024-10-21 15:06:29 +08:00 |
|
lym
|
0b0d17b94b
|
用户名查询修改
|
2024-10-17 17:44:12 +08:00 |
|
lym
|
0b1ee27f0a
|
余料字段校验、用户查询修改
|
2024-10-17 16:45:53 +08:00 |
|
lym
|
84178b3fbe
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-17 10:08:55 +08:00 |
|
lym
|
bc489b1a0d
|
岗位、余料查询修改
|
2024-10-17 10:08:47 +08:00 |
|
lym
|
fb7f1575e2
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-15 17:02:48 +08:00 |
|
lym
|
ef458bf851
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-15 16:10:22 +08:00 |
|
lym
|
e1aa577bc7
|
板材、余料字段检验
|
2024-10-15 16:10:12 +08:00 |
|
lym
|
8b6232edbb
|
板材、余料字段检验
|
2024-10-15 15:55:15 +08:00 |
|
lym
|
7391b6365d
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-11 11:56:23 +08:00 |
|
lym
|
c0dc1302ce
|
提示优化
|
2024-10-11 11:56:13 +08:00 |
|
lym
|
ac39c4a4d7
|
bug修改
|
2024-10-10 11:33:51 +08:00 |
|
lym
|
232e0b597e
|
xml数据对应修改
|
2024-10-10 09:21:21 +08:00 |
|
lym
|
4fd28c58da
|
xml数据对应修改
|
2024-10-10 09:19:40 +08:00 |
|
lym
|
2e96dd8173
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-10-08 17:03:15 +08:00 |
|
lym
|
67291c4517
|
xml数据转换修改
|
2024-10-08 17:03:05 +08:00 |
|
lym
|
85a004b42c
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-24 17:54:16 +08:00 |
|
lym
|
71ce80769a
|
xml字段对应验证
|
2024-09-24 17:54:08 +08:00 |
|
lym
|
6f5bd90c0d
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-23 15:44:44 +08:00 |
|
lym
|
79f011c2df
|
xml数据验证
|
2024-09-23 15:44:36 +08:00 |
|
lym
|
7493703f34
|
es字段修改
|
2024-09-18 11:18:31 +08:00 |
|
lym
|
ef8654f946
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-14 16:31:52 +08:00 |
|
lym
|
e899eb2fea
|
工作台接口修改
|
2024-09-14 16:31:38 +08:00 |
|
lym
|
c3a471276a
|
xml导入-修改
|
2024-09-10 17:53:13 +08:00 |
|
lym
|
433e6825e5
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-10 15:47:58 +08:00 |
|
lym
|
b7acf4d436
|
xml导入
|
2024-09-10 15:47:46 +08:00 |
|
lym
|
a38c2ece52
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-04 12:54:41 +08:00 |
|
lym
|
193d3df939
|
bug修改
|
2024-09-04 12:54:28 +08:00 |
|
lym
|
d46dd943e7
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-09-02 18:00:22 +08:00 |
|
lym
|
aff4212045
|
配件带分组信息获取
|
2024-09-02 18:00:12 +08:00 |
|
lym
|
7fba202f59
|
生产单管理相关接口调整
|
2024-09-02 17:37:22 +08:00 |
|
lym
|
0bea56dd27
|
bug修改
|
2024-09-02 11:52:27 +08:00 |
|
lym
|
e5506de32b
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-08-30 16:20:40 +08:00 |
|
lym
|
f4f6e1d641
|
第三方接口连接修改
|
2024-08-30 16:20:33 +08:00 |
|
lym
|
2dee958b28
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-08-29 17:36:48 +08:00 |
|
lym
|
fc220e5b83
|
xml导入-版一
|
2024-08-29 17:36:39 +08:00 |
|
lym
|
7cf453050f
|
组织id修改
|
2024-08-20 14:02:54 +08:00 |
|
lym
|
6dd785455b
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-08-19 17:52:12 +08:00 |
|
lym
|
889aa87456
|
接口对接修改,超管分时间统计生产单
|
2024-08-19 17:52:04 +08:00 |
|
lym
|
939a8e003f
|
超管统计接口50%
|
2024-08-16 18:22:28 +08:00 |
|
lym
|
c027651b28
|
超管统计接口50%
|
2024-08-16 18:13:37 +08:00 |
|
lym
|
47c9332a4a
|
超管统计接口50%
|
2024-08-16 18:12:02 +08:00 |
|
lym
|
4ce3b17212
|
二版更新-定时任务50%
|
2024-08-09 09:37:52 +08:00 |
|
lym
|
90b89f9da6
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-26 11:18:46 +08:00 |
|
lym
|
f6e72c35b7
|
bug修改-权限获取
|
2024-07-26 11:18:37 +08:00 |
|
lym
|
30f276c355
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-23 11:09:21 +08:00 |
|
lym
|
a95944a4a0
|
bug修改-plate
|
2024-07-23 11:09:13 +08:00 |
|
lym
|
366bd5084c
|
板材库去掉价格2
|
2024-07-19 18:12:49 +08:00 |
|
lym
|
6ffcdba99f
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-19 16:00:58 +08:00 |
|
lym
|
e0253d3011
|
板材库去掉价格
|
2024-07-19 16:00:47 +08:00 |
|
lym
|
14e326c251
|
文件导入新改-修改
|
2024-07-18 18:20:10 +08:00 |
|
lym
|
6e99cb7399
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-18 15:45:13 +08:00 |
|
lym
|
5116e6d74a
|
文件导入新改
|
2024-07-18 15:45:05 +08:00 |
|
lym
|
aa09d8e96c
|
首页-新统计1
|
2024-07-15 18:20:42 +08:00 |
|
lym
|
87d9ebb22e
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-11 17:36:25 +08:00 |
|
lym
|
02c4da859b
|
首页-统计1
|
2024-07-11 17:36:18 +08:00 |
|
lym
|
0aafe646b6
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-11 09:31:23 +08:00 |
|
lym
|
044bdb3163
|
生产单管理-列表时间修改
|
2024-07-11 09:31:15 +08:00 |
|
lym
|
4bd39e579a
|
Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server
|
2024-07-10 10:00:13 +08:00 |
|
lym
|
efe85a5d86
|
生产单管理-api导入列表修改
|
2024-07-10 10:00:06 +08:00 |
|