 zhangxin
|
9edf605822
|
修改dashboard逻辑
|
2 years ago |
|
zhangxin
|
2aa8d8ac17
|
修复锁的bug
|
2 years ago |
|
zhangxin
|
f67a3067f1
|
修复空指针的bug
|
2 years ago |
|
zhangxin
|
0338290c4f
|
添加派工计划工作台的功能
|
2 years ago |
|
zhangxin
|
cdc40602cb
|
修复上传execel不派工的bug
|
2 years ago |
|
zhangxin
|
9d2997a2cb
|
修复异步派工的bug
|
2 years ago |
|
zhangxin
|
1cdcc5b5ba
|
修复异步派工生成工艺的bug
|
2 years ago |
|
zhangxin
|
aadd62aa39
|
重构派工代码， 将派工客户订单改成异步
|
2 years ago |
|
zhangxin
|
82141fc5e5
|
修改解析顺引999之后解析0
|
2 years ago |
|
zhangxin
|
203fcd8c08
|
Merge branch 'master' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
79f36015d3
|
添加流水号缓存表
|
2 years ago |
|
zhangxin
|
df2caec85d
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
abfd3b7a58
|
上传excel并进行排程
|
2 years ago |
|
zhangxin
|
beeb21cece
|
Merge branch 'master' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
642a371f17
|
Merge pull request '修复获取计划开始时间的来源为custOrder的planStartTime' (#215) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/215
|
2 years ago |
|
zhangxin
|
cba2f771cc
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
9588e9399c
|
修复获取计划开始时间的来源为custOrder的planStartTime
|
2 years ago |
|
zhangxin
|
7415e9a54d
|
Merge pull request '修复一台套不使用一个流水号的bug' (#214) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/214
|
2 years ago |
|
zhangxin
|
27c81fdd06
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
9ebb69cba9
|
修复一台套不使用一个流水号的bug
|
2 years ago |
|
zhangxin
|
1c8233d515
|
Merge pull request 'develop' (#213) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/213
|
2 years ago |
|
zhangxin
|
6bed44dc78
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
2ece65a86c
|
创建批次工单传入计划日期
|
2 years ago |
|
zhangxin
|
704ed54fce
|
修复发运翻车的bug
|
2 years ago |
|
zhangxin
|
06160d567e
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into develop
|
2 years ago |
|
zhangxin
|
6eab0e7a43
|
添加按日期下流水号 和修复翻车的bug
|
2 years ago |
|
zhangxin
|
2950a2cf8a
|
修复dashboard bug
|
2 years ago |
|
zhangxin
|
4f106d4d33
|
Merge pull request 'develop' (#212) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/212
|
2 years ago |
|
zhangxin
|
fa5e4372c9
|
修改解析生成得顺序
|
2 years ago |
 娄文智
|
c264921eb5
|
Merge pull request '中心位置修改' (#211) from feature_logDash into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/211
|
2 years ago |
|
娄文智
|
5cfefdc577
|
中心位置修改
|
2 years ago |
|
zhangxin
|
645ab322f5
|
修改翻车直接校验包装单内部座椅 修改发运单展示的排序 然后倒叙入库
|
2 years ago |
|
zhangxin
|
c6e42001fc
|
缤智打包不校验plc地址数据直接写入
|
2 years ago |
|
娄文智
|
42d645dfba
|
Merge pull request '合并到master' (#210) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/210
|
2 years ago |
|
娄文智
|
6427b23815
|
Merge pull request '基于产线查询数据' (#209) from featrue_dashbordworkline into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/209
|
2 years ago |
|
娄文智
|
54b18032e3
|
基于产线查询数据
|
2 years ago |
|
zhangxin
|
a1d0f25015
|
Merge pull request 'develop' (#207) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/207
|
2 years ago |
|
zhangxin
|
1ccd8e9add
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
938e4f394e
|
取消无用逻辑
|
2 years ago |
|
zhangxin
|
39aaa52e56
|
删除测试代码
|
2 years ago |
|
zhangxin
|
27c9e5822b
|
Merge pull request '解析顺引 projectId从派生获取' (#206) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/206
|
2 years ago |
|
zhangxin
|
ae896d6994
|
解析顺引 projectId从派生获取
|
2 years ago |
|
zhangxin
|
f73d478ccf
|
删除了产线作为扫码规则的校验条件
|
2 years ago |
|
zhangxin
|
172701c8eb
|
Merge pull request '修改打印条码的日期为计划生产日期' (#205) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/205
|
2 years ago |
|
zhangxin
|
81a23b4193
|
Merge branch 'master' into develop
|
2 years ago |
|
zhangxin
|
fd90d41fab
|
修改打印条码的日期为计划生产日期
|
2 years ago |
|
zhangxin
|
c14af0c110
|
Merge pull request 'develop' (#204) from develop into master
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/204
|
2 years ago |
|
zhangxin
|
93b7770ae4
|
Merge pull request '添加对樱泰顺引的处理' (#203) from feature_dashboard into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend/pulls/203
|
2 years ago |
|
zhangxin
|
ec83d339cf
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_dashboard
|
2 years ago |
|
zhangxin
|
f68af30e45
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_Acura_MES_Backend into feature_dashboard
|
2 years ago |
