jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
1,488 Commits
21 Branches
24 Tags
10 MiB
uat-temp-wj-chongqingdaqu-dev
uat-temp-nht-2503130000-shipping
dev_temp_xw_202503170000_45656
uat-temp-nht-chengdu-loading
uat-temp-nht-2503130000-chengdu-shipping
uat-temp-wj-chongqingdaqu-prod
uat
test
dev_temp_xw_202503120000_45631
uat-temp-logic-20250313-45610
dev
uat-temp-nht-2503040000-seres
uat-temp-wj-2502060000-chongqing-step
dev_temp_xw_20250305_45455
test-temp-wj-250117-pack
uat-temp-castle-250211-44248
uat-temp-nht-2502100000-45019
uat-temp-wj-250124-equ-check-step
dev-temp-xw-202501150000-44852
dev-temp-xw-202501031219-44700
master
yfai-mes-ext-v3.3
yfai-mes-ext-v3.2
yfai-mes-ext-v3.11
yfai-mes-ext-v3.1
yfai-mes-ext-v3.0
yfai-mes-ext-v2.9
yfai-mes-ext-v2.8
yfai-mes-ext-v2.7
yfai-mes-ext-v2.5
yfai-mes-ext-v2.4
yfai-mes-ext-v2.3
yfai-mes-ext-v2.2
yfai-mes-ext-v2.1
yfai-mes-ext-v2.0
yfai-mes-ext-v1.9
yfai-mes-ext-v1.8
yfai-mes-ext-v1.7
yfai-mes-ext-v1.6
yfai-mes-ext-v1.5
yfai-mes-ext-v1.4
yfai-mes-ext-v1.3
yfai-mes-ext-v1.2
yfai-mes-ext-v1.1
yfai-mes-ext-v1.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'eb048b20ba'
${ noResults }
Commit Graph

331 Commits (eb048b20ba52cb259c8fa8a40597a0ad14c5eaba)

Author SHA1 Message Date
jason afc3e92911 Merge branch 'uat-temp-nht-2503130000-shipping' into uat-temp-wj-chongqingdaqu-dev 
# Conflicts:
#	modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
 7 months ago
jason 28e3e82a42 成都发运，临时提交 7 months ago
王杰 7349798613 merge 装车单打印 7 months ago
王杰 dc3f83357e merge MES: 赛力斯6个报表开发 7 months ago
jason a91b404721 Merge branch 'uat-temp-wj-chongqingdaqu-dev' into uat-temp-nht-chengdu-loading 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/IPrintTemplateStrategyService.java
#	modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
 7 months ago
jason 27fc494cb7 成都装车单打印，临时提交 7 months ago
jason a5290282ac 成都装车单打印，临时提交 7 months ago
王杰 12402b188c 龙兴发运单 7 months ago
王杰 87e3a192a2 Merge remote-tracking branch 'origin/uat-temp-logic-20250313-45610' into uat-temp-wj-chongqingdaqu-dev 7 months ago
logic.fang 5132ae0f10 45610 发运界面增加发运单补打功能 7 months ago
王杰 00cd582ce5 Merge remote-tracking branch 'origin/dev_temp_xw_20250305_45455' into uat-temp-wj-chongqingdaqu-dev 7 months ago
王杰 002ea6bf2d 解决冲突 7 months ago
王杰 615f2b276b Merge remote-tracking branch 'origin/uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 e0b68ec5b9 Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into uat-temp-wj-chongqingdaqu-prod 7 months ago
王杰 b1909674c8 Merge remote-tracking branch 'origin/dev-temp-xw-202501031219-44700' into uat-temp-wj-chongqingdaqu-prod 7 months ago
jason 6f292e8842 新增看板 7 months ago
xiangwei.zhang 4af1337a7f 45455 裁片生产过程控制，产品加工记录数量保存数据不对 8 months ago
王杰 12f0aabdce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 8 months ago
王杰 1b1a559e4d 排序推单 8 months ago
王杰 3de53d476a Merge remote-tracking branch 'origin/uat-temp-castle-2502071033-kitting' into test 8 months ago
王杰 f41716f70a Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into test 8 months ago
王杰 2ee77bb608 重庆推单 8 months ago
jason 078f86e8d3 新增cockpit发运处理功能 8 months ago
castle.zang 4a84cba207 kitting 修复 8 months ago
王杰 8600e15fe6 Merge remote-tracking branch 'origin/uat-temp-castle-2502070911-44952' into test 8 months ago
Janson 6b82f97b73 45019 新增不可用规则维护功能 8 months ago
王杰 0b61c7a143 Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 8 months ago
Janson 3ff9564b61 44953 新增条码打印模板的字段支持自定义配置 8 months ago
castle.zang deff0ac43b fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来 8 months ago
xiangwei.zhang a4d6e8009a 44905 MES-发运异常处理 9 months ago
xiangwei.zhang be1749fb92 44905 MES-发运异常处理 9 months ago
xiangwei.zhang 08301bc9a2 44905 MES-发运异常处理 9 months ago
王杰 ec7f396e33 重庆打包 9 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 9 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新＆裁片报表 9 months ago
xiangwei.zhang 10131f750e 44838 MES:裁片补片逻辑更新＆裁片报表 9 months ago
jun f08ab29045 44656 报工调整报表中原因为空 提示信息错误 9 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求（芜湖） 9 months ago
xiangwei.zhang 745048e43d 44700 沃尔沃料架主数据开发 10 months ago
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
castle.zang bc76beab75 43316 10 months ago
王杰 e11a9e7ffc Merge branch 'uat-temp-wj-20241223-44377' into test 10 months ago
王杰 4bd1ea7aac Merge branch 'dev-temp-castle-2412191445-44381' into test 10 months ago
王杰 4ca5148569 merge 44316 bom是否启动bomVersion 解决冲突 10 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢，需要重新开发 10 months ago
王杰 adb0cf7a8b 44376 武汉 加工记录统计报表 需求变更 10 months ago
castle.zang e1a6521c00 通用客户CBR 10 months ago
王杰 2f388460cc 加工记录统计报表 10 months ago
castle.zang ef0e52289b POM逻辑修改 10 months ago
jun 99c87bd8bc Merge remote-tracking branch 'origin/dev' into dev 11 months ago