Commit Graph

1465 Commits (85280e5c983d7d33124d5f7d1659cc49233e139e)

Author SHA1 Message Date
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 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示,增加车型代码、车型大类名称搜索条件 4 months ago
xiangwei.zhang a0e07ca940 44915 排序加工规则列表增加车型代码、车型大类代码、扫描规则展示,增加车型代码、车型大类名称搜索条件 4 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
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
xiangwei.zhang f6b3a36560 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
xiangwei.zhang 973ff08b91 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
xiangwei.zhang 1815794e04 Merge branch 'dev-temp-xw-202501150000-44838' into dev 4 months ago
xiangwei.zhang 6e756d0065 44813 PC: 缺陷类型与零件类型关系导入后,没有关联显示出来缺陷类型名称和零件类型名称 4 months ago
xiangwei.zhang 10131f750e 44838 MES:裁片补片逻辑更新&裁片报表 4 months ago
王杰 87f42674da Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into test 4 months ago
王杰 132f7d53d7 Merge branch 'uat-temp-wj-2501090000-44746' into test 4 months ago
王杰 f3dd964e48 Merge remote-tracking branch 'origin/dev-temp-xw-202501071939-44728' into test 4 months ago
王杰 d7e9810924 Merge remote-tracking branch 'origin/dev-temp-xw-202501151600-44670' into test 4 months ago
王杰 8e29e74429 merge dev-temp-ljs-202501091824-44656 解决冲突 4 months ago
xiangwei.zhang d8fcc8abfd 44670 PC: 模板导入时报错问题 4 months ago
xiangwei.zhang 471967fd7e 44756 版本回退 4 months ago
王杰 3c152132ca Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into test 4 months ago
王杰 663f430d23 Merge branch 'dev-temp-xw-202412301219-44255' into test 4 months ago
王杰 5faa656bd2 Merge branch 'dev-temp-xw-202412301219-44255' into test 4 months ago
王杰 4f5f24f84a Merge branch 'uat-temp-wj-2412300000-44653' into test 4 months ago
王杰 f1294f551c Merge branch 'uat-temp-wj-2412300000-44615' into test 4 months ago
jun e42cdd4f76 44656 报工调整报表中原因为空 测试问题修复 4 months ago
xiangwei.zhang 06cb051548 Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang 620ae11ebd 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 4 months ago
xiangwei.zhang 732d8acea6 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 6d160bfc2e Merge remote-tracking branch 'origin/dev' into dev 4 months ago
xiangwei.zhang a16cf1e759 Merge branch 'dev-temp-xw-202501130000-44813' into dev 4 months ago
xiangwei.zhang 6ff07cd721 44813 PC: 缺陷类型与零件类型关系导入后,没有关联显示出来缺陷类型名称和零件类型名称 4 months ago
xiangwei.zhang ce6e53fd72 44270 PC:非排序产品加工规则的批量导入 4 months ago
jun f08ab29045 44656 报工调整报表中原因为空 提示信息错误 4 months ago
王杰 d283381dd5 Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 d4725e67c2 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 d953cb8202 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 29026a1051 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 bb794935c9 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 c0b76c9800 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 10315bedcf Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 99386ba5a0 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 8c6178ffbb Merge branch 'uat-temp-wj-2501090000-44517' into dev 4 months ago
王杰 346a5b6049 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into dev 4 months ago
王杰 e9cc89e278 Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into dev 4 months ago
臧学普 1b61155d64 fix bug 44817 离线生成的装配件数据缺少 4 months ago
xiangwei.zhang b6889e8bb6 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 9cdc9c3b1c 44270 非排序产品加工规则的批量导入 4 months ago
xiangwei.zhang fc20661b2b Merge remote-tracking branch 'origin/dev' into dev 4 months ago
王杰 7c92d43739 Merge branch 'uat-temp-wj-2501090000-44746' into dev 4 months ago
王杰 46e28e7efe 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 ffa9deb112 revert 7831a81822
revert  44746 产量统计报表增加报工调整数据查询
4 months ago
王杰 77144820fa Merge remote-tracking branch 'origin/dev-temp-ljs-202501091824-44656' into dev 4 months ago
xiangwei.zhang 0bb9335720 Merge branch 'dev-temp-xw-202501090000-44270' into dev 4 months ago
xiangwei.zhang 42721ff26b 44270 非排序产品加工规则的批量导入 4 months ago
jun 4d34673835 44656 报工调整报表中原因为空 4 months ago
王杰 7831a81822 44746 产量统计报表增加报工调整数据查询 4 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求(芜湖) 4 months ago
王杰 f9fcde7687 Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into dev 4 months ago
臧学普 87ef87ccc9 fix bug 44747 同一个原零件对应多个PTR逻辑优化 4 months ago
xiangwei.zhang 40d041a3cd 44670 PC: 模板导入时报错问题 4 months ago
xiangwei.zhang b9b38e7e4f 44756 零件生产组配置-启用Bom版本号”逻辑优化 4 months ago
xiangwei.zhang 822a48d1ee Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java
4 months ago
xiangwei.zhang cae71e76cc Merge branch 'dev-temp-xw-202501061909-44756' into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBomService.java
4 months ago
xiangwei.zhang 6905574055 Merge branch 'dev-temp-xw-202501071939-44728' into dev 4 months ago
xiangwei.zhang 5e233d6d65 44728: 包装定义明细菜单需要导入按钮 4 months ago
王杰 a02631e51c 44756-零件生产组配置-“启用Bom版本号”逻辑优化 merge dev-temp-xw-202501061909-44756 解决冲突 4 months ago
xiangwei.zhang 21ceb1064d 44756 零件生产组配置-“启用Bom版本号”逻辑优化 4 months ago
王杰 486d1a4102 Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang a0b0442720 44756-零件生产组配置-“启用Bom版本号”逻辑优化 4 months ago
xiangwei.zhang c735e3068c 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 4 months ago
王杰 b8977cffb8 Merge branch 'uat-temp-wj-2501030000-00000' into test 4 months ago
王杰 64b892966a Merge branch 'uat-temp-wj-2501030000-00000' into dev 4 months ago
王杰 ddecc828f7 44704 PC-批量报工和报工调整,根据生效时间和bom_code查询时,bom_code查询条件未生效 4 months ago
王杰 39b0a5ab24 Merge branch 'uat-temp-wj-2412300000-44653' into dev 4 months ago
王杰 ac1971ff16 Merge remote-tracking branch 'origin/uat-temp-xw-202412311219-hotfix' into dev 4 months ago
王杰 b75b23e6f0 44653 电子化检验输入数量支持小数点输入 4 months ago
xiangwei.zhang f3e7ec6eaf hotfix-报工工作中心不对 4 months ago
xiangwei.zhang 947b02ffae Merge branch 'dev-temp-xw-202412301219-44255' into dev 4 months ago
xiangwei.zhang 191704bbae 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 4 months ago
xiangwei.zhang 9317426969 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 4 months ago
王杰 246a7d3269 合并 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 解决冲突: 使用origin/test 分支的MesWorkOrderService/MesCreateWorkOrderImpl 覆盖到dev 4 months ago
王杰 15066f676b merge dev-temp-castle-241223-44172 解决冲突 4 months ago
王杰 fada312113 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 4 months ago
王杰 49c072cc44 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 4 months ago
臧学普 6a90f0f54d Merge remote-tracking branch 'origin/test' into test 4 months ago
臧学普 be6816c3dd 43316 修复bomVersion启用问题 4 months ago
王杰 bdc5db8ea2 Merge branch 'test-temp-castle-2412271558-44316' into test 4 months ago
王杰 60aa5a2272 Merge branch 'test-temp-castle-2412271558-44316' into dev 4 months ago
臧学普 f5f2a4b31d 43316 修复bomVersion启用问题 4 months ago
王杰 c343f0bda6 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
王杰 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 4 months ago
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 4 months ago
臧学普 bc76beab75 43316 4 months ago
王杰 5856d21492 merge uat-temp-wj-2412270000-44628 解决冲突 4 months ago
王杰 6c54c40e68 44628 生产工单重新打印目视单,数据不对 4 months ago
王杰 95f55d8df7 merge dev-temp-castle-241223-44022 解决冲突 4 months ago
王杰 54adc62fdc 44316 bom是否启动bomVersion merge 解决冲突 4 months ago
王杰 ebfbe36dfa Merge branch 'uat-temp-castle-2412251631-44430' into dev 4 months ago
王杰 5601754a02 Merge branch 'uat-temp-wj-2412240000-44335' into test 4 months ago
王杰 407de709fc 44022 芜湖正式:产线看板,需要关联显示异常停线时间 merge 解决冲突 4 months ago
王杰 e11a9e7ffc Merge branch 'uat-temp-wj-20241223-44377' into test 4 months ago
王杰 4bd1ea7aac Merge branch 'dev-temp-castle-2412191445-44381' into test 4 months ago
王杰 4ca5148569 merge 44316 bom是否启动bomVersion 解决冲突 4 months ago
王杰 d6749ca871 merge 44316 bom是否启动bomVersion 解决冲突 4 months ago
xiangwei.zhang a774301a9a 44576 BTO工单看板查询
44510 bom失效查询问题
5 months ago
臧学普 549e8023f5 43316 5 months ago
臧学普 8074411c3c 43316 5 months ago
xiangwei.zhang ffa70f634e bom信息查询失效时间修改 5 months ago
臧学普 559a1c456a 43316 5 months ago
xiangwei.zhang efa93153a5 bom信息查询失效时间修改 5 months ago
臧学普 ed761df83d 需求 44430 待开票业务方案 5 months ago
王杰 97703e2960 Merge branch 'uat-temp-wj-2412240000-44335' into dev 5 months ago
王杰 f824ce25ee 44335 非排序加工规则页面,在“设备代码”列后增加“设备名称”列 5 months ago
王杰 8e6ea7bd53 Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 b2fec000c5 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
王杰 6c83b4cefb Merge branch 'uat-temp-wj-20241223-44377' into dev 5 months ago
王杰 955a5c8d8b 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
臧学普 144edb05ad Merge branch 'dev-temp-castle-241223-44172' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 5 months ago
臧学普 74aa08e9ee Merge branch 'dev-temp-castle-241223-44022' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev 5 months ago
臧学普 2be5ccc1e4 fix bug PC-发运明细报表:增加vin和条码的查询条件-44172 5 months ago
臧学普 e53ddfa6ef fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 5 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 5 months ago
臧学普 7471ceb503 Merge branch 'dev-temp-castle-241223-44022' of https://git.estsh.com/I3-YF/i3plus-mes-yfai into dev
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/board/MesWorkCenterBoardController.java
5 months ago