jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity
1,563 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 '3be4afacb7'
${ noResults }
Commit Graph

1535 Commits (3be4afacb79fdd7e0785bf2db318347a500d4bca)

Author SHA1 Message Date
王杰 edfd543750 Merge remote-tracking branch 'origin/dev-temp-xw-202502170000-45112' into test 3 months ago
王杰 2fb87fcfe8 Merge remote-tracking branch 'origin/dev_temp_xw_202502120000_45071' into test 3 months ago
jason 078f86e8d3 新增cockpit发运处理功能 3 months ago
臧学普 069026f093 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 3 months ago
臧学普 4a84cba207 kitting 修复 3 months ago
臧学普 e3b7ef6664 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 3 months ago
臧学普 52f362970a kitting 修复拉动组明细可以重复拉动零件 3 months ago
臧学普 975c4133c6 kitting单虚结构 3 months ago
xiangwei.zhang dc78fc1e12 Merge branch 'dev-temp-xw-202502170000-45112' into dev 3 months ago
xiangwei.zhang 053e9c77b9 45112 MES：发运明细报表需要按照客户要求到货时间筛选发运明细 3 months ago
xiangwei.zhang 2d2c63a850 Merge branch 'dev_temp_xw_202502120000_45071' into dev 3 months ago
xiangwei.zhang 0bbe272234 45071 非排序 新增字段 顺序号（没填写则默认0），计划开始时间、计划结束时间 3 months ago
臧学普 0344e04ab1 Merge remote-tracking branch 'origin/dev' into dev 3 months ago
臧学普 954bc8660c Merge branch 'uat-temp-castle-2502071033-kitting' into dev 3 months ago
臧学普 af50e4cac2 插入工单时也需要校验是否生产kitting单 3 months ago
王杰 080c7233b8 Merge branch 'dev' of http://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 3 months ago
王杰 7470ab94bf Merge remote-tracking branch 'origin/uat-temp-nht-2502100000-45019' into dev 3 months ago
王杰 56e2819e42 成品包装规则 主数据维护 3 months ago
臧学普 69cc48d7f9 Merge branch 'uat-temp-castle-2502071033-kitting' into dev 3 months ago
臧学普 0f2dce838d 关闭工单时需要校验拉动单是否需要关闭 3 months ago
臧学普 b9c32f9a9e Merge branch 'uat-temp-castle-2502071033-kitting' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/resources/application.properties
 3 months ago
xiangwei.zhang 3dbd65ab92 Merge branch 'dev-temp-xw-202502170000-45112' into dev 
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/AssemblyPartReportDaoImpl.java
 3 months ago
xiangwei.zhang bb49d87d5a 45112 MES：发运明细报表需要按照客户要求到货时间筛选发运明细 3 months ago
臧学普 754f5cf033 修复bug 45097 工单装配件标增加打印模板和打印机名称赋值 3 months ago
王杰 8026daaee8 Merge branch 'uat-temp-castle-2412251631-44430' into test 3 months ago
王杰 8600e15fe6 Merge remote-tracking branch 'origin/uat-temp-castle-2502070911-44952' into test 3 months ago
王杰 ae830a3c9c 45106 MES-产品检验总报表问题 3 months ago
xiangwei.zhang 39cfb67414 Merge remote-tracking branch 'origin/dev' into dev 3 months ago
xiangwei.zhang 6f5ecda4aa Merge branch 'dev_temp_xw_202502120000_45071' into dev 3 months ago
xiangwei.zhang d912b19680 45071 新增字段 顺序号（没填写则默认0），计划开始时间、计划结束时间 3 months ago
臧学普 277ebd94e7 同步拉动单数据到wms中间表 3 months ago
Janson daf654b481 45019 修改不可用规则维护功能 3 months ago
Janson 6b82f97b73 45019 新增不可用规则维护功能 3 months ago
臧学普 b63431ef8f 深汕kitting拉动完成 3 months ago
王杰 e8a6eb4eb2 merge uat-temp-pzj-250123-Assembly-Report 解决冲突 3 months ago
王杰 8ddb559e36 Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 3 months ago
王杰 a99182a0a3 Merge branch 'uat-temp-wj-250206-45014' into dev 3 months ago
王杰 7c1e398550 Merge branch 'uat-temp-wj-250206-45014' into test 3 months ago
王杰 aac1c5c970 45014 通用导出报表针对PTR替换的零件没有显示出来 3 months ago
xiangwei.zhang ae99dcbf12 Merge branch 'dev-temp-xw-202501150000-44838' into dev 3 months ago
xiangwei.zhang 13e8e84e10 44838 MES:裁片补片逻辑更新＆裁片报表 3 months ago
王杰 c147289e65 Merge remote-tracking branch 'origin/uat-temp-pzj-250123-Assembly-Report' into test 3 months ago
王杰 0b61c7a143 Merge remote-tracking branch 'origin/dev-temp-xw-202501150000-44838' into test 3 months ago
王杰 f47eb3accd Merge remote-tracking branch 'origin/uat-temp-wj-250122-44907' into test 3 months ago
王杰 3530a65d0c Merge remote-tracking branch 'origin/dev-temp-xw-202502100000-44915' into test 3 months ago
xiangwei.zhang 17e7e2dd45 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 3 months ago
王杰 b98710fa96 Merge remote-tracking branch 'origin/dev_temp-xw-202502100000-44985' into test 3 months ago
xiangwei.zhang 7ca161a717 44985 离线排序加工规则job执行后没有生成对应数据 3 months ago
王杰 e736d7b591 Merge remote-tracking branch 'origin/uat-temp--logic-20250208-44991' into test 3 months ago
xiangwei.zhang da09e0afaf 44863 PCN-零件生产组增加“使用BOM方式”枚举最终确认版逻辑优化 3 months ago
logic.fang 7f517a0a51 Merge remote-tracking branch 'refs/remotes/origin/uat-temp--logic-20250208-44991' into dev 3 months ago
logic.fang cf1c76b57e 44991 产线看板问题（10点正以后才能看到8-9点的报工数据） 3 months ago
臧学普 d7377fa4c6 深汕kitting拉动,按数量完成 3 months ago
臧学普 9543a7a674 深汕kitting拉动,按套完成 3 months ago
xiangwei.zhang 3e735d98cb Merge remote-tracking branch 'origin/dev' into dev 3 months ago
xiangwei.zhang 4debdd0b55 Merge branch 'dev_temp_xw_202502070000_44985' into dev 3 months ago
xiangwei.zhang fde75716bc 44985 离线排序加工规则job执行后没有生成对应数据 3 months ago
pzj 628592c67a 44939 装配件报表查询优化 3 months ago
Janson 00a33f9bde Merge remote-tracking branch 'origin/uat-temp-nht-2502060000-44953' into dev 3 months ago
Janson 3ff9564b61 44953 新增条码打印模板的字段支持自定义配置 3 months ago
臧学普 29b78d3385 Merge branch 'uat-temp-castle-2502070911-44952' into dev 3 months ago
臧学普 deff0ac43b fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来 3 months ago
pzj 85ef2dd7cf Merge remote-tracking branch 'origin/dev' into dev 3 months ago
王杰 d751010c52 Merge branch 'uat-temp-wj-250124-equ-check-step' into dev 3 months ago
王杰 123ac16c08 红外焊超差预警 3 months ago
xiangwei.zhang ed7863b633 Merge branch 'dev-temp-xw-202501150000-44838' into dev 3 months ago
xiangwei.zhang 756bfeeea6 44838 MES:裁片补片逻辑更新＆裁片报表 3 months ago
pzj 400ae3500c Merge branch 'dev' into uat-temp-pzj-250123-Assembly-Report 3 months ago
pzj d4e58b6449 装配件报表 3 months ago
xiangwei.zhang c600dbedf7 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 3 months ago
xiangwei.zhang a0e07ca940 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 3 months ago
王杰 599ae54988 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 58f87b6e85 打包 4 months ago
王杰 4cf0a5a7b9 Merge branch 'test-temp-wj-250117-pack' into dev 4 months ago
王杰 fdae8a1b45 Merge branch 'uat-temp-wj-250122-44907' into dev 4 months ago
王杰 fb9282ed55 44907 MES：检验产品数据总报表报错 4 months ago
xiangwei.zhang 9bd8ecee92 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang fba028267d 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 58ea818942 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang 5fcef2d14f 44905 MES-发运异常处理 4 months ago
xiangwei.zhang c3abf292e1 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang a4d6e8009a 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 890bd1472b Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang 939c515fc2 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 10456e74a9 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang 463ec92cbf 44905 MES-发运异常处理 4 months ago
xiangwei.zhang 6b5432d5b9 Merge branch 'uat-temp-xw-202501200000-44905' into dev 4 months ago
xiangwei.zhang be1749fb92 44905 MES-发运异常处理 4 months ago
王杰 6ef72a6bee 打包 4 months ago
xiangwei.zhang 3c7d252537 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang b633fbaeb9 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
王杰 d152a464ca 打包 4 months ago
xiangwei.zhang 08301bc9a2 44905 MES-发运异常处理 4 months ago
xiangwei.zhang e834732d74 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
王杰 ec7f396e33 重庆打包 4 months ago
xiangwei.zhang 45c7fe23da Merge branch 'dev-temp-ljs-202501091824-44656' into dev 4 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
王杰 585a8edc62 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into test 4 months ago
王杰 1c33dce687 Merge remote-tracking branch 'origin/dev-temp-xw-202501130000-44813' into test 4 months ago
xiangwei.zhang a1b3d04f30 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago