 zhangxin
|
3bc3c500cf
|
新增从MES同步报工数据的功能
|
3 years ago |
|
zhangxin
|
0c9ee6f68f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
ace9b4211e
|
新增末序工位查询前序所有操作记录的功能接口
|
3 years ago |
|
zhangxin
|
b2720bbce8
|
新增模板代码
|
3 years ago |
|
zhangxin
|
9f899a51b0
|
流水号中的生成方式代码从product中获取
|
3 years ago |
|
zhangxin
|
ee706f4ee0
|
Merge pull request 'meta 字段添加' (#80) from fix_snr1 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/80
|
3 years ago |
 娄文智
|
a36511c463
|
meta 字段添加
|
3 years ago |
|
zhangxin
|
a89ca7b3fe
|
修改注释包名
|
3 years ago |
|
zhangxin
|
3778b120e6
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
389638df09
|
添加末序工位查询前序状态的功能代码
|
3 years ago |
|
娄文智
|
7a80d2e110
|
Merge pull request '生成工单流水号 使用新版的流水号规则' (#79) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/79
|
3 years ago |
|
zhangxin
|
fe5c4d0b34
|
生成工单流水号 使用新版的流水号规则
|
3 years ago |
|
zhangxin
|
de28cee71a
|
Merge pull request '流水号生成' (#78) from fix_snrtab into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/78
|
3 years ago |
|
娄文智
|
57ac3d0cb6
|
流水号生成
|
3 years ago |
|
娄文智
|
69066e16c6
|
Merge pull request '添加适配新的流水号逻辑' (#77) from feature_me into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/77
|
3 years ago |
|
zhangxin
|
45e14f4359
|
修改字段类型 和添加格式支持
|
3 years ago |
|
zhangxin
|
5df722c755
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
01d976f258
|
Merge pull request '返修添加' (#76) from fix_fanxiu1 into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/76
|
3 years ago |
|
zhangxin
|
52721c0e05
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
77d0dfd7bf
|
添加适配新的流水号逻辑
|
3 years ago |
|
娄文智
|
747dc797ae
|
返修添加
|
3 years ago |
|
zhangxin
|
42207cf452
|
Merge pull request 'fix_fanxiu' (#75) from fix_fanxiu into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/75
|
3 years ago |
|
娄文智
|
2b0dca18c1
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into fix_fanxiu
|
3 years ago |
|
娄文智
|
2110665f73
|
生成流水号规则
|
3 years ago |
|
zhangxin
|
1675d3d0c6
|
Merge pull request '返修代码生成逻辑' (#74) from fix_fanxiu into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/74
|
3 years ago |
|
娄文智
|
2c04b8b1e5
|
返修代码生成逻辑
|
3 years ago |
|
zhangxin
|
1719f36685
|
如果CodeLength为空 自动映射为可变
|
3 years ago |
|
zhangxin
|
ac67daee53
|
修改字段名
|
3 years ago |
|
娄文智
|
4d84405333
|
Merge pull request '适配新版的排程' (#73) from feature_me into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/73
|
3 years ago |
|
zhangxin
|
9fdc7e925c
|
适配新版的排程
|
3 years ago |
|
zhangxin
|
046c73ab81
|
添加custOrderQty接口
|
3 years ago |
|
zhangxin
|
d3dc942f5b
|
添加字段worklineid 和 quantityPerHour 修复生成serialOrder使用开关错误的bug
|
3 years ago |
|
zhangxin
|
838ce1ccc7
|
添加custOrderQty的代码
|
3 years ago |
|
zhangxin
|
1231c18722
|
添加通过车型配置id查找生成serialOrder的产品总成
|
3 years ago |
|
zhangxin
|
5b8aa94cf9
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
37e468607f
|
Merge pull request 'snr map转换' (#72) from fix_snr into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/72
|
3 years ago |
|
娄文智
|
1e8bfd5483
|
snr map转换
|
3 years ago |
|
zhangxin
|
4c2cc1695e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
# Conflicts:
# services/pln/implments/CustOrder.service.impl.go
|
3 years ago |
|
zhangxin
|
5cc249cd6e
|
新增锁定订单代码
|
3 years ago |
 yehongyang
|
5d6b8d0f31
|
Merge pull request '添加字段checkSyncKey' (#71) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/71
|
3 years ago |
|
zhangxin
|
880d203d80
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_om
|
3 years ago |
|
zhangxin
|
01129af95a
|
添加字段checkSyncKey
|
3 years ago |
 徐腾飞
|
16cc29ee76
|
Merge pull request '生成的一个台套使用一个流水号数值, serialOrder添加字段isFirstPieceToggle和SyncKey字段' (#70) from feature_om into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/70
|
3 years ago |
|
zhangxin
|
e35167a9fb
|
生成的一个台套使用一个流水号数值, serialOrder添加字段isFirstPieceToggle和SyncKey字段
|
3 years ago |
|
徐腾飞
|
e82ec08a5f
|
Merge pull request '添加标签打印dao成方法' (#69) from feature_me into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/69
|
3 years ago |
|
zhangxin
|
64ad69f91f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
40ff3de537
|
添加标签打印dao成方法
|
3 years ago |
|
徐腾飞
|
2f2006df07
|
Merge pull request '添加字段SyncKey 同时添加单据打印工步生成打印规则' (#68) from feature_me into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/68
|
3 years ago |
|
zhangxin
|
8f55177fc1
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
# Conflicts:
# services/om/implments/SerialOrder.service.impl.go
|
3 years ago |
|
zhangxin
|
e6629be97e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
# Conflicts:
# services/om/implments/SerialOrder.service.impl.go
|
3 years ago |
