Commit Graph

1405 Commits (acb394bb6b863697dc33c55e8ffeebb7667398d0)

Author SHA1 Message Date
logic.fang cf1c76b57e 44991 产线看板问题(10点正以后才能看到8-9点的报工数据) 8 months ago
castle.zang d7377fa4c6 深汕kitting拉动,按数量完成 8 months ago
castle.zang 9543a7a674 深汕kitting拉动,按套完成 8 months ago
Janson 3ff9564b61 44953 新增条码打印模板的字段支持自定义配置 8 months ago
castle.zang deff0ac43b fix bug 44952 MES-零件生产组明细、零件发运组明细、客户车型配置明细输入客户零件号后将零件号带出来 8 months ago
xiangwei.zhang 756bfeeea6 44838 MES:裁片补片逻辑更新&裁片报表 8 months ago
pzj d4e58b6449 装配件报表 8 months ago
王杰 fb9282ed55 44907 MES:检验产品数据总报表报错 9 months ago
xiangwei.zhang fba028267d 44905 MES-发运异常处理 9 months ago
xiangwei.zhang 5fcef2d14f 44905 MES-发运异常处理 9 months ago
xiangwei.zhang a4d6e8009a 44905 MES-发运异常处理 9 months ago
xiangwei.zhang 939c515fc2 44905 MES-发运异常处理 9 months ago
xiangwei.zhang 463ec92cbf 44905 MES-发运异常处理 9 months ago
xiangwei.zhang be1749fb92 44905 MES-发运异常处理 9 months ago
xiangwei.zhang b633fbaeb9 44838 MES:裁片补片逻辑更新&裁片报表 9 months ago
xiangwei.zhang 08301bc9a2 44905 MES-发运异常处理 9 months ago
xiangwei.zhang e834732d74 44838 MES:裁片补片逻辑更新&裁片报表 9 months ago
王杰 bf114910e2 Merge branch 'uat-temp-wj-2501090000-44517' into test 9 months ago
王杰 585a8edc62 Merge remote-tracking branch 'origin/uat-temp-castle-2501101619-44817' into test 9 months ago
王杰 1c33dce687 Merge remote-tracking branch 'origin/dev-temp-xw-202501130000-44813' into test 9 months ago
xiangwei.zhang f6b3a36560 44838 MES:裁片补片逻辑更新&裁片报表 9 months ago
xiangwei.zhang 338dd627ca 44838 MES:裁片补片逻辑更新&裁片报表 9 months ago
xiangwei.zhang 6e756d0065 44813 PC: 缺陷类型与零件类型关系导入后,没有关联显示出来缺陷类型名称和零件类型名称 9 months ago
xiangwei.zhang 10131f750e 44838 MES:裁片补片逻辑更新&裁片报表 9 months ago
王杰 87f42674da Merge remote-tracking branch 'origin/dev-temp-xw-202501090000-44270' into test 9 months ago
王杰 132f7d53d7 Merge branch 'uat-temp-wj-2501090000-44746' into test 9 months ago
王杰 f3dd964e48 Merge remote-tracking branch 'origin/dev-temp-xw-202501071939-44728' into test 9 months ago
王杰 d7e9810924 Merge remote-tracking branch 'origin/dev-temp-xw-202501151600-44670' into test 9 months ago
王杰 8e29e74429 merge dev-temp-ljs-202501091824-44656 解决冲突 9 months ago
xiangwei.zhang d8fcc8abfd 44670 PC: 模板导入时报错问题 9 months ago
xiangwei.zhang 471967fd7e 44756 版本回退 9 months ago
王杰 3c152132ca Merge remote-tracking branch 'origin/uat-temp-castle-2501090952-44747' into test 9 months ago
王杰 663f430d23 Merge branch 'dev-temp-xw-202412301219-44255' into test 9 months ago
王杰 5faa656bd2 Merge branch 'dev-temp-xw-202412301219-44255' into test 9 months ago
王杰 4f5f24f84a Merge branch 'uat-temp-wj-2412300000-44653' into test 9 months ago
王杰 f1294f551c Merge branch 'uat-temp-wj-2412300000-44615' into test 9 months ago
jun e42cdd4f76 44656 报工调整报表中原因为空 测试问题修复 9 months ago
xiangwei.zhang 620ae11ebd 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
xiangwei.zhang 6ff07cd721 44813 PC: 缺陷类型与零件类型关系导入后,没有关联显示出来缺陷类型名称和零件类型名称 9 months ago
xiangwei.zhang ce6e53fd72 44270 PC:非排序产品加工规则的批量导入 9 months ago
jun f08ab29045 44656 报工调整报表中原因为空 提示信息错误 9 months ago
王杰 d4725e67c2 44517 装箱防错后吐条码需求(芜湖) 9 months ago
王杰 29026a1051 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 c0b76c9800 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 99386ba5a0 44746 产量统计报表增加报工调整数据查询 9 months ago
castle.zang 1b61155d64 fix bug 44817 离线生成的装配件数据缺少 9 months ago
xiangwei.zhang 9cdc9c3b1c 44270 非排序产品加工规则的批量导入 9 months ago
王杰 46e28e7efe 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 ffa9deb112 revert 7831a81822
revert  44746 产量统计报表增加报工调整数据查询
9 months ago
xiangwei.zhang 42721ff26b 44270 非排序产品加工规则的批量导入 9 months ago
jun 4d34673835 44656 报工调整报表中原因为空 9 months ago
王杰 7831a81822 44746 产量统计报表增加报工调整数据查询 9 months ago
王杰 7a2d89eda0 44517 装箱防错后吐条码需求(芜湖) 9 months ago
castle.zang 87ef87ccc9 fix bug 44747 同一个原零件对应多个PTR逻辑优化 9 months ago
xiangwei.zhang b9b38e7e4f 44756 零件生产组配置-启用Bom版本号”逻辑优化 9 months ago
xiangwei.zhang 5e233d6d65 44728: 包装定义明细菜单需要导入按钮 9 months ago
xiangwei.zhang 21ceb1064d 44756 零件生产组配置-“启用Bom版本号”逻辑优化 9 months ago
xiangwei.zhang a0b0442720 44756-零件生产组配置-“启用Bom版本号”逻辑优化 9 months ago
xiangwei.zhang c735e3068c 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
王杰 b8977cffb8 Merge branch 'uat-temp-wj-2501030000-00000' into test 9 months ago
王杰 ddecc828f7 44704 PC-批量报工和报工调整,根据生效时间和bom_code查询时,bom_code查询条件未生效 9 months ago
王杰 b75b23e6f0 44653 电子化检验输入数量支持小数点输入 9 months ago
xiangwei.zhang f3e7ec6eaf hotfix-报工工作中心不对 9 months ago
xiangwei.zhang 191704bbae 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
xiangwei.zhang 9317426969 44255-优化:非排序工艺路线支持所有路线主表明细批量导入 9 months ago
王杰 15066f676b merge dev-temp-castle-241223-44172 解决冲突 9 months ago
王杰 fada312113 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 9 months ago
王杰 49c072cc44 44615 发运明细报表增加客户订单号、发运组名称字段模糊查询 9 months ago
castle.zang 6a90f0f54d Merge remote-tracking branch 'origin/test' into test 10 months ago
castle.zang be6816c3dd 43316 修复bomVersion启用问题 10 months ago
王杰 bdc5db8ea2 Merge branch 'test-temp-castle-2412271558-44316' into test 10 months ago
castle.zang f5f2a4b31d 43316 修复bomVersion启用问题 10 months ago
王杰 62d27d7b53 Merge branch 'uat-temp-wj-2412270000-44628' into test 10 months ago
王杰 219353cde2 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
王杰 3db69d968e 合并 test-temp-castle-2412271558-44316 44316 排序工单BOM拆分逻辑更新 --- 解决冲突 10 months ago
castle.zang bc76beab75 43316 10 months ago
王杰 6c54c40e68 44628 生产工单重新打印目视单,数据不对 10 months ago
王杰 95f55d8df7 merge dev-temp-castle-241223-44022 解决冲突 10 months ago
王杰 5601754a02 Merge branch 'uat-temp-wj-2412240000-44335' into test 10 months ago
王杰 407de709fc 44022 芜湖正式:产线看板,需要关联显示异常停线时间 merge 解决冲突 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
xiangwei.zhang a774301a9a 44576 BTO工单看板查询
44510 bom失效查询问题
10 months ago
castle.zang 549e8023f5 43316 10 months ago
castle.zang 8074411c3c 43316 10 months ago
castle.zang 559a1c456a 43316 10 months ago
castle.zang ed761df83d 需求 44430 待开票业务方案 10 months ago
王杰 f824ce25ee 44335 非排序加工规则页面,在“设备代码”列后增加“设备名称”列 10 months ago
王杰 b2fec000c5 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
王杰 955a5c8d8b 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
castle.zang 2be5ccc1e4 fix bug PC-发运明细报表:增加vin和条码的查询条件-44172 10 months ago
castle.zang e53ddfa6ef fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 10 months ago
王杰 b6aa88449d 44377 检验产品数据总报表目前是动态表单配置查询很慢,需要重新开发 10 months ago
castle.zang ee8c085bb0 fix bug 44022 芜湖正式:产线看板,需要关联显示异常停线时间 10 months ago
王杰 adb0cf7a8b 44376 武汉 加工记录统计报表 需求变更 10 months ago
王杰 ced040beb2 Merge branch 'dev-temp-castle-241223-44172' into uat 10 months ago
castle.zang 42033f7d57 fix bug 44172 PC-发运明细报表:增加vin和条码的查询条件 10 months ago
castle.zang 101f359f32 积单颜色 10 months ago
castle.zang 69a47d9a77 bom是否启动bomVersion 10 months ago