 zhangxin
|
ac67daee53
|
修改字段名
|
3 years ago |
 娄文智
|
4d84405333
|
Merge pull request '适配新版的排程' (#73) from feature_me into develop
Reviewed-on: #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: #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: #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: #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: #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: #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 |
|
zhangxin
|
4f6828f12d
|
添加字段SyncKey 同时添加单据打印工步生成打印规则
|
3 years ago |
|
娄文智
|
84128ca2e1
|
Merge pull request '修复生成工艺数据缺少工步的bug' (#66) from feature_om into develop
Reviewed-on: #66
|
3 years ago |
|
zhangxin
|
f88410e1d5
|
修复生成工艺数据缺少工步的bug
|
3 years ago |
|
娄文智
|
da829db9c3
|
Merge pull request '创建预发运单时添加车牌号和校验派生' (#65) from feature_me into develop
Reviewed-on: #65
|
3 years ago |
|
zhangxin
|
7113026ac4
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
1feb271020
|
创建预发运单时添加车牌号和校验派生
|
3 years ago |
|
娄文智
|
ea5d90b307
|
Merge pull request '创建预发运单时添加车牌号和是否校验派生' (#64) from feature_me into develop
Reviewed-on: #64
|
3 years ago |
|
zhangxin
|
5624c7d330
|
创建预发运单时添加车牌号和是否校验派生
|
3 years ago |
|
zhangxin
|
5769a97007
|
Merge pull request 'feature_prin' (#63) from feature_prin into develop
Reviewed-on: #63
|
3 years ago |
|
娄文智
|
39ce8868eb
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_prin
|
3 years ago |
|
娄文智
|
762fc804b0
|
Merge pull request '完成工艺调整维护' (#62) from feature_me into develop
Reviewed-on: #62
|
3 years ago |
|
娄文智
|
bcf46b81b0
|
打印模板列表修改
|
3 years ago |
|
zhangxin
|
eaeea68bb2
|
匹配到一个模板时 匹配到新的扫描项actQty+1
|
3 years ago |
|
zhangxin
|
ceb3ce78b3
|
添加字段
|
3 years ago |
|
zhangxin
|
23bd3fded5
|
修改锁定之后的客户订单为派工状态
|
3 years ago |
|
zhangxin
|
9b58a9f4c0
|
新增字段printerid
|
3 years ago |
|
zhangxin
|
0d3bf0ee0f
|
添加platenumber和checkcarset字段 同时对预发运单进行carset校验
|
3 years ago |
|
zhangxin
|
63b7bc19cd
|
修改只有开启createpackorder的产品才生成到包装模板中
|
3 years ago |
|
zhangxin
|
7cdb2ab9d3
|
完成单据打印规则数据表变动的维护修改
|
3 years ago |
|
zhangxin
|
cbedb0bf3f
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
f88d0a5bac
|
Merge pull request '打印提交' (#61) from fix_printer into develop
Reviewed-on: #61
|
3 years ago |
|
娄文智
|
ca9aa2f335
|
打印提交
|
3 years ago |
|
zhangxin
|
e269bf0fea
|
添加字段pickingflag
|
3 years ago |
|
娄文智
|
c753cb43d8
|
Merge pull request '1.完成OPC规则维护,2.添加工单绑定功能的代码,3.添加通过工序查询监控树状结构的接口' (#60) from feature_me into develop
Reviewed-on: #60
|
3 years ago |
|
zhangxin
|
89994ed1c1
|
添加通过工序查询监控树状结构的接口
|
3 years ago |
|
zhangxin
|
71ad41cc54
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_me
|
3 years ago |
|
zhangxin
|
53ae26b5c6
|
添加工单绑定功能的代码
|
3 years ago |
