 zhangxin
|
a0867078c8
|
添加配置
|
3 years ago |
 weichenglei
|
920b815376
|
Merge pull request '同步数据（portal）' (#309) from fix_syncPortal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/309
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
 娄文智
|
791432b206
|
同步数据（portal）
|
3 years ago |
|
娄文智
|
9625ac3529
|
Merge pull request '根据新的需求修改解析生成工单和供应商数据的逻辑' (#308) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/308
Reviewed-by: 娄文智 <wenzhi.lou@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
b577b128b4
|
添加解析任务
|
3 years ago |
|
zhangxin
|
6d0f74c197
|
去掉过滤条件
|
3 years ago |
|
zhangxin
|
884462cc28
|
不再根据需求的工单状态进行过滤
|
3 years ago |
|
zhangxin
|
e4f6d1dc04
|
根据需求变更 调整解析逻辑
|
3 years ago |
|
zhangxin
|
cc8f2937b2
|
添加字段taskType
|
3 years ago |
|
zhangxin
|
9e4574b221
|
添加两个字段
|
3 years ago |
|
zhangxin
|
e0a645e44f
|
添加删除参数
|
3 years ago |
|
zhangxin
|
d80c3b4d91
|
添加搜索参数
|
3 years ago |
|
zhangxin
|
f3b72156d0
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
|
3 years ago |
|
weichenglei
|
d76ec1cf5b
|
Merge pull request '修改短包实际数量' (#307) from fix_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/307
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
e290f18664
|
修改短包实际数量
|
3 years ago |
|
zhangxin
|
c87aee7af7
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
|
3 years ago |
|
zhangxin
|
99cdca65e0
|
Merge pull request '修正了自动生成代码引发的错误' (#306) from fix_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/306
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
0139d3fc66
|
修正了自动生成代码引发的错误
|
3 years ago |
|
zhangxin
|
41e9e31929
|
Merge pull request '修正了不能正确的自动提交事务的过程' (#305) from fix_NewTransactionBroker into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/305
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
8ce3a87020
|
修正了不能正确的自动提交事务的过程
|
3 years ago |
|
zhangxin
|
597f397dff
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
# Conflicts:
# models/log/ArtDemandHead.model.go
|
3 years ago |
|
zhangxin
|
4972138553
|
根据需求变更 修改生成批次工单和需求的逻辑 临时提交代码
|
3 years ago |
|
zhangxin
|
e4ca59cf16
|
Merge pull request '添加了自动生成代码' (#304) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/304
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
allanwei
|
2f3fb2a7a1
|
添加了自动生成代码
|
3 years ago |
|
zhangxin
|
01cb93e275
|
Merge pull request '根据条码查询' (#303) from fix_select into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/303
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
3e709e28ab
|
根据条码查询
|
3 years ago |
|
zhangxin
|
52fa4bf867
|
Merge pull request '添加包装打开时间和关闭时间' (#302) from fix_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/302
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
3a2bdb35a5
|
添加包装打开时间和关闭时间
|
3 years ago |
|
zhangxin
|
076041a210
|
Merge pull request '包装反追溯查询' (#301) from feature_selectbyorder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/301
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
106ce6844a
|
包装反追溯查询
|
3 years ago |
|
zhangxin
|
51b025a2e0
|
Merge pull request 'portal bug更新' (#300) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/300
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
aa6cb8c851
|
portal bug更新
|
3 years ago |
|
weichenglei
|
bf58b7bf0e
|
Merge pull request '解决portal数据重复生成的bug' (#299) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/299
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
abcdb6e218
|
回滚代码
|
3 years ago |
|
zhangxin
|
d7f275084d
|
检测是否关联了供应商 如果未关联 不做关联过滤
|
3 years ago |
|
zhangxin
|
e9871d9ead
|
解决portal数据重复生成的bug
|
3 years ago |
|
weichenglei
|
e8a5f9f1f9
|
Merge pull request '#2021060104 包装功能开发' (#298) from feature_packSave into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/298
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
b4b4185afb
|
#2021060104 包装功能开发
|
3 years ago |
|
weichenglei
|
3498a8f722
|
Merge pull request '包装功能开发' (#297) from feature_pack into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/297
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
娄文智
|
40b9477fe6
|
包装功能开发
|
3 years ago |
|
weichenglei
|
43a042468c
|
Merge pull request '从mes解析的数据不再需要读取物料数据进行填充， 修改解析从数据库读取数据的排序，将workOrderId写入到artDemandHead数据表中' (#296) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/296
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
f1c2a0bfb1
|
修改解析从数据库读取数据的排序，将workOrderId写入到artDemandHead数据表中
|
3 years ago |
|
zhangxin
|
ef51e2c75b
|
Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_portal
|
3 years ago |
|
zhangxin
|
0fe45909a2
|
从mes解析的数据不再需要读取物料数据进行填充
|
3 years ago |
|
zhangxin
|
a24f619710
|
Merge pull request '包装功能开发' (#295) from feature_packorder into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/295
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
娄文智
|
81c7bf731d
|
包装功能开发
|
3 years ago |
|
weichenglei
|
c390913fab
|
Merge pull request '优化 当不需要传递portal数据时，不再进行excel传输' (#294) from fix_portal into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/294
Reviewed-by: weichenglei <chenglei.wei@le-it.com.cn>
|
3 years ago |
|
zhangxin
|
0927ec761f
|
优化 当不需要传递portal数据时，不再进行excel传输
|
3 years ago |
|
zhangxin
|
b89a03dda1
|
Merge pull request '生成了LabelParserHead和LabelParserDetailLst的代码' (#293) from feature_NewCode into develop
Reviewed-on: http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND/pulls/293
Reviewed-by: zhangxin <xin.zhang@le-it.com.cn>
|
3 years ago |
|
weichenglei
|
f77f396614
|
Merge branch 'develop' into feature_NewCode
|
3 years ago |
