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

229 Commits (e970034c9e38445cb379d7bff84bfc043b0ff938)

Author SHA1 Message Date
王杰 1792859241 Merge remote-tracking branch 'origin/uat-temp-nht-chengdu-loading' into uat-temp-wj-chongqingdaqu-dev 2 months ago
jason ed4e5031e9 成都装车单打印，临时提交 2 months ago
王杰 7349798613 merge 装车单打印 2 months ago
王杰 dc3f83357e merge MES: 赛力斯6个报表开发 2 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
 2 months ago
jason 27fc494cb7 成都装车单打印，临时提交 2 months ago
jason a5290282ac 成都装车单打印，临时提交 2 months ago
王杰 12402b188c 龙兴发运单 2 months ago
王杰 69c1513e97 Merge branch 'uat-temp-wj-chongqingdaqu-prod' into uat-temp-wj-chongqingdaqu-dev 2 months ago
王杰 3653bd4c35 Merge branch 'uat' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 1dbefd1d8c Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 d1a18699c8 龙兴客户条码, 改动影响武汉 2 months ago
王杰 b8a34c8e48 Merge remote-tracking branch 'origin/uat-temp-wj-250124-equ-check-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
王杰 002ea6bf2d 解决冲突 2 months ago
王杰 615f2b276b Merge remote-tracking branch 'origin/uat-temp-wj-2502060000-chongqing-step' into uat-temp-wj-chongqingdaqu-prod 2 months ago
jason fe6ba8e8cf 新增看板 2 months ago
jason bc8cc74021 增加发运单异常处理同步发运零件号及条码卡控 2 months ago
王杰 12f0aabdce Merge remote-tracking branch 'origin/uat-temp-xw-202501200000-44905' into test 2 months ago
王杰 2ee77bb608 重庆推单 3 months ago
jason f29bef72a0 新增cockpit发运处理功能 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
xiangwei.zhang 17e7e2dd45 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示，增加车型代码、车型大类名称搜索条件 3 months ago
王杰 123ac16c08 红外焊超差预警 3 months ago
王杰 fb9282ed55 44907 MES：检验产品数据总报表报错 4 months ago
王杰 ec7f396e33 重庆打包 4 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 4 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新＆裁片报表 4 months ago
王杰 132f7d53d7 Merge branch 'uat-temp-wj-2501090000-44746' into test 4 months ago
王杰 46e28e7efe 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 ffa9deb112 revert 7831a81822 
revert  44746 产量统计报表增加报工调整数据查询
 4 months ago
jun 4d34673835 44656 报工调整报表中原因为空 4 months ago
王杰 7831a81822 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求（芜湖） 4 months ago
王杰 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 4 months ago
王杰 219353cde2 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
王杰 6c54c40e68 44628 生产工单重新打印目视单，数据不对 4 months ago
王杰 955a5c8d8b 44377 检验产品数据总报表目前是动态表单配置查询很慢，需要重新开发 5 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢，需要重新开发 5 months ago
王杰 d32999bef2 BOM查询条件是否携带effEndTime,根据系统配置MES_REPORT_FIND_BOM_WITH_EFFENDTIME,维护1则携带 5 months ago
王杰 ab386358a3 Merge branch 'dev-temp-wj-2412160000-00001' into dev 5 months ago
王杰 195f7dae2a 产量统计报表 5 months ago
王杰 2f388460cc 加工记录统计报表 5 months ago
王杰 3a6c27a3ce Merge branch 'dev-temp-wj-2412120000-00001' into dev 5 months ago
王杰 32dfbdc8d7 点检删除功能 发现代码错误 少了一个感叹号 5 months ago
王杰 ac41c050a5 44273 生产工单页面增加上/下线时间查询条件 5 months ago
xiangwei.zhang acab8131a0 对账单信息 5 months ago
王杰 a186bb7d63 拉动组明细 接口加查询条件 6 months ago
王杰 162cee7c19 关闭工单 时 同时关闭JIS SPS QUEUE[创建] 单据 目视单打印队列 6 months ago
王杰 90f4502454 关闭工单 时 同时关闭JIS SPS QUEUE[创建] 单据 6 months ago