 Yangwl
|
d4e50bba1c
|
计件工资增加字段
|
10 months ago |
A0010407
|
9a559f022a
|
2024-08-27 计划-产品标识卡-测试（二维码生成错误）
|
10 months ago |
zhaoxiaolin
|
9912b4d813
|
标识卡调整
|
10 months ago |
|
zhaoxiaolin
|
01d4b9862c
|
mes报表
|
10 months ago |
|
zhaoxiaolin
|
9da93c4afb
|
mes报表
|
10 months ago |
|
zhaoxiaolin
|
6860dc957b
|
生产日报表相关
|
10 months ago |
mengjiao
|
b64cbf5242
|
物料标识卡对接打印机接口3
|
10 months ago |
|
mengjiao
|
2a3fc36219
|
物料标识卡对接打印机接口2
|
10 months ago |
|
mengjiao
|
a595ae9b8b
|
物料标识卡对接打印机接口
|
10 months ago |
|
mengjiao
|
f34e62a94e
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
mengjiao
|
369c57a302
|
成品入库页面的过账按钮修改，添加修改批次的功能
|
10 months ago |
|
zhaoxiaolin
|
0a230ffae2
|
生产日报表相关
|
10 months ago |
|
zhaoxiaolin
|
379c784213
|
生产日报表相关
|
10 months ago |
|
zhaoxiaolin
|
37735eb68f
|
生产日报表
|
10 months ago |
shaoyong
|
77bf83ac8f
|
首检报告签名
|
10 months ago |
|
shaoyong
|
a250b4d519
|
箱型修改
|
10 months ago |
|
mengjiao
|
3e6c73321e
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
mengjiao
|
68aad407ed
|
包材入库bug修改
|
10 months ago |
|
zhaoxiaolin
|
33beab5b92
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
d082384d27
|
质量报表相关
|
10 months ago |
|
shaoyong
|
3a4b21d435
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
shaoyong
|
22b8bc240b
|
箱型修改
|
10 months ago |
|
zhaoxiaolin
|
6af7ebdc92
|
开发配置还原
|
10 months ago |
|
zhaoxiaolin
|
8b77bd8751
|
辅助排查支持多线体bug修复
|
10 months ago |
|
zhaoxiaolin
|
2e649912b8
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
e5adc98b74
|
巡检报表4
|
10 months ago |
|
A0010407
|
63f07e88c6
|
2024-08-22 设备模块-设备-改字段
|
10 months ago |
|
mengjiao
|
ee790d3c58
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
mengjiao
|
c1de5e8c1d
|
成品入库修改，和打印接口
|
10 months ago |
|
A0010407
|
3a9b3e393b
|
2024-08-22 wms - 设备 - 字段修改
|
10 months ago |
|
zhaoxiaolin
|
c75289012a
|
巡检报表4
|
10 months ago |
陈恒杰
|
2113fc5927
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
陈恒杰
|
5bee31b7e5
|
物料附属信息导入
|
10 months ago |
|
shaoyong
|
4bae9ca274
|
垛型增加
|
10 months ago |
|
A0010407
|
99c3e0e3e7
|
2024-08-21 计划-生产工单管理-产品标识卡
|
10 months ago |
|
shaoyong
|
521f1de96f
|
箱型分类实现
|
10 months ago |
|
Yangwl
|
c48de5d3f3
|
企业微信推送接口修改
|
10 months ago |
|
Yangwl
|
1dc0e7d7d6
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
Yangwl
|
c64daab55f
|
企业微信推送接口、能源单耗
|
10 months ago |
|
mengjiao
|
583e9cb6d7
|
成品修改--又不想在成品下线的时候绑托盘，--让标识卡代替托盘码，如果没有绑的话，就标识卡代替托盘码
|
10 months ago |
|
mengjiao
|
199e7868b9
|
标识卡批次查询修改
|
10 months ago |
|
mengjiao
|
ae1a59be61
|
添加批次
|
10 months ago |
|
zhaoxiaolin
|
c5da1a61e6
|
巡检报表3
|
10 months ago |
|
zhaoxiaolin
|
796bab2176
|
巡检报表2
|
10 months ago |
|
zhaoxiaolin
|
98444d5023
|
巡检报表
|
10 months ago |
|
zhaoxiaolin
|
a5232f1751
|
标识卡码4
|
10 months ago |
|
zhaoxiaolin
|
ff5738fd83
|
Merge remote-tracking branch 'origin/master'
|
10 months ago |
|
zhaoxiaolin
|
ec90425d50
|
标识卡码3
|
10 months ago |
|
mengjiao
|
201b791bcb
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
584484ef9a
|
成品入库修改6
|
11 months ago |
|
shaoyong
|
74c71be7e2
|
不良描述code
|
11 months ago |
|
mengjiao
|
b2411c1680
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
0fe05dab1f
|
成品入库修改5
|
11 months ago |
|
zhaoxiaolin
|
ed1dc18309
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
f7edae003b
|
标识卡码2
|
11 months ago |
|
A0010407
|
bb5ae8667f
|
2024-08-16 质量-物品复检申请-对榄菊开的接口
|
11 months ago |
|
mengjiao
|
4fdc46293b
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
8a22118ac2
|
成品入库修改4
|
11 months ago |
|
zhaoxiaolin
|
78b65211b6
|
标识卡码
|
11 months ago |
|
mengjiao
|
9d03ecfe69
|
成品入库修改3
|
11 months ago |
|
mengjiao
|
c22d391d1b
|
成品入库修改2
|
11 months ago |
|
mengjiao
|
6a4bafb889
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
e597f04d98
|
成品入库修改2
|
11 months ago |
|
zhaoxiaolin
|
45d6c38185
|
oa
|
11 months ago |
|
mengjiao
|
233e5b9314
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
cfbdc424ae
|
成品入库修改2
|
11 months ago |
|
zhaoxiaolin
|
f15bb690cb
|
oa
|
11 months ago |
|
mengjiao
|
366b8c7b16
|
成品生产记录记录修改，和成品入库修改1
|
11 months ago |
|
A0010407
|
51516cd5da
|
2024-08-15 设备-维修-增加审核意见+异常抛出
|
11 months ago |
|
shaoyong
|
b85de0320f
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
shaoyong
|
772667d39d
|
不良描述接口位置修改
|
11 months ago |
|
zhaoxiaolin
|
b298ed6136
|
bug2
|
11 months ago |
|
zhaoxiaolin
|
fe71c70edb
|
bug
|
11 months ago |
|
zhaoxiaolin
|
18cbab3c49
|
质量新增报表
|
11 months ago |
|
zhaoxiaolin
|
74da1f1b19
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
db35521ca6
|
库存检验
|
11 months ago |
|
Yangwl
|
efca5b85b2
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
Yangwl
|
4b323702f6
|
企业微信报表接口
|
11 months ago |
|
shaoyong
|
12f530fdb2
|
检验任务，图片地址增加，不良类型描述修改
|
11 months ago |
|
zhaoxiaolin
|
dcf87b4e7f
|
bug修复
|
11 months ago |
|
A0010407
|
0e8e1dd287
|
2024-08-14 设备-审核优化+委外工单优化+生成委外单定时任务优化
|
11 months ago |
|
zhaoxiaolin
|
7e7221183a
|
看板调整
|
11 months ago |
|
zhaoxiaolin
|
297e733e41
|
抽样数量汇总逻辑
|
11 months ago |
|
A0010407
|
226c4ca215
|
2024-08-13 WMS-设备-辅助设备显示问题
|
11 months ago |
|
A0010407
|
4b1fd57118
|
2024-08-13 WMS-设备管理-绑定辅助设备优化（跟上位机报修有关）
|
11 months ago |
|
A0010407
|
1e9841a700
|
2024-08-13 设备模块+open模块 PC报修维修审核流程修改+手持报修维修接口
|
11 months ago |
|
shaoyong
|
24f317f286
|
草稿功能优化
|
11 months ago |
|
shaoyong
|
5c4341e677
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
shaoyong
|
3f7dc37ea8
|
草稿功能实现
|
11 months ago |
|
zhaoxiaolin
|
2d0d6f8781
|
升级
|
11 months ago |
|
zhaoxiaolin
|
dffd990770
|
del_flag bug
|
11 months ago |
|
mengjiao
|
72f92cd776
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
fb4349d950
|
成品扫标识卡获取生产订单
|
11 months ago |
|
Yangwl
|
f1f472e3f3
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
Yangwl
|
ef62e19fb0
|
计件工资修改
|
11 months ago |
|
zhaoxiaolin
|
d338843bfc
|
质量oa
|
11 months ago |
|
mengjiao
|
682699cb20
|
wms103暂收修改2
|
11 months ago |
|
mengjiao
|
e214ca957e
|
wms103暂收修改
|
11 months ago |
|
mengjiao
|
72bbbd0b7d
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
1c8293df91
|
wms103暂收
|
11 months ago |
|
zhaoxiaolin
|
c62b724af5
|
组件3
|
11 months ago |
|
zhaoxiaolin
|
bb08a4a2ab
|
组件2
|
11 months ago |
|
zhaoxiaolin
|
eb182893b9
|
组件
|
11 months ago |
|
zhaoxiaolin
|
74ef5ea97a
|
手粗草稿
|
11 months ago |
|
zhaoxiaolin
|
d2d18ee1d1
|
报告修改
|
11 months ago |
|
mengjiao
|
5e0db18705
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
db91297694
|
wms标识卡绑定，采购单bug修复
|
11 months ago |
|
zhaoxiaolin
|
dd1a8dc054
|
品质oa流程5
|
11 months ago |
|
zhaoxiaolin
|
dba2cab5ff
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
c4cbcd16dd
|
品质oa流程
|
11 months ago |
|
Yangwl
|
1f2ff73947
|
103收货接口修改
|
11 months ago |
|
Yangwl
|
79a21a7217
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
f52d943681
|
首检bug修复
|
11 months ago |
|
Yangwl
|
b86164b76b
|
103接口收货
|
11 months ago |
|
zhaoxiaolin
|
f78bc76dba
|
首检bug修复
|
11 months ago |
|
zhaoxiaolin
|
42e1dd8150
|
质量看板和报表、标识卡打印补打功能
|
11 months ago |
|
zhaoxiaolin
|
b2dbca3bfb
|
演示数据修改2
|
11 months ago |
|
zhaoxiaolin
|
3983470a67
|
演示数据修改
|
11 months ago |
|
zhaoxiaolin
|
7777b772e1
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
886c016d01
|
演示数据修改
|
11 months ago |
|
Yangwl
|
3cdac663ca
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
Yangwl
|
b78b6ef2ef
|
计件工资报表修改
|
11 months ago |
|
zhaoxiaolin
|
fcacb113eb
|
自动排查bug修复
|
11 months ago |
|
zhaoxiaolin
|
4f6b7c2990
|
质量报表修改
|
11 months ago |
|
A0010407
|
617f8add00
|
2024-08-02 设备-点检巡检保养加创建时间筛选
|
11 months ago |
|
zhaoxiaolin
|
dab3247888
|
仓库检验启用
|
11 months ago |
|
zhaoxiaolin
|
5355ec828d
|
仓库检验启用
|
11 months ago |
|
zhaoxiaolin
|
7f11ad3e9b
|
看板接口sql修改3
|
11 months ago |
|
zhaoxiaolin
|
022205251c
|
看板接口sql修改2
|
11 months ago |
|
zhaoxiaolin
|
df6d74daca
|
看板接口sql修改
|
11 months ago |
|
zhaoxiaolin
|
90d1e52de8
|
批次更新接口
|
11 months ago |
|
mengjiao
|
03c578ce6c
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
dc1f1ecff2
|
wms物料编号问题
|
11 months ago |
|
zhaoxiaolin
|
50080086d6
|
oa更新质检标准接口
|
11 months ago |
|
zhaoxiaolin
|
60168f0946
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
47c690e444
|
oa更新质检标准接口
|
11 months ago |
|
mengjiao
|
1fe9b03f0f
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
e9c64c918f
|
wms提单小问题修改
|
11 months ago |
|
zhaoxiaolin
|
51d7904011
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
c3554ad905
|
oa更新质检标准接口
|
11 months ago |
yinq
|
53764c857d
|
update - ems水功能优化
|
11 months ago |
|
zhaoxiaolin
|
64c0c150f0
|
企业微信异步执行
|
11 months ago |
|
zhaoxiaolin
|
c5f0487ade
|
企业微信异步执行
|
11 months ago |
|
mengjiao
|
d2962d71ed
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
b6a28ae2bb
|
wms成品生成记录页面接口2
|
11 months ago |
|
zhaoxiaolin
|
5270236e81
|
巡检报告加不良数量+首检闸口添加
|
11 months ago |
|
zhaoxiaolin
|
cdd0b4548a
|
巡检报告加不良数量+首检闸口添加
|
11 months ago |
|
zhaoxiaolin
|
1377d82514
|
巡检报告加不良数量+首检闸口添加
|
11 months ago |
|
Yangwl
|
63c8a50843
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
Yangwl
|
03f4316676
|
计件工资修改
|
11 months ago |
|
mengjiao
|
a8e76d04cc
|
wms手持成品生成记录接口
|
11 months ago |
|
mengjiao
|
fa8e9d40e6
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
8a69f82b01
|
wms手持的线体查询
|
11 months ago |
|
zhaoxiaolin
|
9c509a0415
|
修复2
|
11 months ago |
|
zhaoxiaolin
|
286853148c
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
zhaoxiaolin
|
c9f61c2501
|
bug修复3
|
11 months ago |
|
mengjiao
|
ba36460518
|
wms，成品生产入库页面的过账按钮随之修改
|
11 months ago |
|
mengjiao
|
af48888348
|
Merge remote-tracking branch 'origin/master'
|
11 months ago |
|
mengjiao
|
14fcf17a5a
|
wms，sap收货生产批次， 后面加一个入库批次字段。显示上面截取的值或者修改后的值,过账用入库批次
|
11 months ago |
|
zhaoxiaolin
|
05fb2811c8
|
辅助排产订单类型bug修复2
|
11 months ago |
|
zhaoxiaolin
|
26ca325e5f
|
辅助排产订单类型bug修复
|
11 months ago |
|
zhaoxiaolin
|
e333fa5d73
|
来料oa接口调整2
|
11 months ago |
|
zhaoxiaolin
|
0cd19c21d2
|
来料oa接口调整
|
11 months ago |
|
A0010407
|
95dcfd10db
|
2024-07-19 设备-组线问题导致点检任务不生成
|
11 months ago |
|
zhaoxiaolin
|
57e5bf1490
|
领料单新增字段
|
11 months ago |
|
zhaoxiaolin
|
cdb7b88a36
|
系统升级
|
12 months ago |
|
zhaoxiaolin
|
355d8e6d6d
|
测试系统升级
|
12 months ago |
|
A0010407
|
746f963f3c
|
2024-07-17 设备-手持-点检巡检保养提交后微信提醒
|
12 months ago |
|
A0010407
|
25e7440973
|
2024-07-16 设备-点检、巡检、保养任务组线展示PC端
|
12 months ago |
|
yinq
|
db41cdb221
|
update - ems功能优化
|
12 months ago |
|
zhaoxiaolin
|
2c6c9ef7f7
|
人员最少的
|
12 months ago |
|
zhaoxiaolin
|
bab6e368e1
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
zhaoxiaolin
|
e111a303b8
|
自动排产2.0
|
12 months ago |
|
mengjiao
|
cad9c6aab4
|
wms采购提单-送货单提单--修改6
|
12 months ago |
|
mengjiao
|
1a780cb6fd
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
mengjiao
|
72c07c3ecf
|
wms采购提单-送货单提单--修改5
|
12 months ago |
|
zhaoxiaolin
|
f16b434b1b
|
企业微信重复发送日志追踪2
|
12 months ago |
|
zhaoxiaolin
|
86b504972a
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
zhaoxiaolin
|
1deb5de07d
|
企业微信重复发送日志追踪
|
12 months ago |
|
mengjiao
|
d9acff1f1d
|
wms采购提单-送货单提单--修改4
|
12 months ago |
|
mengjiao
|
01c26850ef
|
wms采购提单-送货单提单--修改3
|
12 months ago |
|
zhaoxiaolin
|
30c0376ac7
|
手持发起oa
|
12 months ago |
|
mengjiao
|
183e40745f
|
wms采购提单-送货单提单--修改2
|
12 months ago |
|
mengjiao
|
d16214e62c
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
mengjiao
|
0b6a8d98c5
|
wms采购提单-送货单提单--字段修改
|
12 months ago |
|
zhaoxiaolin
|
fac710cd1e
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
zhaoxiaolin
|
6276ae47f6
|
bug修复
|
12 months ago |
|
mengjiao
|
cbe3d06cdb
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
mengjiao
|
159aceedb0
|
wms包材出库查询--反冲类型
|
12 months ago |
|
zhaoxiaolin
|
a8380b967c
|
bug修复
|
12 months ago |
|
mengjiao
|
943f60e3e7
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
mengjiao
|
7f36ae8a66
|
wms送货单获取
|
12 months ago |
|
A0010407
|
7c6d4e90fc
|
2024-07-09 设备-备品备件-手持提示限制错误+备品备件出入库页面展示问题优化
|
12 months ago |
|
zhaoxiaolin
|
5ac34a2a8a
|
修复
|
12 months ago |
|
A0010407
|
4c7756eeba
|
2024-07-09 设备手持保养和巡检去掉时间
|
12 months ago |
|
Yangwl
|
186d0d0fa8
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
Yangwl
|
7dd75d5c5d
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
陈恒杰
|
6ea636d819
|
Merge remote-tracking branch 'origin/master'
|
12 months ago |
|
陈恒杰
|
e9710a7dfe
|
物料附属属性
|
12 months ago |
|
Yangwl
|
c9012e23ea
|
SRM系统送货单接口
|
12 months ago |
|
A0010407
|
b418483af2
|
2024-07-05 设备-备品备件出入库和手持对接接口
|
12 months ago |
|
A0010407
|
0463d5b512
|
2024-07-05 设备-备品备件-导入和新增加限制
|
12 months ago |
|
A0010407
|
fe306c43a7
|
2024-07-04 设备-点检、巡检、保养、维修-检查人姓名+检查人工号
|
12 months ago |
|
A0010407
|
b13b68d10a
|
2024-07-04 设备模块-备品备件出入库
|
12 months ago |
|
zhaoxiaolin
|
a79aa07f32
|
包装线标准效率计算修改
|
12 months ago |
|
yinq
|
9779dd80f3
|
update - 能源整点数据
|
12 months ago |
|
zhaoxiaolin
|
af49b3dead
|
质量CPK
|
12 months ago |
|
陈恒杰
|
a6cf1c1632
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
8ce2bf7e08
|
chj
|
1 year ago |
|
zhaoxiaolin
|
1038bc3f27
|
质量oa
|
1 year ago |
|
zhaoxiaolin
|
31e2d8f30e
|
日生产报表加白坯参考按钮
|
1 year ago |
|
zhaoxiaolin
|
6d7f042ccb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
9849d22d5b
|
oa
|
1 year ago |
|
zhaoxiaolin
|
a8a5f52f54
|
ywl
|
1 year ago |
|
zhaoxiaolin
|
2e5c27bc7c
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
|
1 year ago |
|
zhaoxiaolin
|
a66aec3ac3
|
榄菊日生产报表--单层订单
|
1 year ago |
|
Yangwl
|
fe1cfe6eb4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
845fc2fa00
|
计件工资、月度报表修改
|
1 year ago |
|
zhaoxiaolin
|
8d926cfb7c
|
榄菊日生产报表导出格式、撤销报工的数据不算入计算逻辑修改
|
1 year ago |
|
zhaoxiaolin
|
fdfbce95ae
|
流程id修改
|
1 year ago |
|
zhaoxiaolin
|
366fda79dc
|
质检物料组，物料信息导入
|
1 year ago |
|
zhaoxiaolin
|
fe49dcaa8e
|
质检物料组，物料信息导入
|
1 year ago |
|
zhaoxiaolin
|
0785b6b95b
|
辅助排产1.0
|
1 year ago |
|
zhaoxiaolin
|
ad5b9ee7a3
|
辅助排产
|
1 year ago |
|
zhaoxiaolin
|
156ed0e831
|
生产日报表人员调动
|
1 year ago |
|
zhaoxiaolin
|
422aaae354
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
c4d7d1cb2b
|
生产日报表人员调动--取最大人数
|
1 year ago |
|
Yangwl
|
79cf66af1f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
96baa90c98
|
OA流程ID修改
|
1 year ago |
|
zhaoxiaolin
|
c97e3fc817
|
报工-自动添加项目编码2
|
1 year ago |
|
zhaoxiaolin
|
0e973d74c1
|
报工-自动添加项目编码
|
1 year ago |
|
zhaoxiaolin
|
a4d46f6c84
|
辅助排产部分
|
1 year ago |
|
Yangwl
|
ef6c50041f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
da7a9054d5
|
月度报表、标准效率计算方式
|
1 year ago |
|
A0010407
|
13f1fc2d22
|
2024-6-21 设备模块-备品备件导入-去掉多余限制，只留下四个限制
|
1 year ago |
|
A0010407
|
abe3d2eefd
|
2024-6-21 基础信息管理系统-设备-备品备件绑定问题
|
1 year ago |
|
zhaoxiaolin
|
b5f14e9f37
|
定量分析
|
1 year ago |
|
zhaoxiaolin
|
918c57bd39
|
报表加日志+质检查自动判定+其它
|
1 year ago |
|
mengjiao
|
7330d3b4be
|
wms成品退货提单修改5
|
1 year ago |
|
mengjiao
|
2d6e2fc206
|
wms成品退货提单修改4
|
1 year ago |
|
mengjiao
|
6edd217e4e
|
wms成品退货提单修改3
|
1 year ago |
|
Yangwl
|
a62f1b43de
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
dc1b0e330d
|
能源单耗统计
|
1 year ago |
|
zhaoxiaolin
|
ac959caf49
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
ad229d3be1
|
del_flag = '0'
|
1 year ago |
|
A0010407
|
49bdabd42d
|
2024-6-12 设备-检查项导入-循环周期
|
1 year ago |
|
A0010407
|
0cad2248e7
|
2024-06-12 设备-检查项维护-导入
|
1 year ago |
|
mengjiao
|
c820d089b5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
8f6330c1c6
|
wms成品退货提单修改2
|
1 year ago |
|
zhaoxiaolin
|
782edad5b3
|
订单同步，改成时间范围
|
1 year ago |
|
Yangwl
|
6e30ae994e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
4aeedab8a0
|
SAP接口更改【订单同步、退货单输出】
|
1 year ago |
|
zhaoxiaolin
|
99c37b5e59
|
bug修复
|
1 year ago |
|
Yangwl
|
6bb5390cd3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
26cd41d400
|
SAP接口修改
|
1 year ago |
|
A0010407
|
93f28ca11a
|
2024-6-11 设备模块-备品备件-导入功能
|
1 year ago |
|
zhaoxiaolin
|
196bde4ba4
|
1
|
1 year ago |
|
zhaoxiaolin
|
cb33c605cf
|
线体产品维护
|
1 year ago |
|
A0010407
|
52c9c41a6d
|
2024-06-07 质量模块-抽样方案改版
|
1 year ago |
|
mengjiao
|
67db458c5d
|
wms成品退货提单修改
|
1 year ago |
|
shaoyong
|
070b44f030
|
线体管理,修改
|
1 year ago |
|
shaoyong
|
439b73e152
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
shaoyong
|
6869af8869
|
线体管理
|
1 year ago |
|
zhaoxiaolin
|
434d747f21
|
检验方案bug修改
|
1 year ago |
|
A0010407
|
a6d9884ce2
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
A0010407
|
54b2d2b91f
|
2024-06-06 质量微信二次提醒2
|
1 year ago |
|
Yangwl
|
3f40d63c52
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
91d95e0aaa
|
销售订单、退货单接口更改
|
1 year ago |
|
A0010407
|
4f9f609e10
|
2024-06-06 质量/系统/定时任务模块-质量未检查检验任务一小时后再次提醒
|
1 year ago |
|
mengjiao
|
5d89dfa31c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
6d280550e7
|
wms包材出库查询新增页面修改
|
1 year ago |
|
zhaoxiaolin
|
da8a504b39
|
日生产报表查询逻辑修改
|
1 year ago |
|
zhaoxiaolin
|
6b4c8f377b
|
抽样方案改版
|
1 year ago |
|
yinq
|
536de3eddb
|
update - 实时状态接口
|
1 year ago |
|
zhaoxiaolin
|
9e74814a5e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
f2dd3dcbc2
|
不切主库查微信id
|
1 year ago |
|
yinq
|
a45a9ae311
|
update - 整点数据
|
1 year ago |
|
yinq
|
556e1f9030
|
update - 能源表具看板
|
1 year ago |
|
shaoyong
|
0f107864a4
|
生产日报表-优化
|
1 year ago |
|
zhaoxiaolin
|
0c0184020a
|
批次编辑升级2
|
1 year ago |
|
zhaoxiaolin
|
4c42e02780
|
企业微信质检提醒+批次编辑升级
|
1 year ago |
|
zhaoxiaolin
|
ef2cae1d7b
|
企业微信默认用工号
|
1 year ago |
|
mengjiao
|
21ac32c35c
|
到货登记记录页面--登记数量代码
|
1 year ago |
|
mengjiao
|
4b713ab5de
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
e1015bcc9e
|
成品wcs部分代码修改
|
1 year ago |
|
shaoyong
|
a7d8206256
|
生产日报表-修改
|
1 year ago |
|
shaoyong
|
4e13248175
|
生产日报表
|
1 year ago |
|
A0010407
|
9ca999e0e1
|
2024-6-1 设备-备品备件-增删改查换表
|
1 year ago |
|
shaoyong
|
dfa5730cb3
|
生产日报表
|
1 year ago |
|
shaoyong
|
959b9dbe19
|
生产日报表
|
1 year ago |
|
zhaoxiaolin
|
5ebb81a661
|
看板和其它bug修复
|
1 year ago |
|
Yangwl
|
c9227dae4a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
2b95424fe4
|
人员更新增加员工卡字段
|
1 year ago |
|
A0010407
|
23d59474b7
|
2024-5-30 设备-维修-维修结果确认审核发送微信消息+保养换id
|
1 year ago |
|
shaoyong
|
8ecedca10d
|
线体管理修改
|
1 year ago |
|
zhaoxiaolin
|
bec9763ca4
|
不合格企业微信发送
|
1 year ago |
|
zhaoxiaolin
|
9c475ad73c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
18434906db
|
成品检验oa流程
|
1 year ago |
|
shaoyong
|
2cad02ff7b
|
线体管理修改
|
1 year ago |
|
Yangwl
|
10a57885f0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
45a5f33fe8
|
计件工资优化、能源模块增加数据源
|
1 year ago |
|
zhaoxiaolin
|
965710511a
|
批次修改1
|
1 year ago |
|
zhaoxiaolin
|
55d9b46a18
|
成品检验2.1
|
1 year ago |
|
zhaoxiaolin
|
0d71cfde99
|
成品检验2.0
|
1 year ago |
|
A0010407
|
ac634b5f61
|
2024-5-28 设备-保养-结果检验微信通知
|
1 year ago |
|
zhaoxiaolin
|
9ba60dba19
|
成品检验
|
1 year ago |
|
A0010407
|
c651a1212e
|
2024-5-28 设备-点检/巡检/保养-当工单删除后，无法重新生成问题
|
1 year ago |
|
shaoyong
|
c00a9ef1b9
|
生产工单，批次编辑
|
1 year ago |
|
shaoyong
|
25d20b25c6
|
生产工单，批次编辑
|
1 year ago |
|
A0010407
|
dd9bfb5496
|
2024-5-27 质量-来料/过程/库存-加逻辑删除
|
1 year ago |
|
zhaoxiaolin
|
3dc6a44888
|
1
|
1 year ago |
|
zhaoxiaolin
|
47c490ec4c
|
报工bug修复4
|
1 year ago |
|
Yangwl
|
4b0ba99444
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
01acbe595e
|
计件工资统计改为只查询本人的
|
1 year ago |
|
zhaoxiaolin
|
37273a2084
|
sap预报工+计划批次bug+报工备注bug修复3
|
1 year ago |
|
zhaoxiaolin
|
2285e279b2
|
sap预报工+计划批次bug+报工备注bug修复3
|
1 year ago |
|
zhaoxiaolin
|
cdf72a20f6
|
sap预报工+计划批次bug+报工备注bug修复2
|
1 year ago |
|
zhaoxiaolin
|
a2de5b5fec
|
sap预报工+计划批次bug+报工备注bug修复
|
1 year ago |
|
A0010407
|
0ab3653d82
|
2024-5-24 设备-巡检/点检-填写记录-不合格会报修+增加手持来源字段
|
1 year ago |
|
A0010407
|
81d4b8cc51
|
2024-5-24 设备-上位机-报修之后-发送微信+PDA修改
|
1 year ago |
|
A0010407
|
13fd0189cb
|
2024-5-24 设备-手持-报修-报修后发送微信审核提醒
|
1 year ago |
|
A0010407
|
540b362065
|
2024-5-24 设备-维修-快速工单-微信提醒
|
1 year ago |
|
mengjiao
|
2884d55e73
|
wms部分代码修改
|
1 year ago |
|
mengjiao
|
b9932e8b4c
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
caa7ae0d98
|
wms包材收货修改---一个物料一个物料登记，记录登记数量修改2
|
1 year ago |
|
A0010407
|
fdc8f9edad
|
2024-5-24 设备-报修-报修审核后发送微信维修通知
|
1 year ago |
|
mengjiao
|
83c8ea6e34
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
5d46e8fd43
|
wms包材收货修改---一个物料一个物料登记，记录登记数量
|
1 year ago |
|
A0010407
|
b777ca8e48
|
2024-5-23 设备管理-PC端报修-微信提醒 + open模块微信Post方法错误
|
1 year ago |
|
Yangwl
|
80c65cc430
|
修改能源模块名
|
1 year ago |
|
mengjiao
|
97ab482d44
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
f79c71bebe
|
wms成品sap收获按钮中过账时批次的截取规则部分修改
|
1 year ago |
|
zhaoxiaolin
|
449df55a08
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
2a52489c41
|
来料检验定时任务排查问题
|
1 year ago |
|
mengjiao
|
0e5f5907e1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
0f25ba8a3b
|
wms成品部分修改
|
1 year ago |
|
A0010407
|
3332d91cd1
|
2024-5-22 open模块-上位机报修新加字段 故障描述
|
1 year ago |
|
yinq
|
951f2e3161
|
update - 水电实时数据
|
1 year ago |
|
zhaoxiaolin
|
6ad5ed5fdd
|
领料单升级+报工批次删除功能
|
1 year ago |
|
shaoyong
|
56553b4e8c
|
检测值修噶
|
1 year ago |
|
zhaoxiaolin
|
752058a4ec
|
人员信息增加三个字段。质量导出模板bug修复
|
1 year ago |
|
zhaoxiaolin
|
102261ec2d
|
8040包材固定码
|
1 year ago |
|
mengjiao
|
764e94276f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
d6b740ba50
|
wms包材部分修改50
|
1 year ago |
|
shaoyong
|
5976bb34b4
|
检测方案修改
|
1 year ago |
|
zhaoxiaolin
|
76fbd2a09b
|
白坯产量定时任务修正
|
1 year ago |
|
zhaoxiaolin
|
e15400be32
|
白坯产量定时任务修正
|
1 year ago |
|
zhaoxiaolin
|
739e8edee1
|
白坯产量定时任务修正
|
1 year ago |
|
A0010407
|
e548b0e3ce
|
2024-5-15 基础信息-产品-新增附属属性
|
1 year ago |
|
A0010407
|
f13ce73f4f
|
2024-5-15 基础信息-产品-修改产品附属属性
|
1 year ago |
|
zhaoxiaolin
|
b5933cc7f2
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
dd6f38a8c5
|
来料检验+微信2
|
1 year ago |
|
mengjiao
|
775727698e
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
2eafce98d6
|
wms包材部分修改48
|
1 year ago |
|
zhaoxiaolin
|
d04791d6a4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
2a4eb59fc0
|
来料检验+微信
|
1 year ago |
|
mengjiao
|
ef694dcc8f
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
d9d8b910c2
|
wms包材部分修改47
|
1 year ago |
|
A0010407
|
9bd854d9d9
|
2024-5-15 基础信息-班组-增加关于微信号逻辑
|
1 year ago |
|
shaoyong
|
f4703186e0
|
通知公告
|
1 year ago |
|
zhaoxiaolin
|
136e05a4e6
|
公共实体
|
1 year ago |
|
shaoyong
|
1093be862a
|
通知公告
|
1 year ago |
|
mengjiao
|
34a6b8a036
|
wms包材部分修改46
|
1 year ago |
|
mengjiao
|
83daf5131c
|
wms包材部分修改45
|
1 year ago |
|
mengjiao
|
d9b25567fb
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
eef3bdabd9
|
wms包材部分修改44
|
1 year ago |
|
zhaoxiaolin
|
3240d511ff
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
715222563e
|
微信接口+bug
|
1 year ago |
|
A0010407
|
bf09a60501
|
2024-5-13 基础信息管理-产品-新增报工汇率（可以0可以空）
|
1 year ago |
|
mengjiao
|
284b2e89dc
|
wms包材部分修改43
|
1 year ago |
|
mengjiao
|
3f5ebda816
|
wms包材部分修改42
|
1 year ago |
|
mengjiao
|
0127363fe9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
5b94a750cb
|
wms包材部分修改41
|
1 year ago |
|
A0010407
|
8ecd7a6233
|
2024-5-13 基础信息-产品-报工汇率修改（可以是0，可以是空）
|
1 year ago |
|
mengjiao
|
6b77d4282a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
661a3198dc
|
wms包材部分修改40
|
1 year ago |
|
zhaoxiaolin
|
0dc626b9ae
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
30b9562287
|
bug
|
1 year ago |
|
A0010407
|
f70f56fa9c
|
2024-5-13 设备优化
|
1 year ago |
|
shaoyong
|
0262e1237a
|
成型机生产报表优化
|
1 year ago |
|
zhaoxiaolin
|
5a88e45c35
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
325fd0ffa2
|
入库检验方案报告+烘房看板2
|
1 year ago |
|
mengjiao
|
342e2895ec
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
1d5c1d46c4
|
wms成品部分修改40
|
1 year ago |
|
zhaoxiaolin
|
5d563721de
|
入库检验方案报告+烘房看板2
|
1 year ago |
|
zhaoxiaolin
|
6031e3f347
|
入库检验方案报告+烘房看板2
|
1 year ago |
|
mengjiao
|
38075ba1f2
|
wms成品部分修改39
|
1 year ago |
|
mengjiao
|
4eb381790d
|
wms成品部分修改38
|
1 year ago |
|
mengjiao
|
6300af9a03
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
f33f28d00e
|
wms成品部分修改37
|
1 year ago |
|
shaoyong
|
21a01669d2
|
成型机生产报表优化
|
1 year ago |
|
A0010407
|
a05ea11a60
|
2024-5-6 设备模块-点检巡检保养判空问题2
|
1 year ago |
|
zhaoxiaolin
|
87c4e71d3d
|
检验方案、检测项配置增加两项+报工汇率加到成品上
|
1 year ago |
|
A0010407
|
8c18e67b1c
|
2024-5-6 设备模块-点检巡检判空问题
|
1 year ago |
|
A0010407
|
a7e2eccc70
|
2024-5-6 设备模块-点检巡检保养工单-图片等问题
|
1 year ago |
|
A0010407
|
ee84f9b8ed
|
2024-5-6 设备模块-单次保养逻辑
|
1 year ago |
|
zhaoxiaolin
|
5578ef5c3c
|
检验方案、检测项配置增加两项
|
1 year ago |
|
zhaoxiaolin
|
498f1bd2d8
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
3293b83595
|
预报工+产线调拨
|
1 year ago |
|
mengjiao
|
2587c244f1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
77384a9e35
|
wms成品部分修改36（不同线体）
|
1 year ago |
|
zhaoxiaolin
|
a823ac786a
|
产线调拨+预报工
|
1 year ago |
|
zhaoxiaolin
|
f7bfe55f23
|
首页未开工提醒
|
1 year ago |
|
zhaoxiaolin
|
f8c5a02b42
|
紧急bug
|
1 year ago |
|
zhaoxiaolin
|
ea660c7686
|
物料工艺变更
|
1 year ago |
|
zhaoxiaolin
|
9082322187
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
dbcf841720
|
湿料计划删除功能
|
1 year ago |
|
shaoyong
|
ea89b6779b
|
成型机生产报表
|
1 year ago |
|
mengjiao
|
6b33ebdcf5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
93fbba26e6
|
wms成品部分修改35（已经过账的数量）
|
1 year ago |
|
zhaoxiaolin
|
9b8457c07f
|
工艺增加物料同步工艺按钮
|
1 year ago |
|
mengjiao
|
d3756bee73
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
a111077f50
|
wms成品部分修改34
|
1 year ago |
|
Yangwl
|
2503a3233e
|
工艺路线接口
|
1 year ago |
|
Yangwl
|
3b8717318b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java
|
1 year ago |
|
Yangwl
|
78229d7662
|
工艺路线同步接口优化
|
1 year ago |
|
zhaoxiaolin
|
9ff3c39ad6
|
事务跟切库不能共生
|
1 year ago |
|
zhaoxiaolin
|
7e524978f1
|
质量手持更新
|
1 year ago |
|
mengjiao
|
f63574ff1f
|
wms成品部分修改33--他sap收货按钮部分批次的字符串长度不满足12
|
1 year ago |
|
mengjiao
|
5ca685d78e
|
wms成品部分修改32
|
1 year ago |
|
mengjiao
|
90b4eac108
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
5d6572c095
|
wms成品部分修改31
|
1 year ago |
|
zhaoxiaolin
|
6cd329334c
|
质量手持更新
|
1 year ago |
|
zhaoxiaolin
|
45670f8b06
|
质量手持更新
|
1 year ago |
|
zhaoxiaolin
|
b5121fd2ab
|
只看今天和昨天的检验任务
|
1 year ago |
|
zhaoxiaolin
|
efa426825e
|
mes相关看板
|
1 year ago |
|
shaoyong
|
65fe3d2ef1
|
不良类型优化
|
1 year ago |
|
mengjiao
|
938749cbf2
|
wms成品部分修改30
|
1 year ago |
|
mengjiao
|
d6953800b3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
7d2ee34a17
|
wms成品部分修改29
|
1 year ago |
|
shaoyong
|
02e833445a
|
工厂数据源修改，质量时间查询
|
1 year ago |
|
mengjiao
|
d83f72dbe8
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
f92a22cb35
|
wms成品部分修改28
|
1 year ago |
|
zhaoxiaolin
|
3c0d9f16ad
|
mes相关
|
1 year ago |
|
zhaoxiaolin
|
374d2dc592
|
单层报工
|
1 year ago |
|
zhaoxiaolin
|
330ec8b0d5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
5354d2f617
|
首页+去掉订单修改功能
|
1 year ago |
|
shaoyong
|
d2e58e871c
|
工厂字典
|
1 year ago |
|
zhaoxiaolin
|
6c71264935
|
mes bug
|
1 year ago |
|
Yangwl
|
783dc284f9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
0c4901d833
|
计件工资删除
|
1 year ago |
|
mengjiao
|
851cc92548
|
wms成品部分修改27
|
1 year ago |
|
zhaoxiaolin
|
0f5dfce375
|
del_flag
|
1 year ago |
|
zhaoxiaolin
|
387b28bae2
|
其它系统数据源打开
|
1 year ago |
|
zhaoxiaolin
|
a22bf0ea9c
|
复检bug修改
|
1 year ago |
|
zhaoxiaolin
|
e96450db07
|
手持批次排序
|
1 year ago |
|
zhaoxiaolin
|
36bf1e057a
|
人员同步重复,bug修复
|
1 year ago |
|
zhaoxiaolin
|
1706f6be9b
|
检验任务只保留当天和昨天的
|
1 year ago |
|
zhaoxiaolin
|
f27d2dcbe9
|
动态数据源垮系统加载
|
1 year ago |
|
zhaoxiaolin
|
17531927aa
|
去掉批次重复领料单
|
1 year ago |