mengjiao
|
78d11947aa
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/views/wms/bpprocure/index.vue
|
1 year ago |
|
mengjiao
|
675af0d52e
|
wms特殊收货改2
|
1 year ago |
 Yangwl
|
33647943e9
|
白坯订单
|
1 year ago |
陈恒杰
|
8b3ef9bc1f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
ff981a9b3e
|
白坯原材料采购单
|
1 year ago |
|
mengjiao
|
caf05678e3
|
wms特殊收货改2
|
1 year ago |
|
mengjiao
|
37601cb1c9
|
wms特殊收货改
|
1 year ago |
|
mengjiao
|
853c139396
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
e018bda66c
|
wms特殊收货
|
1 year ago |
yinq
|
a751d97141
|
update - ems用电实时数据优化
|
1 year ago |
zhaoxiaolin
|
7f0da1e927
|
功能升级2
|
1 year ago |
|
zhaoxiaolin
|
af61bb6cfd
|
功能升级
|
1 year ago |
|
zhaoxiaolin
|
873a223490
|
功能升级
|
1 year ago |
|
Yangwl
|
7f81b590c4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
5211c55bae
|
当日产量收坯机修改
|
1 year ago |
|
Yangwl
|
ee8d51141f
|
Merge remote-tracking branch 'new_hw/yangwl'
|
1 year ago |
|
mengjiao
|
53deff7a8e
|
wms白胚原材料采购打印修改
|
1 year ago |
夜笙歌
|
95a61a8843
|
修改显示
|
1 year ago |
|
夜笙歌
|
238bf9f19c
|
修改显示
|
1 year ago |
|
夜笙歌
|
693373a4ef
|
修改显示
|
1 year ago |
|
夜笙歌
|
014df6e1d2
|
修改显示
|
1 year ago |
|
夜笙歌
|
d769b56e46
|
修改白坯
|
1 year ago |
|
夜笙歌
|
7ff39ccfa5
|
修改白坯
|
1 year ago |
|
夜笙歌
|
aa20145a90
|
修改白坯
|
1 year ago |
|
夜笙歌
|
ef96d4ff18
|
修改白坯
|
1 year ago |
|
夜笙歌
|
c9b1b7af26
|
修改时间
|
1 year ago |
|
夜笙歌
|
5432d0f523
|
修改时间
|
1 year ago |
|
陈恒杰
|
7fea33ec6b
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
a5aae0513e
|
白坯原材料采购单
|
1 year ago |
|
夜笙歌
|
20b298f092
|
添加白坯页面
|
1 year ago |
|
zhaoxiaolin
|
7bc29c56a9
|
功能升级
|
1 year ago |
|
夜笙歌
|
a4ce820649
|
修改agv
|
1 year ago |
|
Yangwl
|
a5190f321c
|
图标修改
|
1 year ago |
|
Yangwl
|
c0aae6aff7
|
Merge remote-tracking branch 'origin/yangwl'
|
1 year ago |
|
夜笙歌
|
a03673b467
|
添加页面
|
1 year ago |
|
Yangwl
|
7bd14b2585
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
0113097356
|
Merge remote-tracking branch 'new_hw/yangwl'
|
1 year ago |
|
夜笙歌
|
1ed302bbb4
|
修改4F
|
1 year ago |
|
夜笙歌
|
b02ca26f1b
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
0db77d65d7
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
2d0d1e6f97
|
修改4F agv
|
1 year ago |
|
mengjiao
|
07189243c1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
f8e5b30d97
|
wms白胚入库页面修改
|
1 year ago |
|
陈恒杰
|
f3dc264b62
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
7021b12a5b
|
白坯原材料入库
|
1 year ago |
|
夜笙歌
|
c93aa37262
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
b63074611c
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
769116bd9a
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
23125dc34e
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
048d05d57f
|
修改4F agv
|
1 year ago |
|
夜笙歌
|
563ade512c
|
修改4F页面
|
1 year ago |
|
夜笙歌
|
a85bdad3da
|
修改4F页面
|
1 year ago |
|
Yangwl
|
196ac9abf3
|
Merge remote-tracking branch 'new_hw/yangwl'
|
1 year ago |
|
Yangwl
|
33642bd453
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/views/mes/prepare/index.vue
|
1 year ago |
|
zhaoxiaolin
|
3bfe45100f
|
功能升级
|
1 year ago |
|
mengjiao
|
33b4b43a06
|
wms出库单字段修改
|
1 year ago |
|
mengjiao
|
017e82115a
|
wms添加新的白胚工单，前端问题清单修改
|
1 year ago |
|
mengjiao
|
3f8c4ea5c0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
9fdf5ded4e
|
wms调整到货页面间距
|
1 year ago |
|
zhaoxiaolin
|
7d4b85eb9a
|
功能升级
|
1 year ago |
|
mengjiao
|
ed7570a366
|
wms报工页面的sap收货按钮修改
|
1 year ago |
|
夜笙歌
|
79dc5102c4
|
添加页面
|
1 year ago |
|
mengjiao
|
adee86c867
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
69234bc0d7
|
wms备货修改
|
1 year ago |
|
zhaoxiaolin
|
26acad94f3
|
功能升级
|
1 year ago |
元气满满(jgy)
|
e179d3835d
|
2024-10-18 设备-运行记录-导出功能
|
1 year ago |
|
mengjiao
|
42a68c5fe8
|
wms过账加过账批次，让他们填加成品出库页面修改
|
1 year ago |
|
mengjiao
|
1d370ce272
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
0375ea9c93
|
wms成品出库页面修改
|
1 year ago |
|
zhaoxiaolin
|
cc13b0c08a
|
质量检测项明细报表开发
|
1 year ago |
|
mengjiao
|
aa22448f42
|
wms库存页面修改2
|
1 year ago |
|
mengjiao
|
74af529a32
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
2a8ba4ba11
|
wms库存明细页面修改
|
1 year ago |
|
zhaoxiaolin
|
548c8932d9
|
受控文件
|
1 year ago |
|
mengjiao
|
381933cc25
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
d53840b98f
|
wms如果入库的标识卡丢失的话，需要可以补打之前的标识卡功能，加到库存明细页面
|
1 year ago |
|
zhaoxiaolin
|
ad2090ebb1
|
质量检测项明细报表开发
|
1 year ago |
|
mengjiao
|
c27b55e50b
|
wms添加新的包材出库明细页面
|
1 year ago |
|
mengjiao
|
5f5f4025c9
|
wms退料页面修改
|
1 year ago |
|
mengjiao
|
a79e1685d3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
687255fe25
|
wms页面查询修改和成品过账修改
|
1 year ago |
|
元气满满(jgy)
|
e6d97a059a
|
2024-10-09 设备-安环-保养报表
|
1 year ago |
|
元气满满(jgy)
|
69295658a1
|
2024-10-09 设备-安环点检报表
|
1 year ago |
|
元气满满(jgy)
|
3bc99f059b
|
2024-10-09 设备-安环-巡检报表
|
1 year ago |
|
zhaoxiaolin
|
6fe2d51784
|
质量问题修改
|
1 year ago |
|
元气满满(jgy)
|
3db9ec02bd
|
2024-10-08 报修单号 按钮移除，在后面添加查看按钮
|
1 year ago |
|
元气满满(jgy)
|
49d3214d59
|
2024-10-08 设备模块 - 点检 巡检 保养报表 合格率
|
1 year ago |
|
mengjiao
|
31537e6e4b
|
之前的库存临时打印标识卡页面修改2
|
1 year ago |
|
mengjiao
|
7dd4e31e00
|
之前的库存临时打印标识卡页面修改
|
1 year ago |
|
mengjiao
|
2dd3a5ffeb
|
包材到货单页面修改
|
1 year ago |
|
mengjiao
|
2447556395
|
包材退货页面--打印修改4
|
1 year ago |
|
mengjiao
|
c85330ed4b
|
包材退货页面--打印修改3，名称修改
|
1 year ago |
|
mengjiao
|
cb22fc4b05
|
包材退货页面--打印修改2
|
1 year ago |
|
mengjiao
|
662a6ab429
|
包材退货页面--打印标识卡修改
|
1 year ago |
|
mengjiao
|
07301ca2b0
|
包材退货页面修改
|
1 year ago |
|
mengjiao
|
6419bc2531
|
包材库存标识卡页面修改1
|
1 year ago |
|
mengjiao
|
4c21cb2487
|
包材页面修改2
|
1 year ago |
|
mengjiao
|
c4c9f07fcf
|
包材页面修改
|
1 year ago |
|
mengjiao
|
3364612ce1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
3aac9e2fb4
|
领料页面修改
|
1 year ago |
|
陈恒杰
|
f808b4dae0
|
附属信息修改
|
1 year ago |
|
Yangwl
|
78b84ce853
|
本地提交
|
1 year ago |
|
陈恒杰
|
f98504bb2e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
6a69b6ba92
|
页面优化
|
1 year ago |
|
元气满满(jgy)
|
d060d8824b
|
2024-09-13 设备-检查项维护-解决循环周期点击不顺畅问题
|
1 year ago |
|
zhaoxiaolin
|
7686d8ba67
|
反冲bug
|
1 year ago |
|
陈恒杰
|
f76a9a937f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
ed43f1061d
|
页面优化
|
1 year ago |
|
zhaoxiaolin
|
ed7f9eab1e
|
cpk配置
|
1 year ago |
|
zhaoxiaolin
|
673ac5fca6
|
质量和生产报表优化、白坯单位bug
|
1 year ago |
|
元气满满(jgy)
|
e676a5e46c
|
2024-09-12 设备-申领记录-隐藏按钮
|
1 year ago |
|
zhaoxiaolin
|
e1b1e1d5c3
|
打印调整
|
1 year ago |
|
元气满满(jgy)
|
67d69833ba
|
2024-09-11 设备-保养工单上方填写按钮
|
1 year ago |
|
元气满满(jgy)
|
c2af175544
|
2024-09-11 设备-点检巡检保养工单页面上方搜索框调整+查看未检查工单时，是否达标隐藏
|
1 year ago |
|
mengjiao
|
2f7578aa71
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
57e8f022fb
|
领料单表3
|
1 year ago |
|
元气满满(jgy)
|
b429b6ec9d
|
2024-09-11 设备模块-检查项维护页面周期类型问题
|
1 year ago |
|
mengjiao
|
b5647018d3
|
领料单表2
|
1 year ago |
|
mengjiao
|
18482a507a
|
领料单表
|
1 year ago |
|
陈恒杰
|
aa2a6beec1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
709901f534
|
包材采购单页面修改
|
1 year ago |
|
A0010407
|
ff2851a0b6
|
2024-09-02 MES-三个上位机报表-产线编码改为产线名称
|
1 year ago |
|
mengjiao
|
d205526131
|
过账按钮
|
1 year ago |
|
zhaoxiaolin
|
5aef4e4582
|
界面调整
|
1 year ago |
|
A0010407
|
59a3013cd2
|
2024-08-30 MES-点检报表调整第二版
|
1 year ago |
|
A0010407
|
e23ab5b15f
|
2024-08-30 MES-自检报表优化+点检
|
1 year ago |
|
zhaoxiaolin
|
e8ad5d296a
|
界面调整
|
1 year ago |
|
zhaoxiaolin
|
03d9240177
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
A0010407
|
f6bda76ab8
|
2024-08-29 MES-首检/自检互检报表优化
|
1 year ago |
|
A0010407
|
561c92dc67
|
2024-08-29 MES-首检报表
|
1 year ago |
|
A0010407
|
ec8dae6ae9
|
2024-08-29 MES-自检互检报表
|
1 year ago |
|
mengjiao
|
a7b6736ee9
|
临时打印功能
|
1 year ago |
|
zhaoxiaolin
|
b6436a59d5
|
报表表格中抽样数是0的，去掉
|
1 year ago |
|
mengjiao
|
33ecf626fd
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
f67cd30d6f
|
补打功能
|
1 year ago |
|
zhaoxiaolin
|
b5ad3b330f
|
质量报表导出明细添加
|
1 year ago |
guoshuang
|
3144dc4d8b
|
领料单打印调整
|
1 year ago |
|
Yangwl
|
681505fc47
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
869109071a
|
计件工资字段调整
|
1 year ago |
|
guoshuang
|
ad5f2dae9f
|
领料打印调整
|
1 year ago |
|
zhaoxiaolin
|
0cbc9f5e85
|
标识卡调整
|
1 year ago |
|
zhaoxiaolin
|
21b0fc26da
|
标识卡调整
|
1 year ago |
|
zhaoxiaolin
|
034bf85448
|
zxl加PC数量
|
1 year ago |
|
zhaoxiaolin
|
541a28fcba
|
zxl
|
1 year ago |
|
mengjiao
|
be12b1bf7c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
3efb304f03
|
成品页面修改，包材标识卡打印
|
1 year ago |
shaoyong
|
1730c2696b
|
首检报告提交
|
1 year ago |
|
mengjiao
|
ac12cd12ea
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
shaoyong
|
79bf271791
|
箱型修改
|
1 year ago |
|
mengjiao
|
be89f332f6
|
成品页面修改
|
1 year ago |
lucungang
|
8eeea8314a
|
新增页面
|
1 year ago |
|
shaoyong
|
ac4cf2debf
|
箱型修改
|
1 year ago |
|
陈恒杰
|
bc1fe00dd9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
efcccd32cf
|
物料附属信息导入
|
1 year ago |
|
lucungang
|
0bd7b4bd09
|
页面优化
|
1 year ago |
|
lucungang
|
8ec02165b7
|
页面优化
|
1 year ago |
|
shaoyong
|
0cac3d84ba
|
垛型增加
|
1 year ago |
|
mengjiao
|
0aaf20ff7a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
1b608bcf69
|
页面优化二维码大小优化
|
1 year ago |
|
A0010407
|
8d5a0fa16f
|
2024-08-21 计划-生产工单管理-打印标识卡
|
1 year ago |
|
mengjiao
|
e0e5c7a74f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
b104388aa6
|
页面优化3加库区打印
|
1 year ago |
|
shaoyong
|
c8769276a6
|
箱体分类实现
|
1 year ago |
|
mengjiao
|
99a2748703
|
页面优化2加库区打印
|
1 year ago |
|
Yangwl
|
7297fc8f30
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
bc593bdec6
|
能源单耗
|
1 year ago |
|
shaoyong
|
be55e95b19
|
长宽高
|
1 year ago |
|
A0010407
|
b2c2ba25c2
|
2024-08-20 设备-检查项-加周期筛选条件
|
1 year ago |
|
lucungang
|
240e16a84a
|
巡检不良分析
|
1 year ago |
|
shaoyong
|
bcc5f92089
|
不良code
|
1 year ago |
|
shaoyong
|
ee54740385
|
检测任务详情回显
|
1 year ago |
|
guoshuang
|
4ae54a2f12
|
分页数量修改
|
1 year ago |
|
A0010407
|
c85d77eb29
|
2024-08-15 mes-领料单-打印生产物料+打印反冲 条码+设备审核意见优化
|
1 year ago |
|
guoshuang
|
5f2b0662fa
|
领料单打印分页
|
1 year ago |
|
lucungang
|
244ea2bd5b
|
榄菊质量管理平台表格增加自动滚动功能
|
1 year ago |
|
guoshuang
|
75ffa99618
|
Merge branch 'master' of http://106.12.13.113:3000/lanju/lanju-front
|
1 year ago |
|
guoshuang
|
9f54af69a1
|
领料单打印修改
|
1 year ago |
|
shaoyong
|
2f97b2570c
|
不良描述逻辑修改
|
1 year ago |
|
mengjiao
|
e3ce362a18
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
042ae8e73e
|
页面优化1
|
1 year ago |
|
zhaoxiaolin
|
c7f81efe61
|
zxl2
|
1 year ago |
|
zhaoxiaolin
|
b385755e03
|
zxl
|
1 year ago |
|
A0010407
|
db92fd0c41
|
2024-08-14 设备模块-前端优化+权限问题
|
1 year ago |
|
zhaoxiaolin
|
e1203b738c
|
zxl
|
1 year ago |
|
A0010407
|
90803780a5
|
2024-08-13 设备-维修-页面调整
|
1 year ago |
|
A0010407
|
373471a836
|
2024-08-13 设备-保修审核优化
|
1 year ago |
|
A0010407
|
abbdf13057
|
2024-08-13 设备-报修维修审核
|
1 year ago |
|
Yangwl
|
de4ed98e6c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
8ec1497827
|
计件工资补录权限字符修改
|
1 year ago |
|
zhaoxiaolin
|
08805ba136
|
报告格式修改
|
1 year ago |
|
guoshuang
|
76d2a292c0
|
标志卡打印纸张调整
|
1 year ago |
|
zhaoxiaolin
|
807caed5f9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
00a0bea29b
|
标识卡打印5
|
1 year ago |
|
mengjiao
|
b405d5e1b9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
ef6932006f
|
SAP收货批次判断
|
1 year ago |
|
zhaoxiaolin
|
b63f08e654
|
标识卡打印3
|
1 year ago |
|
guoshuang
|
b6d96f5544
|
添加补打
|
1 year ago |
|
zhaoxiaolin
|
7fe067ed37
|
标识卡打印2
|
1 year ago |
|
Yangwl
|
957d7968e7
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
1765a6a2c2
|
计件工资报表修改
|
1 year ago |