zhaoxiaolin
|
037498849f
|
LJ04的订单接入
|
1 year ago |
|
zhaoxiaolin
|
da4578bfb0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
cc26587ff6
|
巡检定时任务修改
|
1 year ago |
 Yangwl
|
8b39a2d210
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
35e453de09
|
成品备货单接口
|
1 year ago |
A0010407
|
f32a40142a
|
2024-4-3 基础信息管理-优化SQL
|
1 year ago |
mengjiao
|
31370e80c4
|
wms成品转储部分代码修改30
|
1 year ago |
|
zhaoxiaolin
|
b7bfb7b1ba
|
来料去重修改+成品修改设备+看板bug修改
|
1 year ago |
|
mengjiao
|
2b7e105dff
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
5abd5d3bb7
|
wms成品调拨部分代码修改29
|
1 year ago |
|
A0010407
|
132c2dd84d
|
2024-4-1 设备管理-设备运行记录-定时任务-设备生成不全+创建人不对
|
1 year ago |
|
A0010407
|
d5cee2a8f8
|
2024-4-1 设备管理模块-点检巡检-选择后提示
|
1 year ago |
|
A0010407
|
7069e270f2
|
2024-4-1 设备模块-除了组线全部展示
|
1 year ago |
shaoyong
|
efa4d62224
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
shaoyong
|
cabcceb2a0
|
物料组优化空数据
|
1 year ago |
|
A0010407
|
a4e2b7792a
|
2024-4-1 质量导入还原
|
1 year ago |
|
A0010407
|
37260b893b
|
2024-4-1 质量模块-导入-属性
|
1 year ago |
|
zhaoxiaolin
|
9395573da3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
b3bcf1594f
|
夜班巡检
|
1 year ago |
|
mengjiao
|
cff213a3d0
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
080e34f4ff
|
wms成品调拨部分代码修改28
|
1 year ago |
|
shaoyong
|
70de333f7f
|
物料组新建
|
1 year ago |
|
shaoyong
|
c58ab6cb04
|
物料组新建优化
|
1 year ago |
|
shaoyong
|
8e8c9af514
|
物料组新增导入优化
|
1 year ago |
|
zhaoxiaolin
|
d17f929ad4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
9c4b43216b
|
细节升级
|
1 year ago |
|
mengjiao
|
f8e381df2d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
dfc2258768
|
wms成品调拨部分代码修改27
|
1 year ago |
|
A0010407
|
0fbef62ebb
|
2024-3-29 设备模块-1.看板公式改变 2.手持维修时间 3.管理系统维修加字段
|
1 year ago |
|
zhaoxiaolin
|
0eecd31a19
|
来料检验上线
|
1 year ago |
|
shaoyong
|
5ea60773d6
|
检验任务不良类型优化
|
1 year ago |
|
shaoyong
|
677c6ddb83
|
人员绑定优化
|
1 year ago |
|
zhaoxiaolin
|
67c6a27168
|
bug修复2
|
1 year ago |
|
Yangwl
|
5b0fb2d333
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
5bfd9fa520
|
来料检验增加物料凭证号、物料凭证中的项目
|
1 year ago |
|
zhaoxiaolin
|
2165d42d93
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
bf4b93fe23
|
bug修复
|
1 year ago |
|
mengjiao
|
71a042006d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
b0c711c443
|
wms成品部分代码修改26
|
1 year ago |
|
zhaoxiaolin
|
edb80d785a
|
qc_check_task_defect数据添加逻辑修改
|
1 year ago |
|
zhaoxiaolin
|
43211b5257
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
3486c00461
|
qc_check_task_defect数据添加逻辑修改
|
1 year ago |
|
mengjiao
|
1af3940012
|
wms成品部分代码修改25
|
1 year ago |
|
mengjiao
|
2e38a77da3
|
wms成品部分代码修改24
|
1 year ago |
|
mengjiao
|
59c433642a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
bcf35f37b4
|
wms包材出库部分代码修改23
|
1 year ago |
|
zhaoxiaolin
|
f28c8d5bb4
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
51613502f2
|
qc bug修改3
|
1 year ago |
|
mengjiao
|
c5f002597a
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
14c21142a5
|
wms包材出库部分代码修改22
|
1 year ago |
|
zhaoxiaolin
|
b0c2ef28cf
|
qc bug修改2
|
1 year ago |
|
zhaoxiaolin
|
fb85f305b9
|
qc bug修改1
|
1 year ago |
|
A0010407
|
ca51dbda0c
|
2024-3-27 基础信息-设备-去掉设备名称校验
|
1 year ago |
|
Yangwl
|
1424b9c3a1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
0717f35d64
|
计件工资基础信息维护修改
|
1 year ago |
|
zhaoxiaolin
|
fbd9703421
|
报工更新remark
|
1 year ago |
|
zhaoxiaolin
|
fc21de5529
|
报工损耗添加物料，精确到半成品
|
1 year ago |
|
shaoyong
|
e0be502d8f
|
优化
|
1 year ago |
|
zhaoxiaolin
|
10c0a7c130
|
报工增加remark
|
1 year ago |
|
shaoyong
|
5856609c63
|
人员检验节点绑定
|
1 year ago |
|
Yangwl
|
27853f2ac9
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
af833e891a
|
物料主数据同步接口更改，计件薪酬基础信息修改，SAP报工接口增加备注
|
1 year ago |
|
zhaoxiaolin
|
270495c0ab
|
报工组件修改11
|
1 year ago |
|
zhaoxiaolin
|
a38d0d32e5
|
报工组件修改10
|
1 year ago |
|
zhaoxiaolin
|
1204f6fced
|
报工组件修改9
|
1 year ago |
|
zhaoxiaolin
|
0e86b6715a
|
报工+批次可以重复+其它细节功能改善7
|
1 year ago |
|
zhaoxiaolin
|
ab377c7413
|
报工+批次可以重复+其它细节功能改善6
|
1 year ago |
|
mengjiao
|
c5e85f71af
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
ff952cf249
|
wms成品出库部分代码修改21
|
1 year ago |
|
zhaoxiaolin
|
b013d280ce
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
6122f06e7b
|
报工+批次可以重复+其它细节功能改善5
|
1 year ago |
|
mengjiao
|
51a1b31b27
|
wms成品出库部分代码修改20
|
1 year ago |
|
mengjiao
|
2fa6f29116
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
a3c2a81a8f
|
wms成品出库部分代码修改18
|
1 year ago |
|
zhaoxiaolin
|
767eef01fb
|
报工+批次可以重复+其它细节功能改善4
|
1 year ago |
|
zhaoxiaolin
|
26ab01f44c
|
报工+批次可以重复+其它细节功能改善3
|
1 year ago |
|
zhaoxiaolin
|
29c2ca8448
|
报工+批次可以重复+其它细节功能改善2
|
1 year ago |
|
A0010407
|
53cc4a78b5
|
2024-3-22 基础信息管理模块设备-设备类别选择bug
|
1 year ago |
|
Yangwl
|
ef5954f39a
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
|
1 year ago |
|
Yangwl
|
0efb388eb1
|
SAP来料检验数据接口修改
|
1 year ago |
|
zhaoxiaolin
|
dd16e06623
|
报工+批次可以重复+其它细节功能改善
|
1 year ago |
|
zhaoxiaolin
|
eacf18a4a8
|
人员信息同步2.0
|
1 year ago |
|
zhaoxiaolin
|
8a0a9b7634
|
人员信息同步+报工修改
|
1 year ago |
|
zhaoxiaolin
|
3dcc838eaa
|
来料检验生成-参数2
|
1 year ago |
|
mengjiao
|
b87576a1eb
|
wms成品出库部分代码修改17
|
1 year ago |
|
A0010407
|
2ccd0cab8f
|
2024-3-20 提交代码有问题
|
1 year ago |
|
zhaoxiaolin
|
6e8846e562
|
来料检验生成-参数
|
1 year ago |
|
zhaoxiaolin
|
ef0b1a416e
|
来料检验生成
|
1 year ago |
|
A0010407
|
264916d073
|
2024.3.19-3.20 系统模块、定时任务模块-人力资源基础信息部门、岗位定时任务
|
1 year ago |
|
Yangwl
|
de31118290
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
fa2a3949cf
|
来料接口
|
1 year ago |
|
zhaoxiaolin
|
05c3187e70
|
成品工艺靠上
|
1 year ago |
|
zhaoxiaolin
|
5676606f68
|
问题清单处理1.0
|
1 year ago |
|
shaoyong
|
3dc156131b
|
质量目标显示优化
|
1 year ago |
|
shaoyong
|
8c658b1e46
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
40c14a4a36
|
去掉批次重复校验
|
1 year ago |
|
zhaoxiaolin
|
c8e9bd9791
|
报工修改物料组成+订单计划后台加下发二次校验
|
1 year ago |
|
mengjiao
|
5668850118
|
wms包材出库部分代码修改16---反冲排序
|
1 year ago |
|
shaoyong
|
ba6ab6dd2b
|
质量目标优化,人员线体
|
1 year ago |
|
mengjiao
|
705fdb1a3d
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
2b52d4e7cd
|
wms成品部分代码修改15
|
1 year ago |
|
Yangwl
|
1d0dda6dab
|
SAP物料同步增加基本计量单位字段
|
1 year ago |
|
Yangwl
|
4e04cf0560
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
6db6289d4d
|
SAP订单组件修改接口、来料接口、成品备货单接口
|
1 year ago |
|
mengjiao
|
5e11d53783
|
wms成品部分代码修改14
|
1 year ago |
|
mengjiao
|
adedbe57f3
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
d18d371883
|
wms成品部分代码修改13
|
1 year ago |
|
zhaoxiaolin
|
ebc69796ab
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
1801ac7122
|
收坯机看板展示数据+成品订单删除功能
|
1 year ago |
|
A0010407
|
5fac9b8abe
|
2024-3-13 设备模块-点检提示信息
|
1 year ago |
|
A0010407
|
916d9d86ff
|
2024-3-13 设备管理系统-设备看板-设备有效利用率公式修改
|
1 year ago |
|
A0010407
|
0128967ab9
|
2024-3-13 基础信息管理-设备管理-增加sap_code和sap_name
|
1 year ago |
|
shaoyong
|
e38f9fe567
|
质量模块优化，质量目标优化
|
1 year ago |
|
mengjiao
|
b7852ebc00
|
wms成品部分代码修改12
|
1 year ago |
|
mengjiao
|
1f61137519
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
3cfb4291ab
|
wms成品部分代码修改11
|
1 year ago |
|
zhaoxiaolin
|
cb81c6165a
|
质量+增加线体（检查地点）；质量看板-产品异常趋势
|
1 year ago |
|
mengjiao
|
e96300722b
|
wms白坯部分代码修改10
|
1 year ago |
|
mengjiao
|
afd05fdfed
|
wms白坯部分代码修改9
|
1 year ago |
|
mengjiao
|
c41b1a0b02
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
ff9b1c3cb9
|
wms白坯部分代码修改8
|
1 year ago |
|
Yangwl
|
54a0e76ed1
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
79af2cb25b
|
计件工资修改
|
1 year ago |
|
zhaoxiaolin
|
73a3ffbc3d
|
质量目标暂时注释
|
1 year ago |
|
zhaoxiaolin
|
217a7ee237
|
巡检任务调整回一小时产生一条；成品订单编辑/删除功能优化
|
1 year ago |
|
A0010407
|
27a1e2bba2
|
2024-3-11 设备看板问题修改+维修快速工单修改
|
1 year ago |
|
shaoyong
|
d62bb2fc85
|
质量目标模块
|
1 year ago |
|
zhaoxiaolin
|
3a03b61959
|
订单创建加版本号2
|
1 year ago |
|
zhaoxiaolin
|
c3125ca18b
|
订单创建加版本号
|
1 year ago |
|
zhaoxiaolin
|
adbf632d74
|
巡检任务会多一条
|
1 year ago |
|
zhaoxiaolin
|
93d33895e7
|
报工公式修改+订单关闭接口修改+巡检多出一条的bug修复
|
1 year ago |
|
A0010407
|
841b3029c2
|
2024-3-8 设备模块-设备看板问题解决
|
1 year ago |
|
zhaoxiaolin
|
8bb60b5212
|
巡检任务定点执行
|
1 year ago |
|
A0010407
|
949f6696bf
|
2024-3-7 设备看板部门
|
1 year ago |
|
zhaoxiaolin
|
eabfa9449d
|
报工增加sap产线
|
1 year ago |
|
Yangwl
|
2f2beda622
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
06d6da1045
|
报工返回结果修改
|
1 year ago |
|
A0010407
|
4adc2b3fac
|
2024-3-7 质量模块、定时任务模块-来料检验批量创建检验任务-定时任务
|
1 year ago |
|
Yangwl
|
4e0c487efe
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
f75db486b3
|
SAP报工接口增加产线编码信息
|
1 year ago |
|
zhaoxiaolin
|
44a65a7b1d
|
报工物料去掉多余的
|
1 year ago |
|
zhaoxiaolin
|
cb40968a0f
|
报工物料调整
|
1 year ago |
|
mengjiao
|
e69adf1ea1
|
wms白坯部分代码修改7
|
1 year ago |
|
mengjiao
|
2c0751b871
|
wms白坯部分代码修改6
|
1 year ago |
|
mengjiao
|
443cc305ee
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
6726366b44
|
wms白坯部分代码修改5
|
1 year ago |
|
A0010407
|
6a19ac0e38
|
2024-3-4 基础数据设备、产品显示顺序修改
|
1 year ago |
|
mengjiao
|
75c3ffe061
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
7ea47c8e44
|
wms白坯部分代码修改4
|
1 year ago |
陈恒杰
|
6c044ead06
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
陈恒杰
|
3504cefcb1
|
粉料接口
|
1 year ago |
|
mengjiao
|
2a414a57d6
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
mengjiao
|
131d132a2a
|
wms白坯部分代码修改3
|
1 year ago |
|
A0010407
|
c9778a767e
|
2024-3-4 基础数据管理客户供应商优化
|
1 year ago |
|
zhaoxiaolin
|
04ee02c8e9
|
三层报工功能调整
|
1 year ago |
|
zhaoxiaolin
|
e37f464ea8
|
单层报工功能调整
|
1 year ago |
|
zhaoxiaolin
|
1a331d6b42
|
多层订单改造2.0
|
1 year ago |
|
Yangwl
|
a2e70c021b
|
SAP工单同步接口增加层级字段
|
1 year ago |
|
Yangwl
|
b2dd3e1990
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
0bdafef7be
|
订单创建修改
|
1 year ago |
|
zhaoxiaolin
|
41f2c820fb
|
多层订单改造1.0
|
1 year ago |
|
Yangwl
|
40fee31fab
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
dd404aca7f
|
订单创建接口修改
|
1 year ago |
|
A0010407
|
784c20f172
|
2024-2-28 设备看板 维修工单判空处理+显示限制条件
|
1 year ago |
|
A0010407
|
09b59c4d30
|
2024-2-28 设备模块-看板-维修工单判空处理+管理系统汇总报表排序
|
1 year ago |
|
A0010407
|
7f2628410a
|
2024-2-28 设备模块 设备完好率看板接口调整
|
1 year ago |
|
zhaoxiaolin
|
a4f45a2cbf
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhaoxiaolin
|
8d82a45e05
|
多层订单关闭
|
1 year ago |
|
Yangwl
|
1a954cf0f5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
3f7ec60948
|
计件工资统计修改
|
1 year ago |
|
A0010407
|
24905c34ac
|
2024-2-27 设备模块选择设备页面接口修改
|
1 year ago |
|
Yangwl
|
cf3977a0e5
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
Yangwl
|
97dc167cea
|
计件工资统计
|
1 year ago |
|
mengjiao
|
2931ab8646
|
wms部分代码修改2
|
1 year ago |
|
mengjiao
|
51d3005749
|
wms部分代码修改
|
1 year ago |
|
mengjiao
|
bb6f0cffb9
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
|
1 year ago |
|
zhaoxiaolin
|
52a73c37d3
|
bug修改
|
1 year ago |
|
zhaoxiaolin
|
882baffa17
|
订单生产版本回传+已派发的订单不再进行更新
|
1 year ago |
|
Yangwl
|
01dd5b5629
|
本地保存
|
1 year ago |
|
Yangwl
|
661cb1f822
|
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
|
a7b4b9a6e9
|
订单创建接口增加生产版本
|
1 year ago |
|
zhaoxiaolin
|
b9df5a579f
|
人力信息同步
|
1 year ago |
|
Yangwl
|
72917fbe68
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapOrderServiceImpl.java
|
1 year ago |
|
Yangwl
|
15483d79ec
|
订单创建增加生产版本字段
|
1 year ago |
|
A0010407
|
55a3c6c017
|
2024-2-20 工艺模块-线体设备/工作中心问题修改
|
1 year ago |
wws
|
982665b96b
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
wws
|
4fa7fb9222
|
点/巡检、保养加小时逻辑
|
1 year ago |
|
zhaoxiaolin
|
0df08e1953
|
报工打印v.20
|
1 year ago |
|
zhaoxiaolin
|
538841b44f
|
质量手持检测项不良分类逻辑+报工打印v.0
|
1 year ago |
|
Yangwl
|
f31e349642
|
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
|
4fc8f1c0cc
|
获取HR部门和岗位信息
|
1 year ago |
|
shaoyong
|
830afcd157
|
检验报告显示优化
|
1 year ago |
|
zhaoxiaolin
|
f8ef200121
|
白坯工单导出增加字段3
|
1 year ago |
|
zhaoxiaolin
|
4d6a680e2b
|
3
|
1 year ago |
|
zhaoxiaolin
|
07c7aa498a
|
白坯工单导出增加字段2
|
1 year ago |
|
zhaoxiaolin
|
02e87e5d04
|
白坯工单导出增加字段
|
1 year ago |
|
zhaoxiaolin
|
f8be5b6c77
|
定量值分析报表V1.0
|
1 year ago |
|
zhaoxiaolin
|
f3711dd081
|
定量值分析报表V1.0
|
1 year ago |
|
shaoyong
|
256c6eaac8
|
来料检验优化
|
1 year ago |
|
zhaoxiaolin
|
da4a5364db
|
首检测试
|
1 year ago |